From 80c33ad235e5e5114d76c0b9099893c4a1a70e47 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Mon, 8 Jul 2024 10:56:50 +0100 Subject: [PATCH 001/249] Agrega recursos de imagen de leaflet a compilado --- grunt/config/cleanBuiltApp.js | 2 +- grunt/config/copy.js | 12 ++++++++++++ grunt/task/build.js | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/grunt/config/cleanBuiltApp.js b/grunt/config/cleanBuiltApp.js index 92b1e32e..7345ab7c 100644 --- a/grunt/config/cleanBuiltApp.js +++ b/grunt/config/cleanBuiltApp.js @@ -20,7 +20,7 @@ module.exports = function(grunt) { filesToDelete = [strippedFiles, uncompressedFiles], filesToKeep = [ 'dojo/dojo.js', 'dojo/resources/blank.gif', 'dojox/widget/ColorPicker/images/*.png', - 'redmic/modules/app/App.js' + 'leaflet/dist/images/*.png', 'redmic/modules/app/App.js' ]; grunt.config('redmicConfig.resourcesToCleanInBuiltApp', { diff --git a/grunt/config/copy.js b/grunt/config/copy.js index 0932b059..67c310ef 100644 --- a/grunt/config/copy.js +++ b/grunt/config/copy.js @@ -10,6 +10,10 @@ module.exports = function(grunt) { stylesDistPath = stylesPath + '/dist', distStylesSubPath = distPath + '/stylesheets', + leafletPath = '/javascript/leaflet/', + srcLeafletPath = publicPath + leafletPath, + distLeafletPath = distPath + leafletPath, + pdfjsPath = '/javascript/pdfjs/', srcPdfjsPath = publicPath + pdfjsPath, distPdfjsPath = distPath + pdfjsPath, @@ -33,6 +37,14 @@ module.exports = function(grunt) { expand: true }] }, + leaflet: { + files: [{ + cwd: srcLeafletPath, + src: ['dist/images/marker-*.png'], + dest: distLeafletPath, + expand: true + }] + }, pdfjs: { files: [{ cwd: srcPdfjsPath + pdfjsWebName, diff --git a/grunt/task/build.js b/grunt/task/build.js index 3a42d249..b4c7a38f 100644 --- a/grunt/task/build.js +++ b/grunt/task/build.js @@ -1,5 +1,5 @@ module.exports = function(grunt) { grunt.registerTask('build', - ['buildStyles', 'copy:resources', 'copy:pdfjs', 'buildApp', 'packageApp']); + ['buildStyles', 'copy:resources', 'copy:leaflet', 'copy:pdfjs', 'buildApp', 'packageApp']); }; -- GitLab From a0339844d465bbf1379f9b7ed1f94ef309fd7df9 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Mon, 8 Jul 2024 10:57:21 +0100 Subject: [PATCH 002/249] =?UTF-8?q?Corrige=20preservaci=C3=B3n=20de=20fich?= =?UTF-8?q?eros=20en=20compilado?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cambia la estrategia de copiado temporal para evitar la mezcla de recursos de diferente procedencia, que producía que algunos ficheros se restaurasen al lugar equivocado si existían solapes. --- grunt/task/buildApp.js | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/grunt/task/buildApp.js b/grunt/task/buildApp.js index 50332806..2fe3ca46 100644 --- a/grunt/task/buildApp.js +++ b/grunt/task/buildApp.js @@ -45,12 +45,14 @@ module.exports = function(grunt) { recursiveDirectoriesToClean = resourcesToClean.recursiveDirectories, filesToClean = resourcesToClean.files, - keepFilesCmd = 'mv', + createDirectoriesToKeepFilesCmd = 'mkdir -p', createDirectoriesToRestoreFilesCmd = 'mkdir -p', + keepFilesCmds = [], restoreFilesCmds = [], cleanDirectoriesCmd = 'rm -rf', cleanRecursiveDirsCmd = 'find ' + destPath + ' -type d', cleanFilesCmd = 'find ' + destPath + ' -type f', + temporalBasePath = path.join(destPath, '.temp'), i; for (i = 0; i < filesToKeep.length; i++) { @@ -58,16 +60,23 @@ module.exports = function(grunt) { fileName = path.basename(fileToKeep), filePath = path.dirname(fileToKeep), absoluteFileName = path.join(destPath, fileToKeep), - absoluteFilePath = path.join(destPath, filePath), - absoluteTemporalFileName = path.join(destPath, fileName), - restoreCmd = 'mv ' + absoluteTemporalFileName + ' ' + absoluteFilePath; + absoluteFilePath = path.join(destPath, filePath); - keepFilesCmd += ' ' + absoluteFileName; createDirectoriesToRestoreFilesCmd += ' ' + absoluteFilePath; + var absoluteTemporalPath = path.join(temporalBasePath, i.toString(), filePath), + absoluteTemporalFileName = path.join(absoluteTemporalPath, fileName); + + createDirectoriesToKeepFilesCmd += ' ' + absoluteTemporalPath; + + var keepCmd = 'mv ' + absoluteFileName + ' ' + absoluteTemporalPath, + restoreCmd = 'mv ' + absoluteTemporalFileName + ' ' + absoluteFilePath; + + keepFilesCmds.push(keepCmd); restoreFilesCmds.push(restoreCmd); } - keepFilesCmd += ' ' + destPath; + + restoreFilesCmds.push('rm -r ' + temporalBasePath); for (i = 0; i < directoriesToClean.length; i++) { var directory = directoriesToClean[i]; @@ -97,7 +106,8 @@ module.exports = function(grunt) { return [ 'echo "\nCleaning build and debug resources from built application at ' + destPath + '\n"', - keepFilesCmd, + createDirectoriesToKeepFilesCmd, + keepFilesCmds.join('; '), cleanDirectoriesCmd, cleanRecursiveDirsCmd, createDirectoriesToRestoreFilesCmd, -- GitLab From 9e8503126abb3a5c160b074255e7d661690805fc Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Mon, 8 Jul 2024 10:59:02 +0100 Subject: [PATCH 003/249] Corrige ruta por defecto de recursos de leaflet --- public/javascript/redmic/modules/map/LeafletImpl.js | 2 +- public/javascript/redmic/modules/map/_ImportWkt.js | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/public/javascript/redmic/modules/map/LeafletImpl.js b/public/javascript/redmic/modules/map/LeafletImpl.js index fb0ff3b3..546a0cb9 100644 --- a/public/javascript/redmic/modules/map/LeafletImpl.js +++ b/public/javascript/redmic/modules/map/LeafletImpl.js @@ -48,7 +48,7 @@ define([ _initialize: function() { - L.Icon.Default.imagePath = "/javascript/leaflet/dist/images"; + L.Icon.Default.imagePath = "/javascript/leaflet/dist/images/"; this.mapParentNode = put("div.map"); this.mapNode = put(this.mapParentNode, "div.map"); diff --git a/public/javascript/redmic/modules/map/_ImportWkt.js b/public/javascript/redmic/modules/map/_ImportWkt.js index de99b31a..677efbc0 100644 --- a/public/javascript/redmic/modules/map/_ImportWkt.js +++ b/public/javascript/redmic/modules/map/_ImportWkt.js @@ -99,11 +99,6 @@ define([ bounds = newLayer.getBounds(); } else { bounds = newLayer.getLatLng().toBounds(50); - - // TODO borrar cuando autodetección de leaflet funcione (falta barra final) - newLayer.setIcon(new L.Icon.Default({ - imagePath: '/javascript/leaflet/dist/images/' - })); } this._addMapLayer({ -- GitLab From 0ac1245574f1a960135de5f04ef9d6181e242b11 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Fri, 12 Jul 2024 09:56:15 +0100 Subject: [PATCH 004/249] =?UTF-8?q?Externaliza=20config=20est=C3=A1tica=20?= =?UTF-8?q?de=20dashboards?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Para probar la viabilidad del consumo de configuración de layout de vistas detalle desde configuración externa, además de para limpiar el código de datos estáticos, se mueve la correspondencia entre identificadores de estación e identificadores de dataDefinition para procesar su windRose. Primer paso para completar #88. --- .../viewers/views/RealTimeDashboardView.js | 593 +----------------- 1 file changed, 31 insertions(+), 562 deletions(-) diff --git a/public/javascript/app/viewers/views/RealTimeDashboardView.js b/public/javascript/app/viewers/views/RealTimeDashboardView.js index 9cefc347..919f3ac0 100644 --- a/public/javascript/app/viewers/views/RealTimeDashboardView.js +++ b/public/javascript/app/viewers/views/RealTimeDashboardView.js @@ -7,6 +7,8 @@ define([ , "app/redmicConfig" , "dojo/_base/declare" , "dojo/_base/lang" + , "dojo/Deferred" + , 'redmic/modules/base/_ExternalConfig' , "redmic/modules/chart/ChartsContainer/_AngularAxisWithGridDrawing" , "redmic/modules/chart/ChartsContainer/_InfoOnEmptyData" , "redmic/modules/chart/ChartsContainer/_InfoOnMouseOver" @@ -29,6 +31,8 @@ define([ , redmicConfig , declare , lang + , Deferred + , _ExternalConfig , _AngularAxisWithGridDrawing , _InfoOnEmptyData , _InfoOnMouseOver @@ -42,8 +46,9 @@ define([ , RealTimeInfo , SitePopupTemplate , EmbeddedContentTemplate -){ - return declare([Layout, Controller, _Main, _AddBasicTitle], { +) { + + return declare([Layout, Controller, _Main, _AddBasicTitle, _ExternalConfig], { // summary: // Vista detalle de datos en tiempo real, dashboards. @@ -58,563 +63,7 @@ define([ platformInfoTarget: 'platformInfo', dashboardTarget: 'realTimeDashboard', - // TODO esta información provendrá de un servicio en el futuro, siguiendo este formato - _timeSeriesDashboardSettings: { - '839c02ed-dc2c-4b5e-9100-8c9d88542152': { - panels: [{ - type: 'windRose', - query: { - terms: { - dataDefinition: { - direction: [19], - speed: [20] - } - } - } - }] - }, - '27bad38e-ee75-4fdc-82c9-dfe3d421e677': { - panels: [{ - type: 'windRose', - query: { - terms: { - dataDefinition: { - direction: [15], - speed: [18] - } - } - } - }] - }, - "0c6fc82e-cb39-4668-b732-047b14ecdfc0": { - "panels": [ - { - "type": "windRose", - "query": { - "terms": { - "dataDefinition": { - "direction": [ - 845 - ], - "speed": [ - 844 - ] - } - } - } - } - ] - }, - "2d2b3b42-3223-4290-804c-cbffab6e9689": { - "panels": [ - { - "type": "windRose", - "query": { - "terms": { - "dataDefinition": { - "direction": [ - 758 - ], - "speed": [ - 757 - ] - } - } - } - } - ] - }, - "bbb1e80c-11f8-4dea-be8a-81fa190f4ec0": { - "panels": [ - { - "type": "windRose", - "query": { - "terms": { - "dataDefinition": { - "direction": [ - 956 - ], - "speed": [ - 955 - ] - } - } - } - } - ] - }, - "ab233bc3-bdb1-4396-a8d5-1b50915d42ab": { - "panels": [ - { - "type": "windRose", - "query": { - "terms": { - "dataDefinition": { - "direction": [ - 836 - ], - "speed": [ - 835 - ] - } - } - } - } - ] - }, - "7f9945f7-5691-4307-9b34-bdc39abadb6f": { - "panels": [ - { - "type": "windRose", - "query": { - "terms": { - "dataDefinition": { - "direction": [ - 889 - ], - "speed": [ - 890 - ] - } - } - } - } - ] - }, - "8adce85f-00c8-464a-b5e5-1baf1082dea0": { - "panels": [ - { - "type": "windRose", - "query": { - "terms": { - "dataDefinition": { - "direction": [ - 912 - ], - "speed": [ - 911 - ] - } - } - } - } - ] - }, - "63bb4ef8-8066-40b8-badb-9d596a3733d7": { - "panels": [ - { - "type": "windRose", - "query": { - "terms": { - "dataDefinition": { - "direction": [ - 921 - ], - "speed": [ - 920 - ] - } - } - } - } - ] - }, - "1fba2156-74e9-4fe4-a7a6-d9c346ab63ba": { - "panels": [ - { - "type": "windRose", - "query": { - "terms": { - "dataDefinition": { - "direction": [ - 946 - ], - "speed": [ - 947 - ] - } - } - } - } - ] - }, - "3b9faf21-826c-449a-aa21-d3f1030f847e": { - "panels": [ - { - "type": "windRose", - "query": { - "terms": { - "dataDefinition": { - "direction": [ - 775 - ], - "speed": [ - 776 - ] - } - } - } - } - ] - }, - "4451fe86-9b43-4df8-b2f9-88f8688a4072": { - "panels": [ - { - "type": "windRose", - "query": { - "terms": { - "dataDefinition": { - "direction": [ - 753 - ], - "speed": [ - 752 - ] - } - } - } - } - ] - }, - "146c5133-1e36-4088-8daf-7ebdc9d3d0c1": { - "panels": [ - { - "type": "windRose", - "query": { - "terms": { - "dataDefinition": { - "direction": [ - 747 - ], - "speed": [ - 746 - ] - } - } - } - } - ] - }, - "b4181ed9-f90f-454b-8d5e-e59481f645ea": { - "panels": [ - { - "type": "windRose", - "query": { - "terms": { - "dataDefinition": { - "direction": [], - "speed": [] - } - } - } - } - ] - }, - "2a1d5746-e7c0-4847-afb1-37dfa106c5a9": { - "panels": [ - { - "type": "windRose", - "query": { - "terms": { - "dataDefinition": { - "direction": [ - 764 - ], - "speed": [ - 763 - ] - } - } - } - } - ] - }, - "d4ec21c5-a80d-48f3-9152-43cbc277217a": { - "panels": [ - { - "type": "windRose", - "query": { - "terms": { - "dataDefinition": { - "direction": [ - 1043 - ], - "speed": [ - 1042 - ] - } - } - } - } - ] - }, - "bbfa1aec-3c16-4bbb-8621-b1675bc2d1c1": { - "panels": [ - { - "type": "windRose", - "query": { - "terms": { - "dataDefinition": { - "direction": [ - 770 - ], - "speed": [ - 769 - ] - } - } - } - } - ] - }, - "c6539063-30ab-4aa1-8eff-f7f065da7232": { - "panels": [ - { - "type": "windRose", - "query": { - "terms": { - "dataDefinition": { - "direction": [ - 899 - ], - "speed": [ - 898 - ] - } - } - } - } - ] - }, - "17e04f7b-8295-4095-9488-d2b61408c0ae": { - "panels": [ - { - "type": "windRose", - "query": { - "terms": { - "dataDefinition": { - "direction": [ - 1021 - ], - "speed": [ - 1020 - ] - } - } - } - } - ] - }, - "2383c489-41e4-4037-bb45-d49fe4aebae2": { - "panels": [ - { - "type": "windRose", - "query": { - "terms": { - "dataDefinition": { - "direction": [ - 1010 - ], - "speed": [ - 1009 - ] - } - } - } - } - ] - }, - "8b9ffedc-a511-4e59-bf45-3dc5e2963832": { - "panels": [ - { - "type": "windRose", - "query": { - "terms": { - "dataDefinition": { - "direction": [ - 967 - ], - "speed": [ - 966 - ] - } - } - } - } - ] - }, - "72a17192-3a03-4564-ac2d-e163f81baf9e": { - "panels": [ - { - "type": "windRose", - "query": { - "terms": { - "dataDefinition": { - "direction": [ - 976 - ], - "speed": [ - 975 - ] - } - } - } - } - ] - }, - "45f4e3fd-264b-41a2-83c1-52f7a4a9ac5c": { - "panels": [ - { - "type": "windRose", - "query": { - "terms": { - "dataDefinition": { - "direction": [ - 1034 - ], - "speed": [ - 1033 - ] - } - } - } - } - ] - }, - "9d9cddc6-f0a6-4749-97a5-778daf4af95d": { - "panels": [ - { - "type": "windRose", - "query": { - "terms": { - "dataDefinition": { - "direction": [ - 1058 - ], - "speed": [ - 1057 - ] - } - } - } - } - ] - }, - "acfe67e6-de22-4d7c-9d48-377f3348b30e": { - "panels": [ - { - "type": "windRose", - "query": { - "terms": { - "dataDefinition": { - "direction": [ - 1001 - ], - "speed": [ - 1000 - ] - } - } - } - } - ] - }, - "27cea414-c9ee-446a-ad09-a98fab82d452": { - "panels": [ - { - "type": "windRose", - "query": { - "terms": { - "dataDefinition": { - "direction": [ - 819 - ], - "speed": [ - 818 - ] - } - } - } - } - ] - }, - "6c1a04d9-c538-4efc-98d3-924103a1f38b": { - "panels": [ - { - "type": "windRose", - "query": { - "terms": { - "dataDefinition": { - "direction": [ - 870 - ], - "speed": [ - 869 - ] - } - } - } - } - ] - }, - "f7738bec-9ea8-4f37-8afb-2b7a88de2a04": { - "panels": [ - { - "type": "windRose", - "query": { - "terms": { - "dataDefinition": { - "direction": [ - 985 - ], - "speed": [ - 984 - ] - } - } - } - } - ] - }, - "2fbab8eb-328d-45c1-b658-b6d4b451e271": { - "panels": [ - { - "type": "windRose", - "query": { - "terms": { - "dataDefinition": { - "direction": [ - 930 - ], - "speed": [ - 929 - ] - } - } - } - } - ] - }, - "7a072033-a592-4a45-b8a9-ea2cd7bafa14": { - "panels": [ - { - "type": "windRose", - "query": { - "terms": { - "dataDefinition": { - "direction": [ - 857 - ], - "speed": [ - 856 - ] - } - } - } - } - ] - } - } + externalConfigPropName: 'timeSeriesDashboardSettings' }; lang.mixin(this, this.config, args); @@ -622,6 +71,18 @@ define([ this.target = [this.timeSeriesStationsTarget, this.activityTarget]; }, + _setOwnCallbacksForEvents: function() { + + this._onEvt('GOT_EXTERNAL_CONFIG', lang.hitch(this._onGotExternalConfig)); + }, + + _onGotExternalConfig: function(evt) { + + var configValue = evt[this.externalConfigPropName]; + + this._externalConfigDfd.resolve(configValue); + }, + _setMainConfigurations: function() { this.widgetConfigs = this._merge([{ @@ -676,7 +137,13 @@ define([ postCreate: function() { + this._externalConfigDfd = new Deferred(); + this.inherited(arguments); + + this._emitEvt('GET_EXTERNAL_CONFIG', { + propertyName: this.externalConfigPropName + }); }, _refreshModules: function() { @@ -726,7 +193,9 @@ define([ var measurementData = itemData.properties.measurements; - measurementData && this._manageMeasurementData(measurementData); + if (measurementData && this._externalConfigDfd) { + this._externalConfigDfd.then(lang.hitch(this, this._manageMeasurementData, measurementData)); + } var activityId = itemData.properties.activityId; @@ -795,9 +264,9 @@ define([ }); }, - _manageMeasurementData: function(data) { + _manageMeasurementData: function(data, externalConfigPropValue) { - var dashboardSettings = this._timeSeriesDashboardSettings[this.pathVariableId]; + var dashboardSettings = externalConfigPropValue[this.pathVariableId]; var windRosePanelConfigs = dashboardSettings.panels.filter(function(panelConfig) { -- GitLab From f6e45db725991ecff89cf3f5bcc2bc23282eb206 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Thu, 18 Jul 2024 13:52:18 +0100 Subject: [PATCH 005/249] =?UTF-8?q?Corrige=20carga=20de=20geometr=C3=ADas?= =?UTF-8?q?=20para=20=C3=A1reas?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/javascript/templates | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/javascript/templates b/public/javascript/templates index 2a0e1819..6ea2133c 160000 --- a/public/javascript/templates +++ b/public/javascript/templates @@ -1 +1 @@ -Subproject commit 2a0e181937e084afd68ff46ace360f15d16939a7 +Subproject commit 6ea2133c3bc8458d58ef6cc22aa0e23458296d38 -- GitLab From 3b65aba99536f3d831a93ef76e0ce7634d489729 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Thu, 18 Jul 2024 13:55:26 +0100 Subject: [PATCH 006/249] Permite pedir props anidadas en config externa --- public/javascript/redmic/modules/base/_ExternalConfig.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/public/javascript/redmic/modules/base/_ExternalConfig.js b/public/javascript/redmic/modules/base/_ExternalConfig.js index f60c5ac8..4ed10c60 100644 --- a/public/javascript/redmic/modules/base/_ExternalConfig.js +++ b/public/javascript/redmic/modules/base/_ExternalConfig.js @@ -2,10 +2,12 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/aspect' + , 'RWidgets/Utilities' ], function( declare , lang , aspect + , Utilities ) { return declare(null, { @@ -97,7 +99,7 @@ define([ if (configProp) { configToEmit = {}; - configToEmit[configProp] = config[configProp]; + configToEmit[configProp] = Utilities.getDeepProp(config, configProp); } else { configToEmit = config; } -- GitLab From 1d7735247db3d58dc3bf1c00c74bb759b4ba51f0 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Thu, 18 Jul 2024 14:05:22 +0100 Subject: [PATCH 007/249] Comienza a dinamizar vistas detalle de activity MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Decide que layout mostrar para la actividad en base a la configuración externa recibida. Si no la hay, mantiene el comportamiento anterior de vincular una visualización con un valor concreto de categoría de la actividad. Agrupa configuraciones de widgets de vistas de detalle en un mismo lugar, para evitar su dispersión entre distintos niveles. En progreso. Inaugura nuevo directorio de código fuente, como primeros pasos para reestructurar los recursos del proyecto #87. Mueve lógica de vista detalle de actividad a una nueva ubicación, separándola de otros recursos relativos a su estructura y representación, que aporta el concepto de diseño. Fix #88. --- .../app/designs/details/main/Platform.js | 4 +- .../app/designs/details/main/Program.js | 12 +- .../app/designs/details/main/Project.js | 12 +- .../app/designs/details/main/Species.js | 61 +-- .../app/designs/details/main/_ActivityBase.js | 179 +-------- .../details/main/_ActivityCategoryWidgets.js | 229 ------------ .../views/ActivityCatalogDetailsView.js | 10 +- .../app/details/views/ActivityDetailsView.js | 10 +- public/javascript/dojoConfig.js | 3 + .../src/view/detail/_WidgetDefinition.js | 346 ++++++++++++++++++ .../view/detail/activity/ActivityDetail.js} | 75 ++-- .../detail/activity/_ActivityLayoutWidget.js | 203 ++++++++++ redmic.profile.js | 6 + 13 files changed, 636 insertions(+), 514 deletions(-) delete mode 100644 public/javascript/app/designs/details/main/_ActivityCategoryWidgets.js create mode 100644 public/javascript/src/view/detail/_WidgetDefinition.js rename public/javascript/{app/designs/details/main/Activity.js => src/view/detail/activity/ActivityDetail.js} (65%) create mode 100644 public/javascript/src/view/detail/activity/_ActivityLayoutWidget.js diff --git a/public/javascript/app/designs/details/main/Platform.js b/public/javascript/app/designs/details/main/Platform.js index e2204d74..294f1cc6 100644 --- a/public/javascript/app/designs/details/main/Platform.js +++ b/public/javascript/app/designs/details/main/Platform.js @@ -38,13 +38,13 @@ define([ _setMainConfigurations: function() { this.widgetConfigs = this._merge([{ - contactList: this._contactsConfig() + contactList: this._getContactsConfig() }, this.widgetConfigs || {}]); this.inherited(arguments); }, - _contactsConfig: function() { + _getContactsConfig: function() { return { width: 3, diff --git a/public/javascript/app/designs/details/main/Program.js b/public/javascript/app/designs/details/main/Program.js index f13691e6..821f5f8d 100644 --- a/public/javascript/app/designs/details/main/Program.js +++ b/public/javascript/app/designs/details/main/Program.js @@ -32,15 +32,15 @@ define([ _setMainConfigurations: function() { this.widgetConfigs = this._merge([{ - info: this._infoConfig({ + info: this._getInfoConfig({ template: TemplateInfo }), - additionalInfo: this._setAdditionalConfig(this.i18n.projects, TemplateProjects, + childActivitiesOrProjects: this._getChildActivitiesOrProjectsConfig(this.i18n.projects, TemplateProjects, this.viewPathsWidgets.projects), - organisationList: this._organisationsConfig(), - platformList: this._platformsConfig(), - contactList: this._contactsConfig(), - documentList: this._documentsConfig() + organisationList: this._getOrganisationsConfig(), + platformList: this._getPlatformsConfig(), + contactList: this._getContactsConfig(), + documentList: this._getDocumentsConfig() }, this.widgetConfigs || {}]); } }); diff --git a/public/javascript/app/designs/details/main/Project.js b/public/javascript/app/designs/details/main/Project.js index 8c61f80a..0b71a6e8 100644 --- a/public/javascript/app/designs/details/main/Project.js +++ b/public/javascript/app/designs/details/main/Project.js @@ -32,16 +32,16 @@ define([ _setMainConfigurations: function() { this.widgetConfigs = this._merge([{ - info: this._infoConfig({ + info: this._getInfoConfig({ template: TemplateInfo }), - additionalInfo: this._setAdditionalConfig(this.i18n.activities, TemplateActivities, + childActivitiesOrProjects: this._getChildActivitiesOrProjectsConfig(this.i18n.activities, TemplateActivities, this.viewPathsWidgets.activities ), - organisationList: this._organisationsConfig(), - platformList: this._platformsConfig(), - contactList: this._contactsConfig(), - documentList: this._documentsConfig() + organisationList: this._getOrganisationsConfig(), + platformList: this._getPlatformsConfig(), + contactList: this._getContactsConfig(), + documentList: this._getDocumentsConfig() }, this.widgetConfigs || {}]); } }); diff --git a/public/javascript/app/designs/details/main/Species.js b/public/javascript/app/designs/details/main/Species.js index 98e36c61..993db25f 100644 --- a/public/javascript/app/designs/details/main/Species.js +++ b/public/javascript/app/designs/details/main/Species.js @@ -4,9 +4,7 @@ define([ , "dojo/_base/lang" , "redmic/modules/browser/_ButtonsInRow" , "redmic/modules/browser/_Framework" - , "redmic/modules/browser/ListImpl" - , "redmic/modules/browser/bars/Total" - , "templates/DocumentList" + , 'src/view/detail/_WidgetDefinition' , "templates/LoadingCustom" , "templates/SpeciesInfo" , "templates/SpeciesTitle" @@ -18,9 +16,7 @@ define([ , lang , _ButtonsInRow , _Framework - , ListImpl - , Total - , TemplateDocuments + , _WidgetDefinition , TemplateCustom , TemplateInfo , TemplateTitle @@ -28,7 +24,7 @@ define([ , SpeciesLocation ) { - return declare([_DetailsBase], { + return declare([_DetailsBase, _WidgetDefinition], { // summary: // Vista detalle de especies. @@ -62,6 +58,18 @@ define([ target: this.titleWidgetTarget }, this.titleWidgetConfig || {}]); + var documentListConfig = this._merge([ + this._getDocumentsConfig(), + { + props: { + noDataMessage: TemplateCustom({ + message: this.i18n.noAssociatedDocuments, + iconClass: "fr fr-no-data" + }) + } + } + ]); + this.widgetConfigs = this._merge([ this.widgetConfigs || {}, { @@ -74,7 +82,7 @@ define([ activityList: { height: 3 }, - documentList: this._documentsConfig(), + documentList: documentListConfig, map: { width: 6, height: 4, @@ -88,43 +96,6 @@ define([ ]); }, - _documentsConfig: function() { - - return { - width: 3, - height: 2, - type: declare([ListImpl, _Framework, _ButtonsInRow]), - props: { - title: this.i18n.documents, - target: this.documentTarget, - template: TemplateDocuments, - bars: [{ - instance: Total - }], - rowConfig: { - buttonsConfig: { - listButton: [{ - icon: "fa-file-pdf-o", - btnId: "downloadPdf", - title: this.i18n.download, - condition: "url", - href: redmicConfig.viewPaths.bibliographyDetails - },{ - icon: "fa-info-circle", - btnId: "details", - title: this.i18n.info, - href: this.viewPathsWidgets.documents - }] - } - }, - noDataMessage: TemplateCustom({ - message: this.i18n.noAssociatedDocuments, - iconClass: "fr fr-no-data" - }) - } - }; - }, - _clearModules: function() { this.inherited(arguments); diff --git a/public/javascript/app/designs/details/main/_ActivityBase.js b/public/javascript/app/designs/details/main/_ActivityBase.js index 1238f671..b28ae052 100644 --- a/public/javascript/app/designs/details/main/_ActivityBase.js +++ b/public/javascript/app/designs/details/main/_ActivityBase.js @@ -3,39 +3,16 @@ define([ , "app/designs/details/Controller" , "app/designs/details/Layout" , "app/designs/details/_AddTitle" - , "app/redmicConfig" , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Filter" - , "redmic/modules/browser/_ButtonsInRow" - , "redmic/modules/browser/_Framework" - , "redmic/modules/browser/ListImpl" - , "redmic/modules/browser/bars/Pagination" - , "redmic/modules/browser/bars/Total" - , "redmic/modules/layout/templateDisplayer/TemplateDisplayer" - , "templates/ContactSet" - , "templates/DocumentList" - , "templates/OrganisationSet" - , "templates/PlatformSet" + ], function( _Main , Controller , Layout , _AddTitle - , redmicConfig , declare , lang - , _Filter - , _ButtonsInRow - , _Framework - , ListImpl - , Pagination - , Total - , TemplateDisplayer - , TemplateContacts - , TemplateDocuments - , TemplateOrganisation - , TemplatePlatform ){ return declare([Layout, Controller, _Main, _AddTitle], { // summary: @@ -59,158 +36,6 @@ define([ lang.mixin(this, this.config, args); }, - _organisationsConfig: function() { - - return { - width: 3, - height: 2, - type: declare([ListImpl, _Framework, _ButtonsInRow]), - props: { - title: this.i18n.organisations, - target: this.organisationTarget, - template: TemplateOrganisation, - bars: [{ - instance: Total - }], - rowConfig: { - buttonsConfig: { - listButton: [{ - icon: "fa-info-circle", - btnId: "details", - title: this.i18n.info, - href: this.viewPathsWidgets.organisations, - pathToItem: "organisation" - }] - } - } - } - }; - }, - - _platformsConfig: function() { - - return { - width: 3, - height: 2, - type: declare([ListImpl, _Framework, _ButtonsInRow]), - props: { - title: this.i18n.platforms, - target: this.platformTarget, - template: TemplatePlatform, - bars: [{ - instance: Total - }], - rowConfig: { - buttonsConfig: { - listButton: [{ - icon: "fa-info-circle", - btnId: "details", - title: this.i18n.info, - href: this.viewPathsWidgets.platforms, - pathToItem: "platform" - }] - } - } - } - }; - }, - - _contactsConfig: function() { - - return { - width: 3, - height: 2, - type: declare([ListImpl, _Framework]), - props: { - title: this.i18n.contacts, - target: this.contactTarget, - template: TemplateContacts, - bars: [{ - instance: Total - }] - } - }; - }, - - _documentsConfig: function() { - - return { - width: 3, - height: 2, - type: declare([ListImpl, _Framework, _ButtonsInRow]), - props: { - title: this.i18n.documents, - target: this.documentTarget, - template: TemplateDocuments, - bars: [{ - instance: Total - }], - rowConfig: { - buttonsConfig: { - listButton: [{ - icon: "fa-file-pdf-o", - btnId: "downloadPdf", - title: this.i18n.download, - condition: "url", - href: redmicConfig.viewPaths.bibliographyDetails - },{ - icon: "fa-info-circle", - btnId: "details", - title: this.i18n.info, - href: this.viewPathsWidgets.documents - }] - } - } - } - }; - }, - - _setAdditionalConfig: function(title, template, href) { - - return { - width: 3, - height: 2, - type: declare([ListImpl, _Framework, _ButtonsInRow, _Filter]), - props: { - title: title, - bars: [{ - instance: Total - },{ - instance: Pagination - }], - template: template, - rowConfig: { - buttonsConfig: { - listButton: [{ - icon: "fa-info-circle", - btnId: "details", - title: this.i18n.info, - href: href - }] - } - } - } - }; - }, - - _infoConfig: function(obj) { - - return { - width: obj.width || 3, - height: obj.height || 6, - type: TemplateDisplayer, - props: { - title: this.i18n.info, - template: obj.template, - "class": "containerDetails", - classEmptyTemplate: "contentListNoData", - target: this.infoTarget || this.target, - associatedIds: [this.ownChannel], - shownOption: this.shownOptionInfo - } - }; - }, - _clearModules: function() { this._publish(this._getWidgetInstance('info').getChannel('CLEAR')); @@ -238,7 +63,7 @@ define([ var target = lang.replace(this._targetListRank, { id: this.pathVariableId }), - widgetInstance = this._getWidgetInstance('additionalInfo'); + widgetInstance = this._getWidgetInstance('childActivitiesOrProjects'); this._publish(widgetInstance.getChannel("UPDATE_TARGET"), { target: target diff --git a/public/javascript/app/designs/details/main/_ActivityCategoryWidgets.js b/public/javascript/app/designs/details/main/_ActivityCategoryWidgets.js deleted file mode 100644 index b67576be..00000000 --- a/public/javascript/app/designs/details/main/_ActivityCategoryWidgets.js +++ /dev/null @@ -1,229 +0,0 @@ -define([ - 'app/designs/details/main/ActivityTrackingMap' - , 'app/details/views/ActivityAreaMapBase' - , 'app/details/views/ActivityCitationMapBase' - , 'app/details/views/ActivityFixedTimeseriesChart' - , 'app/details/views/ActivityFixedTimeseriesMap' - , 'app/details/views/ActivityInfrastructureMapBase' - , 'app/details/views/ActivityLayerMapBase' - , 'dojo/_base/declare' - , 'redmic/modules/layout/genericDisplayer/GenericDisplayer' -], function( - ActivityTrackingMap - , ActivityAreaMapBase - , ActivityCitationMapBase - , ActivityFixedTimeseriesChart - , ActivityFixedTimeseriesMap - , ActivityInfrastructureMapBase - , ActivityLayerMapBase - , declare - , GenericDisplayer -) { - - return declare(null, { - // summary: - // Adiciones a vista detalle de Activity, para mostrar datos según su categoría. - - _prepareActivityCategoryCustomWidgets: function() { - - if (!this._activityCategoryCustomWidgets) { - this._activityCategoryCustomWidgets = []; - } - - var activityCategory = this._activityData.activityCategory, - widgetKey; - - if (activityCategory === 'ci') { - widgetKey = this._prepareCitationActivityWidgets(); - } else if (activityCategory === 'ml') { - widgetKey = this._prepareMapLayerActivityWidgets(); - } else if (['tr', 'at', 'pt'].indexOf(activityCategory) !== -1) { - widgetKey = this._prepareTrackingActivityWidgets(); - } else if (activityCategory === 'if') { - widgetKey = this._prepareInfrastructureActivityWidgets(); - } else if (activityCategory === 'ar') { - widgetKey = this._prepareAreaActivityWidgets(); - } else if (activityCategory === 'ft') { - widgetKey = this._prepareFixedTimeseriesActivityWidgets(); - } else if (activityCategory === 'ec') { - widgetKey = this._prepareEmbeddedContentsActivityWidgets(); - } - - if (widgetKey) { - if (widgetKey instanceof Array) { - this._activityCategoryCustomWidgets = this._activityCategoryCustomWidgets.concat(widgetKey); - } else { - this._activityCategoryCustomWidgets.push(widgetKey); - } - } - }, - - _prepareCitationActivityWidgets: function() { - - var key = 'activityCitation'; - - var config = { - width: 6, - height: 6, - type: ActivityCitationMapBase, - props: { - windowTitle: 'citations', - pathVariableId: this._activityData.id - } - }; - - this._addWidget(key, config); - - return key; - }, - - _prepareMapLayerActivityWidgets: function() { - - var key = 'activityMapLayer'; - - var config = { - width: 6, - height: 6, - type: ActivityLayerMapBase, - props: { - windowTitle: 'layers', - pathVariableId: this._activityData.id - } - }; - - this._addWidget(key, config); - - return key; - }, - - _prepareTrackingActivityWidgets: function() { - - var key = 'activityTracking'; - - var config = { - width: 6, - height: 6, - type: ActivityTrackingMap, - props: { - windowTitle: 'tracking', - pathVariableId: this._activityData.id - } - }; - - this._addWidget(key, config); - - return key; - }, - - _prepareInfrastructureActivityWidgets: function() { - - var key = 'activityInfrastructure'; - - var config = { - width: 6, - height: 6, - type: ActivityInfrastructureMapBase, - props: { - windowTitle: 'infrastructures', - pathVariableId: this._activityData.id - } - }; - - this._addWidget(key, config); - - return key; - }, - - _prepareAreaActivityWidgets: function() { - - var key = 'activityArea'; - - var config = { - width: 6, - height: 6, - type: ActivityAreaMapBase, - props: { - windowTitle: 'area', - pathVariableId: this._activityData.id - } - }; - - this._addWidget(key, config); - - return key; - }, - - _prepareFixedTimeseriesActivityWidgets: function() { - - var mapKey = 'activityFixedTimeseriesMap'; - - var mapConfig = { - width: 6, - height: 6, - type: ActivityFixedTimeseriesMap, - props: { - windowTitle: 'associatedSurveyStation', - pathVariableId: this._activityData.id - } - }; - - this._addWidget(mapKey, mapConfig); - - var chartKey = 'activityFixedTimeseriesChart'; - - var chartConfig = { - width: 6, - height: 6, - type: ActivityFixedTimeseriesChart, - props: { - windowTitle: 'charts', - pathVariableId: this._activityData.id, - timeseriesDataChannel: this._getWidgetInstance(mapKey).getChannel('TIMESERIES_DATA') - } - }; - - this._addWidget(chartKey, chartConfig); - - return [mapKey, chartKey]; - }, - - _prepareEmbeddedContentsActivityWidgets: function() { - - var embeddedContents = this._activityData.embeddedContents, - keys = []; - - for (var i = 0; i < embeddedContents.length; i++) { - var embeddedContentObj = embeddedContents[i], - embeddedContentValue = embeddedContentObj.embeddedContent, - embeddedContentParentNode = document.createElement('object'); - - embeddedContentParentNode.innerHTML = embeddedContentValue; - - var config = { - width: 6, - height: 6, - type: GenericDisplayer, - props: { - title: this.i18n.embeddedContent + ' #' + (i + 1), - content: embeddedContentParentNode.firstChild - } - }; - - var key = 'embeddedContent' + i; - keys.push(key); - - this._addWidget(key, config); - } - - return keys; - }, - - _removeActivityCategoryCustomWidgets: function() { - - while (this._activityCategoryCustomWidgets.length) { - var key = this._activityCategoryCustomWidgets.pop(); - this._destroyWidget(key); - } - } - }); -}); diff --git a/public/javascript/app/details/views/ActivityCatalogDetailsView.js b/public/javascript/app/details/views/ActivityCatalogDetailsView.js index 976818b0..2daa1668 100644 --- a/public/javascript/app/details/views/ActivityCatalogDetailsView.js +++ b/public/javascript/app/details/views/ActivityCatalogDetailsView.js @@ -1,14 +1,14 @@ define([ - 'app/designs/details/main/Activity' - , 'app/redmicConfig' + 'app/redmicConfig' , 'dojo/_base/declare' + , 'src/view/detail/activity/ActivityDetail' ], function( - Activity - , redmicConfig + redmicConfig , declare + , ActivityDetail ) { - return declare(Activity, { + return declare(ActivityDetail, { // summary: // diff --git a/public/javascript/app/details/views/ActivityDetailsView.js b/public/javascript/app/details/views/ActivityDetailsView.js index 1058f7fe..12f3e3f1 100644 --- a/public/javascript/app/details/views/ActivityDetailsView.js +++ b/public/javascript/app/details/views/ActivityDetailsView.js @@ -1,14 +1,14 @@ define([ - 'app/designs/details/main/Activity' - , 'app/redmicConfig' + 'app/redmicConfig' , 'dojo/_base/declare' + , 'src/view/detail/activity/ActivityDetail' ], function( - Activity - , redmicConfig + redmicConfig , declare + , ActivityDetail ) { - return declare(Activity, { + return declare(ActivityDetail, { // summary: // diff --git a/public/javascript/dojoConfig.js b/public/javascript/dojoConfig.js index 4ae3855e..f0757382 100644 --- a/public/javascript/dojoConfig.js +++ b/public/javascript/dojoConfig.js @@ -20,6 +20,9 @@ dojoConfig = { },{ name: 'redmic', location: '../redmic' + },{ + name: 'src', + location: '../src' },{ name: 'dropzone', location: '../dropzone/dist/min' diff --git a/public/javascript/src/view/detail/_WidgetDefinition.js b/public/javascript/src/view/detail/_WidgetDefinition.js new file mode 100644 index 00000000..7cb2811d --- /dev/null +++ b/public/javascript/src/view/detail/_WidgetDefinition.js @@ -0,0 +1,346 @@ +define([ + 'app/redmicConfig' + , 'app/designs/details/main/ActivityTrackingMap' + , 'app/details/views/ActivityAreaMapBase' + , 'app/details/views/ActivityCitationMapBase' + , 'app/details/views/ActivityFixedTimeseriesChart' + , 'app/details/views/ActivityFixedTimeseriesMap' + , 'app/details/views/ActivityInfrastructureMapBase' + , 'app/details/views/ActivityLayerMapBase' + , 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'redmic/modules/base/_Filter' + , 'redmic/modules/browser/_ButtonsInRow' + , 'redmic/modules/browser/_Framework' + , 'redmic/modules/browser/ListImpl' + , 'redmic/modules/browser/bars/Pagination' + , 'redmic/modules/browser/bars/Total' + , 'redmic/modules/layout/genericDisplayer/GenericDisplayer' + , 'redmic/modules/layout/templateDisplayer/TemplateDisplayer' + , 'redmic/modules/map/_ImportWkt' + , 'redmic/modules/map/LeafletImpl' + , 'templates/ContactSet' + , 'templates/DocumentList' + , 'templates/OrganisationSet' + , 'templates/PlatformSet' +], function( + redmicConfig + , ActivityTrackingMap + , ActivityAreaMapBase + , ActivityCitationMapBase + , ActivityFixedTimeseriesChart + , ActivityFixedTimeseriesMap + , ActivityInfrastructureMapBase + , ActivityLayerMapBase + , declare + , lang + , _Filter + , _ButtonsInRow + , _Framework + , ListImpl + , Pagination + , Total + , GenericDisplayer + , TemplateDisplayer + , _ImportWkt + , LeafletImpl + , TemplateContacts + , TemplateDocuments + , TemplateOrganisation + , TemplatePlatform +) { + + return declare(null, { + // summary: + // Bloques de configuración de widgets para vistas detalle, para permitir instanciarlos. + + constructor: function(args) { + + this.config = { + documentTarget: 'documents', + contactTarget: 'contacts', + organisationTarget: 'organisations', + platformTarget: 'platforms' + }; + + lang.mixin(this, this.config, args); + }, + + _getOrganisationsConfig: function() { + + return { + width: 3, + height: 2, + type: declare([ListImpl, _Framework, _ButtonsInRow]), + props: { + title: this.i18n.organisations, + target: this.organisationTarget, + template: TemplateOrganisation, + bars: [{ + instance: Total + }], + rowConfig: { + buttonsConfig: { + listButton: [{ + icon: 'fa-info-circle', + btnId: 'details', + title: this.i18n.info, + href: this.viewPathsWidgets.organisations, + pathToItem: 'organisation' + }] + } + } + } + }; + }, + + _getPlatformsConfig: function() { + + return { + width: 3, + height: 2, + type: declare([ListImpl, _Framework, _ButtonsInRow]), + props: { + title: this.i18n.platforms, + target: this.platformTarget, + template: TemplatePlatform, + bars: [{ + instance: Total + }], + rowConfig: { + buttonsConfig: { + listButton: [{ + icon: 'fa-info-circle', + btnId: 'details', + title: this.i18n.info, + href: this.viewPathsWidgets.platforms, + pathToItem: 'platform' + }] + } + } + } + }; + }, + + _getContactsConfig: function() { + + return { + width: 3, + height: 2, + type: declare([ListImpl, _Framework]), + props: { + title: this.i18n.contacts, + target: this.contactTarget, + template: TemplateContacts, + bars: [{ + instance: Total + }] + } + }; + }, + + _getDocumentsConfig: function() { + + return { + width: 3, + height: 2, + type: declare([ListImpl, _Framework, _ButtonsInRow]), + props: { + title: this.i18n.documents, + target: this.documentTarget, + template: TemplateDocuments, + bars: [{ + instance: Total + }], + rowConfig: { + buttonsConfig: { + listButton: [{ + icon: 'fa-file-pdf-o', + btnId: 'downloadPdf', + title: this.i18n.download, + condition: 'url', + href: redmicConfig.viewPaths.bibliographyDetails + },{ + icon: 'fa-info-circle', + btnId: 'details', + title: this.i18n.info, + href: this.viewPathsWidgets.documents + }] + } + } + } + }; + }, + + _getChildActivitiesOrProjectsConfig: function(title, template, href) { + + return { + width: 3, + height: 2, + type: declare([ListImpl, _Framework, _ButtonsInRow, _Filter]), + props: { + title: title, + bars: [{ + instance: Total + },{ + instance: Pagination + }], + template: template, + rowConfig: { + buttonsConfig: { + listButton: [{ + icon: 'fa-info-circle', + btnId: 'details', + title: this.i18n.info, + href: href + }] + } + } + } + }; + }, + + _getInfoConfig: function(obj) { + + return { + width: obj.width || 3, + height: obj.height || 6, + type: TemplateDisplayer, + props: { + title: this.i18n.info, + template: obj.template, + 'class': 'containerDetails', + classEmptyTemplate: 'contentListNoData', + target: this.infoTarget || this.target, + associatedIds: [this.ownChannel], + shownOption: this.shownOptionInfo + } + }; + }, + + _getSpatialExtensionMapConfig: function(obj) { + + return { + width: 3, + height: 2, + hidden: true, + type: declare([LeafletImpl, _ImportWkt]), + props: { + title: this.i18n.spatialExtension, + omitContainerSizeCheck: true, + maxZoom: 15, + coordinatesViewer: false, + navBar: false, + miniMap: false, + scaleBar: false, + measureTools: false + } + }; + }, + + _getActivityCitationConfig: function() { + + return { + width: 6, + height: 6, + type: ActivityCitationMapBase, + props: { + windowTitle: 'citations', + pathVariableId: this._activityData.id + } + }; + }, + + _getActivityMapLayerConfig: function() { + + return { + width: 6, + height: 6, + type: ActivityLayerMapBase, + props: { + windowTitle: 'layers', + pathVariableId: this._activityData.id + } + }; + }, + + _getActivityTrackingConfig: function() { + + return { + width: 6, + height: 6, + type: ActivityTrackingMap, + props: { + windowTitle: 'tracking', + pathVariableId: this._activityData.id + } + }; + }, + + _getActivityInfrastructureConfig: function() { + + return { + width: 6, + height: 6, + type: ActivityInfrastructureMapBase, + props: { + windowTitle: 'infrastructures', + pathVariableId: this._activityData.id + } + }; + }, + + _getActivityAreaConfig: function() { + + return { + width: 6, + height: 6, + type: ActivityAreaMapBase, + props: { + windowTitle: 'area', + pathVariableId: this._activityData.id + } + }; + }, + + _getActivityFixedTimeseriesMapConfig: function() { + + return { + width: 6, + height: 6, + type: ActivityFixedTimeseriesMap, + props: { + windowTitle: 'associatedSurveyStation', + pathVariableId: this._activityData.id + } + }; + }, + + _getActivityFixedTimeseriesChartConfig: function(mapKey) { + + return { + width: 6, + height: 6, + type: ActivityFixedTimeseriesChart, + props: { + windowTitle: 'charts', + pathVariableId: this._activityData.id, + timeseriesDataChannel: this._getWidgetInstance(mapKey).getChannel('TIMESERIES_DATA') + } + }; + }, + + _getActivityEmbeddedContentsConfig: function(node, i) { + + return { + width: 6, + height: 6, + type: GenericDisplayer, + props: { + title: this.i18n.embeddedContent + ' #' + (i + 1), + content: node + } + }; + } + }); +}); diff --git a/public/javascript/app/designs/details/main/Activity.js b/public/javascript/src/view/detail/activity/ActivityDetail.js similarity index 65% rename from public/javascript/app/designs/details/main/Activity.js rename to public/javascript/src/view/detail/activity/ActivityDetail.js index 0b04ccae..7513039d 100644 --- a/public/javascript/app/designs/details/main/Activity.js +++ b/public/javascript/src/view/detail/activity/ActivityDetail.js @@ -1,74 +1,66 @@ define([ 'app/redmicConfig' + , 'app/designs/details/main/_ActivityBase' , 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/modules/map/_ImportWkt' - , 'redmic/modules/map/LeafletImpl' + , 'redmic/modules/base/_ExternalConfig' + , 'src/view/detail/activity/_ActivityLayoutWidget' , 'templates/ActivityInfo' - , './_ActivityBase' - , './_ActivityCategoryWidgets' ], function( redmicConfig + , _ActivityBase , declare , lang - , _ImportWkt - , LeafletImpl + , _ExternalConfig + , _ActivityLayoutWidget , TemplateInfo - , _ActivityBase - , _ActivityCategoryWidgets ) { - return declare([_ActivityBase, _ActivityCategoryWidgets], { + return declare([_ActivityBase, _ActivityLayoutWidget, _ExternalConfig], { // summary: - // Vista detalle de Activity. + // Layout para detalle de actividad con metadatos. constructor: function(args) { - this.target = redmicConfig.services.activity; - this.reportService = 'activity'; - this.ancestorsTarget = redmicConfig.services.activityAncestors; + this.config = { + target: redmicConfig.services.activity, + reportService: 'activity', + ancestorsTarget: redmicConfig.services.activityAncestors, + infoTarget: 'infoWidgetTarget', + externalConfigPropName: 'detailLayouts.activity' + }; - this.infoTarget = 'infoWidgetTarget'; + lang.mixin(this, this.config, args); }, _setMainConfigurations: function() { this.widgetConfigs = this._merge([{ - info: this._infoConfig({ + info: this._getInfoConfig({ height: 4, template: TemplateInfo }), - spatialExtensionMap: { - width: 3, - height: 2, - hidden: true, - type: declare([LeafletImpl, _ImportWkt]), - props: { - title: this.i18n.spatialExtension, - omitContainerSizeCheck: true, - maxZoom: 15, - coordinatesViewer: false, - navBar: false, - miniMap: false, - scaleBar: false, - measureTools: false - } - }, - organisationList: this._organisationsConfig(), - platformList: this._platformsConfig(), - contactList: this._contactsConfig(), - documentList: this._documentsConfig() + spatialExtensionMap: this._getSpatialExtensionMapConfig(), + organisationList: this._getOrganisationsConfig(), + platformList: this._getPlatformsConfig(), + contactList: this._getContactsConfig(), + documentList: this._getDocumentsConfig() }, this.widgetConfigs || {}]); }, _setMainOwnCallbacksForEvents: function() { + this._onEvt('GOT_EXTERNAL_CONFIG', lang.hitch(this._onGotExternalConfig)); this._onEvt('ME_OR_ANCESTOR_HIDDEN', lang.hitch(this, this._onActivityDetailsHidden)); }, - _refreshModules: function() { + _onGotExternalConfig: function(evt) { - this.inherited(arguments); + var configValue = evt[this.externalConfigPropName]; + + this._publish(this.getChannel('SET_PROPS'), { + detailLayouts: configValue + }); }, _itemAvailable: function(res) { @@ -95,7 +87,12 @@ define([ }); this._prepareSpatialExtension(); - this._prepareActivityCategoryCustomWidgets(); + + this._emitEvt('GET_EXTERNAL_CONFIG', { + propertyName: this.externalConfigPropName + }); + + this._prepareCustomWidgets(); this.inherited(arguments); }, @@ -155,7 +152,7 @@ define([ this._hideWidget('spatialExtensionMap'); - this._removeActivityCategoryCustomWidgets(); + this._removeCustomWidgets(); } }); }); diff --git a/public/javascript/src/view/detail/activity/_ActivityLayoutWidget.js b/public/javascript/src/view/detail/activity/_ActivityLayoutWidget.js new file mode 100644 index 00000000..a463fd6e --- /dev/null +++ b/public/javascript/src/view/detail/activity/_ActivityLayoutWidget.js @@ -0,0 +1,203 @@ +define([ + 'dojo/_base/declare' + , 'src/view/detail/_WidgetDefinition' +], function( + declare + , _WidgetDefinition +) { + + return declare(_WidgetDefinition, { + // summary: + // Aplicación de componentes adicionales para la vista detalle de Activity, en función del tipo de layout + // establecido según su identificador. Si no está establecido, se decide según su categoría. + + _onDetailLayoutsPropSet: function(evt) { + + var currentElementId = this.pathVariableId, + detailLayout = evt.value[currentElementId]; + + if (detailLayout) { + this._prepareDetailLayoutWidgets(detailLayout); + } + }, + + _prepareCustomWidgets: function() { + // TODO medida temporal por retrocompatibilidad con activityCategory + + var currentElementId = this.pathVariableId, + detailLayout = this.detailLayouts && this.detailLayouts[currentElementId]; + + if (!detailLayout) { + this._prepareActivityCategoryCustomWidgets(); + } + }, + + _prepareDetailLayoutWidgets: function(detailLayout) { + + if (!this._detailLayoutWidgets) { + this._detailLayoutWidgets = []; + } + + var widgetKey; + + if (detailLayout === 'citationMap') { + widgetKey = this._prepareCitationActivityWidgets(); + } else if (detailLayout === 'ogcLayerMap') { + widgetKey = this._prepareMapLayerActivityWidgets(); + } else if (detailLayout === 'trackingMap') { + widgetKey = this._prepareTrackingActivityWidgets(); + } else if (detailLayout === 'infrastructureMap') { + widgetKey = this._prepareInfrastructureActivityWidgets(); + } else if (detailLayout === 'areaMap') { + widgetKey = this._prepareAreaActivityWidgets(); + } else if (detailLayout === 'featureTimeseriesMapChart') { + widgetKey = this._prepareFixedTimeseriesActivityWidgets(); + } else if (detailLayout === 'embeddedContent') { + widgetKey = this._prepareEmbeddedContentsActivityWidgets(); + } + + if (widgetKey) { + if (widgetKey instanceof Array) { + this._detailLayoutWidgets = this._detailLayoutWidgets.concat(widgetKey); + } else { + this._detailLayoutWidgets.push(widgetKey); + } + } + }, + + _prepareActivityCategoryCustomWidgets: function() { + // TODO borrar cuando se deje de usar activityCategory + + if (!this._detailLayoutWidgets) { + this._detailLayoutWidgets = []; + } + + var activityCategory = this._activityData.activityCategory, + widgetKey; + + if (activityCategory === 'ci') { + widgetKey = this._prepareCitationActivityWidgets(); + } else if (activityCategory === 'ml') { + widgetKey = this._prepareMapLayerActivityWidgets(); + } else if (['tr', 'at', 'pt'].indexOf(activityCategory) !== -1) { + widgetKey = this._prepareTrackingActivityWidgets(); + } else if (activityCategory === 'if') { + widgetKey = this._prepareInfrastructureActivityWidgets(); + } else if (activityCategory === 'ar') { + widgetKey = this._prepareAreaActivityWidgets(); + } else if (activityCategory === 'ft') { + widgetKey = this._prepareFixedTimeseriesActivityWidgets(); + } else if (activityCategory === 'ec') { + widgetKey = this._prepareEmbeddedContentsActivityWidgets(); + } + + if (widgetKey) { + if (widgetKey instanceof Array) { + this._detailLayoutWidgets = this._detailLayoutWidgets.concat(widgetKey); + } else { + this._detailLayoutWidgets.push(widgetKey); + } + } + }, + + _prepareCitationActivityWidgets: function() { + + var key = 'activityCitation', + config = this._getActivityCitationConfig(); + + this._addWidget(key, config); + + return key; + }, + + _prepareMapLayerActivityWidgets: function() { + + var key = 'activityMapLayer', + config = this._getActivityMapLayerConfig(); + + this._addWidget(key, config); + + return key; + }, + + _prepareTrackingActivityWidgets: function() { + + var key = 'activityTracking', + config = this._getActivityTrackingConfig(); + + this._addWidget(key, config); + + return key; + }, + + _prepareInfrastructureActivityWidgets: function() { + + var key = 'activityInfrastructure', + config = this._getActivityInfrastructureConfig(); + + this._addWidget(key, config); + + return key; + }, + + _prepareAreaActivityWidgets: function() { + + var key = 'activityArea', + config = this._getActivityAreaConfig(); + + this._addWidget(key, config); + + return key; + }, + + _prepareFixedTimeseriesActivityWidgets: function() { + + var mapKey = 'activityFixedTimeseriesMap', + mapConfig = this._getActivityFixedTimeseriesMapConfig(); + + this._addWidget(mapKey, mapConfig); + + var chartKey = 'activityFixedTimeseriesChart', + chartConfig = this._getActivityFixedTimeseriesChartConfig(mapKey); + + this._addWidget(chartKey, chartConfig); + + return [mapKey, chartKey]; + }, + + _prepareEmbeddedContentsActivityWidgets: function() { + + var embeddedContents = this._activityData.embeddedContents, + keys = []; + + for (var i = 0; i < embeddedContents.length; i++) { + var embeddedContentObj = embeddedContents[i], + embeddedContentValue = embeddedContentObj.embeddedContent, + embeddedContentParentNode = document.createElement('object'); + + embeddedContentParentNode.innerHTML = embeddedContentValue; + + var key = 'embeddedContent' + i, + config = this._getActivityEmbeddedContentsConfig(embeddedContentParentNode.firstChild, i); + + keys.push(key); + + this._addWidget(key, config); + } + + return keys; + }, + + _removeCustomWidgets: function() { + + if (!this._detailLayoutWidgets) { + return; + } + + while (this._detailLayoutWidgets.length) { + var key = this._detailLayoutWidgets.pop(); + this._destroyWidget(key); + } + } + }); +}); diff --git a/redmic.profile.js b/redmic.profile.js index 404d4ef8..50e1205f 100644 --- a/redmic.profile.js +++ b/redmic.profile.js @@ -145,6 +145,12 @@ var profileObj = { resourceTags: { amd: amdTagger } + },{ + name: 'src', + location: 'src', + resourceTags: { + amd: amdTagger + } },{ name: 'mediatorjs', location: 'mediatorjs', -- GitLab From 17d9cd82b778733fcfc218306d48de02fc940381 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Fri, 19 Jul 2024 09:41:03 +0100 Subject: [PATCH 008/249] Agrega dependencia de widgets a project y program MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Al refactorizar el código de activity, se dejó de incluir una dependencia requerida para project y program, por lo que no podían obtener las configuraciones de widgets. --- public/javascript/app/designs/details/main/Program.js | 4 +++- public/javascript/app/designs/details/main/Project.js | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/public/javascript/app/designs/details/main/Program.js b/public/javascript/app/designs/details/main/Program.js index 821f5f8d..04890bf6 100644 --- a/public/javascript/app/designs/details/main/Program.js +++ b/public/javascript/app/designs/details/main/Program.js @@ -4,6 +4,7 @@ define([ , "dojo/_base/lang" , "templates/ProjectInfo" , "templates/ProjectList" + , 'src/view/detail/_WidgetDefinition' , "./_ActivityBase" ], function( redmicConfig @@ -11,9 +12,10 @@ define([ , lang , TemplateInfo , TemplateProjects + , _WidgetDefinition , _ActivityBase ){ - return declare([_ActivityBase], { + return declare([_ActivityBase, _WidgetDefinition], { // summary: // Vista detalle de Program. diff --git a/public/javascript/app/designs/details/main/Project.js b/public/javascript/app/designs/details/main/Project.js index 0b71a6e8..ba2d4cce 100644 --- a/public/javascript/app/designs/details/main/Project.js +++ b/public/javascript/app/designs/details/main/Project.js @@ -4,6 +4,7 @@ define([ , "dojo/_base/lang" , "templates/ActivityList" , "templates/ProjectInfo" + , 'src/view/detail/_WidgetDefinition' , "./_ActivityBase" ], function( redmicConfig @@ -11,9 +12,10 @@ define([ , lang , TemplateActivities , TemplateInfo + , _WidgetDefinition , _ActivityBase ){ - return declare([_ActivityBase], { + return declare([_ActivityBase, _WidgetDefinition], { // summary: // Vista detalle de Project. -- GitLab From 5401ea5d3f32ad3fbffe35c5f11c0e60ae6ec6b4 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Fri, 19 Jul 2024 12:59:59 +0100 Subject: [PATCH 009/249] Unifica config de widgets y controla acceso MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reutiliza la definición del widget que muestra listado de actividades o proyectos, para mostrar las actividades que tienen relación con otras entidades (organizaciones, plataformas, etc.). Adapta la configuración para permitir pisar valores desde la llamada al método. Omite la posibilidad de seleccionar actividades desde vistas detalle de otras entidades relacionadas con ella. Controla si se debe mostrar enlace de navegación hacia la actividad, en función del valor de accesibilidad de la misma y del rol del usuario en cuestión. Fix #83. --- .../app/designs/details/main/Program.js | 7 +- .../app/designs/details/main/Project.js | 8 ++- .../app/designs/details/main/Species.js | 4 +- .../app/designs/details/main/_DetailsBase.js | 67 +++---------------- .../src/view/detail/_WidgetDefinition.js | 53 +++++++++------ 5 files changed, 55 insertions(+), 84 deletions(-) diff --git a/public/javascript/app/designs/details/main/Program.js b/public/javascript/app/designs/details/main/Program.js index 04890bf6..ed92d537 100644 --- a/public/javascript/app/designs/details/main/Program.js +++ b/public/javascript/app/designs/details/main/Program.js @@ -37,8 +37,11 @@ define([ info: this._getInfoConfig({ template: TemplateInfo }), - childActivitiesOrProjects: this._getChildActivitiesOrProjectsConfig(this.i18n.projects, TemplateProjects, - this.viewPathsWidgets.projects), + childActivitiesOrProjects: this._getActivitiesOrProjectsConfig({ + title: this.i18n.projects, + template: TemplateProjects, + href: this.viewPathsWidgets.projects + }), organisationList: this._getOrganisationsConfig(), platformList: this._getPlatformsConfig(), contactList: this._getContactsConfig(), diff --git a/public/javascript/app/designs/details/main/Project.js b/public/javascript/app/designs/details/main/Project.js index ba2d4cce..afa6c329 100644 --- a/public/javascript/app/designs/details/main/Project.js +++ b/public/javascript/app/designs/details/main/Project.js @@ -37,9 +37,11 @@ define([ info: this._getInfoConfig({ template: TemplateInfo }), - childActivitiesOrProjects: this._getChildActivitiesOrProjectsConfig(this.i18n.activities, TemplateActivities, - this.viewPathsWidgets.activities - ), + childActivitiesOrProjects: this._getActivitiesOrProjectsConfig({ + title: this.i18n.activities, + template: TemplateActivities, + href: this.viewPathsWidgets.activities + }), organisationList: this._getOrganisationsConfig(), platformList: this._getPlatformsConfig(), contactList: this._getContactsConfig(), diff --git a/public/javascript/app/designs/details/main/Species.js b/public/javascript/app/designs/details/main/Species.js index 993db25f..8f2963a8 100644 --- a/public/javascript/app/designs/details/main/Species.js +++ b/public/javascript/app/designs/details/main/Species.js @@ -4,7 +4,6 @@ define([ , "dojo/_base/lang" , "redmic/modules/browser/_ButtonsInRow" , "redmic/modules/browser/_Framework" - , 'src/view/detail/_WidgetDefinition' , "templates/LoadingCustom" , "templates/SpeciesInfo" , "templates/SpeciesTitle" @@ -16,7 +15,6 @@ define([ , lang , _ButtonsInRow , _Framework - , _WidgetDefinition , TemplateCustom , TemplateInfo , TemplateTitle @@ -24,7 +22,7 @@ define([ , SpeciesLocation ) { - return declare([_DetailsBase, _WidgetDefinition], { + return declare([_DetailsBase], { // summary: // Vista detalle de especies. diff --git a/public/javascript/app/designs/details/main/_DetailsBase.js b/public/javascript/app/designs/details/main/_DetailsBase.js index ac5610b2..6c3a9870 100644 --- a/public/javascript/app/designs/details/main/_DetailsBase.js +++ b/public/javascript/app/designs/details/main/_DetailsBase.js @@ -3,34 +3,22 @@ define([ , "app/designs/details/Controller" , "app/designs/details/Layout" , "app/designs/details/_AddTitle" - , "app/redmicConfig" , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/browser/_ButtonsInRow" - , "redmic/modules/browser/_Framework" - , "redmic/modules/browser/_Select" - , "redmic/modules/browser/ListImpl" - , "redmic/modules/browser/bars/Total" - , "redmic/modules/layout/templateDisplayer/TemplateDisplayer" + , 'src/view/detail/_WidgetDefinition' , "templates/ActivityList" ], function( _Main , Controller , Layout , _AddTitle - , redmicConfig , declare , lang - , _ButtonsInRow - , _Framework - , _Select - , ListImpl - , Total - , TemplateDisplayer + , _WidgetDefinition , TemplateActivities ) { - return declare([Layout, Controller, _Main, _AddTitle], { + return declare([Layout, Controller, _Main, _AddTitle, _WidgetDefinition], { // summary: // Base de vistas detalle. @@ -52,50 +40,17 @@ define([ } this.widgetConfigs = this._merge([{ - info: { - width: 3, - height: 6, - type: TemplateDisplayer, - props: { - title: this.i18n.info, - template: this.templateInfo, - "class": "containerDetails", - classEmptyTemplate: "contentListNoData", - target: this.target[0], - associatedIds: [this.ownChannel], - shownOption: this.shownOptionInfo - } - }, - activityList: this._configAdditionalInfoActivity() - }, this.widgetConfigs || {}]); - }, - - _configAdditionalInfoActivity: function() { - - return { - type: declare([ListImpl, _Framework, _ButtonsInRow, _Select]), - width: 3, - height: 2, - props: { + info: this._getInfoConfig({ + template: this.templateInfo, + target: this.target[0] + }), + activityList: this._getActivitiesOrProjectsConfig({ title: this.i18n.activities, - selectionTarget: redmicConfig.services.activity, target: this.activityTarget, template: TemplateActivities, - bars: [{ - instance: Total - }], - rowConfig: { - buttonsConfig: { - listButton: [{ - icon: "fa-info-circle", - btnId: "details", - title: this.i18n.info, - href: this.viewPathsWidgets.activities - }] - } - } - } - }; + href: this.viewPathsWidgets.activities + }) + }, this.widgetConfigs || {}]); }, _clearModules: function() { diff --git a/public/javascript/src/view/detail/_WidgetDefinition.js b/public/javascript/src/view/detail/_WidgetDefinition.js index 7cb2811d..2f624121 100644 --- a/public/javascript/src/view/detail/_WidgetDefinition.js +++ b/public/javascript/src/view/detail/_WidgetDefinition.js @@ -9,6 +9,7 @@ define([ , 'app/details/views/ActivityLayerMapBase' , 'dojo/_base/declare' , 'dojo/_base/lang' + , 'redmic/base/Credentials' , 'redmic/modules/base/_Filter' , 'redmic/modules/browser/_ButtonsInRow' , 'redmic/modules/browser/_Framework' @@ -34,6 +35,7 @@ define([ , ActivityLayerMapBase , declare , lang + , Credentials , _Filter , _ButtonsInRow , _Framework @@ -66,7 +68,7 @@ define([ lang.mixin(this, this.config, args); }, - _getOrganisationsConfig: function() { + _getOrganisationsConfig: function(config) { return { width: 3, @@ -94,7 +96,7 @@ define([ }; }, - _getPlatformsConfig: function() { + _getPlatformsConfig: function(config) { return { width: 3, @@ -122,7 +124,7 @@ define([ }; }, - _getContactsConfig: function() { + _getContactsConfig: function(config) { return { width: 3, @@ -139,7 +141,7 @@ define([ }; }, - _getDocumentsConfig: function() { + _getDocumentsConfig: function(config) { return { width: 3, @@ -172,27 +174,38 @@ define([ }; }, - _getChildActivitiesOrProjectsConfig: function(title, template, href) { + _getActivitiesOrProjectsConfig: function(config) { return { width: 3, height: 2, type: declare([ListImpl, _Framework, _ButtonsInRow, _Filter]), props: { - title: title, + title: config.title, bars: [{ instance: Total },{ instance: Pagination }], - template: template, + target: config.target, + template: config.template, rowConfig: { buttonsConfig: { listButton: [{ icon: 'fa-info-circle', btnId: 'details', title: this.i18n.info, - href: href + href: config.href, + condition: function(item) { + + var accessibilityId = item && item.accessibility && item.accessibility.id, + browseableAccesibilities = [2], // libre + accessibilityIsBrowseable = accessibilityId && + browseableAccesibilities.indexOf(accessibilityId) !== -1, + userRoleIsAdmin = Credentials.get('userRole') === 'ROLE_ADMINISTRATOR'; + + return accessibilityIsBrowseable || userRoleIsAdmin; + } }] } } @@ -200,25 +213,25 @@ define([ }; }, - _getInfoConfig: function(obj) { + _getInfoConfig: function(config) { return { - width: obj.width || 3, - height: obj.height || 6, + width: config.width || 3, + height: config.height || 6, type: TemplateDisplayer, props: { title: this.i18n.info, - template: obj.template, + template: config.template, 'class': 'containerDetails', classEmptyTemplate: 'contentListNoData', - target: this.infoTarget || this.target, + target: config.target || this.infoTarget || this.target, associatedIds: [this.ownChannel], shownOption: this.shownOptionInfo } }; }, - _getSpatialExtensionMapConfig: function(obj) { + _getSpatialExtensionMapConfig: function(config) { return { width: 3, @@ -238,7 +251,7 @@ define([ }; }, - _getActivityCitationConfig: function() { + _getActivityCitationConfig: function(config) { return { width: 6, @@ -251,7 +264,7 @@ define([ }; }, - _getActivityMapLayerConfig: function() { + _getActivityMapLayerConfig: function(config) { return { width: 6, @@ -264,7 +277,7 @@ define([ }; }, - _getActivityTrackingConfig: function() { + _getActivityTrackingConfig: function(config) { return { width: 6, @@ -277,7 +290,7 @@ define([ }; }, - _getActivityInfrastructureConfig: function() { + _getActivityInfrastructureConfig: function(config) { return { width: 6, @@ -290,7 +303,7 @@ define([ }; }, - _getActivityAreaConfig: function() { + _getActivityAreaConfig: function(config) { return { width: 6, @@ -303,7 +316,7 @@ define([ }; }, - _getActivityFixedTimeseriesMapConfig: function() { + _getActivityFixedTimeseriesMapConfig: function(config) { return { width: 6, -- GitLab From e43305aece25ba4bbe56906754d4b34814dfad21 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Fri, 19 Jul 2024 13:26:12 +0100 Subject: [PATCH 010/249] Reorganiza estructura de server-app y gitlab-ci MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Unifica bajo un mismo directorio todos los recursos de la aplicación Node del lado del servidor, para dejar de mezclarse con recursos comunes o de la aplicación del lado del cliente. Unifica bajo un mismo directorio los componentes de plantillas locales importados desde el fichero .gitlab-ci.yml, para disminuir el ruido que se generaba en la raíz del proyecto. Algunos ficheros permanecen en la raíz porque es su ubicación esperada, como package.json o .gitlab-ci.yml. Progreso en #87. --- .gitlab-ci.yml | 10 +++++----- .gitlab-ci.build.yml => .gitlab-ci/build.yml | 0 .gitlab-ci.deploy.yml => .gitlab-ci/deploy.yml | 0 .gitlab-ci.package.yml => .gitlab-ci/package.yml | 0 .gitlab-ci.scan.yml => .gitlab-ci/scan.yml | 0 .gitlab-ci.test.yml => .gitlab-ci/test.yml | 0 package.json | 4 ++-- {app => server-app/src}/exposure.js | 2 +- {app => server-app/src}/externalRequest.js | 0 {app => server-app/src}/index.js | 2 +- {app => server-app/src}/logging.js | 0 {app => server-app/src}/metrics.js | 0 {app => server-app/src}/params.js | 0 {app => server-app/src}/prerender.js | 0 {app => server-app/src}/styles.js | 2 +- {views => server-app/views}/404.pug | 0 {views => server-app/views}/activateAccount.pug | 0 {views => server-app/views}/index.pug | 0 {views => server-app/views}/layout.pug | 0 {views => server-app/views}/noSupportBrowser.pug | 0 20 files changed, 10 insertions(+), 10 deletions(-) rename .gitlab-ci.build.yml => .gitlab-ci/build.yml (100%) rename .gitlab-ci.deploy.yml => .gitlab-ci/deploy.yml (100%) rename .gitlab-ci.package.yml => .gitlab-ci/package.yml (100%) rename .gitlab-ci.scan.yml => .gitlab-ci/scan.yml (100%) rename .gitlab-ci.test.yml => .gitlab-ci/test.yml (100%) rename {app => server-app/src}/exposure.js (97%) rename {app => server-app/src}/externalRequest.js (100%) rename {app => server-app/src}/index.js (96%) rename {app => server-app/src}/logging.js (100%) rename {app => server-app/src}/metrics.js (100%) rename {app => server-app/src}/params.js (100%) rename {app => server-app/src}/prerender.js (100%) rename {app => server-app/src}/styles.js (89%) rename {views => server-app/views}/404.pug (100%) rename {views => server-app/views}/activateAccount.pug (100%) rename {views => server-app/views}/index.pug (100%) rename {views => server-app/views}/layout.pug (100%) rename {views => server-app/views}/noSupportBrowser.pug (100%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b63b3467..0d10482e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,11 +11,11 @@ include: - project: 'redmic-project/gitlab-ci-templates' ref: master file: '/deployment-service/custom-image.yml' - - local: '/.gitlab-ci.scan.yml' - - local: '/.gitlab-ci.test.yml' - - local: '/.gitlab-ci.build.yml' - - local: '/.gitlab-ci.package.yml' - - local: '/.gitlab-ci.deploy.yml' + - local: '/.gitlab-ci/scan.yml' + - local: '/.gitlab-ci/test.yml' + - local: '/.gitlab-ci/build.yml' + - local: '/.gitlab-ci/package.yml' + - local: '/.gitlab-ci/deploy.yml' stages: - pre-build diff --git a/.gitlab-ci.build.yml b/.gitlab-ci/build.yml similarity index 100% rename from .gitlab-ci.build.yml rename to .gitlab-ci/build.yml diff --git a/.gitlab-ci.deploy.yml b/.gitlab-ci/deploy.yml similarity index 100% rename from .gitlab-ci.deploy.yml rename to .gitlab-ci/deploy.yml diff --git a/.gitlab-ci.package.yml b/.gitlab-ci/package.yml similarity index 100% rename from .gitlab-ci.package.yml rename to .gitlab-ci/package.yml diff --git a/.gitlab-ci.scan.yml b/.gitlab-ci/scan.yml similarity index 100% rename from .gitlab-ci.scan.yml rename to .gitlab-ci/scan.yml diff --git a/.gitlab-ci.test.yml b/.gitlab-ci/test.yml similarity index 100% rename from .gitlab-ci.test.yml rename to .gitlab-ci/test.yml diff --git a/package.json b/package.json index 0f3238de..f0c1ea54 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ }, "private": true, "scripts": { - "start": "node app" + "start": "node server-app/src" }, "dependencies": { "commander": "11.1.0", @@ -85,7 +85,7 @@ "node": ">=16.0", "npm": ">=8.19" }, - "main": "app", + "main": "server-app/src", "license": "AGPL-3.0-or-later", "dojoBuild": "redmic.profile.js" } diff --git a/app/exposure.js b/server-app/src/exposure.js similarity index 97% rename from app/exposure.js rename to server-app/src/exposure.js index 5db35bbb..4a9e4bcd 100644 --- a/app/exposure.js +++ b/server-app/src/exposure.js @@ -113,7 +113,7 @@ function exposeContents(app, directoryName) { index: false }; - const exposedPath = path.join(__dirname, '..', directoryName), + const exposedPath = path.join(__dirname, '../..', directoryName), staticPropName = 'static', servedPath = express[staticPropName](exposedPath, pathOptions); diff --git a/app/externalRequest.js b/server-app/src/externalRequest.js similarity index 100% rename from app/externalRequest.js rename to server-app/src/externalRequest.js diff --git a/app/index.js b/server-app/src/index.js similarity index 96% rename from app/index.js rename to server-app/src/index.js index 207b5151..7bb52bcf 100644 --- a/app/index.js +++ b/server-app/src/index.js @@ -7,7 +7,7 @@ try { encoding: 'utf8' }).trim(); } catch (e) { - const packageJson = require('../package.json'); + const packageJson = require('../../package.json'); version = packageJson.version; } diff --git a/app/logging.js b/server-app/src/logging.js similarity index 100% rename from app/logging.js rename to server-app/src/logging.js diff --git a/app/metrics.js b/server-app/src/metrics.js similarity index 100% rename from app/metrics.js rename to server-app/src/metrics.js diff --git a/app/params.js b/server-app/src/params.js similarity index 100% rename from app/params.js rename to server-app/src/params.js diff --git a/app/prerender.js b/server-app/src/prerender.js similarity index 100% rename from app/prerender.js rename to server-app/src/prerender.js diff --git a/app/styles.js b/server-app/src/styles.js similarity index 89% rename from app/styles.js rename to server-app/src/styles.js index a863bc9d..389bfe40 100644 --- a/app/styles.js +++ b/server-app/src/styles.js @@ -24,7 +24,7 @@ function compileStylus(str, filePath) { function generateStylesheets(app) { - const stylesParentPath = path.join(__dirname, '..', 'public'); + const stylesParentPath = path.join(__dirname, '../..', 'public'); app.use(stylus.middleware({ src: stylesParentPath, diff --git a/views/404.pug b/server-app/views/404.pug similarity index 100% rename from views/404.pug rename to server-app/views/404.pug diff --git a/views/activateAccount.pug b/server-app/views/activateAccount.pug similarity index 100% rename from views/activateAccount.pug rename to server-app/views/activateAccount.pug diff --git a/views/index.pug b/server-app/views/index.pug similarity index 100% rename from views/index.pug rename to server-app/views/index.pug diff --git a/views/layout.pug b/server-app/views/layout.pug similarity index 100% rename from views/layout.pug rename to server-app/views/layout.pug diff --git a/views/noSupportBrowser.pug b/server-app/views/noSupportBrowser.pug similarity index 100% rename from views/noSupportBrowser.pug rename to server-app/views/noSupportBrowser.pug -- GitLab From 448ad135cf82c80014fe89abca8a25dec645bd7c Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Fri, 19 Jul 2024 13:48:36 +0100 Subject: [PATCH 011/249] Retoca compilado y mueve index de server-app MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Revisa proceso de copia de recursos de compilado, para recoger los ficheros de server-app en su nueva ubicación. Coloca a primer nivel, dentro de server-app, al fichero principal de la aplicación Node. De esta manera, se puede referenciar directamente sólo con el nombre del directorio. --- grunt/task/packageApp.js | 2 +- package.json | 4 ++-- server-app/{src => }/index.js | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) rename server-app/{src => }/index.js (77%) diff --git a/grunt/task/packageApp.js b/grunt/task/packageApp.js index 272aafd3..0f719a13 100644 --- a/grunt/task/packageApp.js +++ b/grunt/task/packageApp.js @@ -10,7 +10,7 @@ module.exports = function(grunt) { }, command: [ 'version=$(node -p "require(\'./package.json\').version")', - 'tar -acf dist-v$version.tar.gz dist/ views/ app/ package.json yarn.lock README.md LICENSE' + 'tar -acf dist-v$version.tar.gz dist/ server-app/ package.json yarn.lock README.md LICENSE' ].join('; ') }); diff --git a/package.json b/package.json index f0c1ea54..47de4133 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ }, "private": true, "scripts": { - "start": "node server-app/src" + "start": "node server-app" }, "dependencies": { "commander": "11.1.0", @@ -85,7 +85,7 @@ "node": ">=16.0", "npm": ">=8.19" }, - "main": "server-app/src", + "main": "server-app", "license": "AGPL-3.0-or-later", "dojoBuild": "redmic.profile.js" } diff --git a/server-app/src/index.js b/server-app/index.js similarity index 77% rename from server-app/src/index.js rename to server-app/index.js index 7bb52bcf..1953acd3 100644 --- a/server-app/src/index.js +++ b/server-app/index.js @@ -7,13 +7,13 @@ try { encoding: 'utf8' }).trim(); } catch (e) { - const packageJson = require('../../package.json'); + const packageJson = require('../package.json'); version = packageJson.version; } -const params = require('./params')(version), - logging = require('./logging'), +const params = require('./src/params')(version), + logging = require('./src/logging'), logger = logging.logger; let cluster; @@ -37,9 +37,9 @@ if (cluster && cluster.isMaster) { const express = require('express'), http = require('http'), - metrics = require('./metrics')(logger, '/metrics'), - prerender = require('./prerender')(logger), - exposure = require('./exposure')(logger, params, version), + metrics = require('./src/metrics')(logger, '/metrics'), + prerender = require('./src/prerender')(logger), + exposure = require('./src/exposure')(logger, params, version), port = params.port, debug = params.debug, -- GitLab From e9ef68c0f2122be27e96b74e899cb65bd38468bf Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Fri, 19 Jul 2024 13:50:41 +0100 Subject: [PATCH 012/249] Mueve scripts usados por grunt a su directorio MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Originalmente, estos scripts eran lanzados manualmente, de ahí su ubicación en la raíz. Con el tiempo, pasaron a ser invocados solamente desde tareas Grunt, por lo que se mueven a su contexto. --- {scripts => grunt/scripts}/addModules.sh | 0 {scripts => grunt/scripts}/removeModules.sh | 0 {scripts => grunt/scripts}/updateModules.sh | 0 grunt/task/addModules.js | 2 +- grunt/task/removeModules.js | 2 +- grunt/task/updateModules.js | 2 +- 6 files changed, 3 insertions(+), 3 deletions(-) rename {scripts => grunt/scripts}/addModules.sh (100%) rename {scripts => grunt/scripts}/removeModules.sh (100%) rename {scripts => grunt/scripts}/updateModules.sh (100%) diff --git a/scripts/addModules.sh b/grunt/scripts/addModules.sh similarity index 100% rename from scripts/addModules.sh rename to grunt/scripts/addModules.sh diff --git a/scripts/removeModules.sh b/grunt/scripts/removeModules.sh similarity index 100% rename from scripts/removeModules.sh rename to grunt/scripts/removeModules.sh diff --git a/scripts/updateModules.sh b/grunt/scripts/updateModules.sh similarity index 100% rename from scripts/updateModules.sh rename to grunt/scripts/updateModules.sh diff --git a/grunt/task/addModules.js b/grunt/task/addModules.js index aa3dc5bc..e69f19cf 100644 --- a/grunt/task/addModules.js +++ b/grunt/task/addModules.js @@ -10,7 +10,7 @@ module.exports = function(grunt) { }, command: function() { - return 'scripts/addModules.sh'; + return 'grunt/scripts/addModules.sh'; } }); diff --git a/grunt/task/removeModules.js b/grunt/task/removeModules.js index f686f3a7..5378281e 100644 --- a/grunt/task/removeModules.js +++ b/grunt/task/removeModules.js @@ -12,7 +12,7 @@ module.exports = function(grunt) { }, command: function() { - var cmd = 'scripts/removeModules.sh'; + var cmd = 'grunt/scripts/removeModules.sh'; if (module) { cmd += ' ' + module; diff --git a/grunt/task/updateModules.js b/grunt/task/updateModules.js index b4b4b411..11981f49 100644 --- a/grunt/task/updateModules.js +++ b/grunt/task/updateModules.js @@ -13,7 +13,7 @@ module.exports = function(grunt) { }, command: function() { - var cmd = 'scripts/updateModules.sh'; + var cmd = 'grunt/scripts/updateModules.sh'; if (remote) { cmd += ' remote'; -- GitLab From 1103720b89a40e649e1e2d1c52c743800eae6d02 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Fri, 19 Jul 2024 14:24:47 +0100 Subject: [PATCH 013/249] =?UTF-8?q?Agrupa=20recursos=20de=20aplicaci=C3=B3?= =?UTF-8?q?n=20cliente?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cambia la estructura de ficheros de la aplicación para separar convenientemente los recursos de esta de otros elementos, como la aplicación Node, configuraciones ajenas, etc. Aplica el cambio en las rutas detectadas hasta el momento, desde tareas de Grunt hasta la referencia de submódulos Git, pasando por el profile de la aplicación. Revisa ficheros a empaquetar por NPM, ya no hace falta especificar la ruta de vistas porque ya está incorporada en el mismo ámbito. Ignora en el repositorio el fichero de salida que genera el comando npm pack. Avanza en #87. --- .gitignore | 1 + .gitmodules | 10 +++++----- Gruntfile.js | 2 +- redmic.profile.js => client-app/app.profile.js | 2 +- {public => client-app}/javascript/alertify | 0 .../app/administrative/taxonomy/views/ClassView.js | 0 .../app/administrative/taxonomy/views/FamilyView.js | 0 .../app/administrative/taxonomy/views/GenusView.js | 0 .../administrative/taxonomy/views/KingdomView.js | 0 .../taxonomy/views/MisIdentificationView.js | 0 .../app/administrative/taxonomy/views/OrderView.js | 0 .../app/administrative/taxonomy/views/PhylumView.js | 0 .../administrative/taxonomy/views/SpeciesView.js | 0 .../administrative/taxonomy/views/SubphylumView.js | 0 .../administrative/taxonomy/views/TaxonomyView.js | 0 .../taxonomy/views/_AddCompositeTaxon.js | 0 .../taxonomy/views/templates/forms/KingdomForm.html | 0 .../templates/forms/MisIdentificationForm.html | 0 .../views/templates/forms/PeculiarityForm.html | 0 .../views/templates/forms/RecoveryForm.html | 0 .../taxonomy/views/templates/forms/SpeciesForm.html | 0 .../views/templates/forms/SpecimenTagForm.html | 0 .../taxonomy/views/templates/forms/TaxonForm.html | 0 .../app/administrative/views/ActivityView.js | 0 .../app/administrative/views/AnimalView.js | 0 .../app/administrative/views/ContactView.js | 0 .../app/administrative/views/DeviceView.js | 0 .../app/administrative/views/DocumentView.js | 0 .../app/administrative/views/OrganisationView.js | 0 .../app/administrative/views/PlatformView.js | 0 .../app/administrative/views/ProgramView.js | 0 .../app/administrative/views/ProjectView.js | 0 .../views/templates/forms/ActivityContactForm.html | 0 .../forms/ActivityEmbeddedContentForm.html | 0 .../views/templates/forms/ActivityForm.html | 0 .../templates/forms/ActivityOrganisationForm.html | 0 .../views/templates/forms/ActivityPlatformForm.html | 0 .../views/templates/forms/ActivityResourceForm.html | 0 .../views/templates/forms/AnimalForm.html | 0 .../views/templates/forms/CalibrationForm.html | 0 .../views/templates/forms/ConditionForm.html | 0 .../views/templates/forms/ContactForm.html | 0 .../views/templates/forms/DeviceForm.html | 0 .../views/templates/forms/DocumentForm.html | 0 .../templates/forms/MetricsDefinitionForm.html | 0 .../views/templates/forms/OrganisationForm.html | 0 .../views/templates/forms/ParameterForm.html | 0 .../views/templates/forms/PlatformForm.html | 0 .../views/templates/forms/ProgramForm.html | 0 .../views/templates/forms/ProjectForm.html | 0 .../views/templates/forms/UnitForm.html | 0 .../javascript/app/base/models/_Model.js | 0 .../javascript/app/base/models/attr/ArrayAttr.js | 0 .../javascript/app/base/models/attr/Attr.js | 0 .../javascript/app/base/models/attr/ObjAttr.js | 0 .../javascript/app/base/models/attr/RelationAttr.js | 0 .../javascript/app/base/models/attr/_Attr.js | 0 .../javascript/app/base/models/attr/_ComplexAttr.js | 0 .../app/base/views/EditorLayerWithVariableForm.js | 0 .../javascript/app/base/views/Module.js | 0 .../app/base/views/_ListenRequestError.js | 0 .../javascript/app/base/views/_LoadingWidget.js | 0 .../javascript/app/base/views/_SettingsHandler.js | 0 .../javascript/app/base/views/_View.js | 0 .../javascript/app/base/views/_ViewHandle.js | 0 .../javascript/app/base/views/_ViewListBase.js | 0 .../app/base/views/extensions/_ActivityClosed.js | 0 .../app/base/views/extensions/_AddAtlasCategory.js | 0 .../_AddCompositeSearchInTooltipFromTextSearch.js | 0 .../app/base/views/extensions/_AddForm.js | 0 .../app/base/views/extensions/_AddFormItfc.js | 0 .../app/base/views/extensions/_AddSelectInput.js | 0 .../base/views/extensions/_AddSelectInputItfc.js | 0 .../views/extensions/_AddSelectionHandlerKeypad.js | 0 .../base/views/extensions/_AddTextSearchInput.js | 0 .../views/extensions/_AddTextSearchInputItfc.js | 0 .../extensions/_CompositeInTooltipFromIconKeypad.js | 0 .../views/extensions/_CompositeSearchInTooltip.js | 0 .../app/base/views/extensions/_Edition.js | 0 .../app/base/views/extensions/_EditionCommons.js | 0 .../app/base/views/extensions/_EditionFormList.js | 0 .../app/base/views/extensions/_EditionLayerView.js | 0 .../app/base/views/extensions/_EditionView.js | 0 .../app/base/views/extensions/_EditionWizardView.js | 0 .../app/base/views/extensions/_FormInDialogView.js | 0 .../app/base/views/extensions/_GetActivityData.js | 0 .../base/views/extensions/_GetActivityDataItfc.js | 0 .../base/views/extensions/_InterceptCloseUpView.js | 0 ...ListenActivityDataAndAccessByActivityCategory.js | 0 .../base/views/extensions/_LocalSelectionView.js | 0 .../views/extensions/_LocalSelectionViewItfc.js | 0 .../app/base/views/extensions/_OnShownAndRefresh.js | 0 .../app/base/views/extensions/_ProcessInterval.js | 0 .../base/views/extensions/_SelectInDoubleList.js | 0 .../app/catalog/views/ActivitiesCatalogView.js | 0 .../app/catalog/views/OrganisationsCatalogView.js | 0 .../app/catalog/views/PlatformsCatalogView.js | 0 .../app/catalog/views/ProgramsCatalogView.js | 0 .../app/catalog/views/ProjectsCatalogView.js | 0 .../app/catalog/views/SpeciesCatalogView.js | 0 .../javascript/app/components/CookieLoader.js | 0 .../javascript/app/components/ReCaptcha.js | 0 .../app/components/steps/AccessSetStep.js | 0 .../app/components/steps/ActivitySetStep.js | 0 .../app/components/steps/AddGeomSiteStep.js | 0 .../components/steps/AreaClassificationsSetStep.js | 0 .../app/components/steps/CalibrationSetStep.js | 0 .../javascript/app/components/steps/CitationStep.js | 0 .../app/components/steps/ClassificationsStep.js | 0 .../app/components/steps/ContactSetStep.js | 0 .../app/components/steps/DataDefinitionSetStep.js | 0 .../app/components/steps/DescribeSiteStep.js | 0 .../app/components/steps/DocumentSetStep.js | 0 .../app/components/steps/DocumentStepFiltered.js | 0 .../app/components/steps/DownloadsSetStep.js | 0 .../app/components/steps/EmbeddedContentSetStep.js | 0 .../javascript/app/components/steps/MainDataStep.js | 0 .../app/components/steps/MapSelectAreaStep.js | 0 .../app/components/steps/OrganisationSetStep.js | 0 .../app/components/steps/PlatformSetStep.js | 0 .../app/components/steps/PreLoadMainDataStep.js | 0 .../app/components/steps/ProtocolsSetStep.js | 0 .../app/components/steps/RecoverySetStep.js | 0 .../app/components/steps/RelationDataSetStep.js | 0 .../app/components/steps/ResourceSetStep.js | 0 .../components/steps/SelectActivityCategoryStep.js | 0 .../app/components/steps/SelectLayerStep.js | 0 .../app/components/steps/SelectRegisterTypeStep.js | 0 .../app/components/steps/SpeciesMainDataStep.js | 0 .../app/components/steps/SpecimenTagSetStep.js | 0 .../javascript/app/components/steps/UnitSetStep.js | 0 .../steps/_ClassificationsRelationData.js | 0 .../steps/_DataListAndSaveRelationData.js | 0 .../app/components/steps/_DateRelationData.js | 0 .../javascript/app/components/steps/_MainData.js | 0 .../app/components/steps/_ParametersRelationData.js | 0 .../app/components/steps/_RememberDeleteItems.js | 0 .../app/components/steps/_SelectOptionBox.js | 0 .../viewCustomization/addGeomSite/views/Line.js | 0 .../addGeomSite/views/MultiPolygon.js | 0 .../viewCustomization/addGeomSite/views/Point.js | 0 .../addGeomSite/views/_BaseGeometryForm.js | 0 .../addGeomSite/views/templates/LineForm.html | 0 .../addGeomSite/views/templates/PointForm.html | 0 .../describeSite/views/SelectStationByActivity.js | 0 .../describeSite/views/_AdditionalKeyGetter.js | 0 .../describeSite/views/templates/ARForm.html | 0 .../views/templates/DescribeSiteForm.html | 0 .../describeSite/views/templates/IFForm.html | 0 .../loadFile/models/LoadFileModel.js | 0 .../loadFile/views/templates/ARFileForm.html | 0 .../loadFile/views/templates/LoadFileForm.html | 0 .../parameter/views/templates/FTForm.html | 0 .../parameter/views/templates/OCForm.html | 0 .../relationData/views/templates/AreaTypeForm.html | 0 .../relationData/views/templates/DateForm.html | 0 .../relationData/views/templates/DefaultForm.html | 0 .../relationData/views/templates/DeviceForm.html | 0 .../views/templates/PointGeometryForm.html | 0 .../app/dataLoader/areas/views/AreaView.js | 0 .../views/templates/AreaClassificationsForm.html | 0 .../app/dataLoader/base/_GeographicBase.js | 0 .../app/dataLoader/citation/views/CitationView.js | 0 .../citation/views/templates/CitationForm.html | 0 .../views/InfrastructureAttributesView.js | 0 .../infrastructure/views/InfrastructureView.js | 0 .../views/templates/form/AttributesForm.html | 0 .../dataLoader/sightings/models/SightingsModel.js | 0 .../app/dataLoader/sightings/views/SightingsView.js | 0 .../sightings/views/templates/SightingsForm.html | 0 .../views/ObjectCollectingSeriesDataView.js | 0 .../surveyParameters/views/ObjectCollectionView.js | 0 .../views/SurveyStationSeriesDataView.js | 0 .../surveyParameters/views/SurveyStationView.js | 0 .../views/_DataLoadedByStationManagement.js | 0 .../surveyParameters/views/_SeriesDataView.js | 0 .../views/templates/ObjectCollectingForm.html | 0 .../views/templates/TimeSeriesForm.html | 0 .../dataLoader/tracking/views/TrackingDataView.js | 0 .../app/dataLoader/tracking/views/TrackingView.js | 0 .../views/templates/form/TrackingPointForm.html | 0 .../javascript/app/designs/base/_Browser.js | 0 .../javascript/app/designs/base/_Controller.js | 0 .../javascript/app/designs/base/_ControllerItfc.js | 0 .../javascript/app/designs/base/_Layout.js | 0 .../javascript/app/designs/base/_LayoutItfc.js | 0 .../javascript/app/designs/base/_Main.js | 0 .../javascript/app/designs/base/_MainItfc.js | 0 .../javascript/app/designs/base/_ServiceOGC.js | 0 .../javascript/app/designs/chart/Controller.js | 0 .../chart/layout/SideAndTopAndBottomContent.js | 0 .../app/designs/chart/layout/TopAndBottomContent.js | 0 .../app/designs/chart/layout/TopContent.js | 0 .../main/ChartsWithLegendAndToolbarsAndSlider.js | 0 .../chart/main/ChartsWithToolbarsAndSlider.js | 0 .../designs/chart/main/MultiPieChartWithToolbar.js | 0 .../chart/main/MultiWindRoseChartWithToolbar.js | 0 .../designs/chart/main/WindRoseChartWithToolbar.js | 0 .../chart/main/_ChartsWithToolbarsAndSlider.js | 0 .../chart/main/_ChartsWithToolbarsAndSliderItfc.js | 0 .../main/_ProcessDataDefinitionAndGetTimeSeries.js | 0 .../javascript/app/designs/details/Controller.js | 0 .../javascript/app/designs/details/Layout.js | 0 .../app/designs/details/_AddBasicTitle.js | 0 .../javascript/app/designs/details/_AddTitle.js | 0 .../app/designs/details/_ControllerItfc.js | 0 .../app/designs/details/main/ActivityLayerMap.js | 0 .../app/designs/details/main/ActivityMap.js | 0 .../app/designs/details/main/ActivityTrackingMap.js | 0 .../javascript/app/designs/details/main/Contact.js | 0 .../javascript/app/designs/details/main/Document.js | 0 .../app/designs/details/main/DocumentPDF.js | 0 .../app/designs/details/main/Organisation.js | 0 .../javascript/app/designs/details/main/Platform.js | 0 .../javascript/app/designs/details/main/Program.js | 0 .../javascript/app/designs/details/main/Project.js | 0 .../app/designs/details/main/ServiceOGC.js | 0 .../javascript/app/designs/details/main/Species.js | 0 .../app/designs/details/main/SpeciesLocation.js | 0 .../app/designs/details/main/Statistics.js | 0 .../app/designs/details/main/_ActivityBase.js | 0 .../app/designs/details/main/_DetailsBase.js | 0 .../javascript/app/designs/doubleList/Controller.js | 0 .../app/designs/doubleList/layout/Layout.js | 0 .../layout/TopLeftContentAndDoubleList.js | 0 .../doubleList/main/textSearchAndDoubleList.js | 0 .../app/designs/dynamicDualContent/Controller.js | 0 .../layout/FacetsInLeftSecondaryContent.js | 0 .../layout/LeftSecondaryContent.js | 0 .../layout/TopSecondaryContent.js | 0 .../designs/dynamicDualContent/layout/_Layout.js | 0 .../main/FacetsWithDynamicRightContent.js | 0 .../javascript/app/designs/edition/Controller.js | 0 .../javascript/app/designs/edition/Layout.js | 0 .../app/designs/embeddedContent/Controller.js | 0 .../app/designs/embeddedContent/Layout.js | 0 .../designs/embeddedContentWithTopbar/Controller.js | 0 .../layout/TopAndCenterContent.js | 0 .../main/EmbeddedContentSelectionInTopbar.js | 0 .../designs/externalTextSearchList/Controller.js | 0 .../app/designs/externalTextSearchList/Layout.js | 0 .../externalTextSearchList/main/PlaceNames.js | 0 .../designs/externalTextSearchList/main/Worms.js | 0 .../javascript/app/designs/formList/Controller.js | 0 .../app/designs/formList/_ControllerItfc.js | 0 .../app/designs/formList/layout/Layout.js | 0 .../designs/formList/layout/LayoutWithTopForm.js | 0 .../app/designs/formList/main/FormListByStep.js | 0 .../designs/formList/main/_RequestAndParseData.js | 0 .../javascript/app/designs/list/Controller.js | 0 .../javascript/app/designs/list/_AddFilter.js | 0 .../javascript/app/designs/list/layout/Layout.js | 0 .../app/designs/list/layout/ListWithTopContent.js | 0 .../javascript/app/designs/list/layout/NoTitle.js | 0 .../app/designs/mapWithSideContent/Controller.js | 0 .../mapWithSideContent/layout/MapAndContent.js | 0 .../layout/MapAndContentAndTopbar.js | 0 .../mapWithSideContent/main/FilterAndGeographic.js | 0 .../designs/mapWithSideContent/main/Geographic.js | 0 .../mapWithSideContent/main/GeographicEditor.js | 0 .../app/designs/mapWithSideContent/main/Tracking.js | 0 .../mapWithSideContent/main/_TrackingByFilter.js | 0 .../mapWithSideContent/main/_TrackingWithList.js | 0 .../main/_TrackingWithListByFilter.js | 0 .../app/designs/textSearchFacetsList/Controller.js | 0 .../app/designs/textSearchFacetsList/Layout.js | 0 .../app/designs/textSearchFacetsList/_AddFilter.js | 0 .../designs/textSearchFacetsList/main/Activity.js | 0 .../textSearchFacetsList/main/Administrative.js | 0 .../textSearchFacetsList/main/Bibliography.js | 0 .../app/designs/textSearchFacetsList/main/Domain.js | 0 .../textSearchFacetsList/main/Organisation.js | 0 .../designs/textSearchFacetsList/main/Platform.js | 0 .../designs/textSearchFacetsList/main/Program.js | 0 .../designs/textSearchFacetsList/main/Project.js | 0 .../designs/textSearchFacetsList/main/ServiceOGC.js | 0 .../designs/textSearchFacetsList/main/Species.js | 0 .../app/designs/textSearchFacetsList/main/Taxon.js | 0 .../app/designs/textSearchList/Controller.js | 0 .../app/designs/textSearchList/_AddFilter.js | 0 .../textSearchList/layout/BasicAndButtonsTopZone.js | 0 .../designs/textSearchList/layout/BasicTopZone.js | 0 .../app/designs/textSearchList/main/Domain.js | 0 .../app/designs/textSearchList/main/Selection.js | 0 .../app/designs/textSearchList/main/ServiceOGC.js | 0 .../app/details/views/ActivityAreaMapBase.js | 0 .../app/details/views/ActivityCatalogDetailsView.js | 0 .../javascript/app/details/views/ActivityChart.js | 0 .../app/details/views/ActivityCitationMapBase.js | 0 .../app/details/views/ActivityDetailsView.js | 0 .../details/views/ActivityFixedTimeseriesChart.js | 0 .../app/details/views/ActivityFixedTimeseriesMap.js | 0 .../details/views/ActivityInfrastructureMapBase.js | 0 .../app/details/views/ActivityLayerMapBase.js | 0 .../app/details/views/BibliographyDetailsView.js | 0 .../app/details/views/ContactDetailsView.js | 0 .../app/details/views/DocumentDetailsView.js | 0 .../details/views/OrganisationCatalogDetailsView.js | 0 .../app/details/views/OrganisationDetailsView.js | 0 .../app/details/views/PlatformCatalogDetailsView.js | 0 .../app/details/views/PlatformDetailsView.js | 0 .../app/details/views/ProgramCatalogDetailsView.js | 0 .../app/details/views/ProgramDetailsView.js | 0 .../app/details/views/ProjectCatalogDetailsView.js | 0 .../app/details/views/ProjectDetailsView.js | 0 .../details/views/ServiceOGCCatalogDetailsView.js | 0 .../app/details/views/ServiceOGCDetailsView.js | 0 .../app/details/views/SpeciesCatalogDetailsView.js | 0 .../app/details/views/SpeciesDetailsView.js | 0 .../app/details/views/StatisticsDetailsView.js | 0 .../views/_ActivityTimeSeriesDataManagement.js | 0 .../app/edition/views/ActivityEditionView.js | 0 .../app/edition/views/AnimalEditionView.js | 0 .../app/edition/views/ConditionEditionView.js | 0 .../app/edition/views/ContactEditionView.js | 0 .../app/edition/views/DeviceEditionView.js | 0 .../app/edition/views/DocumentEditionView.js | 0 .../edition/views/LoadDataDocumentEditionView.js | 0 .../edition/views/LoadDataToActivityEditionView.js | 0 .../edition/views/MetricsDefinitionEditionView.js | 0 .../edition/views/MisIdentificationEditionView.js | 0 .../app/edition/views/OrganisationEditionView.js | 0 .../app/edition/views/ParameterEditionView.js | 0 .../app/edition/views/PermissionsEditionView.js | 0 .../app/edition/views/PlatformEditionView.js | 0 .../app/edition/views/ProgramEditionView.js | 0 .../app/edition/views/ProjectEditionView.js | 0 .../app/edition/views/ServiceOGCEditionView.js | 0 .../app/edition/views/SpeciesEditionView.js | 0 .../javascript/app/edition/views/UnitEditionView.js | 0 .../app/edition/views/dataLoader/AddDataFT.js | 0 .../app/edition/views/dataLoader/AddDataIF.js | 0 .../app/edition/views/dataLoader/AddDataOC.js | 0 .../app/edition/views/dataLoader/EditDataAR.js | 0 .../app/edition/views/dataLoader/LoadDataAR.js | 0 .../app/edition/views/dataLoader/LoadDataFT.js | 0 .../app/edition/views/dataLoader/LoadDataOC.js | 0 .../app/edition/views/dataLoader/LoadDataTR.js | 0 .../views/dataLoader/_BaseDataToActivityEdition.js | 0 .../dataLoader/_BaseDataToActivityEditionItfc.js | 0 .../dataLoader/_BaseLoadDataToActivityEdition.js | 0 .../_BaseLoadDataToActivityEditionItfc.js | 0 .../javascript/app/home/views/HomeView.js | 0 .../javascript/app/home/views/ProductWidget.js | 0 .../javascript/app/home/views/SearchBarWidget.js | 0 .../app/home/views/SearchFastFilterWidget.js | 0 .../javascript/app/home/views/SearchFilterWidget.js | 0 .../app/home/views/SearchResultsWidget.js | 0 .../javascript/app/home/views/SocialWidget.js | 0 .../javascript/app/home/views/StatsWidget.js | 0 .../javascript/app/home/views/_DashboardItem.js | 0 .../app/maintenance/domains/_HierarchicalDomain.js | 0 .../domains/admin/views/AccessibilityView.js | 0 .../domains/admin/views/ActivityFieldsView.js | 0 .../domains/admin/views/ActivityTypesView.js | 0 .../domains/admin/views/ContactRolesView.js | 0 .../domains/admin/views/CountriesView.js | 0 .../domains/admin/views/DeviceTypesView.js | 0 .../domains/admin/views/DocumentTypesView.js | 0 .../domains/admin/views/OrganisationRolesView.js | 0 .../domains/admin/views/OrganisationTypesView.js | 0 .../domains/admin/views/PlatformTypesView.js | 0 .../domains/admin/views/ProjectGroupsView.js | 0 .../maintenance/domains/admin/views/ScopesView.js | 0 .../views/templates/forms/ActivityTypesForm.html | 0 .../admin/views/templates/forms/CountriesForm.html | 0 .../domains/geometry/views/AreaTypesView.js | 0 .../domains/geometry/views/DestinyView.js | 0 .../domains/geometry/views/EndingView.js | 0 .../domains/geometry/views/InspireThemesView.js | 0 .../domains/geometry/views/LineTypesView.js | 0 .../domains/geometry/views/MeshTypesView.js | 0 .../domains/geometry/views/RasterTypesView.js | 0 .../domains/geometry/views/RecordingTypesView.js | 0 .../domains/geometry/views/ShorelineTypesView.js | 0 .../domains/geometry/views/ThematicTypeView.js | 0 .../domains/geometry/views/ToponymTypesView.js | 0 .../views/templates/forms/InspireThemesForm.html | 0 .../views/templates/forms/LineTypesForm.html | 0 .../views/templates/forms/ThematicTypeForm.html | 0 .../observations/views/AttributeTypesView.js | 0 .../domains/observations/views/CensingStatusView.js | 0 .../domains/observations/views/ConfidenceView.js | 0 .../domains/observations/views/EventGroupsView.js | 0 .../observations/views/InfrastructureTypeView.js | 0 .../domains/observations/views/MetricGroupsView.js | 0 .../observations/views/MetricsDefinitionsView.js | 0 .../domains/observations/views/ObjectTypesView.js | 0 .../observations/views/ObservationTypesView.js | 0 .../observations/views/ParameterTypesView.js | 0 .../domains/observations/views/ParametersView.js | 0 .../domains/observations/views/SampleTypesView.js | 0 .../domains/observations/views/SeaConditionsView.js | 0 .../domains/observations/views/UnitTypesView.js | 0 .../domains/observations/views/UnitsView.js | 0 .../domains/taxon/views/CanaryProtectionView.js | 0 .../domains/taxon/views/EUProtectionView.js | 0 .../maintenance/domains/taxon/views/EcologyView.js | 0 .../domains/taxon/views/EndemicityView.js | 0 .../maintenance/domains/taxon/views/InterestView.js | 0 .../domains/taxon/views/LifeStagesView.js | 0 .../maintenance/domains/taxon/views/OriginView.js | 0 .../domains/taxon/views/PermanenceView.js | 0 .../app/maintenance/domains/taxon/views/RankView.js | 0 .../app/maintenance/domains/taxon/views/SexView.js | 0 .../domains/taxon/views/SpainProtectionView.js | 0 .../maintenance/domains/taxon/views/StatusView.js | 0 .../domains/taxon/views/TrophicRegimeView.js | 0 .../domains/templates/forms/DomainForm.html | 0 .../templates/forms/HierarchicalDomainForm.html | 0 .../app/maintenance/models/AccessModel.js | 0 .../app/maintenance/models/PermissionsModel.js | 0 .../javascript/app/maintenance/views/DomainView.js | 0 .../app/maintenance/views/PermissionsView.js | 0 .../app/maintenance/views/ServiceOGCView.js | 0 .../views/templates/forms/AccessForm.html | 0 .../views/templates/forms/CategoryLayerForm.html | 0 .../views/templates/forms/DownloadsForm.html | 0 .../views/templates/forms/PermissionsForm.html | 0 .../views/templates/forms/ProtocolsForm.html | 0 .../views/templates/forms/ServiceOGCForm.html | 0 .../templates/forms/ServiceOGCLayerSearchForm.html | 0 .../javascript/app/nls/es/translation.js | 0 .../javascript/app/nls/translation.js | 0 .../javascript/app/products/views/OpenMapView.js | 0 .../app/products/views/ServiceOGCCatalogView.js | 0 .../javascript/app/redmicConfig.js | 0 .../javascript/app/user/models/FeedbackModel.js | 0 .../javascript/app/user/models/PasswordModel.js | 0 .../javascript/app/user/models/RegisterModel.js | 0 .../javascript/app/user/models/UserEmailModel.js | 0 .../javascript/app/user/models/UserImageModel.js | 0 .../javascript/app/user/models/UserNameModel.js | 0 .../javascript/app/user/models/UserSectorModel.js | 0 .../app/user/views/ConfirmResettingView.js | 0 .../javascript/app/user/views/FeedbackView.js | 0 .../app/user/views/InnerWhatIsRedmicView.js | 0 .../javascript/app/user/views/LoginView.js | 0 .../javascript/app/user/views/RegisterView.js | 0 .../javascript/app/user/views/ResettingView.js | 0 .../app/user/views/TermsAndConditionsView.js | 0 .../javascript/app/user/views/UserProfileView.js | 0 .../javascript/app/user/views/WhatIsRedmicView.js | 0 .../app/user/views/_ExternalUserBaseView.js | 0 .../app/user/views/templates/ConfirmResetting.html | 0 .../app/user/views/templates/ExternalUserBase.html | 0 .../app/user/views/templates/Feedback.html | 0 .../javascript/app/user/views/templates/Login.html | 0 .../app/user/views/templates/Register.html | 0 .../app/user/views/templates/Resetting.html | 0 .../user/views/templates/TermsAndConditions.html | 0 .../app/user/views/templates/WhatIsRedmic.html | 0 .../views/templates/forms/ChangePasswordForm.html | 0 .../user/views/templates/forms/FeedbackForm.html | 0 .../user/views/templates/forms/RegisterForm.html | 0 .../user/views/templates/forms/UserEmailForm.html | 0 .../user/views/templates/forms/UserImageForm.html | 0 .../user/views/templates/forms/UserNameForm.html | 0 .../user/views/templates/forms/UserSectorForm.html | 0 .../viewers/models/PointClusterCategorizeModel.js | 0 .../app/viewers/models/PointClusterModel.js | 0 .../app/viewers/views/BibliographyView.js | 0 .../javascript/app/viewers/views/ChartsView.js | 0 .../app/viewers/views/RealTimeDashboardView.js | 0 .../javascript/app/viewers/views/RealTimeView.js | 0 .../app/viewers/views/SpeciesDistributionView.js | 0 .../javascript/app/viewers/views/StacBrowserView.js | 0 .../javascript/app/viewers/views/TrackingView.js | 0 .../javascript/app/viewers/views/TrashCharts.js | 0 .../app/viewers/views/TrashCollectionView.js | 0 .../javascript/app/viewers/views/TrashDetails.js | 0 .../javascript/app/viewers/views/TrashInfo.js | 0 .../_ObjectCollectionSeriesSelectionManagement.js | 0 .../app/viewers/views/_SelectTimeInterval.js | 0 .../app/viewers/views/_TimeSeriesDataManagement.js | 0 .../viewers/views/_TimeSeriesSelectionManagement.js | 0 .../templates/forms/PointClusterCategorizeForm.html | 0 .../views/templates/forms/PointClusterForm.html | 0 .../templates/forms/SpeciesDistributionForm.html | 0 .../viewers/views/templates/forms/TrackingForm.html | 0 {public => client-app}/javascript/app/views/404.js | 0 .../javascript/app/views/ActivateAccount.js | 0 .../javascript/app/views/NoSupportBrowser.js | 0 .../javascript/app/views/UnderConstructionView.js | 0 .../javascript/app/views/nls/es/translation.js | 0 .../javascript/app/views/nls/translation.js | 0 .../app/views/templates/NoSupportBrowser.html | 0 {public => client-app}/javascript/cbtree | 0 {public => client-app}/javascript/color-js | 0 {public => client-app}/javascript/d3 | 0 {public => client-app}/javascript/d3-v6-tip | 0 {public => client-app}/javascript/deepmerge | 0 {public => client-app}/javascript/dijit | 0 {public => client-app}/javascript/dojo | 0 {public => client-app}/javascript/dojoConfig.js | 0 .../javascript/dojoConfigBuild.js | 0 {public => client-app}/javascript/dojox | 0 {public => client-app}/javascript/draggabilly | 0 {public => client-app}/javascript/dropzone | 0 {public => client-app}/javascript/handlebars | 0 .../javascript/json-schema-ref-parser | 0 {public => client-app}/javascript/leaflet | 0 .../javascript/leaflet-areaselect | 0 .../javascript/leaflet-awesome-markers | 0 .../javascript/leaflet-coordinates | 0 {public => client-app}/javascript/leaflet-draw | 0 {public => client-app}/javascript/leaflet-measure | 0 {public => client-app}/javascript/leaflet-minimap | 0 {public => client-app}/javascript/leaflet-navbar | 0 .../javascript/leaflet-nontiledlayer | 0 {public => client-app}/javascript/mediatorjs | 0 {public => client-app}/javascript/moment | 0 {public => client-app}/javascript/packery | 0 {public => client-app}/javascript/pdfjs | 0 {public => client-app}/javascript/proj4 | 0 {public => client-app}/javascript/pruneCluster | 0 {public => client-app}/javascript/put-selector | 0 .../javascript/redmic/base/CheckBrowser.js | 0 .../javascript/redmic/base/Credentials.js | 0 .../javascript/redmic/base/GuestChecker.js | 0 .../javascript/redmic/base/Mediator.js | 0 .../javascript/redmic/base/RedmicLocalStorage.js | 0 .../javascript/redmic/base/tv4.js | 0 .../javascript/redmic/dialog/LockDialogImpl.js | 0 .../javascript/redmic/dialog/_DialogComplexItfc.js | 0 .../javascript/redmic/form/FormContainer.js | 0 .../javascript/redmic/form/Select.js | 0 .../javascript/redmic/form/UploadInput.js | 0 .../javascript/redmic/form/nls/UploadInput.js | 0 .../javascript/redmic/form/nls/es/UploadInput.js | 0 .../javascript/redmic/form/templates/Select.html | 0 .../redmic/form/templates/UploadInput.html | 0 .../javascript/redmic/layout/DialogComplex.js | 0 .../javascript/redmic/layout/DialogSimple.js | 0 .../javascript/redmic/layout/_DialogBase.js | 0 .../javascript/redmic/modules/app/App.js | 0 .../javascript/redmic/modules/app/ModuleStore.js | 0 .../javascript/redmic/modules/app/Router.js | 0 .../javascript/redmic/modules/app/_app.js | 0 .../javascript/redmic/modules/app/_appItfc.js | 0 .../javascript/redmic/modules/app/innerApp.js | 0 .../javascript/redmic/modules/app/outerApp.js | 0 .../javascript/redmic/modules/atlas/Atlas.js | 0 .../redmic/modules/atlas/_AtlasLayersManagement.js | 0 .../redmic/modules/atlas/_AtlasLegendManagement.js | 0 .../javascript/redmic/modules/base/Analytics.js | 0 .../javascript/redmic/modules/base/Credentials.js | 0 .../javascript/redmic/modules/base/Loading.js | 0 .../javascript/redmic/modules/base/Manager.js | 0 .../javascript/redmic/modules/base/_AuthFirewall.js | 0 .../redmic/modules/base/_ChkCollection.js | 0 .../redmic/modules/base/_CommunicationCenter.js | 0 .../redmic/modules/base/_ExternalConfig.js | 0 .../javascript/redmic/modules/base/_Filter.js | 0 .../javascript/redmic/modules/base/_FilterItfc.js | 0 .../javascript/redmic/modules/base/_Itfc.js | 0 .../redmic/modules/base/_ListenQueryParams.js | 0 .../redmic/modules/base/_ListenQueryParamsItfc.js | 0 .../redmic/modules/base/_ListenWindowResize.js | 0 .../redmic/modules/base/_ManageClickEvent.js | 0 .../javascript/redmic/modules/base/_Module.js | 0 .../javascript/redmic/modules/base/_ModuleItfc.js | 0 .../javascript/redmic/modules/base/_Persistence.js | 0 .../redmic/modules/base/_PersistenceItfc.js | 0 .../javascript/redmic/modules/base/_Selection.js | 0 .../redmic/modules/base/_SelectionBase.js | 0 .../redmic/modules/base/_SelectionItfc.js | 0 .../javascript/redmic/modules/base/_Show.js | 0 .../javascript/redmic/modules/base/_ShowInPopup.js | 0 .../redmic/modules/base/_ShowInTooltip.js | 0 .../javascript/redmic/modules/base/_ShowItfc.js | 0 .../javascript/redmic/modules/base/_ShowOnEvt.js | 0 .../javascript/redmic/modules/base/_Store.js | 0 .../javascript/redmic/modules/base/_StoreItfc.js | 0 .../javascript/redmic/modules/base/_Window.js | 0 .../javascript/redmic/modules/browser/Browser.js | 0 .../redmic/modules/browser/HierarchicalImpl.js | 0 .../javascript/redmic/modules/browser/ListImpl.js | 0 .../redmic/modules/browser/_BrowserItfc.js | 0 .../redmic/modules/browser/_ButtonsInRow.js | 0 .../redmic/modules/browser/_DataTypeParser.js | 0 .../redmic/modules/browser/_DragAndDrop.js | 0 .../redmic/modules/browser/_EditionTable.js | 0 .../javascript/redmic/modules/browser/_Framework.js | 0 .../redmic/modules/browser/_GeoJsonParser.js | 0 .../modules/browser/_HierarchicalDragAndDrop.js | 0 .../redmic/modules/browser/_HierarchicalLazyLoad.js | 0 .../redmic/modules/browser/_HierarchicalSelect.js | 0 .../redmic/modules/browser/_HierarchicalTable.js | 0 .../redmic/modules/browser/_MultiTemplate.js | 0 .../redmic/modules/browser/_NoDataTemplate.js | 0 .../javascript/redmic/modules/browser/_Select.js | 0 .../javascript/redmic/modules/browser/_Table.js | 0 .../javascript/redmic/modules/browser/bars/Order.js | 0 .../redmic/modules/browser/bars/Pagination.js | 0 .../redmic/modules/browser/bars/SelectionBox.js | 0 .../javascript/redmic/modules/browser/bars/Total.js | 0 .../redmic/modules/browser/bars/_SelectBox.js | 0 .../redmic/modules/browser/buttons/Buttons.js | 0 .../redmic/modules/browser/buttons/_ButtonsItfc.js | 0 .../redmic/modules/browser/buttons/_GroupButtons.js | 0 .../javascript/redmic/modules/browser/row/Row.js | 0 .../redmic/modules/browser/row/_Buttons.js | 0 .../redmic/modules/browser/row/_Hierarchical.js | 0 .../modules/browser/row/_HierarchicalSelect.js | 0 .../modules/browser/row/_HierarchicalTable.js | 0 .../redmic/modules/browser/row/_RowItfc.js | 0 .../redmic/modules/browser/row/_Select.js | 0 .../javascript/redmic/modules/browser/row/_Table.js | 0 .../chart/ChartsContainer/ChartsContainer.js | 0 .../ChartsContainer/InfoChartsContainerImpl.js | 0 .../ChartsContainer/SliderChartsContainerImpl.js | 0 .../chart/ChartsContainer/_AngularAxisDrawing.js | 0 .../ChartsContainer/_AngularAxisWithGridDrawing.js | 0 .../modules/chart/ChartsContainer/_AxesDrawing.js | 0 .../chart/ChartsContainer/_AxesDrawingItfc.js | 0 .../chart/ChartsContainer/_BreadcrumbsBar.js | 0 .../chart/ChartsContainer/_ChartsContainerItfc.js | 0 .../chart/ChartsContainer/_ColorSelection.js | 0 .../chart/ChartsContainer/_ColorSelectionItfc.js | 0 .../ChartsContainer/_DomainHistoryNavigation.js | 0 .../chart/ChartsContainer/_GroupedLegendBar.js | 0 .../chart/ChartsContainer/_InfoOnEmptyData.js | 0 .../chart/ChartsContainer/_InfoOnLayerEvent.js | 0 .../chart/ChartsContainer/_InfoOnLayerEventItfc.js | 0 .../chart/ChartsContainer/_InfoOnMouseOver.js | 0 .../chart/ChartsContainer/_InfoOnZeroValueData.js | 0 .../chart/ChartsContainer/_InfoTooltipManagement.js | 0 .../chart/ChartsContainer/_LayerColorSelection.js | 0 .../modules/chart/ChartsContainer/_LegendBar.js | 0 .../chart/ChartsContainer/_LegendBarCommons.js | 0 .../chart/ChartsContainer/_LegendBarCommonsItfc.js | 0 .../chart/ChartsContainer/_RadialAxisDrawing.js | 0 .../ChartsContainer/_RadialAxisWithGridDrawing.js | 0 .../modules/chart/ChartsContainer/_SummaryBox.js | 0 .../chart/ChartsContainer/_TemporalAxisDrawing.js | 0 .../ChartsContainer/_TemporalAxisWithGridDrawing.js | 0 .../chart/ChartsContainer/_VerticalAxesDrawing.js | 0 .../ChartsContainer/_VerticalAxesWithGridDrawing.js | 0 .../chart/ChartsContainer/_ZoomByDragging.js | 0 .../redmic/modules/chart/SmartLegend/SmartLegend.js | 0 .../chart/SmartLegend/TimeSeriesSmartLegendImpl.js | 0 .../modules/chart/SmartLegend/_SmartLegendItfc.js | 0 .../modules/chart/Toolbar/AggregationToolImpl.js | 0 .../modules/chart/Toolbar/DataSelectorImpl.js | 0 .../redmic/modules/chart/Toolbar/DateFilterImpl.js | 0 .../modules/chart/Toolbar/GridManagementImpl.js | 0 .../modules/chart/Toolbar/SliderSelectorImpl.js | 0 .../redmic/modules/chart/Toolbar/Toolbar.js | 0 .../redmic/modules/chart/Toolbar/_ToolbarItfc.js | 0 .../modules/chart/layer/Axis/AngularAxisImpl.js | 0 .../modules/chart/layer/Axis/AngularGridAxisImpl.js | 0 .../redmic/modules/chart/layer/Axis/Axis.js | 0 .../chart/layer/Axis/HorizontalGridAxisImpl.js | 0 .../modules/chart/layer/Axis/RadialAxisImpl.js | 0 .../modules/chart/layer/Axis/RadialGridAxisImpl.js | 0 .../modules/chart/layer/Axis/TemporalAxisImpl.js | 0 .../modules/chart/layer/Axis/VerticalAxisImpl.js | 0 .../chart/layer/Axis/VerticalGridAxisImpl.js | 0 .../redmic/modules/chart/layer/Axis/_AxisItfc.js | 0 .../modules/chart/layer/Axis/_HorizontalCommons.js | 0 .../modules/chart/layer/Axis/_VerticalCommons.js | 0 .../chart/layer/Axis/_VerticalCommonsItfc.js | 0 .../modules/chart/layer/ChartLayer/ChartLayer.js | 0 .../chart/layer/ChartLayer/LinearChartImpl.js | 0 .../chart/layer/ChartLayer/MultiPieChartImpl.js | 0 .../modules/chart/layer/ChartLayer/PieChartImpl.js | 0 .../chart/layer/ChartLayer/WindRoseChartImpl.js | 0 .../chart/layer/ChartLayer/_CategoryLayerCommons.js | 0 .../layer/ChartLayer/_CategoryLayerCommonsItfc.js | 0 .../chart/layer/ChartLayer/_ChartHoleManagement.js | 0 .../chart/layer/ChartLayer/_ChartLayerItfc.js | 0 .../chart/layer/ChartLayer/_CircularLayerCommons.js | 0 .../layer/ChartLayer/_CircularLayerCommonsItfc.js | 0 .../layer/ChartLayer/_ColorHierarchyGeneration.js | 0 .../chart/layer/ChartLayer/_LevelNavigation.js | 0 .../chart/layer/ChartLayer/_MultipleWindRose.js | 0 .../chart/layer/ChartLayer/_ObtainableValue.js | 0 .../chart/layer/ChartLayer/_ObtainableValueItfc.js | 0 .../modules/chart/layer/ChartLayer/_PieCommons.js | 0 .../chart/layer/ChartLayer/_PutButtonInHole.js | 0 .../chart/layer/ChartLayer/_PutButtonInHoleItfc.js | 0 .../chart/layer/ChartLayer/_QueryableValue.js | 0 .../chart/layer/ChartLayer/_ShowInfoInHole.js | 0 .../chart/layer/ChartLayer/_SimplePieCommons.js | 0 .../chart/layer/ChartLayer/_SimpleWindRose.js | 0 .../layer/ChartLayer/_VariableRadiusByDepth.js | 0 .../redmic/modules/chart/layer/_LayerCommons.js | 0 .../redmic/modules/chart/layer/_LayerCommonsItfc.js | 0 .../modules/chart/layer/_PolarLayerCommons.js | 0 .../modules/chart/layer/_PolarLayerCommonsItfc.js | 0 .../redmic/modules/components/ExternalConfig.js | 0 .../modules/components/Keypad/IconKeypadImpl.js | 0 .../redmic/modules/components/Keypad/Keypad.js | 0 .../modules/components/Keypad/TrizoneKeypadImpl.js | 0 .../redmic/modules/components/Keypad/_KeypadItfc.js | 0 .../modules/components/PDFViewer/PDFViewer.js | 0 .../components/ProgressSlider/ProgressSlider.js | 0 .../components/ProgressSlider/StepAndRateEditor.js | 0 .../modules/components/Sidebar/MainSidebarImpl.js | 0 .../redmic/modules/components/Sidebar/Sidebar.js | 0 .../redmic/modules/components/Sidebar/_Secondary.js | 0 .../javascript/redmic/modules/components/Topbar.js | 0 .../javascript/redmic/modules/filter/Filter.js | 0 .../javascript/redmic/modules/form/Form.js | 0 .../redmic/modules/form/FormContainerImpl.js | 0 .../redmic/modules/form/_BaseCreateKeypad.js | 0 .../redmic/modules/form/_CreateInternalKeypad.js | 0 .../javascript/redmic/modules/form/_CreateKeypad.js | 0 .../javascript/redmic/modules/form/_FormItfc.js | 0 .../redmic/modules/form/_ListenModelHasChanged.js | 0 .../redmic/modules/form/_PublicateChanges.js | 0 .../javascript/redmic/modules/form/_ShowInDialog.js | 0 .../redmic/modules/form/_ShowInTableList.js | 0 .../redmic/modules/form/input/AnnotationImpl.js | 0 .../redmic/modules/form/input/ButtonImpl.js | 0 .../redmic/modules/form/input/CheckBoxGroupImpl.js | 0 .../redmic/modules/form/input/CheckBoxImpl.js | 0 .../redmic/modules/form/input/ColorImpl.js | 0 .../redmic/modules/form/input/ColorPickerImpl.js | 0 .../modules/form/input/ColorPickerTextBoxImpl.js | 0 .../redmic/modules/form/input/ColorsRampImpl.js | 0 .../modules/form/input/DateRangeComplexImpl.js | 0 .../redmic/modules/form/input/DateRangeImpl.js | 0 .../modules/form/input/DateRangeTextBoxImpl.js | 0 .../redmic/modules/form/input/DateTextBoxImpl.js | 0 .../redmic/modules/form/input/DateTimeImpl.js | 0 .../modules/form/input/DateTimeTextBoxImpl.js | 0 .../modules/form/input/FilteringSelectImpl.js | 0 .../input/GeographicCoordinatesComponentImpl.js | 0 .../redmic/modules/form/input/GeometryImpl.js | 0 .../javascript/redmic/modules/form/input/Input.js | 0 .../redmic/modules/form/input/KeywordsImpl.js | 0 .../redmic/modules/form/input/MapSearchImpl.js | 0 .../redmic/modules/form/input/MultiSelectImpl.js | 0 .../redmic/modules/form/input/NumberSpinnerImpl.js | 0 .../redmic/modules/form/input/NumberTextBoxImpl.js | 0 .../redmic/modules/form/input/PointImpl.js | 0 .../modules/form/input/RadioButtonGroupImpl.js | 0 .../redmic/modules/form/input/RadioButtonImpl.js | 0 .../redmic/modules/form/input/RangeImpl.js | 0 .../redmic/modules/form/input/RangeSliderImpl.js | 0 .../redmic/modules/form/input/SelectImpl.js | 0 .../modules/form/input/SelectOnListPopupImpl.js | 0 .../redmic/modules/form/input/SliderImpl.js | 0 .../redmic/modules/form/input/TextAreaImpl.js | 0 .../redmic/modules/form/input/TextBoxImpl.js | 0 .../redmic/modules/form/input/UploadFileImpl.js | 0 .../modules/form/input/ValueAndUnitSelectorImpl.js | 0 .../redmic/modules/form/input/_BaseDateTime.js | 0 .../modules/form/input/_BaseMultiSelectImpl.js | 0 .../redmic/modules/form/input/_BaseRange.js | 0 .../input/_BaseTextBoxWidthExpandTooltipImpl.js | 0 .../form/input/_BaseWidthExpandTooltipImpl.js | 0 .../redmic/modules/form/input/_DeleteOnClear.js | 0 .../redmic/modules/form/input/_Dependence.js | 0 .../redmic/modules/form/input/_DisableInput.js | 0 .../form/input/_IgnoreNonexistentProperty.js | 0 .../redmic/modules/form/input/_InputItfc.js | 0 .../redmic/modules/form/input/_NodesCreation.js | 0 .../redmic/modules/form/input/_SelectOnPopupImpl.js | 0 .../redmic/modules/gateway/AddItemGatewayImpl.js | 0 .../javascript/redmic/modules/gateway/Gateway.js | 0 .../modules/gateway/LocalSelectorGatewayImpl.js | 0 .../modules/gateway/MapCenteringGatewayImpl.js | 0 .../redmic/modules/gateway/_GatewayItfc.js | 0 .../redmic/modules/layout/TabsDisplayer.js | 0 .../modules/layout/dataDisplayer/DataDisplayer.js | 0 .../layout/genericDisplayer/GenericDisplayer.js | 0 .../GenericWithTopbarDisplayerImpl.js | 0 .../redmic/modules/layout/listMenu/ListMenu.js | 0 .../layout/nestedContent/NestedBrowsersImpl.js | 0 .../modules/layout/nestedContent/NestedContent.js | 0 .../layout/templateDisplayer/TemplateDisplayer.js | 0 .../redmic/modules/layout/wizard/Wizard.js | 0 .../modules/layout/wizard/_CompleteBySelection.js | 0 .../modules/layout/wizard/_StepBreadcrumbs.js | 0 .../redmic/modules/layout/wizard/_StepNavigation.js | 0 .../redmic/modules/layout/wizard/_WizardStep.js | 0 .../redmic/modules/layout/wizard/_WizardStepItfc.js | 0 .../javascript/redmic/modules/map/LeafletImpl.js | 0 .../javascript/redmic/modules/map/Map.js | 0 .../javascript/redmic/modules/map/MapButton.js | 0 .../redmic/modules/map/StaticLayersDefinition.js | 0 .../javascript/redmic/modules/map/_ImportWkt.js | 0 .../javascript/redmic/modules/map/_LeafletDraw.js | 0 .../redmic/modules/map/_LeafletImplItfc.js | 0 .../redmic/modules/map/_LeafletWidgetsManagement.js | 0 .../redmic/modules/map/_ListenContainers.js | 0 .../javascript/redmic/modules/map/_MapItfc.js | 0 .../redmic/modules/map/_OverlayLayersManagement.js | 0 .../redmic/modules/map/_PlaceNamesButton.js | 0 .../redmic/modules/map/_StaticLayersManagement.js | 0 .../redmic/modules/map/layer/DrawingLayerImpl.js | 0 .../redmic/modules/map/layer/GeoJsonLayerImpl.js | 0 .../redmic/modules/map/layer/GridLayerImpl.js | 0 .../javascript/redmic/modules/map/layer/MapLayer.js | 0 .../modules/map/layer/PruneClusterLayerImpl.js | 0 .../redmic/modules/map/layer/TrackingLayerImpl.js | 0 .../redmic/modules/map/layer/TrackingLine.js | 0 .../redmic/modules/map/layer/WmsLayerImpl.js | 0 .../redmic/modules/map/layer/_AddFilter.js | 0 .../redmic/modules/map/layer/_AnimateMarker.js | 0 .../redmic/modules/map/layer/_D3Expansion.js | 0 .../redmic/modules/map/layer/_Editable.js | 0 .../redmic/modules/map/layer/_GeoJsonLayerItfc.js | 0 .../redmic/modules/map/layer/_Highlightable.js | 0 .../redmic/modules/map/layer/_LayerProtocols.js | 0 .../redmic/modules/map/layer/_ListenBounds.js | 0 .../redmic/modules/map/layer/_ListenZoom.js | 0 .../redmic/modules/map/layer/_MapLayerItfc.js | 0 .../modules/map/layer/_PruneClusterLayerItfc.js | 0 .../redmic/modules/map/layer/_PublishInfo.js | 0 .../redmic/modules/map/layer/_PublishInfoItfc.js | 0 .../redmic/modules/map/layer/_RadiusCommons.js | 0 .../redmic/modules/map/layer/_RadiusOnClick.js | 0 .../redmic/modules/map/layer/_RadiusOnSelect.js | 0 .../redmic/modules/map/layer/_SelectOnClick.js | 0 .../redmic/modules/map/layer/_Selectable.js | 0 .../redmic/modules/map/layer/_SelectableItfc.js | 0 .../modules/map/layer/_TrackingDataManagement.js | 0 .../modules/map/layer/_TrackingMarkersManagement.js | 0 .../redmic/modules/mapQuery/QueryOnMap.js | 0 .../redmic/modules/mapQuery/_ContentManagement.js | 0 .../redmic/modules/mapQuery/_ResultsBrowser.js | 0 .../javascript/redmic/modules/metaTags/MetaTags.js | 0 .../redmic/modules/metaTags/metaTagsContent.js | 0 .../javascript/redmic/modules/model/Model.js | 0 .../javascript/redmic/modules/model/ModelImpl.js | 0 .../javascript/redmic/modules/model/_ModelItfc.js | 0 .../javascript/redmic/modules/notification/Alert.js | 0 .../modules/notification/CommunicationCenter.js | 0 .../redmic/modules/notification/Notification.js | 0 .../modules/notification/NotificationSidebar.js | 0 .../redmic/modules/notification/TaskNotification.js | 0 .../redmic/modules/search/CompositeImpl.js | 0 .../redmic/modules/search/DateRangeImpl.js | 0 .../javascript/redmic/modules/search/FacetsImpl.js | 0 .../redmic/modules/search/GeographicImpl.js | 0 .../redmic/modules/search/MultiSelectImpl.js | 0 .../javascript/redmic/modules/search/RangeImpl.js | 0 .../javascript/redmic/modules/search/Search.js | 0 .../javascript/redmic/modules/search/TextImpl.js | 0 .../redmic/modules/search/_HideFormByAction.js | 0 .../javascript/redmic/modules/search/_SearchItfc.js | 0 .../redmic/modules/selection/SelectionBox.js | 0 .../redmic/modules/selection/SelectionManager.js | 0 .../javascript/redmic/modules/selection/Selector.js | 0 .../redmic/modules/selection/_SelectorItfc.js | 0 .../modules/selection/_SelectorPersistence.js | 0 .../javascript/redmic/modules/socket/Socket.js | 0 .../javascript/redmic/modules/socket/Task.js | 0 .../javascript/redmic/modules/socket/_IngestData.js | 0 .../javascript/redmic/modules/socket/_Report.js | 0 .../javascript/redmic/modules/socket/_Worms.js | 0 .../modules/store/RequestJoiner/AtlasDataImpl.js | 0 .../modules/store/RequestJoiner/RequestJoiner.js | 0 .../store/RequestJoiner/_RequestJoinerItfc.js | 0 .../javascript/redmic/modules/store/RestManager.js | 0 .../redmic/modules/store/RestManagerImpl.js | 0 .../redmic/modules/store/_RestManagerItfc.js | 0 .../javascript/redmic/modules/tree/CbtreeImpl.js | 0 .../javascript/redmic/modules/tree/Tree.js | 0 .../redmic/modules/tree/_HierarchicalFilter.js | 0 .../javascript/redmic/modules/tree/_LazyLoad.js | 0 .../redmic/modules/tree/_LeafSelection.js | 0 .../javascript/redmic/modules/tree/_SelectionBox.js | 0 .../javascript/redmic/modules/tree/_TreeItfc.js | 0 .../redmic/modules/user/FullscreenToggle.js | 0 .../redmic/modules/user/LanguageSelector.js | 0 .../javascript/redmic/modules/user/UserArea.js | 0 .../javascript/redmic/validation/stringFormats.js | 0 .../javascript/redmic/view/effects/Animation.js | 0 .../javascript/redmic/widgets/Button.js | 0 .../javascript/redmic/widgets/ComboButton.js | 0 .../javascript/redmic/widgets/Converter.js | 0 .../javascript/redmic/widgets/DatePicker.js | 0 .../javascript/redmic/widgets/Facet.js | 0 .../javascript/redmic/widgets/FilteringSelect.js | 0 .../javascript/redmic/widgets/KeywordsInput.js | 0 .../javascript/redmic/widgets/Map.js | 0 .../javascript/redmic/widgets/ProgressSlider.js | 0 .../javascript/redmic/widgets/README.md | 0 .../javascript/redmic/widgets/RangeSlider.js | 0 .../javascript/redmic/widgets/RedmicUtilities.js | 0 .../javascript/redmic/widgets/Slider.js | 0 .../javascript/redmic/widgets/Switch.js | 0 .../javascript/redmic/widgets/TemplateWidget.js | 0 .../javascript/redmic/widgets/TextSearch.js | 0 .../javascript/redmic/widgets/TimeSelect.js | 0 .../javascript/redmic/widgets/ToggleButton.js | 0 .../javascript/redmic/widgets/Utilities.js | 0 .../redmic/widgets/ValueAndUnitSelector.js | 0 .../redmic/widgets/extensions/_ShowValue.js | 0 {public => client-app}/javascript/sockjs | 0 .../javascript/src/view/detail/_WidgetDefinition.js | 0 .../src/view/detail/activity/ActivityDetail.js | 0 .../view/detail/activity/_ActivityLayoutWidget.js | 0 {public => client-app}/javascript/stomp-websocket | 0 {public => client-app}/javascript/templates | 0 {public => client-app}/javascript/tv4 | 0 {public => client-app}/javascript/util | 0 {public => client-app}/javascript/uuid | 0 {public => client-app}/javascript/wicket | 0 .../resources/documents/ModeloLogico.pdf | Bin .../resources/images/browsers/chrome.png | Bin .../resources/images/browsers/ff.png | Bin .../resources/images/browsers/ie.png | Bin .../resources/images/browsers/opera.png | Bin .../resources/images/browsers/safari.png | Bin {public => client-app}/resources/images/favicon.ico | Bin .../resources/images/logos/gobcan-logos.png | Bin .../resources/images/logos/logo.svg | 0 .../images/logos/redmic-logo-1200x1200.jpg | Bin .../resources/images/logos/redmic-logo-og.jpg | Bin .../resources/images/logos/redmic-logo-og.png | Bin .../resources/images/logos/redmicSimple.png | Bin .../resources/images/logos/twitter-light.png | Bin .../resources/images/map/layer-eoc-map.png | Bin .../resources/images/map/layer-ortofoto.png | Bin .../resources/images/map/layer-redmic.png | Bin .../resources/images/map/layer-topografico.png | Bin {public => client-app}/resources/images/noIMG.png | Bin .../resources/images/redmic_opciones_usuario.JPG | Bin .../resources/images/redmic_tabla_geometrias.jpg | Bin {public => client-app}/stylesheets | 0 {tests => client-app/tests}/IpGetter.js | 0 {tests => client-app/tests}/_dojoConfig.js | 0 {tests => client-app/tests}/_environments.js | 0 {tests => client-app/tests}/_functions.js | 0 {tests => client-app/tests}/_intern-functional.js | 0 {tests => client-app/tests}/_intern-unit.js | 0 {tests => client-app/tests}/_intern.js | 0 {tests => client-app/tests}/_remote.js | 0 {tests => client-app/tests}/apitest/app.js | 0 .../tests}/apitest/data/inputs/contacts.json | 0 .../tests}/apitest/data/inputs/organisations.json | 0 .../tests}/apitest/data/inputs/programs.json | 0 .../tests}/apitest/data/inputs/projects.json | 0 .../tests}/apitest/data/inputs/scopes.json | 0 {tests => client-app/tests}/apitest/package.json | 0 .../tests}/functional/administrative/Activity.js | 0 .../tests}/functional/administrative/Animal.js | 0 .../tests}/functional/administrative/Contact.js | 0 .../tests}/functional/administrative/Device.js | 0 .../tests}/functional/administrative/Document.js | 0 .../functional/administrative/Organisation.js | 0 .../tests}/functional/administrative/Platform.js | 0 .../tests}/functional/administrative/Program.js | 0 .../tests}/functional/administrative/Project.js | 0 .../functional/administrative/_Administrative.js | 0 .../administrative/_AdministrativeFacets.js | 0 .../administrative/_AdministrativeFilter.js | 0 .../administrative/_AdministrativeLinks.js | 0 .../functional/administrative/taxonomy/Class.js | 0 .../functional/administrative/taxonomy/Family.js | 0 .../functional/administrative/taxonomy/Genus.js | 0 .../functional/administrative/taxonomy/Kingdom.js | 0 .../administrative/taxonomy/Misidentification.js | 0 .../functional/administrative/taxonomy/Order.js | 0 .../functional/administrative/taxonomy/Phylum.js | 0 .../functional/administrative/taxonomy/Species.js | 0 .../functional/administrative/taxonomy/Subphylum.js | 0 .../functional/administrative/taxonomy/_Taxonomy.js | 0 .../functional/administrativeDetails/Activity.js | 0 .../functional/administrativeDetails/Contact.js | 0 .../functional/administrativeDetails/Document.js | 0 .../administrativeDetails/Organisation.js | 0 .../functional/administrativeDetails/Platform.js | 0 .../functional/administrativeDetails/Program.js | 0 .../functional/administrativeDetails/Project.js | 0 .../functional/administrativeDetails/ServiceOGC.js | 0 .../functional/administrativeDetails/Species.js | 0 .../functional/administrativeDetails/Statistics.js | 0 .../administrativeDetails/_DetailsBase.js | 0 .../administrativeDetails/_DetailsInfo.js | 0 .../functional/administrativeDetails/_DetailsMap.js | 0 .../functional/administrativeDetails/_DetailsPDF.js | 0 .../tests}/functional/catalog/Activity.js | 0 .../tests}/functional/catalog/Organisation.js | 0 .../tests}/functional/catalog/Platform.js | 0 .../tests}/functional/catalog/Program.js | 0 .../tests}/functional/catalog/Project.js | 0 .../tests}/functional/catalog/Species.js | 0 .../tests}/functional/catalog/_Catalog.js | 0 .../tests}/functional/catalog/_CatalogFilter.js | 0 .../tests}/functional/catalog/_CatalogWithReport.js | 0 .../tests}/functional/catalogDetails/Activity.js | 0 .../tests}/functional/catalogDetails/Document.js | 0 .../functional/catalogDetails/Organisation.js | 0 .../tests}/functional/catalogDetails/Platform.js | 0 .../tests}/functional/catalogDetails/Program.js | 0 .../tests}/functional/catalogDetails/Project.js | 0 .../tests}/functional/catalogDetails/ServiceOGC.js | 0 .../tests}/functional/catalogDetails/Species.js | 0 .../tests}/functional/common/Home.js | 0 .../tests}/functional/common/Login.js | 0 .../tests}/functional/common/Profile.js | 0 .../tests}/functional/common/Sidebar.js | 0 .../tests}/functional/common/Topbar.js | 0 .../tests}/functional/dataLoader/Area.js | 0 .../tests}/functional/dataLoader/Citation.js | 0 .../tests}/functional/dataLoader/DataLoader.js | 0 .../tests}/functional/dataLoader/Infrastructure.js | 0 .../functional/dataLoader/ObjectCollection.js | 0 .../tests}/functional/dataLoader/SurveyStation.js | 0 .../tests}/functional/dataLoader/Tracking.js | 0 .../tests}/functional/maintenance/ServiceOGC.js | 0 .../functional/maintenance/domains/_Domain.js | 0 .../functional/maintenance/domains/_DomainBase.js | 0 .../functional/maintenance/domains/_DomainFacets.js | 0 .../maintenance/domains/_DomainFormEdition.js | 0 .../maintenance/domains/_DomainHierarchical.js | 0 .../maintenance/domains/_DomainWizardEdition.js | 0 .../maintenance/domains/admin/Accessibility.js | 0 .../maintenance/domains/admin/ActivityFields.js | 0 .../maintenance/domains/admin/ActivityTypes.js | 0 .../maintenance/domains/admin/ContactRoles.js | 0 .../maintenance/domains/admin/Countries.js | 0 .../maintenance/domains/admin/DeviceTypes.js | 0 .../maintenance/domains/admin/DocumentTypes.js | 0 .../maintenance/domains/admin/OrganisationRoles.js | 0 .../maintenance/domains/admin/OrganisationTypes.js | 0 .../maintenance/domains/admin/PlatformTypes.js | 0 .../maintenance/domains/admin/ProjectGroups.js | 0 .../functional/maintenance/domains/admin/Scopes.js | 0 .../maintenance/domains/geometry/AreaTypes.js | 0 .../maintenance/domains/geometry/Destiny.js | 0 .../maintenance/domains/geometry/Ending.js | 0 .../maintenance/domains/geometry/InspireThemes.js | 0 .../maintenance/domains/geometry/LineTypes.js | 0 .../maintenance/domains/geometry/MeshTypes.js | 0 .../maintenance/domains/geometry/RasterTypes.js | 0 .../maintenance/domains/geometry/RecordingTypes.js | 0 .../maintenance/domains/geometry/ShorelineTypes.js | 0 .../maintenance/domains/geometry/ThematicTypes.js | 0 .../maintenance/domains/geometry/ToponymTypes.js | 0 .../domains/observations/AttributeTypes.js | 0 .../domains/observations/CensusingStatus.js | 0 .../maintenance/domains/observations/Confidence.js | 0 .../domains/observations/InfrastructureType.js | 0 .../domains/observations/MetricGroups.js | 0 .../domains/observations/MetricsDefinitions.js | 0 .../maintenance/domains/observations/ObjectTypes.js | 0 .../domains/observations/ParameterTypes.js | 0 .../maintenance/domains/observations/Parameters.js | 0 .../maintenance/domains/observations/SampleTypes.js | 0 .../domains/observations/SeaConditions.js | 0 .../maintenance/domains/observations/UnitTypes.js | 0 .../maintenance/domains/observations/Units.js | 0 .../maintenance/domains/taxon/CanaryProtection.js | 0 .../maintenance/domains/taxon/EUProtection.js | 0 .../functional/maintenance/domains/taxon/Ecology.js | 0 .../maintenance/domains/taxon/Endemicity.js | 0 .../maintenance/domains/taxon/Interest.js | 0 .../maintenance/domains/taxon/LifeStages.js | 0 .../functional/maintenance/domains/taxon/Origin.js | 0 .../maintenance/domains/taxon/Permanence.js | 0 .../functional/maintenance/domains/taxon/Rank.js | 0 .../functional/maintenance/domains/taxon/Sex.js | 0 .../maintenance/domains/taxon/SpainProtection.js | 0 .../functional/maintenance/domains/taxon/Status.js | 0 .../maintenance/domains/taxon/TrophicRegime.js | 0 .../modules/components/Keypad/testKeypad.js | 0 .../modules/components/Keypad/testKeypadScript.js | 0 .../form/input/MapSearchImpl/testMapSearchImpl.js | 0 .../input/MapSearchImpl/testMapSearchImplScript.js | 0 .../form/input/UploadFileImpl/testUploadFileImpl.js | 0 .../UploadFileImpl/testUploadFileImplScript.js | 0 .../functional/modules/form/testFormWithKeypad.js | 0 .../modules/form/testFormWithKeypadScript.js | 0 .../functional/modules/search/testFacetsImpl.js | 0 .../modules/search/testFacetsImplScript.js | 0 .../tests}/functional/products/Atlas.js | 0 .../tests}/functional/products/ServiceOGC.js | 0 .../tests}/functional/viewers/Bibliography.js | 0 .../functional/viewers/SpeciesDistribution.js | 0 .../tests}/intern-functional-local.js | 0 .../tests}/intern-functional-remote.js | 0 {tests => client-app/tests}/intern-unit-local.js | 0 {tests => client-app/tests}/intern-unit-remote.js | 0 {tests => client-app/tests}/sockTest/app.js | 0 {tests => client-app/tests}/sockTest/stomp.js | 0 .../tests}/sockTest/websocket.mock.js | 0 {tests => client-app/tests}/support/Config.js | 0 .../tests}/support/CustomReporter.js | 0 {tests => client-app/tests}/support/Utils.js | 0 {tests => client-app/tests}/support/pages/Filter.js | 0 {tests => client-app/tests}/support/pages/List.js | 0 .../tests}/support/pages/ListHierarchical.js | 0 .../tests}/support/pages/ListWithTextSearch.js | 0 .../support/pages/ListWithTextSearchAndFacets.js | 0 .../tests}/support/pages/ListWithTreeFilter.js | 0 {tests => client-app/tests}/support/pages/Login.js | 0 {tests => client-app/tests}/support/pages/Map.js | 0 {tests => client-app/tests}/support/pages/Wizard.js | 0 {tests => client-app/tests}/support/pages/_Page.js | 0 .../tests}/support/pages/steps/DoubleList.js | 0 .../support/pages/steps/DoubleListFiltered.js | 0 .../tests}/support/pages/steps/Form.js | 0 .../tests}/support/pages/steps/FormList.js | 0 .../tests}/support/pages/steps/LayerImage.js | 0 .../tests}/support/pages/steps/LineGeometry.js | 0 .../tests}/support/pages/steps/List.js | 0 .../tests}/support/pages/steps/PointGeometry.js | 0 .../tests}/support/pages/steps/RelationData.js | 0 .../tests}/support/pages/steps/ReorderLayerList.js | 0 {tests => client-app/tests}/support/pages/test.html | 0 .../tests}/support/resources/DomainModel.js | 0 .../tests}/support/resources/doc.pdf | Bin .../tests}/support/resources/fileForLoadData/ar.zip | Bin .../support/resources/fileForLoadData/document.csv | 0 .../tests}/support/resources/fileForLoadData/ft.csv | 0 .../tests}/support/resources/fileForLoadData/oc.csv | 0 .../tests}/support/resources/fileForLoadData/pt.csv | 0 .../tests}/support/resources/profile.png | Bin {tests => client-app/tests}/support/tests/Atlas.js | 0 .../tests}/support/tests/AtlasWithClickMap.js | 0 .../tests}/support/tests/CatalogFacets.js | 0 .../tests}/support/tests/CatalogFacetsTotal.js | 0 .../tests}/support/tests/CatalogGuestReport.js | 0 .../tests}/support/tests/CatalogLinks.js | 0 .../tests}/support/tests/CatalogUserReport.js | 0 .../tests}/support/tests/CatalogWizardEdition.js | 0 .../tests}/support/tests/Citation.js | 0 .../tests}/support/tests/Dashboard.js | 0 .../tests}/support/tests/DetailsBase.js | 0 .../tests}/support/tests/DetailsEditionLink.js | 0 .../tests}/support/tests/DetailsInfo.js | 0 .../tests}/support/tests/DetailsPDF.js | 0 .../tests}/support/tests/DetailsTabs.js | 0 {tests => client-app/tests}/support/tests/Filter.js | 0 .../tests}/support/tests/FormAddition.js | 0 .../tests}/support/tests/FormEdition.js | 0 .../tests}/support/tests/ListFilterByTree.js | 0 .../tests}/support/tests/ListHierarchical.js | 0 .../support/tests/ListHierarchicalWithSelection.js | 0 .../tests}/support/tests/ListSelection.js | 0 .../tests}/support/tests/ListWithOrder.js | 0 .../tests}/support/tests/ListWithTextSearch.js | 0 {tests => client-app/tests}/support/tests/Map.js | 0 .../tests}/support/tests/SpeciesDistribution.js | 0 .../tests}/support/tests/WizardAddition.js | 0 .../tests}/support/tests/WizardEdition.js | 0 .../tests}/support/tests/WizardWorms.js | 0 .../tests}/support/tests/_BaseCommons.js | 0 .../tests}/support/tests/_CatalogBase.js | 0 .../tests}/support/tests/_Commons.js | 0 .../tests}/support/tests/_DataLoader.js | 0 .../unit/app/base/models/_ModelTestCommons.js | 0 .../unit/app/base/models/attr/testArrayAttr.js | 0 .../tests}/unit/app/base/models/attr/testAttr.js | 0 .../tests}/unit/app/base/models/attr/testObjAttr.js | 0 .../unit/app/base/models/attr/testRelationAttr.js | 0 .../tests}/unit/app/base/models/test_Model.js | 0 .../app/base/views/extensions/test_EditionView.js | 0 .../unit/app/viewers/views/test_ChartsView.js | 0 .../views/test_TimeSeriesSelectionManagement.js | 0 .../tests}/unit/redmic/base/testCredentials.js | 0 .../tests}/unit/redmic/base/testMediator.js | 0 .../unit/redmic/base/testRedmicLocalStorage.js | 0 .../tests}/unit/redmic/form/testUploadInput.js | 0 .../tests}/unit/redmic/modules/base/testManager.js | 0 .../unit/redmic/modules/base/testNotification.js | 0 .../unit/redmic/modules/base/testSelectionBox.js | 0 .../tests}/unit/redmic/modules/base/test_Module.js | 0 .../unit/redmic/modules/browser/bars/testOrder.js | 0 .../redmic/modules/browser/bars/testPagination.js | 0 .../redmic/modules/browser/bars/testSelectionBox.js | 0 .../unit/redmic/modules/browser/bars/testTotal.js | 0 .../redmic/modules/browser/buttons/testButtons.js | 0 .../unit/redmic/modules/browser/row/testRow.js | 0 .../redmic/modules/browser/testHierarchicalImpl.js | 0 .../unit/redmic/modules/browser/testListImpl.js | 0 .../ChartsContainer/testInfoChartsContainerImpl.js | 0 .../modules/chart/Toolbar/testSliderSelectorImpl.js | 0 .../chart/layer/ChartLayer/testLinearChartImpl.js | 0 .../redmic/modules/form/inputs/testCheckBoxImpl.js | 0 .../modules/form/inputs/testDateTextBoxImpl.js | 0 .../modules/form/inputs/testFilteringInputImpl.js | 0 .../modules/form/inputs/testNumberSpinnerImpl.js | 0 .../modules/form/inputs/testNumberTextBoxImpl.js | 0 .../redmic/modules/form/inputs/testTextAreaImpl.js | 0 .../redmic/modules/form/inputs/testTextBoxImpl.js | 0 .../tests}/unit/redmic/modules/form/testForm.js | 0 .../unit/redmic/modules/gateway/testGateway.js | 0 .../redmic/modules/layout/details/testDetails.js | 0 .../unit/redmic/modules/layout/wizard/testWizard.js | 0 .../unit/redmic/modules/map/testLeafletImpl.js | 0 .../unit/redmic/modules/model/testModelImpl.js | 0 .../modules/notification/test_Communication.js | 0 .../modules/notification/test_Notification.js | 0 .../unit/redmic/modules/search/testFacetsImpl.js | 0 .../tests}/unit/redmic/modules/search/testSearch.js | 0 .../unit/redmic/modules/selection/testSelector.js | 0 .../tests}/unit/redmic/modules/socket/testSocket.js | 0 .../unit/redmic/modules/store/testRestManager.js | 0 .../tests}/unit/redmic/modules/tree/testTree.js | 0 .../tests}/unit/redmic/modules/wizard/testWizard.js | 0 grunt/config/buildModules.js | 8 ++++---- grunt/config/ownModules.js | 4 ++-- package.json | 4 ++-- server-app/src/exposure.js | 2 +- server-app/src/styles.js | 2 +- server-app/views/layout.pug | 2 +- 1205 files changed, 19 insertions(+), 18 deletions(-) rename redmic.profile.js => client-app/app.profile.js (99%) rename {public => client-app}/javascript/alertify (100%) rename {public => client-app}/javascript/app/administrative/taxonomy/views/ClassView.js (100%) rename {public => client-app}/javascript/app/administrative/taxonomy/views/FamilyView.js (100%) rename {public => client-app}/javascript/app/administrative/taxonomy/views/GenusView.js (100%) rename {public => client-app}/javascript/app/administrative/taxonomy/views/KingdomView.js (100%) rename {public => client-app}/javascript/app/administrative/taxonomy/views/MisIdentificationView.js (100%) rename {public => client-app}/javascript/app/administrative/taxonomy/views/OrderView.js (100%) rename {public => client-app}/javascript/app/administrative/taxonomy/views/PhylumView.js (100%) rename {public => client-app}/javascript/app/administrative/taxonomy/views/SpeciesView.js (100%) rename {public => client-app}/javascript/app/administrative/taxonomy/views/SubphylumView.js (100%) rename {public => client-app}/javascript/app/administrative/taxonomy/views/TaxonomyView.js (100%) rename {public => client-app}/javascript/app/administrative/taxonomy/views/_AddCompositeTaxon.js (100%) rename {public => client-app}/javascript/app/administrative/taxonomy/views/templates/forms/KingdomForm.html (100%) rename {public => client-app}/javascript/app/administrative/taxonomy/views/templates/forms/MisIdentificationForm.html (100%) rename {public => client-app}/javascript/app/administrative/taxonomy/views/templates/forms/PeculiarityForm.html (100%) rename {public => client-app}/javascript/app/administrative/taxonomy/views/templates/forms/RecoveryForm.html (100%) rename {public => client-app}/javascript/app/administrative/taxonomy/views/templates/forms/SpeciesForm.html (100%) rename {public => client-app}/javascript/app/administrative/taxonomy/views/templates/forms/SpecimenTagForm.html (100%) rename {public => client-app}/javascript/app/administrative/taxonomy/views/templates/forms/TaxonForm.html (100%) rename {public => client-app}/javascript/app/administrative/views/ActivityView.js (100%) rename {public => client-app}/javascript/app/administrative/views/AnimalView.js (100%) rename {public => client-app}/javascript/app/administrative/views/ContactView.js (100%) rename {public => client-app}/javascript/app/administrative/views/DeviceView.js (100%) rename {public => client-app}/javascript/app/administrative/views/DocumentView.js (100%) rename {public => client-app}/javascript/app/administrative/views/OrganisationView.js (100%) rename {public => client-app}/javascript/app/administrative/views/PlatformView.js (100%) rename {public => client-app}/javascript/app/administrative/views/ProgramView.js (100%) rename {public => client-app}/javascript/app/administrative/views/ProjectView.js (100%) rename {public => client-app}/javascript/app/administrative/views/templates/forms/ActivityContactForm.html (100%) rename {public => client-app}/javascript/app/administrative/views/templates/forms/ActivityEmbeddedContentForm.html (100%) rename {public => client-app}/javascript/app/administrative/views/templates/forms/ActivityForm.html (100%) rename {public => client-app}/javascript/app/administrative/views/templates/forms/ActivityOrganisationForm.html (100%) rename {public => client-app}/javascript/app/administrative/views/templates/forms/ActivityPlatformForm.html (100%) rename {public => client-app}/javascript/app/administrative/views/templates/forms/ActivityResourceForm.html (100%) rename {public => client-app}/javascript/app/administrative/views/templates/forms/AnimalForm.html (100%) rename {public => client-app}/javascript/app/administrative/views/templates/forms/CalibrationForm.html (100%) rename {public => client-app}/javascript/app/administrative/views/templates/forms/ConditionForm.html (100%) rename {public => client-app}/javascript/app/administrative/views/templates/forms/ContactForm.html (100%) rename {public => client-app}/javascript/app/administrative/views/templates/forms/DeviceForm.html (100%) rename {public => client-app}/javascript/app/administrative/views/templates/forms/DocumentForm.html (100%) rename {public => client-app}/javascript/app/administrative/views/templates/forms/MetricsDefinitionForm.html (100%) rename {public => client-app}/javascript/app/administrative/views/templates/forms/OrganisationForm.html (100%) rename {public => client-app}/javascript/app/administrative/views/templates/forms/ParameterForm.html (100%) rename {public => client-app}/javascript/app/administrative/views/templates/forms/PlatformForm.html (100%) rename {public => client-app}/javascript/app/administrative/views/templates/forms/ProgramForm.html (100%) rename {public => client-app}/javascript/app/administrative/views/templates/forms/ProjectForm.html (100%) rename {public => client-app}/javascript/app/administrative/views/templates/forms/UnitForm.html (100%) rename {public => client-app}/javascript/app/base/models/_Model.js (100%) rename {public => client-app}/javascript/app/base/models/attr/ArrayAttr.js (100%) rename {public => client-app}/javascript/app/base/models/attr/Attr.js (100%) rename {public => client-app}/javascript/app/base/models/attr/ObjAttr.js (100%) rename {public => client-app}/javascript/app/base/models/attr/RelationAttr.js (100%) rename {public => client-app}/javascript/app/base/models/attr/_Attr.js (100%) rename {public => client-app}/javascript/app/base/models/attr/_ComplexAttr.js (100%) rename {public => client-app}/javascript/app/base/views/EditorLayerWithVariableForm.js (100%) rename {public => client-app}/javascript/app/base/views/Module.js (100%) rename {public => client-app}/javascript/app/base/views/_ListenRequestError.js (100%) rename {public => client-app}/javascript/app/base/views/_LoadingWidget.js (100%) rename {public => client-app}/javascript/app/base/views/_SettingsHandler.js (100%) rename {public => client-app}/javascript/app/base/views/_View.js (100%) rename {public => client-app}/javascript/app/base/views/_ViewHandle.js (100%) rename {public => client-app}/javascript/app/base/views/_ViewListBase.js (100%) rename {public => client-app}/javascript/app/base/views/extensions/_ActivityClosed.js (100%) rename {public => client-app}/javascript/app/base/views/extensions/_AddAtlasCategory.js (100%) rename {public => client-app}/javascript/app/base/views/extensions/_AddCompositeSearchInTooltipFromTextSearch.js (100%) rename {public => client-app}/javascript/app/base/views/extensions/_AddForm.js (100%) rename {public => client-app}/javascript/app/base/views/extensions/_AddFormItfc.js (100%) rename {public => client-app}/javascript/app/base/views/extensions/_AddSelectInput.js (100%) rename {public => client-app}/javascript/app/base/views/extensions/_AddSelectInputItfc.js (100%) rename {public => client-app}/javascript/app/base/views/extensions/_AddSelectionHandlerKeypad.js (100%) rename {public => client-app}/javascript/app/base/views/extensions/_AddTextSearchInput.js (100%) rename {public => client-app}/javascript/app/base/views/extensions/_AddTextSearchInputItfc.js (100%) rename {public => client-app}/javascript/app/base/views/extensions/_CompositeInTooltipFromIconKeypad.js (100%) rename {public => client-app}/javascript/app/base/views/extensions/_CompositeSearchInTooltip.js (100%) rename {public => client-app}/javascript/app/base/views/extensions/_Edition.js (100%) rename {public => client-app}/javascript/app/base/views/extensions/_EditionCommons.js (100%) rename {public => client-app}/javascript/app/base/views/extensions/_EditionFormList.js (100%) rename {public => client-app}/javascript/app/base/views/extensions/_EditionLayerView.js (100%) rename {public => client-app}/javascript/app/base/views/extensions/_EditionView.js (100%) rename {public => client-app}/javascript/app/base/views/extensions/_EditionWizardView.js (100%) rename {public => client-app}/javascript/app/base/views/extensions/_FormInDialogView.js (100%) rename {public => client-app}/javascript/app/base/views/extensions/_GetActivityData.js (100%) rename {public => client-app}/javascript/app/base/views/extensions/_GetActivityDataItfc.js (100%) rename {public => client-app}/javascript/app/base/views/extensions/_InterceptCloseUpView.js (100%) rename {public => client-app}/javascript/app/base/views/extensions/_ListenActivityDataAndAccessByActivityCategory.js (100%) rename {public => client-app}/javascript/app/base/views/extensions/_LocalSelectionView.js (100%) rename {public => client-app}/javascript/app/base/views/extensions/_LocalSelectionViewItfc.js (100%) rename {public => client-app}/javascript/app/base/views/extensions/_OnShownAndRefresh.js (100%) rename {public => client-app}/javascript/app/base/views/extensions/_ProcessInterval.js (100%) rename {public => client-app}/javascript/app/base/views/extensions/_SelectInDoubleList.js (100%) rename {public => client-app}/javascript/app/catalog/views/ActivitiesCatalogView.js (100%) rename {public => client-app}/javascript/app/catalog/views/OrganisationsCatalogView.js (100%) rename {public => client-app}/javascript/app/catalog/views/PlatformsCatalogView.js (100%) rename {public => client-app}/javascript/app/catalog/views/ProgramsCatalogView.js (100%) rename {public => client-app}/javascript/app/catalog/views/ProjectsCatalogView.js (100%) rename {public => client-app}/javascript/app/catalog/views/SpeciesCatalogView.js (100%) rename {public => client-app}/javascript/app/components/CookieLoader.js (100%) rename {public => client-app}/javascript/app/components/ReCaptcha.js (100%) rename {public => client-app}/javascript/app/components/steps/AccessSetStep.js (100%) rename {public => client-app}/javascript/app/components/steps/ActivitySetStep.js (100%) rename {public => client-app}/javascript/app/components/steps/AddGeomSiteStep.js (100%) rename {public => client-app}/javascript/app/components/steps/AreaClassificationsSetStep.js (100%) rename {public => client-app}/javascript/app/components/steps/CalibrationSetStep.js (100%) rename {public => client-app}/javascript/app/components/steps/CitationStep.js (100%) rename {public => client-app}/javascript/app/components/steps/ClassificationsStep.js (100%) rename {public => client-app}/javascript/app/components/steps/ContactSetStep.js (100%) rename {public => client-app}/javascript/app/components/steps/DataDefinitionSetStep.js (100%) rename {public => client-app}/javascript/app/components/steps/DescribeSiteStep.js (100%) rename {public => client-app}/javascript/app/components/steps/DocumentSetStep.js (100%) rename {public => client-app}/javascript/app/components/steps/DocumentStepFiltered.js (100%) rename {public => client-app}/javascript/app/components/steps/DownloadsSetStep.js (100%) rename {public => client-app}/javascript/app/components/steps/EmbeddedContentSetStep.js (100%) rename {public => client-app}/javascript/app/components/steps/MainDataStep.js (100%) rename {public => client-app}/javascript/app/components/steps/MapSelectAreaStep.js (100%) rename {public => client-app}/javascript/app/components/steps/OrganisationSetStep.js (100%) rename {public => client-app}/javascript/app/components/steps/PlatformSetStep.js (100%) rename {public => client-app}/javascript/app/components/steps/PreLoadMainDataStep.js (100%) rename {public => client-app}/javascript/app/components/steps/ProtocolsSetStep.js (100%) rename {public => client-app}/javascript/app/components/steps/RecoverySetStep.js (100%) rename {public => client-app}/javascript/app/components/steps/RelationDataSetStep.js (100%) rename {public => client-app}/javascript/app/components/steps/ResourceSetStep.js (100%) rename {public => client-app}/javascript/app/components/steps/SelectActivityCategoryStep.js (100%) rename {public => client-app}/javascript/app/components/steps/SelectLayerStep.js (100%) rename {public => client-app}/javascript/app/components/steps/SelectRegisterTypeStep.js (100%) rename {public => client-app}/javascript/app/components/steps/SpeciesMainDataStep.js (100%) rename {public => client-app}/javascript/app/components/steps/SpecimenTagSetStep.js (100%) rename {public => client-app}/javascript/app/components/steps/UnitSetStep.js (100%) rename {public => client-app}/javascript/app/components/steps/_ClassificationsRelationData.js (100%) rename {public => client-app}/javascript/app/components/steps/_DataListAndSaveRelationData.js (100%) rename {public => client-app}/javascript/app/components/steps/_DateRelationData.js (100%) rename {public => client-app}/javascript/app/components/steps/_MainData.js (100%) rename {public => client-app}/javascript/app/components/steps/_ParametersRelationData.js (100%) rename {public => client-app}/javascript/app/components/steps/_RememberDeleteItems.js (100%) rename {public => client-app}/javascript/app/components/steps/_SelectOptionBox.js (100%) rename {public => client-app}/javascript/app/components/viewCustomization/addGeomSite/views/Line.js (100%) rename {public => client-app}/javascript/app/components/viewCustomization/addGeomSite/views/MultiPolygon.js (100%) rename {public => client-app}/javascript/app/components/viewCustomization/addGeomSite/views/Point.js (100%) rename {public => client-app}/javascript/app/components/viewCustomization/addGeomSite/views/_BaseGeometryForm.js (100%) rename {public => client-app}/javascript/app/components/viewCustomization/addGeomSite/views/templates/LineForm.html (100%) rename {public => client-app}/javascript/app/components/viewCustomization/addGeomSite/views/templates/PointForm.html (100%) rename {public => client-app}/javascript/app/components/viewCustomization/describeSite/views/SelectStationByActivity.js (100%) rename {public => client-app}/javascript/app/components/viewCustomization/describeSite/views/_AdditionalKeyGetter.js (100%) rename {public => client-app}/javascript/app/components/viewCustomization/describeSite/views/templates/ARForm.html (100%) rename {public => client-app}/javascript/app/components/viewCustomization/describeSite/views/templates/DescribeSiteForm.html (100%) rename {public => client-app}/javascript/app/components/viewCustomization/describeSite/views/templates/IFForm.html (100%) rename {public => client-app}/javascript/app/components/viewCustomization/loadFile/models/LoadFileModel.js (100%) rename {public => client-app}/javascript/app/components/viewCustomization/loadFile/views/templates/ARFileForm.html (100%) rename {public => client-app}/javascript/app/components/viewCustomization/loadFile/views/templates/LoadFileForm.html (100%) rename {public => client-app}/javascript/app/components/viewCustomization/parameter/views/templates/FTForm.html (100%) rename {public => client-app}/javascript/app/components/viewCustomization/parameter/views/templates/OCForm.html (100%) rename {public => client-app}/javascript/app/components/viewCustomization/relationData/views/templates/AreaTypeForm.html (100%) rename {public => client-app}/javascript/app/components/viewCustomization/relationData/views/templates/DateForm.html (100%) rename {public => client-app}/javascript/app/components/viewCustomization/relationData/views/templates/DefaultForm.html (100%) rename {public => client-app}/javascript/app/components/viewCustomization/relationData/views/templates/DeviceForm.html (100%) rename {public => client-app}/javascript/app/components/viewCustomization/relationData/views/templates/PointGeometryForm.html (100%) rename {public => client-app}/javascript/app/dataLoader/areas/views/AreaView.js (100%) rename {public => client-app}/javascript/app/dataLoader/areas/views/templates/AreaClassificationsForm.html (100%) rename {public => client-app}/javascript/app/dataLoader/base/_GeographicBase.js (100%) rename {public => client-app}/javascript/app/dataLoader/citation/views/CitationView.js (100%) rename {public => client-app}/javascript/app/dataLoader/citation/views/templates/CitationForm.html (100%) rename {public => client-app}/javascript/app/dataLoader/infrastructure/views/InfrastructureAttributesView.js (100%) rename {public => client-app}/javascript/app/dataLoader/infrastructure/views/InfrastructureView.js (100%) rename {public => client-app}/javascript/app/dataLoader/infrastructure/views/templates/form/AttributesForm.html (100%) rename {public => client-app}/javascript/app/dataLoader/sightings/models/SightingsModel.js (100%) rename {public => client-app}/javascript/app/dataLoader/sightings/views/SightingsView.js (100%) rename {public => client-app}/javascript/app/dataLoader/sightings/views/templates/SightingsForm.html (100%) rename {public => client-app}/javascript/app/dataLoader/surveyParameters/views/ObjectCollectingSeriesDataView.js (100%) rename {public => client-app}/javascript/app/dataLoader/surveyParameters/views/ObjectCollectionView.js (100%) rename {public => client-app}/javascript/app/dataLoader/surveyParameters/views/SurveyStationSeriesDataView.js (100%) rename {public => client-app}/javascript/app/dataLoader/surveyParameters/views/SurveyStationView.js (100%) rename {public => client-app}/javascript/app/dataLoader/surveyParameters/views/_DataLoadedByStationManagement.js (100%) rename {public => client-app}/javascript/app/dataLoader/surveyParameters/views/_SeriesDataView.js (100%) rename {public => client-app}/javascript/app/dataLoader/surveyParameters/views/templates/ObjectCollectingForm.html (100%) rename {public => client-app}/javascript/app/dataLoader/surveyParameters/views/templates/TimeSeriesForm.html (100%) rename {public => client-app}/javascript/app/dataLoader/tracking/views/TrackingDataView.js (100%) rename {public => client-app}/javascript/app/dataLoader/tracking/views/TrackingView.js (100%) rename {public => client-app}/javascript/app/dataLoader/tracking/views/templates/form/TrackingPointForm.html (100%) rename {public => client-app}/javascript/app/designs/base/_Browser.js (100%) rename {public => client-app}/javascript/app/designs/base/_Controller.js (100%) rename {public => client-app}/javascript/app/designs/base/_ControllerItfc.js (100%) rename {public => client-app}/javascript/app/designs/base/_Layout.js (100%) rename {public => client-app}/javascript/app/designs/base/_LayoutItfc.js (100%) rename {public => client-app}/javascript/app/designs/base/_Main.js (100%) rename {public => client-app}/javascript/app/designs/base/_MainItfc.js (100%) rename {public => client-app}/javascript/app/designs/base/_ServiceOGC.js (100%) rename {public => client-app}/javascript/app/designs/chart/Controller.js (100%) rename {public => client-app}/javascript/app/designs/chart/layout/SideAndTopAndBottomContent.js (100%) rename {public => client-app}/javascript/app/designs/chart/layout/TopAndBottomContent.js (100%) rename {public => client-app}/javascript/app/designs/chart/layout/TopContent.js (100%) rename {public => client-app}/javascript/app/designs/chart/main/ChartsWithLegendAndToolbarsAndSlider.js (100%) rename {public => client-app}/javascript/app/designs/chart/main/ChartsWithToolbarsAndSlider.js (100%) rename {public => client-app}/javascript/app/designs/chart/main/MultiPieChartWithToolbar.js (100%) rename {public => client-app}/javascript/app/designs/chart/main/MultiWindRoseChartWithToolbar.js (100%) rename {public => client-app}/javascript/app/designs/chart/main/WindRoseChartWithToolbar.js (100%) rename {public => client-app}/javascript/app/designs/chart/main/_ChartsWithToolbarsAndSlider.js (100%) rename {public => client-app}/javascript/app/designs/chart/main/_ChartsWithToolbarsAndSliderItfc.js (100%) rename {public => client-app}/javascript/app/designs/chart/main/_ProcessDataDefinitionAndGetTimeSeries.js (100%) rename {public => client-app}/javascript/app/designs/details/Controller.js (100%) rename {public => client-app}/javascript/app/designs/details/Layout.js (100%) rename {public => client-app}/javascript/app/designs/details/_AddBasicTitle.js (100%) rename {public => client-app}/javascript/app/designs/details/_AddTitle.js (100%) rename {public => client-app}/javascript/app/designs/details/_ControllerItfc.js (100%) rename {public => client-app}/javascript/app/designs/details/main/ActivityLayerMap.js (100%) rename {public => client-app}/javascript/app/designs/details/main/ActivityMap.js (100%) rename {public => client-app}/javascript/app/designs/details/main/ActivityTrackingMap.js (100%) rename {public => client-app}/javascript/app/designs/details/main/Contact.js (100%) rename {public => client-app}/javascript/app/designs/details/main/Document.js (100%) rename {public => client-app}/javascript/app/designs/details/main/DocumentPDF.js (100%) rename {public => client-app}/javascript/app/designs/details/main/Organisation.js (100%) rename {public => client-app}/javascript/app/designs/details/main/Platform.js (100%) rename {public => client-app}/javascript/app/designs/details/main/Program.js (100%) rename {public => client-app}/javascript/app/designs/details/main/Project.js (100%) rename {public => client-app}/javascript/app/designs/details/main/ServiceOGC.js (100%) rename {public => client-app}/javascript/app/designs/details/main/Species.js (100%) rename {public => client-app}/javascript/app/designs/details/main/SpeciesLocation.js (100%) rename {public => client-app}/javascript/app/designs/details/main/Statistics.js (100%) rename {public => client-app}/javascript/app/designs/details/main/_ActivityBase.js (100%) rename {public => client-app}/javascript/app/designs/details/main/_DetailsBase.js (100%) rename {public => client-app}/javascript/app/designs/doubleList/Controller.js (100%) rename {public => client-app}/javascript/app/designs/doubleList/layout/Layout.js (100%) rename {public => client-app}/javascript/app/designs/doubleList/layout/TopLeftContentAndDoubleList.js (100%) rename {public => client-app}/javascript/app/designs/doubleList/main/textSearchAndDoubleList.js (100%) rename {public => client-app}/javascript/app/designs/dynamicDualContent/Controller.js (100%) rename {public => client-app}/javascript/app/designs/dynamicDualContent/layout/FacetsInLeftSecondaryContent.js (100%) rename {public => client-app}/javascript/app/designs/dynamicDualContent/layout/LeftSecondaryContent.js (100%) rename {public => client-app}/javascript/app/designs/dynamicDualContent/layout/TopSecondaryContent.js (100%) rename {public => client-app}/javascript/app/designs/dynamicDualContent/layout/_Layout.js (100%) rename {public => client-app}/javascript/app/designs/dynamicDualContent/main/FacetsWithDynamicRightContent.js (100%) rename {public => client-app}/javascript/app/designs/edition/Controller.js (100%) rename {public => client-app}/javascript/app/designs/edition/Layout.js (100%) rename {public => client-app}/javascript/app/designs/embeddedContent/Controller.js (100%) rename {public => client-app}/javascript/app/designs/embeddedContent/Layout.js (100%) rename {public => client-app}/javascript/app/designs/embeddedContentWithTopbar/Controller.js (100%) rename {public => client-app}/javascript/app/designs/embeddedContentWithTopbar/layout/TopAndCenterContent.js (100%) rename {public => client-app}/javascript/app/designs/embeddedContentWithTopbar/main/EmbeddedContentSelectionInTopbar.js (100%) rename {public => client-app}/javascript/app/designs/externalTextSearchList/Controller.js (100%) rename {public => client-app}/javascript/app/designs/externalTextSearchList/Layout.js (100%) rename {public => client-app}/javascript/app/designs/externalTextSearchList/main/PlaceNames.js (100%) rename {public => client-app}/javascript/app/designs/externalTextSearchList/main/Worms.js (100%) rename {public => client-app}/javascript/app/designs/formList/Controller.js (100%) rename {public => client-app}/javascript/app/designs/formList/_ControllerItfc.js (100%) rename {public => client-app}/javascript/app/designs/formList/layout/Layout.js (100%) rename {public => client-app}/javascript/app/designs/formList/layout/LayoutWithTopForm.js (100%) rename {public => client-app}/javascript/app/designs/formList/main/FormListByStep.js (100%) rename {public => client-app}/javascript/app/designs/formList/main/_RequestAndParseData.js (100%) rename {public => client-app}/javascript/app/designs/list/Controller.js (100%) rename {public => client-app}/javascript/app/designs/list/_AddFilter.js (100%) rename {public => client-app}/javascript/app/designs/list/layout/Layout.js (100%) rename {public => client-app}/javascript/app/designs/list/layout/ListWithTopContent.js (100%) rename {public => client-app}/javascript/app/designs/list/layout/NoTitle.js (100%) rename {public => client-app}/javascript/app/designs/mapWithSideContent/Controller.js (100%) rename {public => client-app}/javascript/app/designs/mapWithSideContent/layout/MapAndContent.js (100%) rename {public => client-app}/javascript/app/designs/mapWithSideContent/layout/MapAndContentAndTopbar.js (100%) rename {public => client-app}/javascript/app/designs/mapWithSideContent/main/FilterAndGeographic.js (100%) rename {public => client-app}/javascript/app/designs/mapWithSideContent/main/Geographic.js (100%) rename {public => client-app}/javascript/app/designs/mapWithSideContent/main/GeographicEditor.js (100%) rename {public => client-app}/javascript/app/designs/mapWithSideContent/main/Tracking.js (100%) rename {public => client-app}/javascript/app/designs/mapWithSideContent/main/_TrackingByFilter.js (100%) rename {public => client-app}/javascript/app/designs/mapWithSideContent/main/_TrackingWithList.js (100%) rename {public => client-app}/javascript/app/designs/mapWithSideContent/main/_TrackingWithListByFilter.js (100%) rename {public => client-app}/javascript/app/designs/textSearchFacetsList/Controller.js (100%) rename {public => client-app}/javascript/app/designs/textSearchFacetsList/Layout.js (100%) rename {public => client-app}/javascript/app/designs/textSearchFacetsList/_AddFilter.js (100%) rename {public => client-app}/javascript/app/designs/textSearchFacetsList/main/Activity.js (100%) rename {public => client-app}/javascript/app/designs/textSearchFacetsList/main/Administrative.js (100%) rename {public => client-app}/javascript/app/designs/textSearchFacetsList/main/Bibliography.js (100%) rename {public => client-app}/javascript/app/designs/textSearchFacetsList/main/Domain.js (100%) rename {public => client-app}/javascript/app/designs/textSearchFacetsList/main/Organisation.js (100%) rename {public => client-app}/javascript/app/designs/textSearchFacetsList/main/Platform.js (100%) rename {public => client-app}/javascript/app/designs/textSearchFacetsList/main/Program.js (100%) rename {public => client-app}/javascript/app/designs/textSearchFacetsList/main/Project.js (100%) rename {public => client-app}/javascript/app/designs/textSearchFacetsList/main/ServiceOGC.js (100%) rename {public => client-app}/javascript/app/designs/textSearchFacetsList/main/Species.js (100%) rename {public => client-app}/javascript/app/designs/textSearchFacetsList/main/Taxon.js (100%) rename {public => client-app}/javascript/app/designs/textSearchList/Controller.js (100%) rename {public => client-app}/javascript/app/designs/textSearchList/_AddFilter.js (100%) rename {public => client-app}/javascript/app/designs/textSearchList/layout/BasicAndButtonsTopZone.js (100%) rename {public => client-app}/javascript/app/designs/textSearchList/layout/BasicTopZone.js (100%) rename {public => client-app}/javascript/app/designs/textSearchList/main/Domain.js (100%) rename {public => client-app}/javascript/app/designs/textSearchList/main/Selection.js (100%) rename {public => client-app}/javascript/app/designs/textSearchList/main/ServiceOGC.js (100%) rename {public => client-app}/javascript/app/details/views/ActivityAreaMapBase.js (100%) rename {public => client-app}/javascript/app/details/views/ActivityCatalogDetailsView.js (100%) rename {public => client-app}/javascript/app/details/views/ActivityChart.js (100%) rename {public => client-app}/javascript/app/details/views/ActivityCitationMapBase.js (100%) rename {public => client-app}/javascript/app/details/views/ActivityDetailsView.js (100%) rename {public => client-app}/javascript/app/details/views/ActivityFixedTimeseriesChart.js (100%) rename {public => client-app}/javascript/app/details/views/ActivityFixedTimeseriesMap.js (100%) rename {public => client-app}/javascript/app/details/views/ActivityInfrastructureMapBase.js (100%) rename {public => client-app}/javascript/app/details/views/ActivityLayerMapBase.js (100%) rename {public => client-app}/javascript/app/details/views/BibliographyDetailsView.js (100%) rename {public => client-app}/javascript/app/details/views/ContactDetailsView.js (100%) rename {public => client-app}/javascript/app/details/views/DocumentDetailsView.js (100%) rename {public => client-app}/javascript/app/details/views/OrganisationCatalogDetailsView.js (100%) rename {public => client-app}/javascript/app/details/views/OrganisationDetailsView.js (100%) rename {public => client-app}/javascript/app/details/views/PlatformCatalogDetailsView.js (100%) rename {public => client-app}/javascript/app/details/views/PlatformDetailsView.js (100%) rename {public => client-app}/javascript/app/details/views/ProgramCatalogDetailsView.js (100%) rename {public => client-app}/javascript/app/details/views/ProgramDetailsView.js (100%) rename {public => client-app}/javascript/app/details/views/ProjectCatalogDetailsView.js (100%) rename {public => client-app}/javascript/app/details/views/ProjectDetailsView.js (100%) rename {public => client-app}/javascript/app/details/views/ServiceOGCCatalogDetailsView.js (100%) rename {public => client-app}/javascript/app/details/views/ServiceOGCDetailsView.js (100%) rename {public => client-app}/javascript/app/details/views/SpeciesCatalogDetailsView.js (100%) rename {public => client-app}/javascript/app/details/views/SpeciesDetailsView.js (100%) rename {public => client-app}/javascript/app/details/views/StatisticsDetailsView.js (100%) rename {public => client-app}/javascript/app/details/views/_ActivityTimeSeriesDataManagement.js (100%) rename {public => client-app}/javascript/app/edition/views/ActivityEditionView.js (100%) rename {public => client-app}/javascript/app/edition/views/AnimalEditionView.js (100%) rename {public => client-app}/javascript/app/edition/views/ConditionEditionView.js (100%) rename {public => client-app}/javascript/app/edition/views/ContactEditionView.js (100%) rename {public => client-app}/javascript/app/edition/views/DeviceEditionView.js (100%) rename {public => client-app}/javascript/app/edition/views/DocumentEditionView.js (100%) rename {public => client-app}/javascript/app/edition/views/LoadDataDocumentEditionView.js (100%) rename {public => client-app}/javascript/app/edition/views/LoadDataToActivityEditionView.js (100%) rename {public => client-app}/javascript/app/edition/views/MetricsDefinitionEditionView.js (100%) rename {public => client-app}/javascript/app/edition/views/MisIdentificationEditionView.js (100%) rename {public => client-app}/javascript/app/edition/views/OrganisationEditionView.js (100%) rename {public => client-app}/javascript/app/edition/views/ParameterEditionView.js (100%) rename {public => client-app}/javascript/app/edition/views/PermissionsEditionView.js (100%) rename {public => client-app}/javascript/app/edition/views/PlatformEditionView.js (100%) rename {public => client-app}/javascript/app/edition/views/ProgramEditionView.js (100%) rename {public => client-app}/javascript/app/edition/views/ProjectEditionView.js (100%) rename {public => client-app}/javascript/app/edition/views/ServiceOGCEditionView.js (100%) rename {public => client-app}/javascript/app/edition/views/SpeciesEditionView.js (100%) rename {public => client-app}/javascript/app/edition/views/UnitEditionView.js (100%) rename {public => client-app}/javascript/app/edition/views/dataLoader/AddDataFT.js (100%) rename {public => client-app}/javascript/app/edition/views/dataLoader/AddDataIF.js (100%) rename {public => client-app}/javascript/app/edition/views/dataLoader/AddDataOC.js (100%) rename {public => client-app}/javascript/app/edition/views/dataLoader/EditDataAR.js (100%) rename {public => client-app}/javascript/app/edition/views/dataLoader/LoadDataAR.js (100%) rename {public => client-app}/javascript/app/edition/views/dataLoader/LoadDataFT.js (100%) rename {public => client-app}/javascript/app/edition/views/dataLoader/LoadDataOC.js (100%) rename {public => client-app}/javascript/app/edition/views/dataLoader/LoadDataTR.js (100%) rename {public => client-app}/javascript/app/edition/views/dataLoader/_BaseDataToActivityEdition.js (100%) rename {public => client-app}/javascript/app/edition/views/dataLoader/_BaseDataToActivityEditionItfc.js (100%) rename {public => client-app}/javascript/app/edition/views/dataLoader/_BaseLoadDataToActivityEdition.js (100%) rename {public => client-app}/javascript/app/edition/views/dataLoader/_BaseLoadDataToActivityEditionItfc.js (100%) rename {public => client-app}/javascript/app/home/views/HomeView.js (100%) rename {public => client-app}/javascript/app/home/views/ProductWidget.js (100%) rename {public => client-app}/javascript/app/home/views/SearchBarWidget.js (100%) rename {public => client-app}/javascript/app/home/views/SearchFastFilterWidget.js (100%) rename {public => client-app}/javascript/app/home/views/SearchFilterWidget.js (100%) rename {public => client-app}/javascript/app/home/views/SearchResultsWidget.js (100%) rename {public => client-app}/javascript/app/home/views/SocialWidget.js (100%) rename {public => client-app}/javascript/app/home/views/StatsWidget.js (100%) rename {public => client-app}/javascript/app/home/views/_DashboardItem.js (100%) rename {public => client-app}/javascript/app/maintenance/domains/_HierarchicalDomain.js (100%) rename {public => client-app}/javascript/app/maintenance/domains/admin/views/AccessibilityView.js (100%) rename {public => client-app}/javascript/app/maintenance/domains/admin/views/ActivityFieldsView.js (100%) rename {public => client-app}/javascript/app/maintenance/domains/admin/views/ActivityTypesView.js (100%) rename {public => client-app}/javascript/app/maintenance/domains/admin/views/ContactRolesView.js (100%) rename {public => client-app}/javascript/app/maintenance/domains/admin/views/CountriesView.js (100%) rename {public => client-app}/javascript/app/maintenance/domains/admin/views/DeviceTypesView.js (100%) rename {public => client-app}/javascript/app/maintenance/domains/admin/views/DocumentTypesView.js (100%) rename {public => client-app}/javascript/app/maintenance/domains/admin/views/OrganisationRolesView.js (100%) rename {public => client-app}/javascript/app/maintenance/domains/admin/views/OrganisationTypesView.js (100%) rename {public => client-app}/javascript/app/maintenance/domains/admin/views/PlatformTypesView.js (100%) rename {public => client-app}/javascript/app/maintenance/domains/admin/views/ProjectGroupsView.js (100%) rename {public => client-app}/javascript/app/maintenance/domains/admin/views/ScopesView.js (100%) rename {public => client-app}/javascript/app/maintenance/domains/admin/views/templates/forms/ActivityTypesForm.html (100%) rename {public => client-app}/javascript/app/maintenance/domains/admin/views/templates/forms/CountriesForm.html (100%) rename {public => client-app}/javascript/app/maintenance/domains/geometry/views/AreaTypesView.js (100%) rename {public => client-app}/javascript/app/maintenance/domains/geometry/views/DestinyView.js (100%) rename {public => client-app}/javascript/app/maintenance/domains/geometry/views/EndingView.js (100%) rename {public => client-app}/javascript/app/maintenance/domains/geometry/views/InspireThemesView.js (100%) rename {public => client-app}/javascript/app/maintenance/domains/geometry/views/LineTypesView.js (100%) rename {public => client-app}/javascript/app/maintenance/domains/geometry/views/MeshTypesView.js (100%) rename {public => client-app}/javascript/app/maintenance/domains/geometry/views/RasterTypesView.js (100%) rename {public => client-app}/javascript/app/maintenance/domains/geometry/views/RecordingTypesView.js (100%) rename {public => client-app}/javascript/app/maintenance/domains/geometry/views/ShorelineTypesView.js (100%) rename {public => client-app}/javascript/app/maintenance/domains/geometry/views/ThematicTypeView.js (100%) rename {public => client-app}/javascript/app/maintenance/domains/geometry/views/ToponymTypesView.js (100%) rename {public => client-app}/javascript/app/maintenance/domains/geometry/views/templates/forms/InspireThemesForm.html (100%) rename {public => client-app}/javascript/app/maintenance/domains/geometry/views/templates/forms/LineTypesForm.html (100%) rename {public => client-app}/javascript/app/maintenance/domains/geometry/views/templates/forms/ThematicTypeForm.html (100%) rename {public => client-app}/javascript/app/maintenance/domains/observations/views/AttributeTypesView.js (100%) rename {public => client-app}/javascript/app/maintenance/domains/observations/views/CensingStatusView.js (100%) rename {public => client-app}/javascript/app/maintenance/domains/observations/views/ConfidenceView.js (100%) rename {public => client-app}/javascript/app/maintenance/domains/observations/views/EventGroupsView.js (100%) rename {public => client-app}/javascript/app/maintenance/domains/observations/views/InfrastructureTypeView.js (100%) rename {public => client-app}/javascript/app/maintenance/domains/observations/views/MetricGroupsView.js (100%) rename {public => client-app}/javascript/app/maintenance/domains/observations/views/MetricsDefinitionsView.js (100%) rename {public => client-app}/javascript/app/maintenance/domains/observations/views/ObjectTypesView.js (100%) rename {public => client-app}/javascript/app/maintenance/domains/observations/views/ObservationTypesView.js (100%) rename {public => client-app}/javascript/app/maintenance/domains/observations/views/ParameterTypesView.js (100%) rename {public => client-app}/javascript/app/maintenance/domains/observations/views/ParametersView.js (100%) rename {public => client-app}/javascript/app/maintenance/domains/observations/views/SampleTypesView.js (100%) rename {public => client-app}/javascript/app/maintenance/domains/observations/views/SeaConditionsView.js (100%) rename {public => client-app}/javascript/app/maintenance/domains/observations/views/UnitTypesView.js (100%) rename {public => client-app}/javascript/app/maintenance/domains/observations/views/UnitsView.js (100%) rename {public => client-app}/javascript/app/maintenance/domains/taxon/views/CanaryProtectionView.js (100%) rename {public => client-app}/javascript/app/maintenance/domains/taxon/views/EUProtectionView.js (100%) rename {public => client-app}/javascript/app/maintenance/domains/taxon/views/EcologyView.js (100%) rename {public => client-app}/javascript/app/maintenance/domains/taxon/views/EndemicityView.js (100%) rename {public => client-app}/javascript/app/maintenance/domains/taxon/views/InterestView.js (100%) rename {public => client-app}/javascript/app/maintenance/domains/taxon/views/LifeStagesView.js (100%) rename {public => client-app}/javascript/app/maintenance/domains/taxon/views/OriginView.js (100%) rename {public => client-app}/javascript/app/maintenance/domains/taxon/views/PermanenceView.js (100%) rename {public => client-app}/javascript/app/maintenance/domains/taxon/views/RankView.js (100%) rename {public => client-app}/javascript/app/maintenance/domains/taxon/views/SexView.js (100%) rename {public => client-app}/javascript/app/maintenance/domains/taxon/views/SpainProtectionView.js (100%) rename {public => client-app}/javascript/app/maintenance/domains/taxon/views/StatusView.js (100%) rename {public => client-app}/javascript/app/maintenance/domains/taxon/views/TrophicRegimeView.js (100%) rename {public => client-app}/javascript/app/maintenance/domains/templates/forms/DomainForm.html (100%) rename {public => client-app}/javascript/app/maintenance/domains/templates/forms/HierarchicalDomainForm.html (100%) rename {public => client-app}/javascript/app/maintenance/models/AccessModel.js (100%) rename {public => client-app}/javascript/app/maintenance/models/PermissionsModel.js (100%) rename {public => client-app}/javascript/app/maintenance/views/DomainView.js (100%) rename {public => client-app}/javascript/app/maintenance/views/PermissionsView.js (100%) rename {public => client-app}/javascript/app/maintenance/views/ServiceOGCView.js (100%) rename {public => client-app}/javascript/app/maintenance/views/templates/forms/AccessForm.html (100%) rename {public => client-app}/javascript/app/maintenance/views/templates/forms/CategoryLayerForm.html (100%) rename {public => client-app}/javascript/app/maintenance/views/templates/forms/DownloadsForm.html (100%) rename {public => client-app}/javascript/app/maintenance/views/templates/forms/PermissionsForm.html (100%) rename {public => client-app}/javascript/app/maintenance/views/templates/forms/ProtocolsForm.html (100%) rename {public => client-app}/javascript/app/maintenance/views/templates/forms/ServiceOGCForm.html (100%) rename {public => client-app}/javascript/app/maintenance/views/templates/forms/ServiceOGCLayerSearchForm.html (100%) rename {public => client-app}/javascript/app/nls/es/translation.js (100%) rename {public => client-app}/javascript/app/nls/translation.js (100%) rename {public => client-app}/javascript/app/products/views/OpenMapView.js (100%) rename {public => client-app}/javascript/app/products/views/ServiceOGCCatalogView.js (100%) rename {public => client-app}/javascript/app/redmicConfig.js (100%) rename {public => client-app}/javascript/app/user/models/FeedbackModel.js (100%) rename {public => client-app}/javascript/app/user/models/PasswordModel.js (100%) rename {public => client-app}/javascript/app/user/models/RegisterModel.js (100%) rename {public => client-app}/javascript/app/user/models/UserEmailModel.js (100%) rename {public => client-app}/javascript/app/user/models/UserImageModel.js (100%) rename {public => client-app}/javascript/app/user/models/UserNameModel.js (100%) rename {public => client-app}/javascript/app/user/models/UserSectorModel.js (100%) rename {public => client-app}/javascript/app/user/views/ConfirmResettingView.js (100%) rename {public => client-app}/javascript/app/user/views/FeedbackView.js (100%) rename {public => client-app}/javascript/app/user/views/InnerWhatIsRedmicView.js (100%) rename {public => client-app}/javascript/app/user/views/LoginView.js (100%) rename {public => client-app}/javascript/app/user/views/RegisterView.js (100%) rename {public => client-app}/javascript/app/user/views/ResettingView.js (100%) rename {public => client-app}/javascript/app/user/views/TermsAndConditionsView.js (100%) rename {public => client-app}/javascript/app/user/views/UserProfileView.js (100%) rename {public => client-app}/javascript/app/user/views/WhatIsRedmicView.js (100%) rename {public => client-app}/javascript/app/user/views/_ExternalUserBaseView.js (100%) rename {public => client-app}/javascript/app/user/views/templates/ConfirmResetting.html (100%) rename {public => client-app}/javascript/app/user/views/templates/ExternalUserBase.html (100%) rename {public => client-app}/javascript/app/user/views/templates/Feedback.html (100%) rename {public => client-app}/javascript/app/user/views/templates/Login.html (100%) rename {public => client-app}/javascript/app/user/views/templates/Register.html (100%) rename {public => client-app}/javascript/app/user/views/templates/Resetting.html (100%) rename {public => client-app}/javascript/app/user/views/templates/TermsAndConditions.html (100%) rename {public => client-app}/javascript/app/user/views/templates/WhatIsRedmic.html (100%) rename {public => client-app}/javascript/app/user/views/templates/forms/ChangePasswordForm.html (100%) rename {public => client-app}/javascript/app/user/views/templates/forms/FeedbackForm.html (100%) rename {public => client-app}/javascript/app/user/views/templates/forms/RegisterForm.html (100%) rename {public => client-app}/javascript/app/user/views/templates/forms/UserEmailForm.html (100%) rename {public => client-app}/javascript/app/user/views/templates/forms/UserImageForm.html (100%) rename {public => client-app}/javascript/app/user/views/templates/forms/UserNameForm.html (100%) rename {public => client-app}/javascript/app/user/views/templates/forms/UserSectorForm.html (100%) rename {public => client-app}/javascript/app/viewers/models/PointClusterCategorizeModel.js (100%) rename {public => client-app}/javascript/app/viewers/models/PointClusterModel.js (100%) rename {public => client-app}/javascript/app/viewers/views/BibliographyView.js (100%) rename {public => client-app}/javascript/app/viewers/views/ChartsView.js (100%) rename {public => client-app}/javascript/app/viewers/views/RealTimeDashboardView.js (100%) rename {public => client-app}/javascript/app/viewers/views/RealTimeView.js (100%) rename {public => client-app}/javascript/app/viewers/views/SpeciesDistributionView.js (100%) rename {public => client-app}/javascript/app/viewers/views/StacBrowserView.js (100%) rename {public => client-app}/javascript/app/viewers/views/TrackingView.js (100%) rename {public => client-app}/javascript/app/viewers/views/TrashCharts.js (100%) rename {public => client-app}/javascript/app/viewers/views/TrashCollectionView.js (100%) rename {public => client-app}/javascript/app/viewers/views/TrashDetails.js (100%) rename {public => client-app}/javascript/app/viewers/views/TrashInfo.js (100%) rename {public => client-app}/javascript/app/viewers/views/_ObjectCollectionSeriesSelectionManagement.js (100%) rename {public => client-app}/javascript/app/viewers/views/_SelectTimeInterval.js (100%) rename {public => client-app}/javascript/app/viewers/views/_TimeSeriesDataManagement.js (100%) rename {public => client-app}/javascript/app/viewers/views/_TimeSeriesSelectionManagement.js (100%) rename {public => client-app}/javascript/app/viewers/views/templates/forms/PointClusterCategorizeForm.html (100%) rename {public => client-app}/javascript/app/viewers/views/templates/forms/PointClusterForm.html (100%) rename {public => client-app}/javascript/app/viewers/views/templates/forms/SpeciesDistributionForm.html (100%) rename {public => client-app}/javascript/app/viewers/views/templates/forms/TrackingForm.html (100%) rename {public => client-app}/javascript/app/views/404.js (100%) rename {public => client-app}/javascript/app/views/ActivateAccount.js (100%) rename {public => client-app}/javascript/app/views/NoSupportBrowser.js (100%) rename {public => client-app}/javascript/app/views/UnderConstructionView.js (100%) rename {public => client-app}/javascript/app/views/nls/es/translation.js (100%) rename {public => client-app}/javascript/app/views/nls/translation.js (100%) rename {public => client-app}/javascript/app/views/templates/NoSupportBrowser.html (100%) rename {public => client-app}/javascript/cbtree (100%) rename {public => client-app}/javascript/color-js (100%) rename {public => client-app}/javascript/d3 (100%) rename {public => client-app}/javascript/d3-v6-tip (100%) rename {public => client-app}/javascript/deepmerge (100%) rename {public => client-app}/javascript/dijit (100%) rename {public => client-app}/javascript/dojo (100%) rename {public => client-app}/javascript/dojoConfig.js (100%) rename {public => client-app}/javascript/dojoConfigBuild.js (100%) rename {public => client-app}/javascript/dojox (100%) rename {public => client-app}/javascript/draggabilly (100%) rename {public => client-app}/javascript/dropzone (100%) rename {public => client-app}/javascript/handlebars (100%) rename {public => client-app}/javascript/json-schema-ref-parser (100%) rename {public => client-app}/javascript/leaflet (100%) rename {public => client-app}/javascript/leaflet-areaselect (100%) rename {public => client-app}/javascript/leaflet-awesome-markers (100%) rename {public => client-app}/javascript/leaflet-coordinates (100%) rename {public => client-app}/javascript/leaflet-draw (100%) rename {public => client-app}/javascript/leaflet-measure (100%) rename {public => client-app}/javascript/leaflet-minimap (100%) rename {public => client-app}/javascript/leaflet-navbar (100%) rename {public => client-app}/javascript/leaflet-nontiledlayer (100%) rename {public => client-app}/javascript/mediatorjs (100%) rename {public => client-app}/javascript/moment (100%) rename {public => client-app}/javascript/packery (100%) rename {public => client-app}/javascript/pdfjs (100%) rename {public => client-app}/javascript/proj4 (100%) rename {public => client-app}/javascript/pruneCluster (100%) rename {public => client-app}/javascript/put-selector (100%) rename {public => client-app}/javascript/redmic/base/CheckBrowser.js (100%) rename {public => client-app}/javascript/redmic/base/Credentials.js (100%) rename {public => client-app}/javascript/redmic/base/GuestChecker.js (100%) rename {public => client-app}/javascript/redmic/base/Mediator.js (100%) rename {public => client-app}/javascript/redmic/base/RedmicLocalStorage.js (100%) rename {public => client-app}/javascript/redmic/base/tv4.js (100%) rename {public => client-app}/javascript/redmic/dialog/LockDialogImpl.js (100%) rename {public => client-app}/javascript/redmic/dialog/_DialogComplexItfc.js (100%) rename {public => client-app}/javascript/redmic/form/FormContainer.js (100%) rename {public => client-app}/javascript/redmic/form/Select.js (100%) rename {public => client-app}/javascript/redmic/form/UploadInput.js (100%) rename {public => client-app}/javascript/redmic/form/nls/UploadInput.js (100%) rename {public => client-app}/javascript/redmic/form/nls/es/UploadInput.js (100%) rename {public => client-app}/javascript/redmic/form/templates/Select.html (100%) rename {public => client-app}/javascript/redmic/form/templates/UploadInput.html (100%) rename {public => client-app}/javascript/redmic/layout/DialogComplex.js (100%) rename {public => client-app}/javascript/redmic/layout/DialogSimple.js (100%) rename {public => client-app}/javascript/redmic/layout/_DialogBase.js (100%) rename {public => client-app}/javascript/redmic/modules/app/App.js (100%) rename {public => client-app}/javascript/redmic/modules/app/ModuleStore.js (100%) rename {public => client-app}/javascript/redmic/modules/app/Router.js (100%) rename {public => client-app}/javascript/redmic/modules/app/_app.js (100%) rename {public => client-app}/javascript/redmic/modules/app/_appItfc.js (100%) rename {public => client-app}/javascript/redmic/modules/app/innerApp.js (100%) rename {public => client-app}/javascript/redmic/modules/app/outerApp.js (100%) rename {public => client-app}/javascript/redmic/modules/atlas/Atlas.js (100%) rename {public => client-app}/javascript/redmic/modules/atlas/_AtlasLayersManagement.js (100%) rename {public => client-app}/javascript/redmic/modules/atlas/_AtlasLegendManagement.js (100%) rename {public => client-app}/javascript/redmic/modules/base/Analytics.js (100%) rename {public => client-app}/javascript/redmic/modules/base/Credentials.js (100%) rename {public => client-app}/javascript/redmic/modules/base/Loading.js (100%) rename {public => client-app}/javascript/redmic/modules/base/Manager.js (100%) rename {public => client-app}/javascript/redmic/modules/base/_AuthFirewall.js (100%) rename {public => client-app}/javascript/redmic/modules/base/_ChkCollection.js (100%) rename {public => client-app}/javascript/redmic/modules/base/_CommunicationCenter.js (100%) rename {public => client-app}/javascript/redmic/modules/base/_ExternalConfig.js (100%) rename {public => client-app}/javascript/redmic/modules/base/_Filter.js (100%) rename {public => client-app}/javascript/redmic/modules/base/_FilterItfc.js (100%) rename {public => client-app}/javascript/redmic/modules/base/_Itfc.js (100%) rename {public => client-app}/javascript/redmic/modules/base/_ListenQueryParams.js (100%) rename {public => client-app}/javascript/redmic/modules/base/_ListenQueryParamsItfc.js (100%) rename {public => client-app}/javascript/redmic/modules/base/_ListenWindowResize.js (100%) rename {public => client-app}/javascript/redmic/modules/base/_ManageClickEvent.js (100%) rename {public => client-app}/javascript/redmic/modules/base/_Module.js (100%) rename {public => client-app}/javascript/redmic/modules/base/_ModuleItfc.js (100%) rename {public => client-app}/javascript/redmic/modules/base/_Persistence.js (100%) rename {public => client-app}/javascript/redmic/modules/base/_PersistenceItfc.js (100%) rename {public => client-app}/javascript/redmic/modules/base/_Selection.js (100%) rename {public => client-app}/javascript/redmic/modules/base/_SelectionBase.js (100%) rename {public => client-app}/javascript/redmic/modules/base/_SelectionItfc.js (100%) rename {public => client-app}/javascript/redmic/modules/base/_Show.js (100%) rename {public => client-app}/javascript/redmic/modules/base/_ShowInPopup.js (100%) rename {public => client-app}/javascript/redmic/modules/base/_ShowInTooltip.js (100%) rename {public => client-app}/javascript/redmic/modules/base/_ShowItfc.js (100%) rename {public => client-app}/javascript/redmic/modules/base/_ShowOnEvt.js (100%) rename {public => client-app}/javascript/redmic/modules/base/_Store.js (100%) rename {public => client-app}/javascript/redmic/modules/base/_StoreItfc.js (100%) rename {public => client-app}/javascript/redmic/modules/base/_Window.js (100%) rename {public => client-app}/javascript/redmic/modules/browser/Browser.js (100%) rename {public => client-app}/javascript/redmic/modules/browser/HierarchicalImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/browser/ListImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/browser/_BrowserItfc.js (100%) rename {public => client-app}/javascript/redmic/modules/browser/_ButtonsInRow.js (100%) rename {public => client-app}/javascript/redmic/modules/browser/_DataTypeParser.js (100%) rename {public => client-app}/javascript/redmic/modules/browser/_DragAndDrop.js (100%) rename {public => client-app}/javascript/redmic/modules/browser/_EditionTable.js (100%) rename {public => client-app}/javascript/redmic/modules/browser/_Framework.js (100%) rename {public => client-app}/javascript/redmic/modules/browser/_GeoJsonParser.js (100%) rename {public => client-app}/javascript/redmic/modules/browser/_HierarchicalDragAndDrop.js (100%) rename {public => client-app}/javascript/redmic/modules/browser/_HierarchicalLazyLoad.js (100%) rename {public => client-app}/javascript/redmic/modules/browser/_HierarchicalSelect.js (100%) rename {public => client-app}/javascript/redmic/modules/browser/_HierarchicalTable.js (100%) rename {public => client-app}/javascript/redmic/modules/browser/_MultiTemplate.js (100%) rename {public => client-app}/javascript/redmic/modules/browser/_NoDataTemplate.js (100%) rename {public => client-app}/javascript/redmic/modules/browser/_Select.js (100%) rename {public => client-app}/javascript/redmic/modules/browser/_Table.js (100%) rename {public => client-app}/javascript/redmic/modules/browser/bars/Order.js (100%) rename {public => client-app}/javascript/redmic/modules/browser/bars/Pagination.js (100%) rename {public => client-app}/javascript/redmic/modules/browser/bars/SelectionBox.js (100%) rename {public => client-app}/javascript/redmic/modules/browser/bars/Total.js (100%) rename {public => client-app}/javascript/redmic/modules/browser/bars/_SelectBox.js (100%) rename {public => client-app}/javascript/redmic/modules/browser/buttons/Buttons.js (100%) rename {public => client-app}/javascript/redmic/modules/browser/buttons/_ButtonsItfc.js (100%) rename {public => client-app}/javascript/redmic/modules/browser/buttons/_GroupButtons.js (100%) rename {public => client-app}/javascript/redmic/modules/browser/row/Row.js (100%) rename {public => client-app}/javascript/redmic/modules/browser/row/_Buttons.js (100%) rename {public => client-app}/javascript/redmic/modules/browser/row/_Hierarchical.js (100%) rename {public => client-app}/javascript/redmic/modules/browser/row/_HierarchicalSelect.js (100%) rename {public => client-app}/javascript/redmic/modules/browser/row/_HierarchicalTable.js (100%) rename {public => client-app}/javascript/redmic/modules/browser/row/_RowItfc.js (100%) rename {public => client-app}/javascript/redmic/modules/browser/row/_Select.js (100%) rename {public => client-app}/javascript/redmic/modules/browser/row/_Table.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/ChartsContainer/ChartsContainer.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/ChartsContainer/InfoChartsContainerImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/ChartsContainer/SliderChartsContainerImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/ChartsContainer/_AngularAxisDrawing.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/ChartsContainer/_AngularAxisWithGridDrawing.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/ChartsContainer/_AxesDrawing.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/ChartsContainer/_AxesDrawingItfc.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/ChartsContainer/_BreadcrumbsBar.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/ChartsContainer/_ChartsContainerItfc.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/ChartsContainer/_ColorSelection.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/ChartsContainer/_ColorSelectionItfc.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/ChartsContainer/_DomainHistoryNavigation.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/ChartsContainer/_GroupedLegendBar.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/ChartsContainer/_InfoOnEmptyData.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/ChartsContainer/_InfoOnLayerEvent.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/ChartsContainer/_InfoOnLayerEventItfc.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/ChartsContainer/_InfoOnMouseOver.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/ChartsContainer/_InfoOnZeroValueData.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/ChartsContainer/_InfoTooltipManagement.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/ChartsContainer/_LayerColorSelection.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/ChartsContainer/_LegendBar.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/ChartsContainer/_LegendBarCommons.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/ChartsContainer/_LegendBarCommonsItfc.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/ChartsContainer/_RadialAxisDrawing.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/ChartsContainer/_RadialAxisWithGridDrawing.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/ChartsContainer/_SummaryBox.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/ChartsContainer/_TemporalAxisDrawing.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/ChartsContainer/_TemporalAxisWithGridDrawing.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/ChartsContainer/_VerticalAxesDrawing.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/ChartsContainer/_VerticalAxesWithGridDrawing.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/ChartsContainer/_ZoomByDragging.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/SmartLegend/SmartLegend.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/SmartLegend/TimeSeriesSmartLegendImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/SmartLegend/_SmartLegendItfc.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/Toolbar/AggregationToolImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/Toolbar/DataSelectorImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/Toolbar/DateFilterImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/Toolbar/GridManagementImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/Toolbar/SliderSelectorImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/Toolbar/Toolbar.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/Toolbar/_ToolbarItfc.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/layer/Axis/AngularAxisImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/layer/Axis/AngularGridAxisImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/layer/Axis/Axis.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/layer/Axis/HorizontalGridAxisImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/layer/Axis/RadialAxisImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/layer/Axis/RadialGridAxisImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/layer/Axis/TemporalAxisImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/layer/Axis/VerticalAxisImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/layer/Axis/VerticalGridAxisImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/layer/Axis/_AxisItfc.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/layer/Axis/_HorizontalCommons.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/layer/Axis/_VerticalCommons.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/layer/Axis/_VerticalCommonsItfc.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/layer/ChartLayer/ChartLayer.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/layer/ChartLayer/LinearChartImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/layer/ChartLayer/MultiPieChartImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/layer/ChartLayer/PieChartImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/layer/ChartLayer/WindRoseChartImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/layer/ChartLayer/_CategoryLayerCommons.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/layer/ChartLayer/_CategoryLayerCommonsItfc.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/layer/ChartLayer/_ChartHoleManagement.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/layer/ChartLayer/_ChartLayerItfc.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/layer/ChartLayer/_CircularLayerCommons.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/layer/ChartLayer/_CircularLayerCommonsItfc.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/layer/ChartLayer/_ColorHierarchyGeneration.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/layer/ChartLayer/_LevelNavigation.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/layer/ChartLayer/_MultipleWindRose.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/layer/ChartLayer/_ObtainableValue.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/layer/ChartLayer/_ObtainableValueItfc.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/layer/ChartLayer/_PieCommons.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/layer/ChartLayer/_PutButtonInHole.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/layer/ChartLayer/_PutButtonInHoleItfc.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/layer/ChartLayer/_QueryableValue.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/layer/ChartLayer/_ShowInfoInHole.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/layer/ChartLayer/_SimplePieCommons.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/layer/ChartLayer/_SimpleWindRose.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/layer/ChartLayer/_VariableRadiusByDepth.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/layer/_LayerCommons.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/layer/_LayerCommonsItfc.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/layer/_PolarLayerCommons.js (100%) rename {public => client-app}/javascript/redmic/modules/chart/layer/_PolarLayerCommonsItfc.js (100%) rename {public => client-app}/javascript/redmic/modules/components/ExternalConfig.js (100%) rename {public => client-app}/javascript/redmic/modules/components/Keypad/IconKeypadImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/components/Keypad/Keypad.js (100%) rename {public => client-app}/javascript/redmic/modules/components/Keypad/TrizoneKeypadImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/components/Keypad/_KeypadItfc.js (100%) rename {public => client-app}/javascript/redmic/modules/components/PDFViewer/PDFViewer.js (100%) rename {public => client-app}/javascript/redmic/modules/components/ProgressSlider/ProgressSlider.js (100%) rename {public => client-app}/javascript/redmic/modules/components/ProgressSlider/StepAndRateEditor.js (100%) rename {public => client-app}/javascript/redmic/modules/components/Sidebar/MainSidebarImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/components/Sidebar/Sidebar.js (100%) rename {public => client-app}/javascript/redmic/modules/components/Sidebar/_Secondary.js (100%) rename {public => client-app}/javascript/redmic/modules/components/Topbar.js (100%) rename {public => client-app}/javascript/redmic/modules/filter/Filter.js (100%) rename {public => client-app}/javascript/redmic/modules/form/Form.js (100%) rename {public => client-app}/javascript/redmic/modules/form/FormContainerImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/form/_BaseCreateKeypad.js (100%) rename {public => client-app}/javascript/redmic/modules/form/_CreateInternalKeypad.js (100%) rename {public => client-app}/javascript/redmic/modules/form/_CreateKeypad.js (100%) rename {public => client-app}/javascript/redmic/modules/form/_FormItfc.js (100%) rename {public => client-app}/javascript/redmic/modules/form/_ListenModelHasChanged.js (100%) rename {public => client-app}/javascript/redmic/modules/form/_PublicateChanges.js (100%) rename {public => client-app}/javascript/redmic/modules/form/_ShowInDialog.js (100%) rename {public => client-app}/javascript/redmic/modules/form/_ShowInTableList.js (100%) rename {public => client-app}/javascript/redmic/modules/form/input/AnnotationImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/form/input/ButtonImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/form/input/CheckBoxGroupImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/form/input/CheckBoxImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/form/input/ColorImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/form/input/ColorPickerImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/form/input/ColorPickerTextBoxImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/form/input/ColorsRampImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/form/input/DateRangeComplexImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/form/input/DateRangeImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/form/input/DateRangeTextBoxImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/form/input/DateTextBoxImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/form/input/DateTimeImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/form/input/DateTimeTextBoxImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/form/input/FilteringSelectImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/form/input/GeographicCoordinatesComponentImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/form/input/GeometryImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/form/input/Input.js (100%) rename {public => client-app}/javascript/redmic/modules/form/input/KeywordsImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/form/input/MapSearchImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/form/input/MultiSelectImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/form/input/NumberSpinnerImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/form/input/NumberTextBoxImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/form/input/PointImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/form/input/RadioButtonGroupImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/form/input/RadioButtonImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/form/input/RangeImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/form/input/RangeSliderImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/form/input/SelectImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/form/input/SelectOnListPopupImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/form/input/SliderImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/form/input/TextAreaImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/form/input/TextBoxImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/form/input/UploadFileImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/form/input/ValueAndUnitSelectorImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/form/input/_BaseDateTime.js (100%) rename {public => client-app}/javascript/redmic/modules/form/input/_BaseMultiSelectImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/form/input/_BaseRange.js (100%) rename {public => client-app}/javascript/redmic/modules/form/input/_BaseTextBoxWidthExpandTooltipImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/form/input/_BaseWidthExpandTooltipImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/form/input/_DeleteOnClear.js (100%) rename {public => client-app}/javascript/redmic/modules/form/input/_Dependence.js (100%) rename {public => client-app}/javascript/redmic/modules/form/input/_DisableInput.js (100%) rename {public => client-app}/javascript/redmic/modules/form/input/_IgnoreNonexistentProperty.js (100%) rename {public => client-app}/javascript/redmic/modules/form/input/_InputItfc.js (100%) rename {public => client-app}/javascript/redmic/modules/form/input/_NodesCreation.js (100%) rename {public => client-app}/javascript/redmic/modules/form/input/_SelectOnPopupImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/gateway/AddItemGatewayImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/gateway/Gateway.js (100%) rename {public => client-app}/javascript/redmic/modules/gateway/LocalSelectorGatewayImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/gateway/MapCenteringGatewayImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/gateway/_GatewayItfc.js (100%) rename {public => client-app}/javascript/redmic/modules/layout/TabsDisplayer.js (100%) rename {public => client-app}/javascript/redmic/modules/layout/dataDisplayer/DataDisplayer.js (100%) rename {public => client-app}/javascript/redmic/modules/layout/genericDisplayer/GenericDisplayer.js (100%) rename {public => client-app}/javascript/redmic/modules/layout/genericDisplayer/GenericWithTopbarDisplayerImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/layout/listMenu/ListMenu.js (100%) rename {public => client-app}/javascript/redmic/modules/layout/nestedContent/NestedBrowsersImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/layout/nestedContent/NestedContent.js (100%) rename {public => client-app}/javascript/redmic/modules/layout/templateDisplayer/TemplateDisplayer.js (100%) rename {public => client-app}/javascript/redmic/modules/layout/wizard/Wizard.js (100%) rename {public => client-app}/javascript/redmic/modules/layout/wizard/_CompleteBySelection.js (100%) rename {public => client-app}/javascript/redmic/modules/layout/wizard/_StepBreadcrumbs.js (100%) rename {public => client-app}/javascript/redmic/modules/layout/wizard/_StepNavigation.js (100%) rename {public => client-app}/javascript/redmic/modules/layout/wizard/_WizardStep.js (100%) rename {public => client-app}/javascript/redmic/modules/layout/wizard/_WizardStepItfc.js (100%) rename {public => client-app}/javascript/redmic/modules/map/LeafletImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/map/Map.js (100%) rename {public => client-app}/javascript/redmic/modules/map/MapButton.js (100%) rename {public => client-app}/javascript/redmic/modules/map/StaticLayersDefinition.js (100%) rename {public => client-app}/javascript/redmic/modules/map/_ImportWkt.js (100%) rename {public => client-app}/javascript/redmic/modules/map/_LeafletDraw.js (100%) rename {public => client-app}/javascript/redmic/modules/map/_LeafletImplItfc.js (100%) rename {public => client-app}/javascript/redmic/modules/map/_LeafletWidgetsManagement.js (100%) rename {public => client-app}/javascript/redmic/modules/map/_ListenContainers.js (100%) rename {public => client-app}/javascript/redmic/modules/map/_MapItfc.js (100%) rename {public => client-app}/javascript/redmic/modules/map/_OverlayLayersManagement.js (100%) rename {public => client-app}/javascript/redmic/modules/map/_PlaceNamesButton.js (100%) rename {public => client-app}/javascript/redmic/modules/map/_StaticLayersManagement.js (100%) rename {public => client-app}/javascript/redmic/modules/map/layer/DrawingLayerImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/map/layer/GeoJsonLayerImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/map/layer/GridLayerImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/map/layer/MapLayer.js (100%) rename {public => client-app}/javascript/redmic/modules/map/layer/PruneClusterLayerImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/map/layer/TrackingLayerImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/map/layer/TrackingLine.js (100%) rename {public => client-app}/javascript/redmic/modules/map/layer/WmsLayerImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/map/layer/_AddFilter.js (100%) rename {public => client-app}/javascript/redmic/modules/map/layer/_AnimateMarker.js (100%) rename {public => client-app}/javascript/redmic/modules/map/layer/_D3Expansion.js (100%) rename {public => client-app}/javascript/redmic/modules/map/layer/_Editable.js (100%) rename {public => client-app}/javascript/redmic/modules/map/layer/_GeoJsonLayerItfc.js (100%) rename {public => client-app}/javascript/redmic/modules/map/layer/_Highlightable.js (100%) rename {public => client-app}/javascript/redmic/modules/map/layer/_LayerProtocols.js (100%) rename {public => client-app}/javascript/redmic/modules/map/layer/_ListenBounds.js (100%) rename {public => client-app}/javascript/redmic/modules/map/layer/_ListenZoom.js (100%) rename {public => client-app}/javascript/redmic/modules/map/layer/_MapLayerItfc.js (100%) rename {public => client-app}/javascript/redmic/modules/map/layer/_PruneClusterLayerItfc.js (100%) rename {public => client-app}/javascript/redmic/modules/map/layer/_PublishInfo.js (100%) rename {public => client-app}/javascript/redmic/modules/map/layer/_PublishInfoItfc.js (100%) rename {public => client-app}/javascript/redmic/modules/map/layer/_RadiusCommons.js (100%) rename {public => client-app}/javascript/redmic/modules/map/layer/_RadiusOnClick.js (100%) rename {public => client-app}/javascript/redmic/modules/map/layer/_RadiusOnSelect.js (100%) rename {public => client-app}/javascript/redmic/modules/map/layer/_SelectOnClick.js (100%) rename {public => client-app}/javascript/redmic/modules/map/layer/_Selectable.js (100%) rename {public => client-app}/javascript/redmic/modules/map/layer/_SelectableItfc.js (100%) rename {public => client-app}/javascript/redmic/modules/map/layer/_TrackingDataManagement.js (100%) rename {public => client-app}/javascript/redmic/modules/map/layer/_TrackingMarkersManagement.js (100%) rename {public => client-app}/javascript/redmic/modules/mapQuery/QueryOnMap.js (100%) rename {public => client-app}/javascript/redmic/modules/mapQuery/_ContentManagement.js (100%) rename {public => client-app}/javascript/redmic/modules/mapQuery/_ResultsBrowser.js (100%) rename {public => client-app}/javascript/redmic/modules/metaTags/MetaTags.js (100%) rename {public => client-app}/javascript/redmic/modules/metaTags/metaTagsContent.js (100%) rename {public => client-app}/javascript/redmic/modules/model/Model.js (100%) rename {public => client-app}/javascript/redmic/modules/model/ModelImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/model/_ModelItfc.js (100%) rename {public => client-app}/javascript/redmic/modules/notification/Alert.js (100%) rename {public => client-app}/javascript/redmic/modules/notification/CommunicationCenter.js (100%) rename {public => client-app}/javascript/redmic/modules/notification/Notification.js (100%) rename {public => client-app}/javascript/redmic/modules/notification/NotificationSidebar.js (100%) rename {public => client-app}/javascript/redmic/modules/notification/TaskNotification.js (100%) rename {public => client-app}/javascript/redmic/modules/search/CompositeImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/search/DateRangeImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/search/FacetsImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/search/GeographicImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/search/MultiSelectImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/search/RangeImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/search/Search.js (100%) rename {public => client-app}/javascript/redmic/modules/search/TextImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/search/_HideFormByAction.js (100%) rename {public => client-app}/javascript/redmic/modules/search/_SearchItfc.js (100%) rename {public => client-app}/javascript/redmic/modules/selection/SelectionBox.js (100%) rename {public => client-app}/javascript/redmic/modules/selection/SelectionManager.js (100%) rename {public => client-app}/javascript/redmic/modules/selection/Selector.js (100%) rename {public => client-app}/javascript/redmic/modules/selection/_SelectorItfc.js (100%) rename {public => client-app}/javascript/redmic/modules/selection/_SelectorPersistence.js (100%) rename {public => client-app}/javascript/redmic/modules/socket/Socket.js (100%) rename {public => client-app}/javascript/redmic/modules/socket/Task.js (100%) rename {public => client-app}/javascript/redmic/modules/socket/_IngestData.js (100%) rename {public => client-app}/javascript/redmic/modules/socket/_Report.js (100%) rename {public => client-app}/javascript/redmic/modules/socket/_Worms.js (100%) rename {public => client-app}/javascript/redmic/modules/store/RequestJoiner/AtlasDataImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/store/RequestJoiner/RequestJoiner.js (100%) rename {public => client-app}/javascript/redmic/modules/store/RequestJoiner/_RequestJoinerItfc.js (100%) rename {public => client-app}/javascript/redmic/modules/store/RestManager.js (100%) rename {public => client-app}/javascript/redmic/modules/store/RestManagerImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/store/_RestManagerItfc.js (100%) rename {public => client-app}/javascript/redmic/modules/tree/CbtreeImpl.js (100%) rename {public => client-app}/javascript/redmic/modules/tree/Tree.js (100%) rename {public => client-app}/javascript/redmic/modules/tree/_HierarchicalFilter.js (100%) rename {public => client-app}/javascript/redmic/modules/tree/_LazyLoad.js (100%) rename {public => client-app}/javascript/redmic/modules/tree/_LeafSelection.js (100%) rename {public => client-app}/javascript/redmic/modules/tree/_SelectionBox.js (100%) rename {public => client-app}/javascript/redmic/modules/tree/_TreeItfc.js (100%) rename {public => client-app}/javascript/redmic/modules/user/FullscreenToggle.js (100%) rename {public => client-app}/javascript/redmic/modules/user/LanguageSelector.js (100%) rename {public => client-app}/javascript/redmic/modules/user/UserArea.js (100%) rename {public => client-app}/javascript/redmic/validation/stringFormats.js (100%) rename {public => client-app}/javascript/redmic/view/effects/Animation.js (100%) rename {public => client-app}/javascript/redmic/widgets/Button.js (100%) rename {public => client-app}/javascript/redmic/widgets/ComboButton.js (100%) rename {public => client-app}/javascript/redmic/widgets/Converter.js (100%) rename {public => client-app}/javascript/redmic/widgets/DatePicker.js (100%) rename {public => client-app}/javascript/redmic/widgets/Facet.js (100%) rename {public => client-app}/javascript/redmic/widgets/FilteringSelect.js (100%) rename {public => client-app}/javascript/redmic/widgets/KeywordsInput.js (100%) rename {public => client-app}/javascript/redmic/widgets/Map.js (100%) rename {public => client-app}/javascript/redmic/widgets/ProgressSlider.js (100%) rename {public => client-app}/javascript/redmic/widgets/README.md (100%) rename {public => client-app}/javascript/redmic/widgets/RangeSlider.js (100%) rename {public => client-app}/javascript/redmic/widgets/RedmicUtilities.js (100%) rename {public => client-app}/javascript/redmic/widgets/Slider.js (100%) rename {public => client-app}/javascript/redmic/widgets/Switch.js (100%) rename {public => client-app}/javascript/redmic/widgets/TemplateWidget.js (100%) rename {public => client-app}/javascript/redmic/widgets/TextSearch.js (100%) rename {public => client-app}/javascript/redmic/widgets/TimeSelect.js (100%) rename {public => client-app}/javascript/redmic/widgets/ToggleButton.js (100%) rename {public => client-app}/javascript/redmic/widgets/Utilities.js (100%) rename {public => client-app}/javascript/redmic/widgets/ValueAndUnitSelector.js (100%) rename {public => client-app}/javascript/redmic/widgets/extensions/_ShowValue.js (100%) rename {public => client-app}/javascript/sockjs (100%) rename {public => client-app}/javascript/src/view/detail/_WidgetDefinition.js (100%) rename {public => client-app}/javascript/src/view/detail/activity/ActivityDetail.js (100%) rename {public => client-app}/javascript/src/view/detail/activity/_ActivityLayoutWidget.js (100%) rename {public => client-app}/javascript/stomp-websocket (100%) rename {public => client-app}/javascript/templates (100%) rename {public => client-app}/javascript/tv4 (100%) rename {public => client-app}/javascript/util (100%) rename {public => client-app}/javascript/uuid (100%) rename {public => client-app}/javascript/wicket (100%) rename {public => client-app}/resources/documents/ModeloLogico.pdf (100%) rename {public => client-app}/resources/images/browsers/chrome.png (100%) rename {public => client-app}/resources/images/browsers/ff.png (100%) rename {public => client-app}/resources/images/browsers/ie.png (100%) rename {public => client-app}/resources/images/browsers/opera.png (100%) rename {public => client-app}/resources/images/browsers/safari.png (100%) rename {public => client-app}/resources/images/favicon.ico (100%) rename {public => client-app}/resources/images/logos/gobcan-logos.png (100%) rename {public => client-app}/resources/images/logos/logo.svg (100%) rename {public => client-app}/resources/images/logos/redmic-logo-1200x1200.jpg (100%) rename {public => client-app}/resources/images/logos/redmic-logo-og.jpg (100%) rename {public => client-app}/resources/images/logos/redmic-logo-og.png (100%) rename {public => client-app}/resources/images/logos/redmicSimple.png (100%) rename {public => client-app}/resources/images/logos/twitter-light.png (100%) rename {public => client-app}/resources/images/map/layer-eoc-map.png (100%) rename {public => client-app}/resources/images/map/layer-ortofoto.png (100%) rename {public => client-app}/resources/images/map/layer-redmic.png (100%) rename {public => client-app}/resources/images/map/layer-topografico.png (100%) rename {public => client-app}/resources/images/noIMG.png (100%) rename {public => client-app}/resources/images/redmic_opciones_usuario.JPG (100%) rename {public => client-app}/resources/images/redmic_tabla_geometrias.jpg (100%) rename {public => client-app}/stylesheets (100%) rename {tests => client-app/tests}/IpGetter.js (100%) rename {tests => client-app/tests}/_dojoConfig.js (100%) rename {tests => client-app/tests}/_environments.js (100%) rename {tests => client-app/tests}/_functions.js (100%) rename {tests => client-app/tests}/_intern-functional.js (100%) rename {tests => client-app/tests}/_intern-unit.js (100%) rename {tests => client-app/tests}/_intern.js (100%) rename {tests => client-app/tests}/_remote.js (100%) rename {tests => client-app/tests}/apitest/app.js (100%) rename {tests => client-app/tests}/apitest/data/inputs/contacts.json (100%) rename {tests => client-app/tests}/apitest/data/inputs/organisations.json (100%) rename {tests => client-app/tests}/apitest/data/inputs/programs.json (100%) rename {tests => client-app/tests}/apitest/data/inputs/projects.json (100%) rename {tests => client-app/tests}/apitest/data/inputs/scopes.json (100%) rename {tests => client-app/tests}/apitest/package.json (100%) rename {tests => client-app/tests}/functional/administrative/Activity.js (100%) rename {tests => client-app/tests}/functional/administrative/Animal.js (100%) rename {tests => client-app/tests}/functional/administrative/Contact.js (100%) rename {tests => client-app/tests}/functional/administrative/Device.js (100%) rename {tests => client-app/tests}/functional/administrative/Document.js (100%) rename {tests => client-app/tests}/functional/administrative/Organisation.js (100%) rename {tests => client-app/tests}/functional/administrative/Platform.js (100%) rename {tests => client-app/tests}/functional/administrative/Program.js (100%) rename {tests => client-app/tests}/functional/administrative/Project.js (100%) rename {tests => client-app/tests}/functional/administrative/_Administrative.js (100%) rename {tests => client-app/tests}/functional/administrative/_AdministrativeFacets.js (100%) rename {tests => client-app/tests}/functional/administrative/_AdministrativeFilter.js (100%) rename {tests => client-app/tests}/functional/administrative/_AdministrativeLinks.js (100%) rename {tests => client-app/tests}/functional/administrative/taxonomy/Class.js (100%) rename {tests => client-app/tests}/functional/administrative/taxonomy/Family.js (100%) rename {tests => client-app/tests}/functional/administrative/taxonomy/Genus.js (100%) rename {tests => client-app/tests}/functional/administrative/taxonomy/Kingdom.js (100%) rename {tests => client-app/tests}/functional/administrative/taxonomy/Misidentification.js (100%) rename {tests => client-app/tests}/functional/administrative/taxonomy/Order.js (100%) rename {tests => client-app/tests}/functional/administrative/taxonomy/Phylum.js (100%) rename {tests => client-app/tests}/functional/administrative/taxonomy/Species.js (100%) rename {tests => client-app/tests}/functional/administrative/taxonomy/Subphylum.js (100%) rename {tests => client-app/tests}/functional/administrative/taxonomy/_Taxonomy.js (100%) rename {tests => client-app/tests}/functional/administrativeDetails/Activity.js (100%) rename {tests => client-app/tests}/functional/administrativeDetails/Contact.js (100%) rename {tests => client-app/tests}/functional/administrativeDetails/Document.js (100%) rename {tests => client-app/tests}/functional/administrativeDetails/Organisation.js (100%) rename {tests => client-app/tests}/functional/administrativeDetails/Platform.js (100%) rename {tests => client-app/tests}/functional/administrativeDetails/Program.js (100%) rename {tests => client-app/tests}/functional/administrativeDetails/Project.js (100%) rename {tests => client-app/tests}/functional/administrativeDetails/ServiceOGC.js (100%) rename {tests => client-app/tests}/functional/administrativeDetails/Species.js (100%) rename {tests => client-app/tests}/functional/administrativeDetails/Statistics.js (100%) rename {tests => client-app/tests}/functional/administrativeDetails/_DetailsBase.js (100%) rename {tests => client-app/tests}/functional/administrativeDetails/_DetailsInfo.js (100%) rename {tests => client-app/tests}/functional/administrativeDetails/_DetailsMap.js (100%) rename {tests => client-app/tests}/functional/administrativeDetails/_DetailsPDF.js (100%) rename {tests => client-app/tests}/functional/catalog/Activity.js (100%) rename {tests => client-app/tests}/functional/catalog/Organisation.js (100%) rename {tests => client-app/tests}/functional/catalog/Platform.js (100%) rename {tests => client-app/tests}/functional/catalog/Program.js (100%) rename {tests => client-app/tests}/functional/catalog/Project.js (100%) rename {tests => client-app/tests}/functional/catalog/Species.js (100%) rename {tests => client-app/tests}/functional/catalog/_Catalog.js (100%) rename {tests => client-app/tests}/functional/catalog/_CatalogFilter.js (100%) rename {tests => client-app/tests}/functional/catalog/_CatalogWithReport.js (100%) rename {tests => client-app/tests}/functional/catalogDetails/Activity.js (100%) rename {tests => client-app/tests}/functional/catalogDetails/Document.js (100%) rename {tests => client-app/tests}/functional/catalogDetails/Organisation.js (100%) rename {tests => client-app/tests}/functional/catalogDetails/Platform.js (100%) rename {tests => client-app/tests}/functional/catalogDetails/Program.js (100%) rename {tests => client-app/tests}/functional/catalogDetails/Project.js (100%) rename {tests => client-app/tests}/functional/catalogDetails/ServiceOGC.js (100%) rename {tests => client-app/tests}/functional/catalogDetails/Species.js (100%) rename {tests => client-app/tests}/functional/common/Home.js (100%) rename {tests => client-app/tests}/functional/common/Login.js (100%) rename {tests => client-app/tests}/functional/common/Profile.js (100%) rename {tests => client-app/tests}/functional/common/Sidebar.js (100%) rename {tests => client-app/tests}/functional/common/Topbar.js (100%) rename {tests => client-app/tests}/functional/dataLoader/Area.js (100%) rename {tests => client-app/tests}/functional/dataLoader/Citation.js (100%) rename {tests => client-app/tests}/functional/dataLoader/DataLoader.js (100%) rename {tests => client-app/tests}/functional/dataLoader/Infrastructure.js (100%) rename {tests => client-app/tests}/functional/dataLoader/ObjectCollection.js (100%) rename {tests => client-app/tests}/functional/dataLoader/SurveyStation.js (100%) rename {tests => client-app/tests}/functional/dataLoader/Tracking.js (100%) rename {tests => client-app/tests}/functional/maintenance/ServiceOGC.js (100%) rename {tests => client-app/tests}/functional/maintenance/domains/_Domain.js (100%) rename {tests => client-app/tests}/functional/maintenance/domains/_DomainBase.js (100%) rename {tests => client-app/tests}/functional/maintenance/domains/_DomainFacets.js (100%) rename {tests => client-app/tests}/functional/maintenance/domains/_DomainFormEdition.js (100%) rename {tests => client-app/tests}/functional/maintenance/domains/_DomainHierarchical.js (100%) rename {tests => client-app/tests}/functional/maintenance/domains/_DomainWizardEdition.js (100%) rename {tests => client-app/tests}/functional/maintenance/domains/admin/Accessibility.js (100%) rename {tests => client-app/tests}/functional/maintenance/domains/admin/ActivityFields.js (100%) rename {tests => client-app/tests}/functional/maintenance/domains/admin/ActivityTypes.js (100%) rename {tests => client-app/tests}/functional/maintenance/domains/admin/ContactRoles.js (100%) rename {tests => client-app/tests}/functional/maintenance/domains/admin/Countries.js (100%) rename {tests => client-app/tests}/functional/maintenance/domains/admin/DeviceTypes.js (100%) rename {tests => client-app/tests}/functional/maintenance/domains/admin/DocumentTypes.js (100%) rename {tests => client-app/tests}/functional/maintenance/domains/admin/OrganisationRoles.js (100%) rename {tests => client-app/tests}/functional/maintenance/domains/admin/OrganisationTypes.js (100%) rename {tests => client-app/tests}/functional/maintenance/domains/admin/PlatformTypes.js (100%) rename {tests => client-app/tests}/functional/maintenance/domains/admin/ProjectGroups.js (100%) rename {tests => client-app/tests}/functional/maintenance/domains/admin/Scopes.js (100%) rename {tests => client-app/tests}/functional/maintenance/domains/geometry/AreaTypes.js (100%) rename {tests => client-app/tests}/functional/maintenance/domains/geometry/Destiny.js (100%) rename {tests => client-app/tests}/functional/maintenance/domains/geometry/Ending.js (100%) rename {tests => client-app/tests}/functional/maintenance/domains/geometry/InspireThemes.js (100%) rename {tests => client-app/tests}/functional/maintenance/domains/geometry/LineTypes.js (100%) rename {tests => client-app/tests}/functional/maintenance/domains/geometry/MeshTypes.js (100%) rename {tests => client-app/tests}/functional/maintenance/domains/geometry/RasterTypes.js (100%) rename {tests => client-app/tests}/functional/maintenance/domains/geometry/RecordingTypes.js (100%) rename {tests => client-app/tests}/functional/maintenance/domains/geometry/ShorelineTypes.js (100%) rename {tests => client-app/tests}/functional/maintenance/domains/geometry/ThematicTypes.js (100%) rename {tests => client-app/tests}/functional/maintenance/domains/geometry/ToponymTypes.js (100%) rename {tests => client-app/tests}/functional/maintenance/domains/observations/AttributeTypes.js (100%) rename {tests => client-app/tests}/functional/maintenance/domains/observations/CensusingStatus.js (100%) rename {tests => client-app/tests}/functional/maintenance/domains/observations/Confidence.js (100%) rename {tests => client-app/tests}/functional/maintenance/domains/observations/InfrastructureType.js (100%) rename {tests => client-app/tests}/functional/maintenance/domains/observations/MetricGroups.js (100%) rename {tests => client-app/tests}/functional/maintenance/domains/observations/MetricsDefinitions.js (100%) rename {tests => client-app/tests}/functional/maintenance/domains/observations/ObjectTypes.js (100%) rename {tests => client-app/tests}/functional/maintenance/domains/observations/ParameterTypes.js (100%) rename {tests => client-app/tests}/functional/maintenance/domains/observations/Parameters.js (100%) rename {tests => client-app/tests}/functional/maintenance/domains/observations/SampleTypes.js (100%) rename {tests => client-app/tests}/functional/maintenance/domains/observations/SeaConditions.js (100%) rename {tests => client-app/tests}/functional/maintenance/domains/observations/UnitTypes.js (100%) rename {tests => client-app/tests}/functional/maintenance/domains/observations/Units.js (100%) rename {tests => client-app/tests}/functional/maintenance/domains/taxon/CanaryProtection.js (100%) rename {tests => client-app/tests}/functional/maintenance/domains/taxon/EUProtection.js (100%) rename {tests => client-app/tests}/functional/maintenance/domains/taxon/Ecology.js (100%) rename {tests => client-app/tests}/functional/maintenance/domains/taxon/Endemicity.js (100%) rename {tests => client-app/tests}/functional/maintenance/domains/taxon/Interest.js (100%) rename {tests => client-app/tests}/functional/maintenance/domains/taxon/LifeStages.js (100%) rename {tests => client-app/tests}/functional/maintenance/domains/taxon/Origin.js (100%) rename {tests => client-app/tests}/functional/maintenance/domains/taxon/Permanence.js (100%) rename {tests => client-app/tests}/functional/maintenance/domains/taxon/Rank.js (100%) rename {tests => client-app/tests}/functional/maintenance/domains/taxon/Sex.js (100%) rename {tests => client-app/tests}/functional/maintenance/domains/taxon/SpainProtection.js (100%) rename {tests => client-app/tests}/functional/maintenance/domains/taxon/Status.js (100%) rename {tests => client-app/tests}/functional/maintenance/domains/taxon/TrophicRegime.js (100%) rename {tests => client-app/tests}/functional/modules/components/Keypad/testKeypad.js (100%) rename {tests => client-app/tests}/functional/modules/components/Keypad/testKeypadScript.js (100%) rename {tests => client-app/tests}/functional/modules/form/input/MapSearchImpl/testMapSearchImpl.js (100%) rename {tests => client-app/tests}/functional/modules/form/input/MapSearchImpl/testMapSearchImplScript.js (100%) rename {tests => client-app/tests}/functional/modules/form/input/UploadFileImpl/testUploadFileImpl.js (100%) rename {tests => client-app/tests}/functional/modules/form/input/UploadFileImpl/testUploadFileImplScript.js (100%) rename {tests => client-app/tests}/functional/modules/form/testFormWithKeypad.js (100%) rename {tests => client-app/tests}/functional/modules/form/testFormWithKeypadScript.js (100%) rename {tests => client-app/tests}/functional/modules/search/testFacetsImpl.js (100%) rename {tests => client-app/tests}/functional/modules/search/testFacetsImplScript.js (100%) rename {tests => client-app/tests}/functional/products/Atlas.js (100%) rename {tests => client-app/tests}/functional/products/ServiceOGC.js (100%) rename {tests => client-app/tests}/functional/viewers/Bibliography.js (100%) rename {tests => client-app/tests}/functional/viewers/SpeciesDistribution.js (100%) rename {tests => client-app/tests}/intern-functional-local.js (100%) rename {tests => client-app/tests}/intern-functional-remote.js (100%) rename {tests => client-app/tests}/intern-unit-local.js (100%) rename {tests => client-app/tests}/intern-unit-remote.js (100%) rename {tests => client-app/tests}/sockTest/app.js (100%) rename {tests => client-app/tests}/sockTest/stomp.js (100%) rename {tests => client-app/tests}/sockTest/websocket.mock.js (100%) rename {tests => client-app/tests}/support/Config.js (100%) rename {tests => client-app/tests}/support/CustomReporter.js (100%) rename {tests => client-app/tests}/support/Utils.js (100%) rename {tests => client-app/tests}/support/pages/Filter.js (100%) rename {tests => client-app/tests}/support/pages/List.js (100%) rename {tests => client-app/tests}/support/pages/ListHierarchical.js (100%) rename {tests => client-app/tests}/support/pages/ListWithTextSearch.js (100%) rename {tests => client-app/tests}/support/pages/ListWithTextSearchAndFacets.js (100%) rename {tests => client-app/tests}/support/pages/ListWithTreeFilter.js (100%) rename {tests => client-app/tests}/support/pages/Login.js (100%) rename {tests => client-app/tests}/support/pages/Map.js (100%) rename {tests => client-app/tests}/support/pages/Wizard.js (100%) rename {tests => client-app/tests}/support/pages/_Page.js (100%) rename {tests => client-app/tests}/support/pages/steps/DoubleList.js (100%) rename {tests => client-app/tests}/support/pages/steps/DoubleListFiltered.js (100%) rename {tests => client-app/tests}/support/pages/steps/Form.js (100%) rename {tests => client-app/tests}/support/pages/steps/FormList.js (100%) rename {tests => client-app/tests}/support/pages/steps/LayerImage.js (100%) rename {tests => client-app/tests}/support/pages/steps/LineGeometry.js (100%) rename {tests => client-app/tests}/support/pages/steps/List.js (100%) rename {tests => client-app/tests}/support/pages/steps/PointGeometry.js (100%) rename {tests => client-app/tests}/support/pages/steps/RelationData.js (100%) rename {tests => client-app/tests}/support/pages/steps/ReorderLayerList.js (100%) rename {tests => client-app/tests}/support/pages/test.html (100%) rename {tests => client-app/tests}/support/resources/DomainModel.js (100%) rename {tests => client-app/tests}/support/resources/doc.pdf (100%) rename {tests => client-app/tests}/support/resources/fileForLoadData/ar.zip (100%) rename {tests => client-app/tests}/support/resources/fileForLoadData/document.csv (100%) rename {tests => client-app/tests}/support/resources/fileForLoadData/ft.csv (100%) rename {tests => client-app/tests}/support/resources/fileForLoadData/oc.csv (100%) rename {tests => client-app/tests}/support/resources/fileForLoadData/pt.csv (100%) rename {tests => client-app/tests}/support/resources/profile.png (100%) rename {tests => client-app/tests}/support/tests/Atlas.js (100%) rename {tests => client-app/tests}/support/tests/AtlasWithClickMap.js (100%) rename {tests => client-app/tests}/support/tests/CatalogFacets.js (100%) rename {tests => client-app/tests}/support/tests/CatalogFacetsTotal.js (100%) rename {tests => client-app/tests}/support/tests/CatalogGuestReport.js (100%) rename {tests => client-app/tests}/support/tests/CatalogLinks.js (100%) rename {tests => client-app/tests}/support/tests/CatalogUserReport.js (100%) rename {tests => client-app/tests}/support/tests/CatalogWizardEdition.js (100%) rename {tests => client-app/tests}/support/tests/Citation.js (100%) rename {tests => client-app/tests}/support/tests/Dashboard.js (100%) rename {tests => client-app/tests}/support/tests/DetailsBase.js (100%) rename {tests => client-app/tests}/support/tests/DetailsEditionLink.js (100%) rename {tests => client-app/tests}/support/tests/DetailsInfo.js (100%) rename {tests => client-app/tests}/support/tests/DetailsPDF.js (100%) rename {tests => client-app/tests}/support/tests/DetailsTabs.js (100%) rename {tests => client-app/tests}/support/tests/Filter.js (100%) rename {tests => client-app/tests}/support/tests/FormAddition.js (100%) rename {tests => client-app/tests}/support/tests/FormEdition.js (100%) rename {tests => client-app/tests}/support/tests/ListFilterByTree.js (100%) rename {tests => client-app/tests}/support/tests/ListHierarchical.js (100%) rename {tests => client-app/tests}/support/tests/ListHierarchicalWithSelection.js (100%) rename {tests => client-app/tests}/support/tests/ListSelection.js (100%) rename {tests => client-app/tests}/support/tests/ListWithOrder.js (100%) rename {tests => client-app/tests}/support/tests/ListWithTextSearch.js (100%) rename {tests => client-app/tests}/support/tests/Map.js (100%) rename {tests => client-app/tests}/support/tests/SpeciesDistribution.js (100%) rename {tests => client-app/tests}/support/tests/WizardAddition.js (100%) rename {tests => client-app/tests}/support/tests/WizardEdition.js (100%) rename {tests => client-app/tests}/support/tests/WizardWorms.js (100%) rename {tests => client-app/tests}/support/tests/_BaseCommons.js (100%) rename {tests => client-app/tests}/support/tests/_CatalogBase.js (100%) rename {tests => client-app/tests}/support/tests/_Commons.js (100%) rename {tests => client-app/tests}/support/tests/_DataLoader.js (100%) rename {tests => client-app/tests}/unit/app/base/models/_ModelTestCommons.js (100%) rename {tests => client-app/tests}/unit/app/base/models/attr/testArrayAttr.js (100%) rename {tests => client-app/tests}/unit/app/base/models/attr/testAttr.js (100%) rename {tests => client-app/tests}/unit/app/base/models/attr/testObjAttr.js (100%) rename {tests => client-app/tests}/unit/app/base/models/attr/testRelationAttr.js (100%) rename {tests => client-app/tests}/unit/app/base/models/test_Model.js (100%) rename {tests => client-app/tests}/unit/app/base/views/extensions/test_EditionView.js (100%) rename {tests => client-app/tests}/unit/app/viewers/views/test_ChartsView.js (100%) rename {tests => client-app/tests}/unit/app/viewers/views/test_TimeSeriesSelectionManagement.js (100%) rename {tests => client-app/tests}/unit/redmic/base/testCredentials.js (100%) rename {tests => client-app/tests}/unit/redmic/base/testMediator.js (100%) rename {tests => client-app/tests}/unit/redmic/base/testRedmicLocalStorage.js (100%) rename {tests => client-app/tests}/unit/redmic/form/testUploadInput.js (100%) rename {tests => client-app/tests}/unit/redmic/modules/base/testManager.js (100%) rename {tests => client-app/tests}/unit/redmic/modules/base/testNotification.js (100%) rename {tests => client-app/tests}/unit/redmic/modules/base/testSelectionBox.js (100%) rename {tests => client-app/tests}/unit/redmic/modules/base/test_Module.js (100%) rename {tests => client-app/tests}/unit/redmic/modules/browser/bars/testOrder.js (100%) rename {tests => client-app/tests}/unit/redmic/modules/browser/bars/testPagination.js (100%) rename {tests => client-app/tests}/unit/redmic/modules/browser/bars/testSelectionBox.js (100%) rename {tests => client-app/tests}/unit/redmic/modules/browser/bars/testTotal.js (100%) rename {tests => client-app/tests}/unit/redmic/modules/browser/buttons/testButtons.js (100%) rename {tests => client-app/tests}/unit/redmic/modules/browser/row/testRow.js (100%) rename {tests => client-app/tests}/unit/redmic/modules/browser/testHierarchicalImpl.js (100%) rename {tests => client-app/tests}/unit/redmic/modules/browser/testListImpl.js (100%) rename {tests => client-app/tests}/unit/redmic/modules/chart/ChartsContainer/testInfoChartsContainerImpl.js (100%) rename {tests => client-app/tests}/unit/redmic/modules/chart/Toolbar/testSliderSelectorImpl.js (100%) rename {tests => client-app/tests}/unit/redmic/modules/chart/layer/ChartLayer/testLinearChartImpl.js (100%) rename {tests => client-app/tests}/unit/redmic/modules/form/inputs/testCheckBoxImpl.js (100%) rename {tests => client-app/tests}/unit/redmic/modules/form/inputs/testDateTextBoxImpl.js (100%) rename {tests => client-app/tests}/unit/redmic/modules/form/inputs/testFilteringInputImpl.js (100%) rename {tests => client-app/tests}/unit/redmic/modules/form/inputs/testNumberSpinnerImpl.js (100%) rename {tests => client-app/tests}/unit/redmic/modules/form/inputs/testNumberTextBoxImpl.js (100%) rename {tests => client-app/tests}/unit/redmic/modules/form/inputs/testTextAreaImpl.js (100%) rename {tests => client-app/tests}/unit/redmic/modules/form/inputs/testTextBoxImpl.js (100%) rename {tests => client-app/tests}/unit/redmic/modules/form/testForm.js (100%) rename {tests => client-app/tests}/unit/redmic/modules/gateway/testGateway.js (100%) rename {tests => client-app/tests}/unit/redmic/modules/layout/details/testDetails.js (100%) rename {tests => client-app/tests}/unit/redmic/modules/layout/wizard/testWizard.js (100%) rename {tests => client-app/tests}/unit/redmic/modules/map/testLeafletImpl.js (100%) rename {tests => client-app/tests}/unit/redmic/modules/model/testModelImpl.js (100%) rename {tests => client-app/tests}/unit/redmic/modules/notification/test_Communication.js (100%) rename {tests => client-app/tests}/unit/redmic/modules/notification/test_Notification.js (100%) rename {tests => client-app/tests}/unit/redmic/modules/search/testFacetsImpl.js (100%) rename {tests => client-app/tests}/unit/redmic/modules/search/testSearch.js (100%) rename {tests => client-app/tests}/unit/redmic/modules/selection/testSelector.js (100%) rename {tests => client-app/tests}/unit/redmic/modules/socket/testSocket.js (100%) rename {tests => client-app/tests}/unit/redmic/modules/store/testRestManager.js (100%) rename {tests => client-app/tests}/unit/redmic/modules/tree/testTree.js (100%) rename {tests => client-app/tests}/unit/redmic/modules/wizard/testWizard.js (100%) diff --git a/.gitignore b/.gitignore index eec9469a..7c8e46e9 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,5 @@ test_reports .gitmodules.old build-report.txt *.tar.gz +*.tgz *.log diff --git a/.gitmodules b/.gitmodules index a91961a1..f09c2f55 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,10 +1,10 @@ -[submodule "public/stylesheets"] - path = public/stylesheets +[submodule "client-app/stylesheets"] + path = client-app/stylesheets url = ../style.git branch = master ignore = dirty -[submodule "public/javascript/templates"] - path = public/javascript/templates +[submodule "client-app/javascript/templates"] + path = client-app/javascript/templates url = ../templates.git branch = master - ignore = dirty \ No newline at end of file + ignore = dirty diff --git a/Gruntfile.js b/Gruntfile.js index cd004bb4..42270a68 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -12,7 +12,7 @@ module.exports = function(grunt) { grunt.initConfig({ redmicConfig: { rootPath: __dirname, - srcPath: 'public/javascript', + srcPath: 'client-app/javascript', distPath: 'dist', destDir: 'javascript' }, diff --git a/redmic.profile.js b/client-app/app.profile.js similarity index 99% rename from redmic.profile.js rename to client-app/app.profile.js index 50e1205f..cffc0ec9 100644 --- a/redmic.profile.js +++ b/client-app/app.profile.js @@ -25,7 +25,7 @@ var declarativeTagger = function(filename) { }; var profileObj = { - basePath: './public/javascript', + basePath: './javascript', releaseDir: '../../dist', releaseName: 'javascript', action: 'release', diff --git a/public/javascript/alertify b/client-app/javascript/alertify similarity index 100% rename from public/javascript/alertify rename to client-app/javascript/alertify diff --git a/public/javascript/app/administrative/taxonomy/views/ClassView.js b/client-app/javascript/app/administrative/taxonomy/views/ClassView.js similarity index 100% rename from public/javascript/app/administrative/taxonomy/views/ClassView.js rename to client-app/javascript/app/administrative/taxonomy/views/ClassView.js diff --git a/public/javascript/app/administrative/taxonomy/views/FamilyView.js b/client-app/javascript/app/administrative/taxonomy/views/FamilyView.js similarity index 100% rename from public/javascript/app/administrative/taxonomy/views/FamilyView.js rename to client-app/javascript/app/administrative/taxonomy/views/FamilyView.js diff --git a/public/javascript/app/administrative/taxonomy/views/GenusView.js b/client-app/javascript/app/administrative/taxonomy/views/GenusView.js similarity index 100% rename from public/javascript/app/administrative/taxonomy/views/GenusView.js rename to client-app/javascript/app/administrative/taxonomy/views/GenusView.js diff --git a/public/javascript/app/administrative/taxonomy/views/KingdomView.js b/client-app/javascript/app/administrative/taxonomy/views/KingdomView.js similarity index 100% rename from public/javascript/app/administrative/taxonomy/views/KingdomView.js rename to client-app/javascript/app/administrative/taxonomy/views/KingdomView.js diff --git a/public/javascript/app/administrative/taxonomy/views/MisIdentificationView.js b/client-app/javascript/app/administrative/taxonomy/views/MisIdentificationView.js similarity index 100% rename from public/javascript/app/administrative/taxonomy/views/MisIdentificationView.js rename to client-app/javascript/app/administrative/taxonomy/views/MisIdentificationView.js diff --git a/public/javascript/app/administrative/taxonomy/views/OrderView.js b/client-app/javascript/app/administrative/taxonomy/views/OrderView.js similarity index 100% rename from public/javascript/app/administrative/taxonomy/views/OrderView.js rename to client-app/javascript/app/administrative/taxonomy/views/OrderView.js diff --git a/public/javascript/app/administrative/taxonomy/views/PhylumView.js b/client-app/javascript/app/administrative/taxonomy/views/PhylumView.js similarity index 100% rename from public/javascript/app/administrative/taxonomy/views/PhylumView.js rename to client-app/javascript/app/administrative/taxonomy/views/PhylumView.js diff --git a/public/javascript/app/administrative/taxonomy/views/SpeciesView.js b/client-app/javascript/app/administrative/taxonomy/views/SpeciesView.js similarity index 100% rename from public/javascript/app/administrative/taxonomy/views/SpeciesView.js rename to client-app/javascript/app/administrative/taxonomy/views/SpeciesView.js diff --git a/public/javascript/app/administrative/taxonomy/views/SubphylumView.js b/client-app/javascript/app/administrative/taxonomy/views/SubphylumView.js similarity index 100% rename from public/javascript/app/administrative/taxonomy/views/SubphylumView.js rename to client-app/javascript/app/administrative/taxonomy/views/SubphylumView.js diff --git a/public/javascript/app/administrative/taxonomy/views/TaxonomyView.js b/client-app/javascript/app/administrative/taxonomy/views/TaxonomyView.js similarity index 100% rename from public/javascript/app/administrative/taxonomy/views/TaxonomyView.js rename to client-app/javascript/app/administrative/taxonomy/views/TaxonomyView.js diff --git a/public/javascript/app/administrative/taxonomy/views/_AddCompositeTaxon.js b/client-app/javascript/app/administrative/taxonomy/views/_AddCompositeTaxon.js similarity index 100% rename from public/javascript/app/administrative/taxonomy/views/_AddCompositeTaxon.js rename to client-app/javascript/app/administrative/taxonomy/views/_AddCompositeTaxon.js diff --git a/public/javascript/app/administrative/taxonomy/views/templates/forms/KingdomForm.html b/client-app/javascript/app/administrative/taxonomy/views/templates/forms/KingdomForm.html similarity index 100% rename from public/javascript/app/administrative/taxonomy/views/templates/forms/KingdomForm.html rename to client-app/javascript/app/administrative/taxonomy/views/templates/forms/KingdomForm.html diff --git a/public/javascript/app/administrative/taxonomy/views/templates/forms/MisIdentificationForm.html b/client-app/javascript/app/administrative/taxonomy/views/templates/forms/MisIdentificationForm.html similarity index 100% rename from public/javascript/app/administrative/taxonomy/views/templates/forms/MisIdentificationForm.html rename to client-app/javascript/app/administrative/taxonomy/views/templates/forms/MisIdentificationForm.html diff --git a/public/javascript/app/administrative/taxonomy/views/templates/forms/PeculiarityForm.html b/client-app/javascript/app/administrative/taxonomy/views/templates/forms/PeculiarityForm.html similarity index 100% rename from public/javascript/app/administrative/taxonomy/views/templates/forms/PeculiarityForm.html rename to client-app/javascript/app/administrative/taxonomy/views/templates/forms/PeculiarityForm.html diff --git a/public/javascript/app/administrative/taxonomy/views/templates/forms/RecoveryForm.html b/client-app/javascript/app/administrative/taxonomy/views/templates/forms/RecoveryForm.html similarity index 100% rename from public/javascript/app/administrative/taxonomy/views/templates/forms/RecoveryForm.html rename to client-app/javascript/app/administrative/taxonomy/views/templates/forms/RecoveryForm.html diff --git a/public/javascript/app/administrative/taxonomy/views/templates/forms/SpeciesForm.html b/client-app/javascript/app/administrative/taxonomy/views/templates/forms/SpeciesForm.html similarity index 100% rename from public/javascript/app/administrative/taxonomy/views/templates/forms/SpeciesForm.html rename to client-app/javascript/app/administrative/taxonomy/views/templates/forms/SpeciesForm.html diff --git a/public/javascript/app/administrative/taxonomy/views/templates/forms/SpecimenTagForm.html b/client-app/javascript/app/administrative/taxonomy/views/templates/forms/SpecimenTagForm.html similarity index 100% rename from public/javascript/app/administrative/taxonomy/views/templates/forms/SpecimenTagForm.html rename to client-app/javascript/app/administrative/taxonomy/views/templates/forms/SpecimenTagForm.html diff --git a/public/javascript/app/administrative/taxonomy/views/templates/forms/TaxonForm.html b/client-app/javascript/app/administrative/taxonomy/views/templates/forms/TaxonForm.html similarity index 100% rename from public/javascript/app/administrative/taxonomy/views/templates/forms/TaxonForm.html rename to client-app/javascript/app/administrative/taxonomy/views/templates/forms/TaxonForm.html diff --git a/public/javascript/app/administrative/views/ActivityView.js b/client-app/javascript/app/administrative/views/ActivityView.js similarity index 100% rename from public/javascript/app/administrative/views/ActivityView.js rename to client-app/javascript/app/administrative/views/ActivityView.js diff --git a/public/javascript/app/administrative/views/AnimalView.js b/client-app/javascript/app/administrative/views/AnimalView.js similarity index 100% rename from public/javascript/app/administrative/views/AnimalView.js rename to client-app/javascript/app/administrative/views/AnimalView.js diff --git a/public/javascript/app/administrative/views/ContactView.js b/client-app/javascript/app/administrative/views/ContactView.js similarity index 100% rename from public/javascript/app/administrative/views/ContactView.js rename to client-app/javascript/app/administrative/views/ContactView.js diff --git a/public/javascript/app/administrative/views/DeviceView.js b/client-app/javascript/app/administrative/views/DeviceView.js similarity index 100% rename from public/javascript/app/administrative/views/DeviceView.js rename to client-app/javascript/app/administrative/views/DeviceView.js diff --git a/public/javascript/app/administrative/views/DocumentView.js b/client-app/javascript/app/administrative/views/DocumentView.js similarity index 100% rename from public/javascript/app/administrative/views/DocumentView.js rename to client-app/javascript/app/administrative/views/DocumentView.js diff --git a/public/javascript/app/administrative/views/OrganisationView.js b/client-app/javascript/app/administrative/views/OrganisationView.js similarity index 100% rename from public/javascript/app/administrative/views/OrganisationView.js rename to client-app/javascript/app/administrative/views/OrganisationView.js diff --git a/public/javascript/app/administrative/views/PlatformView.js b/client-app/javascript/app/administrative/views/PlatformView.js similarity index 100% rename from public/javascript/app/administrative/views/PlatformView.js rename to client-app/javascript/app/administrative/views/PlatformView.js diff --git a/public/javascript/app/administrative/views/ProgramView.js b/client-app/javascript/app/administrative/views/ProgramView.js similarity index 100% rename from public/javascript/app/administrative/views/ProgramView.js rename to client-app/javascript/app/administrative/views/ProgramView.js diff --git a/public/javascript/app/administrative/views/ProjectView.js b/client-app/javascript/app/administrative/views/ProjectView.js similarity index 100% rename from public/javascript/app/administrative/views/ProjectView.js rename to client-app/javascript/app/administrative/views/ProjectView.js diff --git a/public/javascript/app/administrative/views/templates/forms/ActivityContactForm.html b/client-app/javascript/app/administrative/views/templates/forms/ActivityContactForm.html similarity index 100% rename from public/javascript/app/administrative/views/templates/forms/ActivityContactForm.html rename to client-app/javascript/app/administrative/views/templates/forms/ActivityContactForm.html diff --git a/public/javascript/app/administrative/views/templates/forms/ActivityEmbeddedContentForm.html b/client-app/javascript/app/administrative/views/templates/forms/ActivityEmbeddedContentForm.html similarity index 100% rename from public/javascript/app/administrative/views/templates/forms/ActivityEmbeddedContentForm.html rename to client-app/javascript/app/administrative/views/templates/forms/ActivityEmbeddedContentForm.html diff --git a/public/javascript/app/administrative/views/templates/forms/ActivityForm.html b/client-app/javascript/app/administrative/views/templates/forms/ActivityForm.html similarity index 100% rename from public/javascript/app/administrative/views/templates/forms/ActivityForm.html rename to client-app/javascript/app/administrative/views/templates/forms/ActivityForm.html diff --git a/public/javascript/app/administrative/views/templates/forms/ActivityOrganisationForm.html b/client-app/javascript/app/administrative/views/templates/forms/ActivityOrganisationForm.html similarity index 100% rename from public/javascript/app/administrative/views/templates/forms/ActivityOrganisationForm.html rename to client-app/javascript/app/administrative/views/templates/forms/ActivityOrganisationForm.html diff --git a/public/javascript/app/administrative/views/templates/forms/ActivityPlatformForm.html b/client-app/javascript/app/administrative/views/templates/forms/ActivityPlatformForm.html similarity index 100% rename from public/javascript/app/administrative/views/templates/forms/ActivityPlatformForm.html rename to client-app/javascript/app/administrative/views/templates/forms/ActivityPlatformForm.html diff --git a/public/javascript/app/administrative/views/templates/forms/ActivityResourceForm.html b/client-app/javascript/app/administrative/views/templates/forms/ActivityResourceForm.html similarity index 100% rename from public/javascript/app/administrative/views/templates/forms/ActivityResourceForm.html rename to client-app/javascript/app/administrative/views/templates/forms/ActivityResourceForm.html diff --git a/public/javascript/app/administrative/views/templates/forms/AnimalForm.html b/client-app/javascript/app/administrative/views/templates/forms/AnimalForm.html similarity index 100% rename from public/javascript/app/administrative/views/templates/forms/AnimalForm.html rename to client-app/javascript/app/administrative/views/templates/forms/AnimalForm.html diff --git a/public/javascript/app/administrative/views/templates/forms/CalibrationForm.html b/client-app/javascript/app/administrative/views/templates/forms/CalibrationForm.html similarity index 100% rename from public/javascript/app/administrative/views/templates/forms/CalibrationForm.html rename to client-app/javascript/app/administrative/views/templates/forms/CalibrationForm.html diff --git a/public/javascript/app/administrative/views/templates/forms/ConditionForm.html b/client-app/javascript/app/administrative/views/templates/forms/ConditionForm.html similarity index 100% rename from public/javascript/app/administrative/views/templates/forms/ConditionForm.html rename to client-app/javascript/app/administrative/views/templates/forms/ConditionForm.html diff --git a/public/javascript/app/administrative/views/templates/forms/ContactForm.html b/client-app/javascript/app/administrative/views/templates/forms/ContactForm.html similarity index 100% rename from public/javascript/app/administrative/views/templates/forms/ContactForm.html rename to client-app/javascript/app/administrative/views/templates/forms/ContactForm.html diff --git a/public/javascript/app/administrative/views/templates/forms/DeviceForm.html b/client-app/javascript/app/administrative/views/templates/forms/DeviceForm.html similarity index 100% rename from public/javascript/app/administrative/views/templates/forms/DeviceForm.html rename to client-app/javascript/app/administrative/views/templates/forms/DeviceForm.html diff --git a/public/javascript/app/administrative/views/templates/forms/DocumentForm.html b/client-app/javascript/app/administrative/views/templates/forms/DocumentForm.html similarity index 100% rename from public/javascript/app/administrative/views/templates/forms/DocumentForm.html rename to client-app/javascript/app/administrative/views/templates/forms/DocumentForm.html diff --git a/public/javascript/app/administrative/views/templates/forms/MetricsDefinitionForm.html b/client-app/javascript/app/administrative/views/templates/forms/MetricsDefinitionForm.html similarity index 100% rename from public/javascript/app/administrative/views/templates/forms/MetricsDefinitionForm.html rename to client-app/javascript/app/administrative/views/templates/forms/MetricsDefinitionForm.html diff --git a/public/javascript/app/administrative/views/templates/forms/OrganisationForm.html b/client-app/javascript/app/administrative/views/templates/forms/OrganisationForm.html similarity index 100% rename from public/javascript/app/administrative/views/templates/forms/OrganisationForm.html rename to client-app/javascript/app/administrative/views/templates/forms/OrganisationForm.html diff --git a/public/javascript/app/administrative/views/templates/forms/ParameterForm.html b/client-app/javascript/app/administrative/views/templates/forms/ParameterForm.html similarity index 100% rename from public/javascript/app/administrative/views/templates/forms/ParameterForm.html rename to client-app/javascript/app/administrative/views/templates/forms/ParameterForm.html diff --git a/public/javascript/app/administrative/views/templates/forms/PlatformForm.html b/client-app/javascript/app/administrative/views/templates/forms/PlatformForm.html similarity index 100% rename from public/javascript/app/administrative/views/templates/forms/PlatformForm.html rename to client-app/javascript/app/administrative/views/templates/forms/PlatformForm.html diff --git a/public/javascript/app/administrative/views/templates/forms/ProgramForm.html b/client-app/javascript/app/administrative/views/templates/forms/ProgramForm.html similarity index 100% rename from public/javascript/app/administrative/views/templates/forms/ProgramForm.html rename to client-app/javascript/app/administrative/views/templates/forms/ProgramForm.html diff --git a/public/javascript/app/administrative/views/templates/forms/ProjectForm.html b/client-app/javascript/app/administrative/views/templates/forms/ProjectForm.html similarity index 100% rename from public/javascript/app/administrative/views/templates/forms/ProjectForm.html rename to client-app/javascript/app/administrative/views/templates/forms/ProjectForm.html diff --git a/public/javascript/app/administrative/views/templates/forms/UnitForm.html b/client-app/javascript/app/administrative/views/templates/forms/UnitForm.html similarity index 100% rename from public/javascript/app/administrative/views/templates/forms/UnitForm.html rename to client-app/javascript/app/administrative/views/templates/forms/UnitForm.html diff --git a/public/javascript/app/base/models/_Model.js b/client-app/javascript/app/base/models/_Model.js similarity index 100% rename from public/javascript/app/base/models/_Model.js rename to client-app/javascript/app/base/models/_Model.js diff --git a/public/javascript/app/base/models/attr/ArrayAttr.js b/client-app/javascript/app/base/models/attr/ArrayAttr.js similarity index 100% rename from public/javascript/app/base/models/attr/ArrayAttr.js rename to client-app/javascript/app/base/models/attr/ArrayAttr.js diff --git a/public/javascript/app/base/models/attr/Attr.js b/client-app/javascript/app/base/models/attr/Attr.js similarity index 100% rename from public/javascript/app/base/models/attr/Attr.js rename to client-app/javascript/app/base/models/attr/Attr.js diff --git a/public/javascript/app/base/models/attr/ObjAttr.js b/client-app/javascript/app/base/models/attr/ObjAttr.js similarity index 100% rename from public/javascript/app/base/models/attr/ObjAttr.js rename to client-app/javascript/app/base/models/attr/ObjAttr.js diff --git a/public/javascript/app/base/models/attr/RelationAttr.js b/client-app/javascript/app/base/models/attr/RelationAttr.js similarity index 100% rename from public/javascript/app/base/models/attr/RelationAttr.js rename to client-app/javascript/app/base/models/attr/RelationAttr.js diff --git a/public/javascript/app/base/models/attr/_Attr.js b/client-app/javascript/app/base/models/attr/_Attr.js similarity index 100% rename from public/javascript/app/base/models/attr/_Attr.js rename to client-app/javascript/app/base/models/attr/_Attr.js diff --git a/public/javascript/app/base/models/attr/_ComplexAttr.js b/client-app/javascript/app/base/models/attr/_ComplexAttr.js similarity index 100% rename from public/javascript/app/base/models/attr/_ComplexAttr.js rename to client-app/javascript/app/base/models/attr/_ComplexAttr.js diff --git a/public/javascript/app/base/views/EditorLayerWithVariableForm.js b/client-app/javascript/app/base/views/EditorLayerWithVariableForm.js similarity index 100% rename from public/javascript/app/base/views/EditorLayerWithVariableForm.js rename to client-app/javascript/app/base/views/EditorLayerWithVariableForm.js diff --git a/public/javascript/app/base/views/Module.js b/client-app/javascript/app/base/views/Module.js similarity index 100% rename from public/javascript/app/base/views/Module.js rename to client-app/javascript/app/base/views/Module.js diff --git a/public/javascript/app/base/views/_ListenRequestError.js b/client-app/javascript/app/base/views/_ListenRequestError.js similarity index 100% rename from public/javascript/app/base/views/_ListenRequestError.js rename to client-app/javascript/app/base/views/_ListenRequestError.js diff --git a/public/javascript/app/base/views/_LoadingWidget.js b/client-app/javascript/app/base/views/_LoadingWidget.js similarity index 100% rename from public/javascript/app/base/views/_LoadingWidget.js rename to client-app/javascript/app/base/views/_LoadingWidget.js diff --git a/public/javascript/app/base/views/_SettingsHandler.js b/client-app/javascript/app/base/views/_SettingsHandler.js similarity index 100% rename from public/javascript/app/base/views/_SettingsHandler.js rename to client-app/javascript/app/base/views/_SettingsHandler.js diff --git a/public/javascript/app/base/views/_View.js b/client-app/javascript/app/base/views/_View.js similarity index 100% rename from public/javascript/app/base/views/_View.js rename to client-app/javascript/app/base/views/_View.js diff --git a/public/javascript/app/base/views/_ViewHandle.js b/client-app/javascript/app/base/views/_ViewHandle.js similarity index 100% rename from public/javascript/app/base/views/_ViewHandle.js rename to client-app/javascript/app/base/views/_ViewHandle.js diff --git a/public/javascript/app/base/views/_ViewListBase.js b/client-app/javascript/app/base/views/_ViewListBase.js similarity index 100% rename from public/javascript/app/base/views/_ViewListBase.js rename to client-app/javascript/app/base/views/_ViewListBase.js diff --git a/public/javascript/app/base/views/extensions/_ActivityClosed.js b/client-app/javascript/app/base/views/extensions/_ActivityClosed.js similarity index 100% rename from public/javascript/app/base/views/extensions/_ActivityClosed.js rename to client-app/javascript/app/base/views/extensions/_ActivityClosed.js diff --git a/public/javascript/app/base/views/extensions/_AddAtlasCategory.js b/client-app/javascript/app/base/views/extensions/_AddAtlasCategory.js similarity index 100% rename from public/javascript/app/base/views/extensions/_AddAtlasCategory.js rename to client-app/javascript/app/base/views/extensions/_AddAtlasCategory.js diff --git a/public/javascript/app/base/views/extensions/_AddCompositeSearchInTooltipFromTextSearch.js b/client-app/javascript/app/base/views/extensions/_AddCompositeSearchInTooltipFromTextSearch.js similarity index 100% rename from public/javascript/app/base/views/extensions/_AddCompositeSearchInTooltipFromTextSearch.js rename to client-app/javascript/app/base/views/extensions/_AddCompositeSearchInTooltipFromTextSearch.js diff --git a/public/javascript/app/base/views/extensions/_AddForm.js b/client-app/javascript/app/base/views/extensions/_AddForm.js similarity index 100% rename from public/javascript/app/base/views/extensions/_AddForm.js rename to client-app/javascript/app/base/views/extensions/_AddForm.js diff --git a/public/javascript/app/base/views/extensions/_AddFormItfc.js b/client-app/javascript/app/base/views/extensions/_AddFormItfc.js similarity index 100% rename from public/javascript/app/base/views/extensions/_AddFormItfc.js rename to client-app/javascript/app/base/views/extensions/_AddFormItfc.js diff --git a/public/javascript/app/base/views/extensions/_AddSelectInput.js b/client-app/javascript/app/base/views/extensions/_AddSelectInput.js similarity index 100% rename from public/javascript/app/base/views/extensions/_AddSelectInput.js rename to client-app/javascript/app/base/views/extensions/_AddSelectInput.js diff --git a/public/javascript/app/base/views/extensions/_AddSelectInputItfc.js b/client-app/javascript/app/base/views/extensions/_AddSelectInputItfc.js similarity index 100% rename from public/javascript/app/base/views/extensions/_AddSelectInputItfc.js rename to client-app/javascript/app/base/views/extensions/_AddSelectInputItfc.js diff --git a/public/javascript/app/base/views/extensions/_AddSelectionHandlerKeypad.js b/client-app/javascript/app/base/views/extensions/_AddSelectionHandlerKeypad.js similarity index 100% rename from public/javascript/app/base/views/extensions/_AddSelectionHandlerKeypad.js rename to client-app/javascript/app/base/views/extensions/_AddSelectionHandlerKeypad.js diff --git a/public/javascript/app/base/views/extensions/_AddTextSearchInput.js b/client-app/javascript/app/base/views/extensions/_AddTextSearchInput.js similarity index 100% rename from public/javascript/app/base/views/extensions/_AddTextSearchInput.js rename to client-app/javascript/app/base/views/extensions/_AddTextSearchInput.js diff --git a/public/javascript/app/base/views/extensions/_AddTextSearchInputItfc.js b/client-app/javascript/app/base/views/extensions/_AddTextSearchInputItfc.js similarity index 100% rename from public/javascript/app/base/views/extensions/_AddTextSearchInputItfc.js rename to client-app/javascript/app/base/views/extensions/_AddTextSearchInputItfc.js diff --git a/public/javascript/app/base/views/extensions/_CompositeInTooltipFromIconKeypad.js b/client-app/javascript/app/base/views/extensions/_CompositeInTooltipFromIconKeypad.js similarity index 100% rename from public/javascript/app/base/views/extensions/_CompositeInTooltipFromIconKeypad.js rename to client-app/javascript/app/base/views/extensions/_CompositeInTooltipFromIconKeypad.js diff --git a/public/javascript/app/base/views/extensions/_CompositeSearchInTooltip.js b/client-app/javascript/app/base/views/extensions/_CompositeSearchInTooltip.js similarity index 100% rename from public/javascript/app/base/views/extensions/_CompositeSearchInTooltip.js rename to client-app/javascript/app/base/views/extensions/_CompositeSearchInTooltip.js diff --git a/public/javascript/app/base/views/extensions/_Edition.js b/client-app/javascript/app/base/views/extensions/_Edition.js similarity index 100% rename from public/javascript/app/base/views/extensions/_Edition.js rename to client-app/javascript/app/base/views/extensions/_Edition.js diff --git a/public/javascript/app/base/views/extensions/_EditionCommons.js b/client-app/javascript/app/base/views/extensions/_EditionCommons.js similarity index 100% rename from public/javascript/app/base/views/extensions/_EditionCommons.js rename to client-app/javascript/app/base/views/extensions/_EditionCommons.js diff --git a/public/javascript/app/base/views/extensions/_EditionFormList.js b/client-app/javascript/app/base/views/extensions/_EditionFormList.js similarity index 100% rename from public/javascript/app/base/views/extensions/_EditionFormList.js rename to client-app/javascript/app/base/views/extensions/_EditionFormList.js diff --git a/public/javascript/app/base/views/extensions/_EditionLayerView.js b/client-app/javascript/app/base/views/extensions/_EditionLayerView.js similarity index 100% rename from public/javascript/app/base/views/extensions/_EditionLayerView.js rename to client-app/javascript/app/base/views/extensions/_EditionLayerView.js diff --git a/public/javascript/app/base/views/extensions/_EditionView.js b/client-app/javascript/app/base/views/extensions/_EditionView.js similarity index 100% rename from public/javascript/app/base/views/extensions/_EditionView.js rename to client-app/javascript/app/base/views/extensions/_EditionView.js diff --git a/public/javascript/app/base/views/extensions/_EditionWizardView.js b/client-app/javascript/app/base/views/extensions/_EditionWizardView.js similarity index 100% rename from public/javascript/app/base/views/extensions/_EditionWizardView.js rename to client-app/javascript/app/base/views/extensions/_EditionWizardView.js diff --git a/public/javascript/app/base/views/extensions/_FormInDialogView.js b/client-app/javascript/app/base/views/extensions/_FormInDialogView.js similarity index 100% rename from public/javascript/app/base/views/extensions/_FormInDialogView.js rename to client-app/javascript/app/base/views/extensions/_FormInDialogView.js diff --git a/public/javascript/app/base/views/extensions/_GetActivityData.js b/client-app/javascript/app/base/views/extensions/_GetActivityData.js similarity index 100% rename from public/javascript/app/base/views/extensions/_GetActivityData.js rename to client-app/javascript/app/base/views/extensions/_GetActivityData.js diff --git a/public/javascript/app/base/views/extensions/_GetActivityDataItfc.js b/client-app/javascript/app/base/views/extensions/_GetActivityDataItfc.js similarity index 100% rename from public/javascript/app/base/views/extensions/_GetActivityDataItfc.js rename to client-app/javascript/app/base/views/extensions/_GetActivityDataItfc.js diff --git a/public/javascript/app/base/views/extensions/_InterceptCloseUpView.js b/client-app/javascript/app/base/views/extensions/_InterceptCloseUpView.js similarity index 100% rename from public/javascript/app/base/views/extensions/_InterceptCloseUpView.js rename to client-app/javascript/app/base/views/extensions/_InterceptCloseUpView.js diff --git a/public/javascript/app/base/views/extensions/_ListenActivityDataAndAccessByActivityCategory.js b/client-app/javascript/app/base/views/extensions/_ListenActivityDataAndAccessByActivityCategory.js similarity index 100% rename from public/javascript/app/base/views/extensions/_ListenActivityDataAndAccessByActivityCategory.js rename to client-app/javascript/app/base/views/extensions/_ListenActivityDataAndAccessByActivityCategory.js diff --git a/public/javascript/app/base/views/extensions/_LocalSelectionView.js b/client-app/javascript/app/base/views/extensions/_LocalSelectionView.js similarity index 100% rename from public/javascript/app/base/views/extensions/_LocalSelectionView.js rename to client-app/javascript/app/base/views/extensions/_LocalSelectionView.js diff --git a/public/javascript/app/base/views/extensions/_LocalSelectionViewItfc.js b/client-app/javascript/app/base/views/extensions/_LocalSelectionViewItfc.js similarity index 100% rename from public/javascript/app/base/views/extensions/_LocalSelectionViewItfc.js rename to client-app/javascript/app/base/views/extensions/_LocalSelectionViewItfc.js diff --git a/public/javascript/app/base/views/extensions/_OnShownAndRefresh.js b/client-app/javascript/app/base/views/extensions/_OnShownAndRefresh.js similarity index 100% rename from public/javascript/app/base/views/extensions/_OnShownAndRefresh.js rename to client-app/javascript/app/base/views/extensions/_OnShownAndRefresh.js diff --git a/public/javascript/app/base/views/extensions/_ProcessInterval.js b/client-app/javascript/app/base/views/extensions/_ProcessInterval.js similarity index 100% rename from public/javascript/app/base/views/extensions/_ProcessInterval.js rename to client-app/javascript/app/base/views/extensions/_ProcessInterval.js diff --git a/public/javascript/app/base/views/extensions/_SelectInDoubleList.js b/client-app/javascript/app/base/views/extensions/_SelectInDoubleList.js similarity index 100% rename from public/javascript/app/base/views/extensions/_SelectInDoubleList.js rename to client-app/javascript/app/base/views/extensions/_SelectInDoubleList.js diff --git a/public/javascript/app/catalog/views/ActivitiesCatalogView.js b/client-app/javascript/app/catalog/views/ActivitiesCatalogView.js similarity index 100% rename from public/javascript/app/catalog/views/ActivitiesCatalogView.js rename to client-app/javascript/app/catalog/views/ActivitiesCatalogView.js diff --git a/public/javascript/app/catalog/views/OrganisationsCatalogView.js b/client-app/javascript/app/catalog/views/OrganisationsCatalogView.js similarity index 100% rename from public/javascript/app/catalog/views/OrganisationsCatalogView.js rename to client-app/javascript/app/catalog/views/OrganisationsCatalogView.js diff --git a/public/javascript/app/catalog/views/PlatformsCatalogView.js b/client-app/javascript/app/catalog/views/PlatformsCatalogView.js similarity index 100% rename from public/javascript/app/catalog/views/PlatformsCatalogView.js rename to client-app/javascript/app/catalog/views/PlatformsCatalogView.js diff --git a/public/javascript/app/catalog/views/ProgramsCatalogView.js b/client-app/javascript/app/catalog/views/ProgramsCatalogView.js similarity index 100% rename from public/javascript/app/catalog/views/ProgramsCatalogView.js rename to client-app/javascript/app/catalog/views/ProgramsCatalogView.js diff --git a/public/javascript/app/catalog/views/ProjectsCatalogView.js b/client-app/javascript/app/catalog/views/ProjectsCatalogView.js similarity index 100% rename from public/javascript/app/catalog/views/ProjectsCatalogView.js rename to client-app/javascript/app/catalog/views/ProjectsCatalogView.js diff --git a/public/javascript/app/catalog/views/SpeciesCatalogView.js b/client-app/javascript/app/catalog/views/SpeciesCatalogView.js similarity index 100% rename from public/javascript/app/catalog/views/SpeciesCatalogView.js rename to client-app/javascript/app/catalog/views/SpeciesCatalogView.js diff --git a/public/javascript/app/components/CookieLoader.js b/client-app/javascript/app/components/CookieLoader.js similarity index 100% rename from public/javascript/app/components/CookieLoader.js rename to client-app/javascript/app/components/CookieLoader.js diff --git a/public/javascript/app/components/ReCaptcha.js b/client-app/javascript/app/components/ReCaptcha.js similarity index 100% rename from public/javascript/app/components/ReCaptcha.js rename to client-app/javascript/app/components/ReCaptcha.js diff --git a/public/javascript/app/components/steps/AccessSetStep.js b/client-app/javascript/app/components/steps/AccessSetStep.js similarity index 100% rename from public/javascript/app/components/steps/AccessSetStep.js rename to client-app/javascript/app/components/steps/AccessSetStep.js diff --git a/public/javascript/app/components/steps/ActivitySetStep.js b/client-app/javascript/app/components/steps/ActivitySetStep.js similarity index 100% rename from public/javascript/app/components/steps/ActivitySetStep.js rename to client-app/javascript/app/components/steps/ActivitySetStep.js diff --git a/public/javascript/app/components/steps/AddGeomSiteStep.js b/client-app/javascript/app/components/steps/AddGeomSiteStep.js similarity index 100% rename from public/javascript/app/components/steps/AddGeomSiteStep.js rename to client-app/javascript/app/components/steps/AddGeomSiteStep.js diff --git a/public/javascript/app/components/steps/AreaClassificationsSetStep.js b/client-app/javascript/app/components/steps/AreaClassificationsSetStep.js similarity index 100% rename from public/javascript/app/components/steps/AreaClassificationsSetStep.js rename to client-app/javascript/app/components/steps/AreaClassificationsSetStep.js diff --git a/public/javascript/app/components/steps/CalibrationSetStep.js b/client-app/javascript/app/components/steps/CalibrationSetStep.js similarity index 100% rename from public/javascript/app/components/steps/CalibrationSetStep.js rename to client-app/javascript/app/components/steps/CalibrationSetStep.js diff --git a/public/javascript/app/components/steps/CitationStep.js b/client-app/javascript/app/components/steps/CitationStep.js similarity index 100% rename from public/javascript/app/components/steps/CitationStep.js rename to client-app/javascript/app/components/steps/CitationStep.js diff --git a/public/javascript/app/components/steps/ClassificationsStep.js b/client-app/javascript/app/components/steps/ClassificationsStep.js similarity index 100% rename from public/javascript/app/components/steps/ClassificationsStep.js rename to client-app/javascript/app/components/steps/ClassificationsStep.js diff --git a/public/javascript/app/components/steps/ContactSetStep.js b/client-app/javascript/app/components/steps/ContactSetStep.js similarity index 100% rename from public/javascript/app/components/steps/ContactSetStep.js rename to client-app/javascript/app/components/steps/ContactSetStep.js diff --git a/public/javascript/app/components/steps/DataDefinitionSetStep.js b/client-app/javascript/app/components/steps/DataDefinitionSetStep.js similarity index 100% rename from public/javascript/app/components/steps/DataDefinitionSetStep.js rename to client-app/javascript/app/components/steps/DataDefinitionSetStep.js diff --git a/public/javascript/app/components/steps/DescribeSiteStep.js b/client-app/javascript/app/components/steps/DescribeSiteStep.js similarity index 100% rename from public/javascript/app/components/steps/DescribeSiteStep.js rename to client-app/javascript/app/components/steps/DescribeSiteStep.js diff --git a/public/javascript/app/components/steps/DocumentSetStep.js b/client-app/javascript/app/components/steps/DocumentSetStep.js similarity index 100% rename from public/javascript/app/components/steps/DocumentSetStep.js rename to client-app/javascript/app/components/steps/DocumentSetStep.js diff --git a/public/javascript/app/components/steps/DocumentStepFiltered.js b/client-app/javascript/app/components/steps/DocumentStepFiltered.js similarity index 100% rename from public/javascript/app/components/steps/DocumentStepFiltered.js rename to client-app/javascript/app/components/steps/DocumentStepFiltered.js diff --git a/public/javascript/app/components/steps/DownloadsSetStep.js b/client-app/javascript/app/components/steps/DownloadsSetStep.js similarity index 100% rename from public/javascript/app/components/steps/DownloadsSetStep.js rename to client-app/javascript/app/components/steps/DownloadsSetStep.js diff --git a/public/javascript/app/components/steps/EmbeddedContentSetStep.js b/client-app/javascript/app/components/steps/EmbeddedContentSetStep.js similarity index 100% rename from public/javascript/app/components/steps/EmbeddedContentSetStep.js rename to client-app/javascript/app/components/steps/EmbeddedContentSetStep.js diff --git a/public/javascript/app/components/steps/MainDataStep.js b/client-app/javascript/app/components/steps/MainDataStep.js similarity index 100% rename from public/javascript/app/components/steps/MainDataStep.js rename to client-app/javascript/app/components/steps/MainDataStep.js diff --git a/public/javascript/app/components/steps/MapSelectAreaStep.js b/client-app/javascript/app/components/steps/MapSelectAreaStep.js similarity index 100% rename from public/javascript/app/components/steps/MapSelectAreaStep.js rename to client-app/javascript/app/components/steps/MapSelectAreaStep.js diff --git a/public/javascript/app/components/steps/OrganisationSetStep.js b/client-app/javascript/app/components/steps/OrganisationSetStep.js similarity index 100% rename from public/javascript/app/components/steps/OrganisationSetStep.js rename to client-app/javascript/app/components/steps/OrganisationSetStep.js diff --git a/public/javascript/app/components/steps/PlatformSetStep.js b/client-app/javascript/app/components/steps/PlatformSetStep.js similarity index 100% rename from public/javascript/app/components/steps/PlatformSetStep.js rename to client-app/javascript/app/components/steps/PlatformSetStep.js diff --git a/public/javascript/app/components/steps/PreLoadMainDataStep.js b/client-app/javascript/app/components/steps/PreLoadMainDataStep.js similarity index 100% rename from public/javascript/app/components/steps/PreLoadMainDataStep.js rename to client-app/javascript/app/components/steps/PreLoadMainDataStep.js diff --git a/public/javascript/app/components/steps/ProtocolsSetStep.js b/client-app/javascript/app/components/steps/ProtocolsSetStep.js similarity index 100% rename from public/javascript/app/components/steps/ProtocolsSetStep.js rename to client-app/javascript/app/components/steps/ProtocolsSetStep.js diff --git a/public/javascript/app/components/steps/RecoverySetStep.js b/client-app/javascript/app/components/steps/RecoverySetStep.js similarity index 100% rename from public/javascript/app/components/steps/RecoverySetStep.js rename to client-app/javascript/app/components/steps/RecoverySetStep.js diff --git a/public/javascript/app/components/steps/RelationDataSetStep.js b/client-app/javascript/app/components/steps/RelationDataSetStep.js similarity index 100% rename from public/javascript/app/components/steps/RelationDataSetStep.js rename to client-app/javascript/app/components/steps/RelationDataSetStep.js diff --git a/public/javascript/app/components/steps/ResourceSetStep.js b/client-app/javascript/app/components/steps/ResourceSetStep.js similarity index 100% rename from public/javascript/app/components/steps/ResourceSetStep.js rename to client-app/javascript/app/components/steps/ResourceSetStep.js diff --git a/public/javascript/app/components/steps/SelectActivityCategoryStep.js b/client-app/javascript/app/components/steps/SelectActivityCategoryStep.js similarity index 100% rename from public/javascript/app/components/steps/SelectActivityCategoryStep.js rename to client-app/javascript/app/components/steps/SelectActivityCategoryStep.js diff --git a/public/javascript/app/components/steps/SelectLayerStep.js b/client-app/javascript/app/components/steps/SelectLayerStep.js similarity index 100% rename from public/javascript/app/components/steps/SelectLayerStep.js rename to client-app/javascript/app/components/steps/SelectLayerStep.js diff --git a/public/javascript/app/components/steps/SelectRegisterTypeStep.js b/client-app/javascript/app/components/steps/SelectRegisterTypeStep.js similarity index 100% rename from public/javascript/app/components/steps/SelectRegisterTypeStep.js rename to client-app/javascript/app/components/steps/SelectRegisterTypeStep.js diff --git a/public/javascript/app/components/steps/SpeciesMainDataStep.js b/client-app/javascript/app/components/steps/SpeciesMainDataStep.js similarity index 100% rename from public/javascript/app/components/steps/SpeciesMainDataStep.js rename to client-app/javascript/app/components/steps/SpeciesMainDataStep.js diff --git a/public/javascript/app/components/steps/SpecimenTagSetStep.js b/client-app/javascript/app/components/steps/SpecimenTagSetStep.js similarity index 100% rename from public/javascript/app/components/steps/SpecimenTagSetStep.js rename to client-app/javascript/app/components/steps/SpecimenTagSetStep.js diff --git a/public/javascript/app/components/steps/UnitSetStep.js b/client-app/javascript/app/components/steps/UnitSetStep.js similarity index 100% rename from public/javascript/app/components/steps/UnitSetStep.js rename to client-app/javascript/app/components/steps/UnitSetStep.js diff --git a/public/javascript/app/components/steps/_ClassificationsRelationData.js b/client-app/javascript/app/components/steps/_ClassificationsRelationData.js similarity index 100% rename from public/javascript/app/components/steps/_ClassificationsRelationData.js rename to client-app/javascript/app/components/steps/_ClassificationsRelationData.js diff --git a/public/javascript/app/components/steps/_DataListAndSaveRelationData.js b/client-app/javascript/app/components/steps/_DataListAndSaveRelationData.js similarity index 100% rename from public/javascript/app/components/steps/_DataListAndSaveRelationData.js rename to client-app/javascript/app/components/steps/_DataListAndSaveRelationData.js diff --git a/public/javascript/app/components/steps/_DateRelationData.js b/client-app/javascript/app/components/steps/_DateRelationData.js similarity index 100% rename from public/javascript/app/components/steps/_DateRelationData.js rename to client-app/javascript/app/components/steps/_DateRelationData.js diff --git a/public/javascript/app/components/steps/_MainData.js b/client-app/javascript/app/components/steps/_MainData.js similarity index 100% rename from public/javascript/app/components/steps/_MainData.js rename to client-app/javascript/app/components/steps/_MainData.js diff --git a/public/javascript/app/components/steps/_ParametersRelationData.js b/client-app/javascript/app/components/steps/_ParametersRelationData.js similarity index 100% rename from public/javascript/app/components/steps/_ParametersRelationData.js rename to client-app/javascript/app/components/steps/_ParametersRelationData.js diff --git a/public/javascript/app/components/steps/_RememberDeleteItems.js b/client-app/javascript/app/components/steps/_RememberDeleteItems.js similarity index 100% rename from public/javascript/app/components/steps/_RememberDeleteItems.js rename to client-app/javascript/app/components/steps/_RememberDeleteItems.js diff --git a/public/javascript/app/components/steps/_SelectOptionBox.js b/client-app/javascript/app/components/steps/_SelectOptionBox.js similarity index 100% rename from public/javascript/app/components/steps/_SelectOptionBox.js rename to client-app/javascript/app/components/steps/_SelectOptionBox.js diff --git a/public/javascript/app/components/viewCustomization/addGeomSite/views/Line.js b/client-app/javascript/app/components/viewCustomization/addGeomSite/views/Line.js similarity index 100% rename from public/javascript/app/components/viewCustomization/addGeomSite/views/Line.js rename to client-app/javascript/app/components/viewCustomization/addGeomSite/views/Line.js diff --git a/public/javascript/app/components/viewCustomization/addGeomSite/views/MultiPolygon.js b/client-app/javascript/app/components/viewCustomization/addGeomSite/views/MultiPolygon.js similarity index 100% rename from public/javascript/app/components/viewCustomization/addGeomSite/views/MultiPolygon.js rename to client-app/javascript/app/components/viewCustomization/addGeomSite/views/MultiPolygon.js diff --git a/public/javascript/app/components/viewCustomization/addGeomSite/views/Point.js b/client-app/javascript/app/components/viewCustomization/addGeomSite/views/Point.js similarity index 100% rename from public/javascript/app/components/viewCustomization/addGeomSite/views/Point.js rename to client-app/javascript/app/components/viewCustomization/addGeomSite/views/Point.js diff --git a/public/javascript/app/components/viewCustomization/addGeomSite/views/_BaseGeometryForm.js b/client-app/javascript/app/components/viewCustomization/addGeomSite/views/_BaseGeometryForm.js similarity index 100% rename from public/javascript/app/components/viewCustomization/addGeomSite/views/_BaseGeometryForm.js rename to client-app/javascript/app/components/viewCustomization/addGeomSite/views/_BaseGeometryForm.js diff --git a/public/javascript/app/components/viewCustomization/addGeomSite/views/templates/LineForm.html b/client-app/javascript/app/components/viewCustomization/addGeomSite/views/templates/LineForm.html similarity index 100% rename from public/javascript/app/components/viewCustomization/addGeomSite/views/templates/LineForm.html rename to client-app/javascript/app/components/viewCustomization/addGeomSite/views/templates/LineForm.html diff --git a/public/javascript/app/components/viewCustomization/addGeomSite/views/templates/PointForm.html b/client-app/javascript/app/components/viewCustomization/addGeomSite/views/templates/PointForm.html similarity index 100% rename from public/javascript/app/components/viewCustomization/addGeomSite/views/templates/PointForm.html rename to client-app/javascript/app/components/viewCustomization/addGeomSite/views/templates/PointForm.html diff --git a/public/javascript/app/components/viewCustomization/describeSite/views/SelectStationByActivity.js b/client-app/javascript/app/components/viewCustomization/describeSite/views/SelectStationByActivity.js similarity index 100% rename from public/javascript/app/components/viewCustomization/describeSite/views/SelectStationByActivity.js rename to client-app/javascript/app/components/viewCustomization/describeSite/views/SelectStationByActivity.js diff --git a/public/javascript/app/components/viewCustomization/describeSite/views/_AdditionalKeyGetter.js b/client-app/javascript/app/components/viewCustomization/describeSite/views/_AdditionalKeyGetter.js similarity index 100% rename from public/javascript/app/components/viewCustomization/describeSite/views/_AdditionalKeyGetter.js rename to client-app/javascript/app/components/viewCustomization/describeSite/views/_AdditionalKeyGetter.js diff --git a/public/javascript/app/components/viewCustomization/describeSite/views/templates/ARForm.html b/client-app/javascript/app/components/viewCustomization/describeSite/views/templates/ARForm.html similarity index 100% rename from public/javascript/app/components/viewCustomization/describeSite/views/templates/ARForm.html rename to client-app/javascript/app/components/viewCustomization/describeSite/views/templates/ARForm.html diff --git a/public/javascript/app/components/viewCustomization/describeSite/views/templates/DescribeSiteForm.html b/client-app/javascript/app/components/viewCustomization/describeSite/views/templates/DescribeSiteForm.html similarity index 100% rename from public/javascript/app/components/viewCustomization/describeSite/views/templates/DescribeSiteForm.html rename to client-app/javascript/app/components/viewCustomization/describeSite/views/templates/DescribeSiteForm.html diff --git a/public/javascript/app/components/viewCustomization/describeSite/views/templates/IFForm.html b/client-app/javascript/app/components/viewCustomization/describeSite/views/templates/IFForm.html similarity index 100% rename from public/javascript/app/components/viewCustomization/describeSite/views/templates/IFForm.html rename to client-app/javascript/app/components/viewCustomization/describeSite/views/templates/IFForm.html diff --git a/public/javascript/app/components/viewCustomization/loadFile/models/LoadFileModel.js b/client-app/javascript/app/components/viewCustomization/loadFile/models/LoadFileModel.js similarity index 100% rename from public/javascript/app/components/viewCustomization/loadFile/models/LoadFileModel.js rename to client-app/javascript/app/components/viewCustomization/loadFile/models/LoadFileModel.js diff --git a/public/javascript/app/components/viewCustomization/loadFile/views/templates/ARFileForm.html b/client-app/javascript/app/components/viewCustomization/loadFile/views/templates/ARFileForm.html similarity index 100% rename from public/javascript/app/components/viewCustomization/loadFile/views/templates/ARFileForm.html rename to client-app/javascript/app/components/viewCustomization/loadFile/views/templates/ARFileForm.html diff --git a/public/javascript/app/components/viewCustomization/loadFile/views/templates/LoadFileForm.html b/client-app/javascript/app/components/viewCustomization/loadFile/views/templates/LoadFileForm.html similarity index 100% rename from public/javascript/app/components/viewCustomization/loadFile/views/templates/LoadFileForm.html rename to client-app/javascript/app/components/viewCustomization/loadFile/views/templates/LoadFileForm.html diff --git a/public/javascript/app/components/viewCustomization/parameter/views/templates/FTForm.html b/client-app/javascript/app/components/viewCustomization/parameter/views/templates/FTForm.html similarity index 100% rename from public/javascript/app/components/viewCustomization/parameter/views/templates/FTForm.html rename to client-app/javascript/app/components/viewCustomization/parameter/views/templates/FTForm.html diff --git a/public/javascript/app/components/viewCustomization/parameter/views/templates/OCForm.html b/client-app/javascript/app/components/viewCustomization/parameter/views/templates/OCForm.html similarity index 100% rename from public/javascript/app/components/viewCustomization/parameter/views/templates/OCForm.html rename to client-app/javascript/app/components/viewCustomization/parameter/views/templates/OCForm.html diff --git a/public/javascript/app/components/viewCustomization/relationData/views/templates/AreaTypeForm.html b/client-app/javascript/app/components/viewCustomization/relationData/views/templates/AreaTypeForm.html similarity index 100% rename from public/javascript/app/components/viewCustomization/relationData/views/templates/AreaTypeForm.html rename to client-app/javascript/app/components/viewCustomization/relationData/views/templates/AreaTypeForm.html diff --git a/public/javascript/app/components/viewCustomization/relationData/views/templates/DateForm.html b/client-app/javascript/app/components/viewCustomization/relationData/views/templates/DateForm.html similarity index 100% rename from public/javascript/app/components/viewCustomization/relationData/views/templates/DateForm.html rename to client-app/javascript/app/components/viewCustomization/relationData/views/templates/DateForm.html diff --git a/public/javascript/app/components/viewCustomization/relationData/views/templates/DefaultForm.html b/client-app/javascript/app/components/viewCustomization/relationData/views/templates/DefaultForm.html similarity index 100% rename from public/javascript/app/components/viewCustomization/relationData/views/templates/DefaultForm.html rename to client-app/javascript/app/components/viewCustomization/relationData/views/templates/DefaultForm.html diff --git a/public/javascript/app/components/viewCustomization/relationData/views/templates/DeviceForm.html b/client-app/javascript/app/components/viewCustomization/relationData/views/templates/DeviceForm.html similarity index 100% rename from public/javascript/app/components/viewCustomization/relationData/views/templates/DeviceForm.html rename to client-app/javascript/app/components/viewCustomization/relationData/views/templates/DeviceForm.html diff --git a/public/javascript/app/components/viewCustomization/relationData/views/templates/PointGeometryForm.html b/client-app/javascript/app/components/viewCustomization/relationData/views/templates/PointGeometryForm.html similarity index 100% rename from public/javascript/app/components/viewCustomization/relationData/views/templates/PointGeometryForm.html rename to client-app/javascript/app/components/viewCustomization/relationData/views/templates/PointGeometryForm.html diff --git a/public/javascript/app/dataLoader/areas/views/AreaView.js b/client-app/javascript/app/dataLoader/areas/views/AreaView.js similarity index 100% rename from public/javascript/app/dataLoader/areas/views/AreaView.js rename to client-app/javascript/app/dataLoader/areas/views/AreaView.js diff --git a/public/javascript/app/dataLoader/areas/views/templates/AreaClassificationsForm.html b/client-app/javascript/app/dataLoader/areas/views/templates/AreaClassificationsForm.html similarity index 100% rename from public/javascript/app/dataLoader/areas/views/templates/AreaClassificationsForm.html rename to client-app/javascript/app/dataLoader/areas/views/templates/AreaClassificationsForm.html diff --git a/public/javascript/app/dataLoader/base/_GeographicBase.js b/client-app/javascript/app/dataLoader/base/_GeographicBase.js similarity index 100% rename from public/javascript/app/dataLoader/base/_GeographicBase.js rename to client-app/javascript/app/dataLoader/base/_GeographicBase.js diff --git a/public/javascript/app/dataLoader/citation/views/CitationView.js b/client-app/javascript/app/dataLoader/citation/views/CitationView.js similarity index 100% rename from public/javascript/app/dataLoader/citation/views/CitationView.js rename to client-app/javascript/app/dataLoader/citation/views/CitationView.js diff --git a/public/javascript/app/dataLoader/citation/views/templates/CitationForm.html b/client-app/javascript/app/dataLoader/citation/views/templates/CitationForm.html similarity index 100% rename from public/javascript/app/dataLoader/citation/views/templates/CitationForm.html rename to client-app/javascript/app/dataLoader/citation/views/templates/CitationForm.html diff --git a/public/javascript/app/dataLoader/infrastructure/views/InfrastructureAttributesView.js b/client-app/javascript/app/dataLoader/infrastructure/views/InfrastructureAttributesView.js similarity index 100% rename from public/javascript/app/dataLoader/infrastructure/views/InfrastructureAttributesView.js rename to client-app/javascript/app/dataLoader/infrastructure/views/InfrastructureAttributesView.js diff --git a/public/javascript/app/dataLoader/infrastructure/views/InfrastructureView.js b/client-app/javascript/app/dataLoader/infrastructure/views/InfrastructureView.js similarity index 100% rename from public/javascript/app/dataLoader/infrastructure/views/InfrastructureView.js rename to client-app/javascript/app/dataLoader/infrastructure/views/InfrastructureView.js diff --git a/public/javascript/app/dataLoader/infrastructure/views/templates/form/AttributesForm.html b/client-app/javascript/app/dataLoader/infrastructure/views/templates/form/AttributesForm.html similarity index 100% rename from public/javascript/app/dataLoader/infrastructure/views/templates/form/AttributesForm.html rename to client-app/javascript/app/dataLoader/infrastructure/views/templates/form/AttributesForm.html diff --git a/public/javascript/app/dataLoader/sightings/models/SightingsModel.js b/client-app/javascript/app/dataLoader/sightings/models/SightingsModel.js similarity index 100% rename from public/javascript/app/dataLoader/sightings/models/SightingsModel.js rename to client-app/javascript/app/dataLoader/sightings/models/SightingsModel.js diff --git a/public/javascript/app/dataLoader/sightings/views/SightingsView.js b/client-app/javascript/app/dataLoader/sightings/views/SightingsView.js similarity index 100% rename from public/javascript/app/dataLoader/sightings/views/SightingsView.js rename to client-app/javascript/app/dataLoader/sightings/views/SightingsView.js diff --git a/public/javascript/app/dataLoader/sightings/views/templates/SightingsForm.html b/client-app/javascript/app/dataLoader/sightings/views/templates/SightingsForm.html similarity index 100% rename from public/javascript/app/dataLoader/sightings/views/templates/SightingsForm.html rename to client-app/javascript/app/dataLoader/sightings/views/templates/SightingsForm.html diff --git a/public/javascript/app/dataLoader/surveyParameters/views/ObjectCollectingSeriesDataView.js b/client-app/javascript/app/dataLoader/surveyParameters/views/ObjectCollectingSeriesDataView.js similarity index 100% rename from public/javascript/app/dataLoader/surveyParameters/views/ObjectCollectingSeriesDataView.js rename to client-app/javascript/app/dataLoader/surveyParameters/views/ObjectCollectingSeriesDataView.js diff --git a/public/javascript/app/dataLoader/surveyParameters/views/ObjectCollectionView.js b/client-app/javascript/app/dataLoader/surveyParameters/views/ObjectCollectionView.js similarity index 100% rename from public/javascript/app/dataLoader/surveyParameters/views/ObjectCollectionView.js rename to client-app/javascript/app/dataLoader/surveyParameters/views/ObjectCollectionView.js diff --git a/public/javascript/app/dataLoader/surveyParameters/views/SurveyStationSeriesDataView.js b/client-app/javascript/app/dataLoader/surveyParameters/views/SurveyStationSeriesDataView.js similarity index 100% rename from public/javascript/app/dataLoader/surveyParameters/views/SurveyStationSeriesDataView.js rename to client-app/javascript/app/dataLoader/surveyParameters/views/SurveyStationSeriesDataView.js diff --git a/public/javascript/app/dataLoader/surveyParameters/views/SurveyStationView.js b/client-app/javascript/app/dataLoader/surveyParameters/views/SurveyStationView.js similarity index 100% rename from public/javascript/app/dataLoader/surveyParameters/views/SurveyStationView.js rename to client-app/javascript/app/dataLoader/surveyParameters/views/SurveyStationView.js diff --git a/public/javascript/app/dataLoader/surveyParameters/views/_DataLoadedByStationManagement.js b/client-app/javascript/app/dataLoader/surveyParameters/views/_DataLoadedByStationManagement.js similarity index 100% rename from public/javascript/app/dataLoader/surveyParameters/views/_DataLoadedByStationManagement.js rename to client-app/javascript/app/dataLoader/surveyParameters/views/_DataLoadedByStationManagement.js diff --git a/public/javascript/app/dataLoader/surveyParameters/views/_SeriesDataView.js b/client-app/javascript/app/dataLoader/surveyParameters/views/_SeriesDataView.js similarity index 100% rename from public/javascript/app/dataLoader/surveyParameters/views/_SeriesDataView.js rename to client-app/javascript/app/dataLoader/surveyParameters/views/_SeriesDataView.js diff --git a/public/javascript/app/dataLoader/surveyParameters/views/templates/ObjectCollectingForm.html b/client-app/javascript/app/dataLoader/surveyParameters/views/templates/ObjectCollectingForm.html similarity index 100% rename from public/javascript/app/dataLoader/surveyParameters/views/templates/ObjectCollectingForm.html rename to client-app/javascript/app/dataLoader/surveyParameters/views/templates/ObjectCollectingForm.html diff --git a/public/javascript/app/dataLoader/surveyParameters/views/templates/TimeSeriesForm.html b/client-app/javascript/app/dataLoader/surveyParameters/views/templates/TimeSeriesForm.html similarity index 100% rename from public/javascript/app/dataLoader/surveyParameters/views/templates/TimeSeriesForm.html rename to client-app/javascript/app/dataLoader/surveyParameters/views/templates/TimeSeriesForm.html diff --git a/public/javascript/app/dataLoader/tracking/views/TrackingDataView.js b/client-app/javascript/app/dataLoader/tracking/views/TrackingDataView.js similarity index 100% rename from public/javascript/app/dataLoader/tracking/views/TrackingDataView.js rename to client-app/javascript/app/dataLoader/tracking/views/TrackingDataView.js diff --git a/public/javascript/app/dataLoader/tracking/views/TrackingView.js b/client-app/javascript/app/dataLoader/tracking/views/TrackingView.js similarity index 100% rename from public/javascript/app/dataLoader/tracking/views/TrackingView.js rename to client-app/javascript/app/dataLoader/tracking/views/TrackingView.js diff --git a/public/javascript/app/dataLoader/tracking/views/templates/form/TrackingPointForm.html b/client-app/javascript/app/dataLoader/tracking/views/templates/form/TrackingPointForm.html similarity index 100% rename from public/javascript/app/dataLoader/tracking/views/templates/form/TrackingPointForm.html rename to client-app/javascript/app/dataLoader/tracking/views/templates/form/TrackingPointForm.html diff --git a/public/javascript/app/designs/base/_Browser.js b/client-app/javascript/app/designs/base/_Browser.js similarity index 100% rename from public/javascript/app/designs/base/_Browser.js rename to client-app/javascript/app/designs/base/_Browser.js diff --git a/public/javascript/app/designs/base/_Controller.js b/client-app/javascript/app/designs/base/_Controller.js similarity index 100% rename from public/javascript/app/designs/base/_Controller.js rename to client-app/javascript/app/designs/base/_Controller.js diff --git a/public/javascript/app/designs/base/_ControllerItfc.js b/client-app/javascript/app/designs/base/_ControllerItfc.js similarity index 100% rename from public/javascript/app/designs/base/_ControllerItfc.js rename to client-app/javascript/app/designs/base/_ControllerItfc.js diff --git a/public/javascript/app/designs/base/_Layout.js b/client-app/javascript/app/designs/base/_Layout.js similarity index 100% rename from public/javascript/app/designs/base/_Layout.js rename to client-app/javascript/app/designs/base/_Layout.js diff --git a/public/javascript/app/designs/base/_LayoutItfc.js b/client-app/javascript/app/designs/base/_LayoutItfc.js similarity index 100% rename from public/javascript/app/designs/base/_LayoutItfc.js rename to client-app/javascript/app/designs/base/_LayoutItfc.js diff --git a/public/javascript/app/designs/base/_Main.js b/client-app/javascript/app/designs/base/_Main.js similarity index 100% rename from public/javascript/app/designs/base/_Main.js rename to client-app/javascript/app/designs/base/_Main.js diff --git a/public/javascript/app/designs/base/_MainItfc.js b/client-app/javascript/app/designs/base/_MainItfc.js similarity index 100% rename from public/javascript/app/designs/base/_MainItfc.js rename to client-app/javascript/app/designs/base/_MainItfc.js diff --git a/public/javascript/app/designs/base/_ServiceOGC.js b/client-app/javascript/app/designs/base/_ServiceOGC.js similarity index 100% rename from public/javascript/app/designs/base/_ServiceOGC.js rename to client-app/javascript/app/designs/base/_ServiceOGC.js diff --git a/public/javascript/app/designs/chart/Controller.js b/client-app/javascript/app/designs/chart/Controller.js similarity index 100% rename from public/javascript/app/designs/chart/Controller.js rename to client-app/javascript/app/designs/chart/Controller.js diff --git a/public/javascript/app/designs/chart/layout/SideAndTopAndBottomContent.js b/client-app/javascript/app/designs/chart/layout/SideAndTopAndBottomContent.js similarity index 100% rename from public/javascript/app/designs/chart/layout/SideAndTopAndBottomContent.js rename to client-app/javascript/app/designs/chart/layout/SideAndTopAndBottomContent.js diff --git a/public/javascript/app/designs/chart/layout/TopAndBottomContent.js b/client-app/javascript/app/designs/chart/layout/TopAndBottomContent.js similarity index 100% rename from public/javascript/app/designs/chart/layout/TopAndBottomContent.js rename to client-app/javascript/app/designs/chart/layout/TopAndBottomContent.js diff --git a/public/javascript/app/designs/chart/layout/TopContent.js b/client-app/javascript/app/designs/chart/layout/TopContent.js similarity index 100% rename from public/javascript/app/designs/chart/layout/TopContent.js rename to client-app/javascript/app/designs/chart/layout/TopContent.js diff --git a/public/javascript/app/designs/chart/main/ChartsWithLegendAndToolbarsAndSlider.js b/client-app/javascript/app/designs/chart/main/ChartsWithLegendAndToolbarsAndSlider.js similarity index 100% rename from public/javascript/app/designs/chart/main/ChartsWithLegendAndToolbarsAndSlider.js rename to client-app/javascript/app/designs/chart/main/ChartsWithLegendAndToolbarsAndSlider.js diff --git a/public/javascript/app/designs/chart/main/ChartsWithToolbarsAndSlider.js b/client-app/javascript/app/designs/chart/main/ChartsWithToolbarsAndSlider.js similarity index 100% rename from public/javascript/app/designs/chart/main/ChartsWithToolbarsAndSlider.js rename to client-app/javascript/app/designs/chart/main/ChartsWithToolbarsAndSlider.js diff --git a/public/javascript/app/designs/chart/main/MultiPieChartWithToolbar.js b/client-app/javascript/app/designs/chart/main/MultiPieChartWithToolbar.js similarity index 100% rename from public/javascript/app/designs/chart/main/MultiPieChartWithToolbar.js rename to client-app/javascript/app/designs/chart/main/MultiPieChartWithToolbar.js diff --git a/public/javascript/app/designs/chart/main/MultiWindRoseChartWithToolbar.js b/client-app/javascript/app/designs/chart/main/MultiWindRoseChartWithToolbar.js similarity index 100% rename from public/javascript/app/designs/chart/main/MultiWindRoseChartWithToolbar.js rename to client-app/javascript/app/designs/chart/main/MultiWindRoseChartWithToolbar.js diff --git a/public/javascript/app/designs/chart/main/WindRoseChartWithToolbar.js b/client-app/javascript/app/designs/chart/main/WindRoseChartWithToolbar.js similarity index 100% rename from public/javascript/app/designs/chart/main/WindRoseChartWithToolbar.js rename to client-app/javascript/app/designs/chart/main/WindRoseChartWithToolbar.js diff --git a/public/javascript/app/designs/chart/main/_ChartsWithToolbarsAndSlider.js b/client-app/javascript/app/designs/chart/main/_ChartsWithToolbarsAndSlider.js similarity index 100% rename from public/javascript/app/designs/chart/main/_ChartsWithToolbarsAndSlider.js rename to client-app/javascript/app/designs/chart/main/_ChartsWithToolbarsAndSlider.js diff --git a/public/javascript/app/designs/chart/main/_ChartsWithToolbarsAndSliderItfc.js b/client-app/javascript/app/designs/chart/main/_ChartsWithToolbarsAndSliderItfc.js similarity index 100% rename from public/javascript/app/designs/chart/main/_ChartsWithToolbarsAndSliderItfc.js rename to client-app/javascript/app/designs/chart/main/_ChartsWithToolbarsAndSliderItfc.js diff --git a/public/javascript/app/designs/chart/main/_ProcessDataDefinitionAndGetTimeSeries.js b/client-app/javascript/app/designs/chart/main/_ProcessDataDefinitionAndGetTimeSeries.js similarity index 100% rename from public/javascript/app/designs/chart/main/_ProcessDataDefinitionAndGetTimeSeries.js rename to client-app/javascript/app/designs/chart/main/_ProcessDataDefinitionAndGetTimeSeries.js diff --git a/public/javascript/app/designs/details/Controller.js b/client-app/javascript/app/designs/details/Controller.js similarity index 100% rename from public/javascript/app/designs/details/Controller.js rename to client-app/javascript/app/designs/details/Controller.js diff --git a/public/javascript/app/designs/details/Layout.js b/client-app/javascript/app/designs/details/Layout.js similarity index 100% rename from public/javascript/app/designs/details/Layout.js rename to client-app/javascript/app/designs/details/Layout.js diff --git a/public/javascript/app/designs/details/_AddBasicTitle.js b/client-app/javascript/app/designs/details/_AddBasicTitle.js similarity index 100% rename from public/javascript/app/designs/details/_AddBasicTitle.js rename to client-app/javascript/app/designs/details/_AddBasicTitle.js diff --git a/public/javascript/app/designs/details/_AddTitle.js b/client-app/javascript/app/designs/details/_AddTitle.js similarity index 100% rename from public/javascript/app/designs/details/_AddTitle.js rename to client-app/javascript/app/designs/details/_AddTitle.js diff --git a/public/javascript/app/designs/details/_ControllerItfc.js b/client-app/javascript/app/designs/details/_ControllerItfc.js similarity index 100% rename from public/javascript/app/designs/details/_ControllerItfc.js rename to client-app/javascript/app/designs/details/_ControllerItfc.js diff --git a/public/javascript/app/designs/details/main/ActivityLayerMap.js b/client-app/javascript/app/designs/details/main/ActivityLayerMap.js similarity index 100% rename from public/javascript/app/designs/details/main/ActivityLayerMap.js rename to client-app/javascript/app/designs/details/main/ActivityLayerMap.js diff --git a/public/javascript/app/designs/details/main/ActivityMap.js b/client-app/javascript/app/designs/details/main/ActivityMap.js similarity index 100% rename from public/javascript/app/designs/details/main/ActivityMap.js rename to client-app/javascript/app/designs/details/main/ActivityMap.js diff --git a/public/javascript/app/designs/details/main/ActivityTrackingMap.js b/client-app/javascript/app/designs/details/main/ActivityTrackingMap.js similarity index 100% rename from public/javascript/app/designs/details/main/ActivityTrackingMap.js rename to client-app/javascript/app/designs/details/main/ActivityTrackingMap.js diff --git a/public/javascript/app/designs/details/main/Contact.js b/client-app/javascript/app/designs/details/main/Contact.js similarity index 100% rename from public/javascript/app/designs/details/main/Contact.js rename to client-app/javascript/app/designs/details/main/Contact.js diff --git a/public/javascript/app/designs/details/main/Document.js b/client-app/javascript/app/designs/details/main/Document.js similarity index 100% rename from public/javascript/app/designs/details/main/Document.js rename to client-app/javascript/app/designs/details/main/Document.js diff --git a/public/javascript/app/designs/details/main/DocumentPDF.js b/client-app/javascript/app/designs/details/main/DocumentPDF.js similarity index 100% rename from public/javascript/app/designs/details/main/DocumentPDF.js rename to client-app/javascript/app/designs/details/main/DocumentPDF.js diff --git a/public/javascript/app/designs/details/main/Organisation.js b/client-app/javascript/app/designs/details/main/Organisation.js similarity index 100% rename from public/javascript/app/designs/details/main/Organisation.js rename to client-app/javascript/app/designs/details/main/Organisation.js diff --git a/public/javascript/app/designs/details/main/Platform.js b/client-app/javascript/app/designs/details/main/Platform.js similarity index 100% rename from public/javascript/app/designs/details/main/Platform.js rename to client-app/javascript/app/designs/details/main/Platform.js diff --git a/public/javascript/app/designs/details/main/Program.js b/client-app/javascript/app/designs/details/main/Program.js similarity index 100% rename from public/javascript/app/designs/details/main/Program.js rename to client-app/javascript/app/designs/details/main/Program.js diff --git a/public/javascript/app/designs/details/main/Project.js b/client-app/javascript/app/designs/details/main/Project.js similarity index 100% rename from public/javascript/app/designs/details/main/Project.js rename to client-app/javascript/app/designs/details/main/Project.js diff --git a/public/javascript/app/designs/details/main/ServiceOGC.js b/client-app/javascript/app/designs/details/main/ServiceOGC.js similarity index 100% rename from public/javascript/app/designs/details/main/ServiceOGC.js rename to client-app/javascript/app/designs/details/main/ServiceOGC.js diff --git a/public/javascript/app/designs/details/main/Species.js b/client-app/javascript/app/designs/details/main/Species.js similarity index 100% rename from public/javascript/app/designs/details/main/Species.js rename to client-app/javascript/app/designs/details/main/Species.js diff --git a/public/javascript/app/designs/details/main/SpeciesLocation.js b/client-app/javascript/app/designs/details/main/SpeciesLocation.js similarity index 100% rename from public/javascript/app/designs/details/main/SpeciesLocation.js rename to client-app/javascript/app/designs/details/main/SpeciesLocation.js diff --git a/public/javascript/app/designs/details/main/Statistics.js b/client-app/javascript/app/designs/details/main/Statistics.js similarity index 100% rename from public/javascript/app/designs/details/main/Statistics.js rename to client-app/javascript/app/designs/details/main/Statistics.js diff --git a/public/javascript/app/designs/details/main/_ActivityBase.js b/client-app/javascript/app/designs/details/main/_ActivityBase.js similarity index 100% rename from public/javascript/app/designs/details/main/_ActivityBase.js rename to client-app/javascript/app/designs/details/main/_ActivityBase.js diff --git a/public/javascript/app/designs/details/main/_DetailsBase.js b/client-app/javascript/app/designs/details/main/_DetailsBase.js similarity index 100% rename from public/javascript/app/designs/details/main/_DetailsBase.js rename to client-app/javascript/app/designs/details/main/_DetailsBase.js diff --git a/public/javascript/app/designs/doubleList/Controller.js b/client-app/javascript/app/designs/doubleList/Controller.js similarity index 100% rename from public/javascript/app/designs/doubleList/Controller.js rename to client-app/javascript/app/designs/doubleList/Controller.js diff --git a/public/javascript/app/designs/doubleList/layout/Layout.js b/client-app/javascript/app/designs/doubleList/layout/Layout.js similarity index 100% rename from public/javascript/app/designs/doubleList/layout/Layout.js rename to client-app/javascript/app/designs/doubleList/layout/Layout.js diff --git a/public/javascript/app/designs/doubleList/layout/TopLeftContentAndDoubleList.js b/client-app/javascript/app/designs/doubleList/layout/TopLeftContentAndDoubleList.js similarity index 100% rename from public/javascript/app/designs/doubleList/layout/TopLeftContentAndDoubleList.js rename to client-app/javascript/app/designs/doubleList/layout/TopLeftContentAndDoubleList.js diff --git a/public/javascript/app/designs/doubleList/main/textSearchAndDoubleList.js b/client-app/javascript/app/designs/doubleList/main/textSearchAndDoubleList.js similarity index 100% rename from public/javascript/app/designs/doubleList/main/textSearchAndDoubleList.js rename to client-app/javascript/app/designs/doubleList/main/textSearchAndDoubleList.js diff --git a/public/javascript/app/designs/dynamicDualContent/Controller.js b/client-app/javascript/app/designs/dynamicDualContent/Controller.js similarity index 100% rename from public/javascript/app/designs/dynamicDualContent/Controller.js rename to client-app/javascript/app/designs/dynamicDualContent/Controller.js diff --git a/public/javascript/app/designs/dynamicDualContent/layout/FacetsInLeftSecondaryContent.js b/client-app/javascript/app/designs/dynamicDualContent/layout/FacetsInLeftSecondaryContent.js similarity index 100% rename from public/javascript/app/designs/dynamicDualContent/layout/FacetsInLeftSecondaryContent.js rename to client-app/javascript/app/designs/dynamicDualContent/layout/FacetsInLeftSecondaryContent.js diff --git a/public/javascript/app/designs/dynamicDualContent/layout/LeftSecondaryContent.js b/client-app/javascript/app/designs/dynamicDualContent/layout/LeftSecondaryContent.js similarity index 100% rename from public/javascript/app/designs/dynamicDualContent/layout/LeftSecondaryContent.js rename to client-app/javascript/app/designs/dynamicDualContent/layout/LeftSecondaryContent.js diff --git a/public/javascript/app/designs/dynamicDualContent/layout/TopSecondaryContent.js b/client-app/javascript/app/designs/dynamicDualContent/layout/TopSecondaryContent.js similarity index 100% rename from public/javascript/app/designs/dynamicDualContent/layout/TopSecondaryContent.js rename to client-app/javascript/app/designs/dynamicDualContent/layout/TopSecondaryContent.js diff --git a/public/javascript/app/designs/dynamicDualContent/layout/_Layout.js b/client-app/javascript/app/designs/dynamicDualContent/layout/_Layout.js similarity index 100% rename from public/javascript/app/designs/dynamicDualContent/layout/_Layout.js rename to client-app/javascript/app/designs/dynamicDualContent/layout/_Layout.js diff --git a/public/javascript/app/designs/dynamicDualContent/main/FacetsWithDynamicRightContent.js b/client-app/javascript/app/designs/dynamicDualContent/main/FacetsWithDynamicRightContent.js similarity index 100% rename from public/javascript/app/designs/dynamicDualContent/main/FacetsWithDynamicRightContent.js rename to client-app/javascript/app/designs/dynamicDualContent/main/FacetsWithDynamicRightContent.js diff --git a/public/javascript/app/designs/edition/Controller.js b/client-app/javascript/app/designs/edition/Controller.js similarity index 100% rename from public/javascript/app/designs/edition/Controller.js rename to client-app/javascript/app/designs/edition/Controller.js diff --git a/public/javascript/app/designs/edition/Layout.js b/client-app/javascript/app/designs/edition/Layout.js similarity index 100% rename from public/javascript/app/designs/edition/Layout.js rename to client-app/javascript/app/designs/edition/Layout.js diff --git a/public/javascript/app/designs/embeddedContent/Controller.js b/client-app/javascript/app/designs/embeddedContent/Controller.js similarity index 100% rename from public/javascript/app/designs/embeddedContent/Controller.js rename to client-app/javascript/app/designs/embeddedContent/Controller.js diff --git a/public/javascript/app/designs/embeddedContent/Layout.js b/client-app/javascript/app/designs/embeddedContent/Layout.js similarity index 100% rename from public/javascript/app/designs/embeddedContent/Layout.js rename to client-app/javascript/app/designs/embeddedContent/Layout.js diff --git a/public/javascript/app/designs/embeddedContentWithTopbar/Controller.js b/client-app/javascript/app/designs/embeddedContentWithTopbar/Controller.js similarity index 100% rename from public/javascript/app/designs/embeddedContentWithTopbar/Controller.js rename to client-app/javascript/app/designs/embeddedContentWithTopbar/Controller.js diff --git a/public/javascript/app/designs/embeddedContentWithTopbar/layout/TopAndCenterContent.js b/client-app/javascript/app/designs/embeddedContentWithTopbar/layout/TopAndCenterContent.js similarity index 100% rename from public/javascript/app/designs/embeddedContentWithTopbar/layout/TopAndCenterContent.js rename to client-app/javascript/app/designs/embeddedContentWithTopbar/layout/TopAndCenterContent.js diff --git a/public/javascript/app/designs/embeddedContentWithTopbar/main/EmbeddedContentSelectionInTopbar.js b/client-app/javascript/app/designs/embeddedContentWithTopbar/main/EmbeddedContentSelectionInTopbar.js similarity index 100% rename from public/javascript/app/designs/embeddedContentWithTopbar/main/EmbeddedContentSelectionInTopbar.js rename to client-app/javascript/app/designs/embeddedContentWithTopbar/main/EmbeddedContentSelectionInTopbar.js diff --git a/public/javascript/app/designs/externalTextSearchList/Controller.js b/client-app/javascript/app/designs/externalTextSearchList/Controller.js similarity index 100% rename from public/javascript/app/designs/externalTextSearchList/Controller.js rename to client-app/javascript/app/designs/externalTextSearchList/Controller.js diff --git a/public/javascript/app/designs/externalTextSearchList/Layout.js b/client-app/javascript/app/designs/externalTextSearchList/Layout.js similarity index 100% rename from public/javascript/app/designs/externalTextSearchList/Layout.js rename to client-app/javascript/app/designs/externalTextSearchList/Layout.js diff --git a/public/javascript/app/designs/externalTextSearchList/main/PlaceNames.js b/client-app/javascript/app/designs/externalTextSearchList/main/PlaceNames.js similarity index 100% rename from public/javascript/app/designs/externalTextSearchList/main/PlaceNames.js rename to client-app/javascript/app/designs/externalTextSearchList/main/PlaceNames.js diff --git a/public/javascript/app/designs/externalTextSearchList/main/Worms.js b/client-app/javascript/app/designs/externalTextSearchList/main/Worms.js similarity index 100% rename from public/javascript/app/designs/externalTextSearchList/main/Worms.js rename to client-app/javascript/app/designs/externalTextSearchList/main/Worms.js diff --git a/public/javascript/app/designs/formList/Controller.js b/client-app/javascript/app/designs/formList/Controller.js similarity index 100% rename from public/javascript/app/designs/formList/Controller.js rename to client-app/javascript/app/designs/formList/Controller.js diff --git a/public/javascript/app/designs/formList/_ControllerItfc.js b/client-app/javascript/app/designs/formList/_ControllerItfc.js similarity index 100% rename from public/javascript/app/designs/formList/_ControllerItfc.js rename to client-app/javascript/app/designs/formList/_ControllerItfc.js diff --git a/public/javascript/app/designs/formList/layout/Layout.js b/client-app/javascript/app/designs/formList/layout/Layout.js similarity index 100% rename from public/javascript/app/designs/formList/layout/Layout.js rename to client-app/javascript/app/designs/formList/layout/Layout.js diff --git a/public/javascript/app/designs/formList/layout/LayoutWithTopForm.js b/client-app/javascript/app/designs/formList/layout/LayoutWithTopForm.js similarity index 100% rename from public/javascript/app/designs/formList/layout/LayoutWithTopForm.js rename to client-app/javascript/app/designs/formList/layout/LayoutWithTopForm.js diff --git a/public/javascript/app/designs/formList/main/FormListByStep.js b/client-app/javascript/app/designs/formList/main/FormListByStep.js similarity index 100% rename from public/javascript/app/designs/formList/main/FormListByStep.js rename to client-app/javascript/app/designs/formList/main/FormListByStep.js diff --git a/public/javascript/app/designs/formList/main/_RequestAndParseData.js b/client-app/javascript/app/designs/formList/main/_RequestAndParseData.js similarity index 100% rename from public/javascript/app/designs/formList/main/_RequestAndParseData.js rename to client-app/javascript/app/designs/formList/main/_RequestAndParseData.js diff --git a/public/javascript/app/designs/list/Controller.js b/client-app/javascript/app/designs/list/Controller.js similarity index 100% rename from public/javascript/app/designs/list/Controller.js rename to client-app/javascript/app/designs/list/Controller.js diff --git a/public/javascript/app/designs/list/_AddFilter.js b/client-app/javascript/app/designs/list/_AddFilter.js similarity index 100% rename from public/javascript/app/designs/list/_AddFilter.js rename to client-app/javascript/app/designs/list/_AddFilter.js diff --git a/public/javascript/app/designs/list/layout/Layout.js b/client-app/javascript/app/designs/list/layout/Layout.js similarity index 100% rename from public/javascript/app/designs/list/layout/Layout.js rename to client-app/javascript/app/designs/list/layout/Layout.js diff --git a/public/javascript/app/designs/list/layout/ListWithTopContent.js b/client-app/javascript/app/designs/list/layout/ListWithTopContent.js similarity index 100% rename from public/javascript/app/designs/list/layout/ListWithTopContent.js rename to client-app/javascript/app/designs/list/layout/ListWithTopContent.js diff --git a/public/javascript/app/designs/list/layout/NoTitle.js b/client-app/javascript/app/designs/list/layout/NoTitle.js similarity index 100% rename from public/javascript/app/designs/list/layout/NoTitle.js rename to client-app/javascript/app/designs/list/layout/NoTitle.js diff --git a/public/javascript/app/designs/mapWithSideContent/Controller.js b/client-app/javascript/app/designs/mapWithSideContent/Controller.js similarity index 100% rename from public/javascript/app/designs/mapWithSideContent/Controller.js rename to client-app/javascript/app/designs/mapWithSideContent/Controller.js diff --git a/public/javascript/app/designs/mapWithSideContent/layout/MapAndContent.js b/client-app/javascript/app/designs/mapWithSideContent/layout/MapAndContent.js similarity index 100% rename from public/javascript/app/designs/mapWithSideContent/layout/MapAndContent.js rename to client-app/javascript/app/designs/mapWithSideContent/layout/MapAndContent.js diff --git a/public/javascript/app/designs/mapWithSideContent/layout/MapAndContentAndTopbar.js b/client-app/javascript/app/designs/mapWithSideContent/layout/MapAndContentAndTopbar.js similarity index 100% rename from public/javascript/app/designs/mapWithSideContent/layout/MapAndContentAndTopbar.js rename to client-app/javascript/app/designs/mapWithSideContent/layout/MapAndContentAndTopbar.js diff --git a/public/javascript/app/designs/mapWithSideContent/main/FilterAndGeographic.js b/client-app/javascript/app/designs/mapWithSideContent/main/FilterAndGeographic.js similarity index 100% rename from public/javascript/app/designs/mapWithSideContent/main/FilterAndGeographic.js rename to client-app/javascript/app/designs/mapWithSideContent/main/FilterAndGeographic.js diff --git a/public/javascript/app/designs/mapWithSideContent/main/Geographic.js b/client-app/javascript/app/designs/mapWithSideContent/main/Geographic.js similarity index 100% rename from public/javascript/app/designs/mapWithSideContent/main/Geographic.js rename to client-app/javascript/app/designs/mapWithSideContent/main/Geographic.js diff --git a/public/javascript/app/designs/mapWithSideContent/main/GeographicEditor.js b/client-app/javascript/app/designs/mapWithSideContent/main/GeographicEditor.js similarity index 100% rename from public/javascript/app/designs/mapWithSideContent/main/GeographicEditor.js rename to client-app/javascript/app/designs/mapWithSideContent/main/GeographicEditor.js diff --git a/public/javascript/app/designs/mapWithSideContent/main/Tracking.js b/client-app/javascript/app/designs/mapWithSideContent/main/Tracking.js similarity index 100% rename from public/javascript/app/designs/mapWithSideContent/main/Tracking.js rename to client-app/javascript/app/designs/mapWithSideContent/main/Tracking.js diff --git a/public/javascript/app/designs/mapWithSideContent/main/_TrackingByFilter.js b/client-app/javascript/app/designs/mapWithSideContent/main/_TrackingByFilter.js similarity index 100% rename from public/javascript/app/designs/mapWithSideContent/main/_TrackingByFilter.js rename to client-app/javascript/app/designs/mapWithSideContent/main/_TrackingByFilter.js diff --git a/public/javascript/app/designs/mapWithSideContent/main/_TrackingWithList.js b/client-app/javascript/app/designs/mapWithSideContent/main/_TrackingWithList.js similarity index 100% rename from public/javascript/app/designs/mapWithSideContent/main/_TrackingWithList.js rename to client-app/javascript/app/designs/mapWithSideContent/main/_TrackingWithList.js diff --git a/public/javascript/app/designs/mapWithSideContent/main/_TrackingWithListByFilter.js b/client-app/javascript/app/designs/mapWithSideContent/main/_TrackingWithListByFilter.js similarity index 100% rename from public/javascript/app/designs/mapWithSideContent/main/_TrackingWithListByFilter.js rename to client-app/javascript/app/designs/mapWithSideContent/main/_TrackingWithListByFilter.js diff --git a/public/javascript/app/designs/textSearchFacetsList/Controller.js b/client-app/javascript/app/designs/textSearchFacetsList/Controller.js similarity index 100% rename from public/javascript/app/designs/textSearchFacetsList/Controller.js rename to client-app/javascript/app/designs/textSearchFacetsList/Controller.js diff --git a/public/javascript/app/designs/textSearchFacetsList/Layout.js b/client-app/javascript/app/designs/textSearchFacetsList/Layout.js similarity index 100% rename from public/javascript/app/designs/textSearchFacetsList/Layout.js rename to client-app/javascript/app/designs/textSearchFacetsList/Layout.js diff --git a/public/javascript/app/designs/textSearchFacetsList/_AddFilter.js b/client-app/javascript/app/designs/textSearchFacetsList/_AddFilter.js similarity index 100% rename from public/javascript/app/designs/textSearchFacetsList/_AddFilter.js rename to client-app/javascript/app/designs/textSearchFacetsList/_AddFilter.js diff --git a/public/javascript/app/designs/textSearchFacetsList/main/Activity.js b/client-app/javascript/app/designs/textSearchFacetsList/main/Activity.js similarity index 100% rename from public/javascript/app/designs/textSearchFacetsList/main/Activity.js rename to client-app/javascript/app/designs/textSearchFacetsList/main/Activity.js diff --git a/public/javascript/app/designs/textSearchFacetsList/main/Administrative.js b/client-app/javascript/app/designs/textSearchFacetsList/main/Administrative.js similarity index 100% rename from public/javascript/app/designs/textSearchFacetsList/main/Administrative.js rename to client-app/javascript/app/designs/textSearchFacetsList/main/Administrative.js diff --git a/public/javascript/app/designs/textSearchFacetsList/main/Bibliography.js b/client-app/javascript/app/designs/textSearchFacetsList/main/Bibliography.js similarity index 100% rename from public/javascript/app/designs/textSearchFacetsList/main/Bibliography.js rename to client-app/javascript/app/designs/textSearchFacetsList/main/Bibliography.js diff --git a/public/javascript/app/designs/textSearchFacetsList/main/Domain.js b/client-app/javascript/app/designs/textSearchFacetsList/main/Domain.js similarity index 100% rename from public/javascript/app/designs/textSearchFacetsList/main/Domain.js rename to client-app/javascript/app/designs/textSearchFacetsList/main/Domain.js diff --git a/public/javascript/app/designs/textSearchFacetsList/main/Organisation.js b/client-app/javascript/app/designs/textSearchFacetsList/main/Organisation.js similarity index 100% rename from public/javascript/app/designs/textSearchFacetsList/main/Organisation.js rename to client-app/javascript/app/designs/textSearchFacetsList/main/Organisation.js diff --git a/public/javascript/app/designs/textSearchFacetsList/main/Platform.js b/client-app/javascript/app/designs/textSearchFacetsList/main/Platform.js similarity index 100% rename from public/javascript/app/designs/textSearchFacetsList/main/Platform.js rename to client-app/javascript/app/designs/textSearchFacetsList/main/Platform.js diff --git a/public/javascript/app/designs/textSearchFacetsList/main/Program.js b/client-app/javascript/app/designs/textSearchFacetsList/main/Program.js similarity index 100% rename from public/javascript/app/designs/textSearchFacetsList/main/Program.js rename to client-app/javascript/app/designs/textSearchFacetsList/main/Program.js diff --git a/public/javascript/app/designs/textSearchFacetsList/main/Project.js b/client-app/javascript/app/designs/textSearchFacetsList/main/Project.js similarity index 100% rename from public/javascript/app/designs/textSearchFacetsList/main/Project.js rename to client-app/javascript/app/designs/textSearchFacetsList/main/Project.js diff --git a/public/javascript/app/designs/textSearchFacetsList/main/ServiceOGC.js b/client-app/javascript/app/designs/textSearchFacetsList/main/ServiceOGC.js similarity index 100% rename from public/javascript/app/designs/textSearchFacetsList/main/ServiceOGC.js rename to client-app/javascript/app/designs/textSearchFacetsList/main/ServiceOGC.js diff --git a/public/javascript/app/designs/textSearchFacetsList/main/Species.js b/client-app/javascript/app/designs/textSearchFacetsList/main/Species.js similarity index 100% rename from public/javascript/app/designs/textSearchFacetsList/main/Species.js rename to client-app/javascript/app/designs/textSearchFacetsList/main/Species.js diff --git a/public/javascript/app/designs/textSearchFacetsList/main/Taxon.js b/client-app/javascript/app/designs/textSearchFacetsList/main/Taxon.js similarity index 100% rename from public/javascript/app/designs/textSearchFacetsList/main/Taxon.js rename to client-app/javascript/app/designs/textSearchFacetsList/main/Taxon.js diff --git a/public/javascript/app/designs/textSearchList/Controller.js b/client-app/javascript/app/designs/textSearchList/Controller.js similarity index 100% rename from public/javascript/app/designs/textSearchList/Controller.js rename to client-app/javascript/app/designs/textSearchList/Controller.js diff --git a/public/javascript/app/designs/textSearchList/_AddFilter.js b/client-app/javascript/app/designs/textSearchList/_AddFilter.js similarity index 100% rename from public/javascript/app/designs/textSearchList/_AddFilter.js rename to client-app/javascript/app/designs/textSearchList/_AddFilter.js diff --git a/public/javascript/app/designs/textSearchList/layout/BasicAndButtonsTopZone.js b/client-app/javascript/app/designs/textSearchList/layout/BasicAndButtonsTopZone.js similarity index 100% rename from public/javascript/app/designs/textSearchList/layout/BasicAndButtonsTopZone.js rename to client-app/javascript/app/designs/textSearchList/layout/BasicAndButtonsTopZone.js diff --git a/public/javascript/app/designs/textSearchList/layout/BasicTopZone.js b/client-app/javascript/app/designs/textSearchList/layout/BasicTopZone.js similarity index 100% rename from public/javascript/app/designs/textSearchList/layout/BasicTopZone.js rename to client-app/javascript/app/designs/textSearchList/layout/BasicTopZone.js diff --git a/public/javascript/app/designs/textSearchList/main/Domain.js b/client-app/javascript/app/designs/textSearchList/main/Domain.js similarity index 100% rename from public/javascript/app/designs/textSearchList/main/Domain.js rename to client-app/javascript/app/designs/textSearchList/main/Domain.js diff --git a/public/javascript/app/designs/textSearchList/main/Selection.js b/client-app/javascript/app/designs/textSearchList/main/Selection.js similarity index 100% rename from public/javascript/app/designs/textSearchList/main/Selection.js rename to client-app/javascript/app/designs/textSearchList/main/Selection.js diff --git a/public/javascript/app/designs/textSearchList/main/ServiceOGC.js b/client-app/javascript/app/designs/textSearchList/main/ServiceOGC.js similarity index 100% rename from public/javascript/app/designs/textSearchList/main/ServiceOGC.js rename to client-app/javascript/app/designs/textSearchList/main/ServiceOGC.js diff --git a/public/javascript/app/details/views/ActivityAreaMapBase.js b/client-app/javascript/app/details/views/ActivityAreaMapBase.js similarity index 100% rename from public/javascript/app/details/views/ActivityAreaMapBase.js rename to client-app/javascript/app/details/views/ActivityAreaMapBase.js diff --git a/public/javascript/app/details/views/ActivityCatalogDetailsView.js b/client-app/javascript/app/details/views/ActivityCatalogDetailsView.js similarity index 100% rename from public/javascript/app/details/views/ActivityCatalogDetailsView.js rename to client-app/javascript/app/details/views/ActivityCatalogDetailsView.js diff --git a/public/javascript/app/details/views/ActivityChart.js b/client-app/javascript/app/details/views/ActivityChart.js similarity index 100% rename from public/javascript/app/details/views/ActivityChart.js rename to client-app/javascript/app/details/views/ActivityChart.js diff --git a/public/javascript/app/details/views/ActivityCitationMapBase.js b/client-app/javascript/app/details/views/ActivityCitationMapBase.js similarity index 100% rename from public/javascript/app/details/views/ActivityCitationMapBase.js rename to client-app/javascript/app/details/views/ActivityCitationMapBase.js diff --git a/public/javascript/app/details/views/ActivityDetailsView.js b/client-app/javascript/app/details/views/ActivityDetailsView.js similarity index 100% rename from public/javascript/app/details/views/ActivityDetailsView.js rename to client-app/javascript/app/details/views/ActivityDetailsView.js diff --git a/public/javascript/app/details/views/ActivityFixedTimeseriesChart.js b/client-app/javascript/app/details/views/ActivityFixedTimeseriesChart.js similarity index 100% rename from public/javascript/app/details/views/ActivityFixedTimeseriesChart.js rename to client-app/javascript/app/details/views/ActivityFixedTimeseriesChart.js diff --git a/public/javascript/app/details/views/ActivityFixedTimeseriesMap.js b/client-app/javascript/app/details/views/ActivityFixedTimeseriesMap.js similarity index 100% rename from public/javascript/app/details/views/ActivityFixedTimeseriesMap.js rename to client-app/javascript/app/details/views/ActivityFixedTimeseriesMap.js diff --git a/public/javascript/app/details/views/ActivityInfrastructureMapBase.js b/client-app/javascript/app/details/views/ActivityInfrastructureMapBase.js similarity index 100% rename from public/javascript/app/details/views/ActivityInfrastructureMapBase.js rename to client-app/javascript/app/details/views/ActivityInfrastructureMapBase.js diff --git a/public/javascript/app/details/views/ActivityLayerMapBase.js b/client-app/javascript/app/details/views/ActivityLayerMapBase.js similarity index 100% rename from public/javascript/app/details/views/ActivityLayerMapBase.js rename to client-app/javascript/app/details/views/ActivityLayerMapBase.js diff --git a/public/javascript/app/details/views/BibliographyDetailsView.js b/client-app/javascript/app/details/views/BibliographyDetailsView.js similarity index 100% rename from public/javascript/app/details/views/BibliographyDetailsView.js rename to client-app/javascript/app/details/views/BibliographyDetailsView.js diff --git a/public/javascript/app/details/views/ContactDetailsView.js b/client-app/javascript/app/details/views/ContactDetailsView.js similarity index 100% rename from public/javascript/app/details/views/ContactDetailsView.js rename to client-app/javascript/app/details/views/ContactDetailsView.js diff --git a/public/javascript/app/details/views/DocumentDetailsView.js b/client-app/javascript/app/details/views/DocumentDetailsView.js similarity index 100% rename from public/javascript/app/details/views/DocumentDetailsView.js rename to client-app/javascript/app/details/views/DocumentDetailsView.js diff --git a/public/javascript/app/details/views/OrganisationCatalogDetailsView.js b/client-app/javascript/app/details/views/OrganisationCatalogDetailsView.js similarity index 100% rename from public/javascript/app/details/views/OrganisationCatalogDetailsView.js rename to client-app/javascript/app/details/views/OrganisationCatalogDetailsView.js diff --git a/public/javascript/app/details/views/OrganisationDetailsView.js b/client-app/javascript/app/details/views/OrganisationDetailsView.js similarity index 100% rename from public/javascript/app/details/views/OrganisationDetailsView.js rename to client-app/javascript/app/details/views/OrganisationDetailsView.js diff --git a/public/javascript/app/details/views/PlatformCatalogDetailsView.js b/client-app/javascript/app/details/views/PlatformCatalogDetailsView.js similarity index 100% rename from public/javascript/app/details/views/PlatformCatalogDetailsView.js rename to client-app/javascript/app/details/views/PlatformCatalogDetailsView.js diff --git a/public/javascript/app/details/views/PlatformDetailsView.js b/client-app/javascript/app/details/views/PlatformDetailsView.js similarity index 100% rename from public/javascript/app/details/views/PlatformDetailsView.js rename to client-app/javascript/app/details/views/PlatformDetailsView.js diff --git a/public/javascript/app/details/views/ProgramCatalogDetailsView.js b/client-app/javascript/app/details/views/ProgramCatalogDetailsView.js similarity index 100% rename from public/javascript/app/details/views/ProgramCatalogDetailsView.js rename to client-app/javascript/app/details/views/ProgramCatalogDetailsView.js diff --git a/public/javascript/app/details/views/ProgramDetailsView.js b/client-app/javascript/app/details/views/ProgramDetailsView.js similarity index 100% rename from public/javascript/app/details/views/ProgramDetailsView.js rename to client-app/javascript/app/details/views/ProgramDetailsView.js diff --git a/public/javascript/app/details/views/ProjectCatalogDetailsView.js b/client-app/javascript/app/details/views/ProjectCatalogDetailsView.js similarity index 100% rename from public/javascript/app/details/views/ProjectCatalogDetailsView.js rename to client-app/javascript/app/details/views/ProjectCatalogDetailsView.js diff --git a/public/javascript/app/details/views/ProjectDetailsView.js b/client-app/javascript/app/details/views/ProjectDetailsView.js similarity index 100% rename from public/javascript/app/details/views/ProjectDetailsView.js rename to client-app/javascript/app/details/views/ProjectDetailsView.js diff --git a/public/javascript/app/details/views/ServiceOGCCatalogDetailsView.js b/client-app/javascript/app/details/views/ServiceOGCCatalogDetailsView.js similarity index 100% rename from public/javascript/app/details/views/ServiceOGCCatalogDetailsView.js rename to client-app/javascript/app/details/views/ServiceOGCCatalogDetailsView.js diff --git a/public/javascript/app/details/views/ServiceOGCDetailsView.js b/client-app/javascript/app/details/views/ServiceOGCDetailsView.js similarity index 100% rename from public/javascript/app/details/views/ServiceOGCDetailsView.js rename to client-app/javascript/app/details/views/ServiceOGCDetailsView.js diff --git a/public/javascript/app/details/views/SpeciesCatalogDetailsView.js b/client-app/javascript/app/details/views/SpeciesCatalogDetailsView.js similarity index 100% rename from public/javascript/app/details/views/SpeciesCatalogDetailsView.js rename to client-app/javascript/app/details/views/SpeciesCatalogDetailsView.js diff --git a/public/javascript/app/details/views/SpeciesDetailsView.js b/client-app/javascript/app/details/views/SpeciesDetailsView.js similarity index 100% rename from public/javascript/app/details/views/SpeciesDetailsView.js rename to client-app/javascript/app/details/views/SpeciesDetailsView.js diff --git a/public/javascript/app/details/views/StatisticsDetailsView.js b/client-app/javascript/app/details/views/StatisticsDetailsView.js similarity index 100% rename from public/javascript/app/details/views/StatisticsDetailsView.js rename to client-app/javascript/app/details/views/StatisticsDetailsView.js diff --git a/public/javascript/app/details/views/_ActivityTimeSeriesDataManagement.js b/client-app/javascript/app/details/views/_ActivityTimeSeriesDataManagement.js similarity index 100% rename from public/javascript/app/details/views/_ActivityTimeSeriesDataManagement.js rename to client-app/javascript/app/details/views/_ActivityTimeSeriesDataManagement.js diff --git a/public/javascript/app/edition/views/ActivityEditionView.js b/client-app/javascript/app/edition/views/ActivityEditionView.js similarity index 100% rename from public/javascript/app/edition/views/ActivityEditionView.js rename to client-app/javascript/app/edition/views/ActivityEditionView.js diff --git a/public/javascript/app/edition/views/AnimalEditionView.js b/client-app/javascript/app/edition/views/AnimalEditionView.js similarity index 100% rename from public/javascript/app/edition/views/AnimalEditionView.js rename to client-app/javascript/app/edition/views/AnimalEditionView.js diff --git a/public/javascript/app/edition/views/ConditionEditionView.js b/client-app/javascript/app/edition/views/ConditionEditionView.js similarity index 100% rename from public/javascript/app/edition/views/ConditionEditionView.js rename to client-app/javascript/app/edition/views/ConditionEditionView.js diff --git a/public/javascript/app/edition/views/ContactEditionView.js b/client-app/javascript/app/edition/views/ContactEditionView.js similarity index 100% rename from public/javascript/app/edition/views/ContactEditionView.js rename to client-app/javascript/app/edition/views/ContactEditionView.js diff --git a/public/javascript/app/edition/views/DeviceEditionView.js b/client-app/javascript/app/edition/views/DeviceEditionView.js similarity index 100% rename from public/javascript/app/edition/views/DeviceEditionView.js rename to client-app/javascript/app/edition/views/DeviceEditionView.js diff --git a/public/javascript/app/edition/views/DocumentEditionView.js b/client-app/javascript/app/edition/views/DocumentEditionView.js similarity index 100% rename from public/javascript/app/edition/views/DocumentEditionView.js rename to client-app/javascript/app/edition/views/DocumentEditionView.js diff --git a/public/javascript/app/edition/views/LoadDataDocumentEditionView.js b/client-app/javascript/app/edition/views/LoadDataDocumentEditionView.js similarity index 100% rename from public/javascript/app/edition/views/LoadDataDocumentEditionView.js rename to client-app/javascript/app/edition/views/LoadDataDocumentEditionView.js diff --git a/public/javascript/app/edition/views/LoadDataToActivityEditionView.js b/client-app/javascript/app/edition/views/LoadDataToActivityEditionView.js similarity index 100% rename from public/javascript/app/edition/views/LoadDataToActivityEditionView.js rename to client-app/javascript/app/edition/views/LoadDataToActivityEditionView.js diff --git a/public/javascript/app/edition/views/MetricsDefinitionEditionView.js b/client-app/javascript/app/edition/views/MetricsDefinitionEditionView.js similarity index 100% rename from public/javascript/app/edition/views/MetricsDefinitionEditionView.js rename to client-app/javascript/app/edition/views/MetricsDefinitionEditionView.js diff --git a/public/javascript/app/edition/views/MisIdentificationEditionView.js b/client-app/javascript/app/edition/views/MisIdentificationEditionView.js similarity index 100% rename from public/javascript/app/edition/views/MisIdentificationEditionView.js rename to client-app/javascript/app/edition/views/MisIdentificationEditionView.js diff --git a/public/javascript/app/edition/views/OrganisationEditionView.js b/client-app/javascript/app/edition/views/OrganisationEditionView.js similarity index 100% rename from public/javascript/app/edition/views/OrganisationEditionView.js rename to client-app/javascript/app/edition/views/OrganisationEditionView.js diff --git a/public/javascript/app/edition/views/ParameterEditionView.js b/client-app/javascript/app/edition/views/ParameterEditionView.js similarity index 100% rename from public/javascript/app/edition/views/ParameterEditionView.js rename to client-app/javascript/app/edition/views/ParameterEditionView.js diff --git a/public/javascript/app/edition/views/PermissionsEditionView.js b/client-app/javascript/app/edition/views/PermissionsEditionView.js similarity index 100% rename from public/javascript/app/edition/views/PermissionsEditionView.js rename to client-app/javascript/app/edition/views/PermissionsEditionView.js diff --git a/public/javascript/app/edition/views/PlatformEditionView.js b/client-app/javascript/app/edition/views/PlatformEditionView.js similarity index 100% rename from public/javascript/app/edition/views/PlatformEditionView.js rename to client-app/javascript/app/edition/views/PlatformEditionView.js diff --git a/public/javascript/app/edition/views/ProgramEditionView.js b/client-app/javascript/app/edition/views/ProgramEditionView.js similarity index 100% rename from public/javascript/app/edition/views/ProgramEditionView.js rename to client-app/javascript/app/edition/views/ProgramEditionView.js diff --git a/public/javascript/app/edition/views/ProjectEditionView.js b/client-app/javascript/app/edition/views/ProjectEditionView.js similarity index 100% rename from public/javascript/app/edition/views/ProjectEditionView.js rename to client-app/javascript/app/edition/views/ProjectEditionView.js diff --git a/public/javascript/app/edition/views/ServiceOGCEditionView.js b/client-app/javascript/app/edition/views/ServiceOGCEditionView.js similarity index 100% rename from public/javascript/app/edition/views/ServiceOGCEditionView.js rename to client-app/javascript/app/edition/views/ServiceOGCEditionView.js diff --git a/public/javascript/app/edition/views/SpeciesEditionView.js b/client-app/javascript/app/edition/views/SpeciesEditionView.js similarity index 100% rename from public/javascript/app/edition/views/SpeciesEditionView.js rename to client-app/javascript/app/edition/views/SpeciesEditionView.js diff --git a/public/javascript/app/edition/views/UnitEditionView.js b/client-app/javascript/app/edition/views/UnitEditionView.js similarity index 100% rename from public/javascript/app/edition/views/UnitEditionView.js rename to client-app/javascript/app/edition/views/UnitEditionView.js diff --git a/public/javascript/app/edition/views/dataLoader/AddDataFT.js b/client-app/javascript/app/edition/views/dataLoader/AddDataFT.js similarity index 100% rename from public/javascript/app/edition/views/dataLoader/AddDataFT.js rename to client-app/javascript/app/edition/views/dataLoader/AddDataFT.js diff --git a/public/javascript/app/edition/views/dataLoader/AddDataIF.js b/client-app/javascript/app/edition/views/dataLoader/AddDataIF.js similarity index 100% rename from public/javascript/app/edition/views/dataLoader/AddDataIF.js rename to client-app/javascript/app/edition/views/dataLoader/AddDataIF.js diff --git a/public/javascript/app/edition/views/dataLoader/AddDataOC.js b/client-app/javascript/app/edition/views/dataLoader/AddDataOC.js similarity index 100% rename from public/javascript/app/edition/views/dataLoader/AddDataOC.js rename to client-app/javascript/app/edition/views/dataLoader/AddDataOC.js diff --git a/public/javascript/app/edition/views/dataLoader/EditDataAR.js b/client-app/javascript/app/edition/views/dataLoader/EditDataAR.js similarity index 100% rename from public/javascript/app/edition/views/dataLoader/EditDataAR.js rename to client-app/javascript/app/edition/views/dataLoader/EditDataAR.js diff --git a/public/javascript/app/edition/views/dataLoader/LoadDataAR.js b/client-app/javascript/app/edition/views/dataLoader/LoadDataAR.js similarity index 100% rename from public/javascript/app/edition/views/dataLoader/LoadDataAR.js rename to client-app/javascript/app/edition/views/dataLoader/LoadDataAR.js diff --git a/public/javascript/app/edition/views/dataLoader/LoadDataFT.js b/client-app/javascript/app/edition/views/dataLoader/LoadDataFT.js similarity index 100% rename from public/javascript/app/edition/views/dataLoader/LoadDataFT.js rename to client-app/javascript/app/edition/views/dataLoader/LoadDataFT.js diff --git a/public/javascript/app/edition/views/dataLoader/LoadDataOC.js b/client-app/javascript/app/edition/views/dataLoader/LoadDataOC.js similarity index 100% rename from public/javascript/app/edition/views/dataLoader/LoadDataOC.js rename to client-app/javascript/app/edition/views/dataLoader/LoadDataOC.js diff --git a/public/javascript/app/edition/views/dataLoader/LoadDataTR.js b/client-app/javascript/app/edition/views/dataLoader/LoadDataTR.js similarity index 100% rename from public/javascript/app/edition/views/dataLoader/LoadDataTR.js rename to client-app/javascript/app/edition/views/dataLoader/LoadDataTR.js diff --git a/public/javascript/app/edition/views/dataLoader/_BaseDataToActivityEdition.js b/client-app/javascript/app/edition/views/dataLoader/_BaseDataToActivityEdition.js similarity index 100% rename from public/javascript/app/edition/views/dataLoader/_BaseDataToActivityEdition.js rename to client-app/javascript/app/edition/views/dataLoader/_BaseDataToActivityEdition.js diff --git a/public/javascript/app/edition/views/dataLoader/_BaseDataToActivityEditionItfc.js b/client-app/javascript/app/edition/views/dataLoader/_BaseDataToActivityEditionItfc.js similarity index 100% rename from public/javascript/app/edition/views/dataLoader/_BaseDataToActivityEditionItfc.js rename to client-app/javascript/app/edition/views/dataLoader/_BaseDataToActivityEditionItfc.js diff --git a/public/javascript/app/edition/views/dataLoader/_BaseLoadDataToActivityEdition.js b/client-app/javascript/app/edition/views/dataLoader/_BaseLoadDataToActivityEdition.js similarity index 100% rename from public/javascript/app/edition/views/dataLoader/_BaseLoadDataToActivityEdition.js rename to client-app/javascript/app/edition/views/dataLoader/_BaseLoadDataToActivityEdition.js diff --git a/public/javascript/app/edition/views/dataLoader/_BaseLoadDataToActivityEditionItfc.js b/client-app/javascript/app/edition/views/dataLoader/_BaseLoadDataToActivityEditionItfc.js similarity index 100% rename from public/javascript/app/edition/views/dataLoader/_BaseLoadDataToActivityEditionItfc.js rename to client-app/javascript/app/edition/views/dataLoader/_BaseLoadDataToActivityEditionItfc.js diff --git a/public/javascript/app/home/views/HomeView.js b/client-app/javascript/app/home/views/HomeView.js similarity index 100% rename from public/javascript/app/home/views/HomeView.js rename to client-app/javascript/app/home/views/HomeView.js diff --git a/public/javascript/app/home/views/ProductWidget.js b/client-app/javascript/app/home/views/ProductWidget.js similarity index 100% rename from public/javascript/app/home/views/ProductWidget.js rename to client-app/javascript/app/home/views/ProductWidget.js diff --git a/public/javascript/app/home/views/SearchBarWidget.js b/client-app/javascript/app/home/views/SearchBarWidget.js similarity index 100% rename from public/javascript/app/home/views/SearchBarWidget.js rename to client-app/javascript/app/home/views/SearchBarWidget.js diff --git a/public/javascript/app/home/views/SearchFastFilterWidget.js b/client-app/javascript/app/home/views/SearchFastFilterWidget.js similarity index 100% rename from public/javascript/app/home/views/SearchFastFilterWidget.js rename to client-app/javascript/app/home/views/SearchFastFilterWidget.js diff --git a/public/javascript/app/home/views/SearchFilterWidget.js b/client-app/javascript/app/home/views/SearchFilterWidget.js similarity index 100% rename from public/javascript/app/home/views/SearchFilterWidget.js rename to client-app/javascript/app/home/views/SearchFilterWidget.js diff --git a/public/javascript/app/home/views/SearchResultsWidget.js b/client-app/javascript/app/home/views/SearchResultsWidget.js similarity index 100% rename from public/javascript/app/home/views/SearchResultsWidget.js rename to client-app/javascript/app/home/views/SearchResultsWidget.js diff --git a/public/javascript/app/home/views/SocialWidget.js b/client-app/javascript/app/home/views/SocialWidget.js similarity index 100% rename from public/javascript/app/home/views/SocialWidget.js rename to client-app/javascript/app/home/views/SocialWidget.js diff --git a/public/javascript/app/home/views/StatsWidget.js b/client-app/javascript/app/home/views/StatsWidget.js similarity index 100% rename from public/javascript/app/home/views/StatsWidget.js rename to client-app/javascript/app/home/views/StatsWidget.js diff --git a/public/javascript/app/home/views/_DashboardItem.js b/client-app/javascript/app/home/views/_DashboardItem.js similarity index 100% rename from public/javascript/app/home/views/_DashboardItem.js rename to client-app/javascript/app/home/views/_DashboardItem.js diff --git a/public/javascript/app/maintenance/domains/_HierarchicalDomain.js b/client-app/javascript/app/maintenance/domains/_HierarchicalDomain.js similarity index 100% rename from public/javascript/app/maintenance/domains/_HierarchicalDomain.js rename to client-app/javascript/app/maintenance/domains/_HierarchicalDomain.js diff --git a/public/javascript/app/maintenance/domains/admin/views/AccessibilityView.js b/client-app/javascript/app/maintenance/domains/admin/views/AccessibilityView.js similarity index 100% rename from public/javascript/app/maintenance/domains/admin/views/AccessibilityView.js rename to client-app/javascript/app/maintenance/domains/admin/views/AccessibilityView.js diff --git a/public/javascript/app/maintenance/domains/admin/views/ActivityFieldsView.js b/client-app/javascript/app/maintenance/domains/admin/views/ActivityFieldsView.js similarity index 100% rename from public/javascript/app/maintenance/domains/admin/views/ActivityFieldsView.js rename to client-app/javascript/app/maintenance/domains/admin/views/ActivityFieldsView.js diff --git a/public/javascript/app/maintenance/domains/admin/views/ActivityTypesView.js b/client-app/javascript/app/maintenance/domains/admin/views/ActivityTypesView.js similarity index 100% rename from public/javascript/app/maintenance/domains/admin/views/ActivityTypesView.js rename to client-app/javascript/app/maintenance/domains/admin/views/ActivityTypesView.js diff --git a/public/javascript/app/maintenance/domains/admin/views/ContactRolesView.js b/client-app/javascript/app/maintenance/domains/admin/views/ContactRolesView.js similarity index 100% rename from public/javascript/app/maintenance/domains/admin/views/ContactRolesView.js rename to client-app/javascript/app/maintenance/domains/admin/views/ContactRolesView.js diff --git a/public/javascript/app/maintenance/domains/admin/views/CountriesView.js b/client-app/javascript/app/maintenance/domains/admin/views/CountriesView.js similarity index 100% rename from public/javascript/app/maintenance/domains/admin/views/CountriesView.js rename to client-app/javascript/app/maintenance/domains/admin/views/CountriesView.js diff --git a/public/javascript/app/maintenance/domains/admin/views/DeviceTypesView.js b/client-app/javascript/app/maintenance/domains/admin/views/DeviceTypesView.js similarity index 100% rename from public/javascript/app/maintenance/domains/admin/views/DeviceTypesView.js rename to client-app/javascript/app/maintenance/domains/admin/views/DeviceTypesView.js diff --git a/public/javascript/app/maintenance/domains/admin/views/DocumentTypesView.js b/client-app/javascript/app/maintenance/domains/admin/views/DocumentTypesView.js similarity index 100% rename from public/javascript/app/maintenance/domains/admin/views/DocumentTypesView.js rename to client-app/javascript/app/maintenance/domains/admin/views/DocumentTypesView.js diff --git a/public/javascript/app/maintenance/domains/admin/views/OrganisationRolesView.js b/client-app/javascript/app/maintenance/domains/admin/views/OrganisationRolesView.js similarity index 100% rename from public/javascript/app/maintenance/domains/admin/views/OrganisationRolesView.js rename to client-app/javascript/app/maintenance/domains/admin/views/OrganisationRolesView.js diff --git a/public/javascript/app/maintenance/domains/admin/views/OrganisationTypesView.js b/client-app/javascript/app/maintenance/domains/admin/views/OrganisationTypesView.js similarity index 100% rename from public/javascript/app/maintenance/domains/admin/views/OrganisationTypesView.js rename to client-app/javascript/app/maintenance/domains/admin/views/OrganisationTypesView.js diff --git a/public/javascript/app/maintenance/domains/admin/views/PlatformTypesView.js b/client-app/javascript/app/maintenance/domains/admin/views/PlatformTypesView.js similarity index 100% rename from public/javascript/app/maintenance/domains/admin/views/PlatformTypesView.js rename to client-app/javascript/app/maintenance/domains/admin/views/PlatformTypesView.js diff --git a/public/javascript/app/maintenance/domains/admin/views/ProjectGroupsView.js b/client-app/javascript/app/maintenance/domains/admin/views/ProjectGroupsView.js similarity index 100% rename from public/javascript/app/maintenance/domains/admin/views/ProjectGroupsView.js rename to client-app/javascript/app/maintenance/domains/admin/views/ProjectGroupsView.js diff --git a/public/javascript/app/maintenance/domains/admin/views/ScopesView.js b/client-app/javascript/app/maintenance/domains/admin/views/ScopesView.js similarity index 100% rename from public/javascript/app/maintenance/domains/admin/views/ScopesView.js rename to client-app/javascript/app/maintenance/domains/admin/views/ScopesView.js diff --git a/public/javascript/app/maintenance/domains/admin/views/templates/forms/ActivityTypesForm.html b/client-app/javascript/app/maintenance/domains/admin/views/templates/forms/ActivityTypesForm.html similarity index 100% rename from public/javascript/app/maintenance/domains/admin/views/templates/forms/ActivityTypesForm.html rename to client-app/javascript/app/maintenance/domains/admin/views/templates/forms/ActivityTypesForm.html diff --git a/public/javascript/app/maintenance/domains/admin/views/templates/forms/CountriesForm.html b/client-app/javascript/app/maintenance/domains/admin/views/templates/forms/CountriesForm.html similarity index 100% rename from public/javascript/app/maintenance/domains/admin/views/templates/forms/CountriesForm.html rename to client-app/javascript/app/maintenance/domains/admin/views/templates/forms/CountriesForm.html diff --git a/public/javascript/app/maintenance/domains/geometry/views/AreaTypesView.js b/client-app/javascript/app/maintenance/domains/geometry/views/AreaTypesView.js similarity index 100% rename from public/javascript/app/maintenance/domains/geometry/views/AreaTypesView.js rename to client-app/javascript/app/maintenance/domains/geometry/views/AreaTypesView.js diff --git a/public/javascript/app/maintenance/domains/geometry/views/DestinyView.js b/client-app/javascript/app/maintenance/domains/geometry/views/DestinyView.js similarity index 100% rename from public/javascript/app/maintenance/domains/geometry/views/DestinyView.js rename to client-app/javascript/app/maintenance/domains/geometry/views/DestinyView.js diff --git a/public/javascript/app/maintenance/domains/geometry/views/EndingView.js b/client-app/javascript/app/maintenance/domains/geometry/views/EndingView.js similarity index 100% rename from public/javascript/app/maintenance/domains/geometry/views/EndingView.js rename to client-app/javascript/app/maintenance/domains/geometry/views/EndingView.js diff --git a/public/javascript/app/maintenance/domains/geometry/views/InspireThemesView.js b/client-app/javascript/app/maintenance/domains/geometry/views/InspireThemesView.js similarity index 100% rename from public/javascript/app/maintenance/domains/geometry/views/InspireThemesView.js rename to client-app/javascript/app/maintenance/domains/geometry/views/InspireThemesView.js diff --git a/public/javascript/app/maintenance/domains/geometry/views/LineTypesView.js b/client-app/javascript/app/maintenance/domains/geometry/views/LineTypesView.js similarity index 100% rename from public/javascript/app/maintenance/domains/geometry/views/LineTypesView.js rename to client-app/javascript/app/maintenance/domains/geometry/views/LineTypesView.js diff --git a/public/javascript/app/maintenance/domains/geometry/views/MeshTypesView.js b/client-app/javascript/app/maintenance/domains/geometry/views/MeshTypesView.js similarity index 100% rename from public/javascript/app/maintenance/domains/geometry/views/MeshTypesView.js rename to client-app/javascript/app/maintenance/domains/geometry/views/MeshTypesView.js diff --git a/public/javascript/app/maintenance/domains/geometry/views/RasterTypesView.js b/client-app/javascript/app/maintenance/domains/geometry/views/RasterTypesView.js similarity index 100% rename from public/javascript/app/maintenance/domains/geometry/views/RasterTypesView.js rename to client-app/javascript/app/maintenance/domains/geometry/views/RasterTypesView.js diff --git a/public/javascript/app/maintenance/domains/geometry/views/RecordingTypesView.js b/client-app/javascript/app/maintenance/domains/geometry/views/RecordingTypesView.js similarity index 100% rename from public/javascript/app/maintenance/domains/geometry/views/RecordingTypesView.js rename to client-app/javascript/app/maintenance/domains/geometry/views/RecordingTypesView.js diff --git a/public/javascript/app/maintenance/domains/geometry/views/ShorelineTypesView.js b/client-app/javascript/app/maintenance/domains/geometry/views/ShorelineTypesView.js similarity index 100% rename from public/javascript/app/maintenance/domains/geometry/views/ShorelineTypesView.js rename to client-app/javascript/app/maintenance/domains/geometry/views/ShorelineTypesView.js diff --git a/public/javascript/app/maintenance/domains/geometry/views/ThematicTypeView.js b/client-app/javascript/app/maintenance/domains/geometry/views/ThematicTypeView.js similarity index 100% rename from public/javascript/app/maintenance/domains/geometry/views/ThematicTypeView.js rename to client-app/javascript/app/maintenance/domains/geometry/views/ThematicTypeView.js diff --git a/public/javascript/app/maintenance/domains/geometry/views/ToponymTypesView.js b/client-app/javascript/app/maintenance/domains/geometry/views/ToponymTypesView.js similarity index 100% rename from public/javascript/app/maintenance/domains/geometry/views/ToponymTypesView.js rename to client-app/javascript/app/maintenance/domains/geometry/views/ToponymTypesView.js diff --git a/public/javascript/app/maintenance/domains/geometry/views/templates/forms/InspireThemesForm.html b/client-app/javascript/app/maintenance/domains/geometry/views/templates/forms/InspireThemesForm.html similarity index 100% rename from public/javascript/app/maintenance/domains/geometry/views/templates/forms/InspireThemesForm.html rename to client-app/javascript/app/maintenance/domains/geometry/views/templates/forms/InspireThemesForm.html diff --git a/public/javascript/app/maintenance/domains/geometry/views/templates/forms/LineTypesForm.html b/client-app/javascript/app/maintenance/domains/geometry/views/templates/forms/LineTypesForm.html similarity index 100% rename from public/javascript/app/maintenance/domains/geometry/views/templates/forms/LineTypesForm.html rename to client-app/javascript/app/maintenance/domains/geometry/views/templates/forms/LineTypesForm.html diff --git a/public/javascript/app/maintenance/domains/geometry/views/templates/forms/ThematicTypeForm.html b/client-app/javascript/app/maintenance/domains/geometry/views/templates/forms/ThematicTypeForm.html similarity index 100% rename from public/javascript/app/maintenance/domains/geometry/views/templates/forms/ThematicTypeForm.html rename to client-app/javascript/app/maintenance/domains/geometry/views/templates/forms/ThematicTypeForm.html diff --git a/public/javascript/app/maintenance/domains/observations/views/AttributeTypesView.js b/client-app/javascript/app/maintenance/domains/observations/views/AttributeTypesView.js similarity index 100% rename from public/javascript/app/maintenance/domains/observations/views/AttributeTypesView.js rename to client-app/javascript/app/maintenance/domains/observations/views/AttributeTypesView.js diff --git a/public/javascript/app/maintenance/domains/observations/views/CensingStatusView.js b/client-app/javascript/app/maintenance/domains/observations/views/CensingStatusView.js similarity index 100% rename from public/javascript/app/maintenance/domains/observations/views/CensingStatusView.js rename to client-app/javascript/app/maintenance/domains/observations/views/CensingStatusView.js diff --git a/public/javascript/app/maintenance/domains/observations/views/ConfidenceView.js b/client-app/javascript/app/maintenance/domains/observations/views/ConfidenceView.js similarity index 100% rename from public/javascript/app/maintenance/domains/observations/views/ConfidenceView.js rename to client-app/javascript/app/maintenance/domains/observations/views/ConfidenceView.js diff --git a/public/javascript/app/maintenance/domains/observations/views/EventGroupsView.js b/client-app/javascript/app/maintenance/domains/observations/views/EventGroupsView.js similarity index 100% rename from public/javascript/app/maintenance/domains/observations/views/EventGroupsView.js rename to client-app/javascript/app/maintenance/domains/observations/views/EventGroupsView.js diff --git a/public/javascript/app/maintenance/domains/observations/views/InfrastructureTypeView.js b/client-app/javascript/app/maintenance/domains/observations/views/InfrastructureTypeView.js similarity index 100% rename from public/javascript/app/maintenance/domains/observations/views/InfrastructureTypeView.js rename to client-app/javascript/app/maintenance/domains/observations/views/InfrastructureTypeView.js diff --git a/public/javascript/app/maintenance/domains/observations/views/MetricGroupsView.js b/client-app/javascript/app/maintenance/domains/observations/views/MetricGroupsView.js similarity index 100% rename from public/javascript/app/maintenance/domains/observations/views/MetricGroupsView.js rename to client-app/javascript/app/maintenance/domains/observations/views/MetricGroupsView.js diff --git a/public/javascript/app/maintenance/domains/observations/views/MetricsDefinitionsView.js b/client-app/javascript/app/maintenance/domains/observations/views/MetricsDefinitionsView.js similarity index 100% rename from public/javascript/app/maintenance/domains/observations/views/MetricsDefinitionsView.js rename to client-app/javascript/app/maintenance/domains/observations/views/MetricsDefinitionsView.js diff --git a/public/javascript/app/maintenance/domains/observations/views/ObjectTypesView.js b/client-app/javascript/app/maintenance/domains/observations/views/ObjectTypesView.js similarity index 100% rename from public/javascript/app/maintenance/domains/observations/views/ObjectTypesView.js rename to client-app/javascript/app/maintenance/domains/observations/views/ObjectTypesView.js diff --git a/public/javascript/app/maintenance/domains/observations/views/ObservationTypesView.js b/client-app/javascript/app/maintenance/domains/observations/views/ObservationTypesView.js similarity index 100% rename from public/javascript/app/maintenance/domains/observations/views/ObservationTypesView.js rename to client-app/javascript/app/maintenance/domains/observations/views/ObservationTypesView.js diff --git a/public/javascript/app/maintenance/domains/observations/views/ParameterTypesView.js b/client-app/javascript/app/maintenance/domains/observations/views/ParameterTypesView.js similarity index 100% rename from public/javascript/app/maintenance/domains/observations/views/ParameterTypesView.js rename to client-app/javascript/app/maintenance/domains/observations/views/ParameterTypesView.js diff --git a/public/javascript/app/maintenance/domains/observations/views/ParametersView.js b/client-app/javascript/app/maintenance/domains/observations/views/ParametersView.js similarity index 100% rename from public/javascript/app/maintenance/domains/observations/views/ParametersView.js rename to client-app/javascript/app/maintenance/domains/observations/views/ParametersView.js diff --git a/public/javascript/app/maintenance/domains/observations/views/SampleTypesView.js b/client-app/javascript/app/maintenance/domains/observations/views/SampleTypesView.js similarity index 100% rename from public/javascript/app/maintenance/domains/observations/views/SampleTypesView.js rename to client-app/javascript/app/maintenance/domains/observations/views/SampleTypesView.js diff --git a/public/javascript/app/maintenance/domains/observations/views/SeaConditionsView.js b/client-app/javascript/app/maintenance/domains/observations/views/SeaConditionsView.js similarity index 100% rename from public/javascript/app/maintenance/domains/observations/views/SeaConditionsView.js rename to client-app/javascript/app/maintenance/domains/observations/views/SeaConditionsView.js diff --git a/public/javascript/app/maintenance/domains/observations/views/UnitTypesView.js b/client-app/javascript/app/maintenance/domains/observations/views/UnitTypesView.js similarity index 100% rename from public/javascript/app/maintenance/domains/observations/views/UnitTypesView.js rename to client-app/javascript/app/maintenance/domains/observations/views/UnitTypesView.js diff --git a/public/javascript/app/maintenance/domains/observations/views/UnitsView.js b/client-app/javascript/app/maintenance/domains/observations/views/UnitsView.js similarity index 100% rename from public/javascript/app/maintenance/domains/observations/views/UnitsView.js rename to client-app/javascript/app/maintenance/domains/observations/views/UnitsView.js diff --git a/public/javascript/app/maintenance/domains/taxon/views/CanaryProtectionView.js b/client-app/javascript/app/maintenance/domains/taxon/views/CanaryProtectionView.js similarity index 100% rename from public/javascript/app/maintenance/domains/taxon/views/CanaryProtectionView.js rename to client-app/javascript/app/maintenance/domains/taxon/views/CanaryProtectionView.js diff --git a/public/javascript/app/maintenance/domains/taxon/views/EUProtectionView.js b/client-app/javascript/app/maintenance/domains/taxon/views/EUProtectionView.js similarity index 100% rename from public/javascript/app/maintenance/domains/taxon/views/EUProtectionView.js rename to client-app/javascript/app/maintenance/domains/taxon/views/EUProtectionView.js diff --git a/public/javascript/app/maintenance/domains/taxon/views/EcologyView.js b/client-app/javascript/app/maintenance/domains/taxon/views/EcologyView.js similarity index 100% rename from public/javascript/app/maintenance/domains/taxon/views/EcologyView.js rename to client-app/javascript/app/maintenance/domains/taxon/views/EcologyView.js diff --git a/public/javascript/app/maintenance/domains/taxon/views/EndemicityView.js b/client-app/javascript/app/maintenance/domains/taxon/views/EndemicityView.js similarity index 100% rename from public/javascript/app/maintenance/domains/taxon/views/EndemicityView.js rename to client-app/javascript/app/maintenance/domains/taxon/views/EndemicityView.js diff --git a/public/javascript/app/maintenance/domains/taxon/views/InterestView.js b/client-app/javascript/app/maintenance/domains/taxon/views/InterestView.js similarity index 100% rename from public/javascript/app/maintenance/domains/taxon/views/InterestView.js rename to client-app/javascript/app/maintenance/domains/taxon/views/InterestView.js diff --git a/public/javascript/app/maintenance/domains/taxon/views/LifeStagesView.js b/client-app/javascript/app/maintenance/domains/taxon/views/LifeStagesView.js similarity index 100% rename from public/javascript/app/maintenance/domains/taxon/views/LifeStagesView.js rename to client-app/javascript/app/maintenance/domains/taxon/views/LifeStagesView.js diff --git a/public/javascript/app/maintenance/domains/taxon/views/OriginView.js b/client-app/javascript/app/maintenance/domains/taxon/views/OriginView.js similarity index 100% rename from public/javascript/app/maintenance/domains/taxon/views/OriginView.js rename to client-app/javascript/app/maintenance/domains/taxon/views/OriginView.js diff --git a/public/javascript/app/maintenance/domains/taxon/views/PermanenceView.js b/client-app/javascript/app/maintenance/domains/taxon/views/PermanenceView.js similarity index 100% rename from public/javascript/app/maintenance/domains/taxon/views/PermanenceView.js rename to client-app/javascript/app/maintenance/domains/taxon/views/PermanenceView.js diff --git a/public/javascript/app/maintenance/domains/taxon/views/RankView.js b/client-app/javascript/app/maintenance/domains/taxon/views/RankView.js similarity index 100% rename from public/javascript/app/maintenance/domains/taxon/views/RankView.js rename to client-app/javascript/app/maintenance/domains/taxon/views/RankView.js diff --git a/public/javascript/app/maintenance/domains/taxon/views/SexView.js b/client-app/javascript/app/maintenance/domains/taxon/views/SexView.js similarity index 100% rename from public/javascript/app/maintenance/domains/taxon/views/SexView.js rename to client-app/javascript/app/maintenance/domains/taxon/views/SexView.js diff --git a/public/javascript/app/maintenance/domains/taxon/views/SpainProtectionView.js b/client-app/javascript/app/maintenance/domains/taxon/views/SpainProtectionView.js similarity index 100% rename from public/javascript/app/maintenance/domains/taxon/views/SpainProtectionView.js rename to client-app/javascript/app/maintenance/domains/taxon/views/SpainProtectionView.js diff --git a/public/javascript/app/maintenance/domains/taxon/views/StatusView.js b/client-app/javascript/app/maintenance/domains/taxon/views/StatusView.js similarity index 100% rename from public/javascript/app/maintenance/domains/taxon/views/StatusView.js rename to client-app/javascript/app/maintenance/domains/taxon/views/StatusView.js diff --git a/public/javascript/app/maintenance/domains/taxon/views/TrophicRegimeView.js b/client-app/javascript/app/maintenance/domains/taxon/views/TrophicRegimeView.js similarity index 100% rename from public/javascript/app/maintenance/domains/taxon/views/TrophicRegimeView.js rename to client-app/javascript/app/maintenance/domains/taxon/views/TrophicRegimeView.js diff --git a/public/javascript/app/maintenance/domains/templates/forms/DomainForm.html b/client-app/javascript/app/maintenance/domains/templates/forms/DomainForm.html similarity index 100% rename from public/javascript/app/maintenance/domains/templates/forms/DomainForm.html rename to client-app/javascript/app/maintenance/domains/templates/forms/DomainForm.html diff --git a/public/javascript/app/maintenance/domains/templates/forms/HierarchicalDomainForm.html b/client-app/javascript/app/maintenance/domains/templates/forms/HierarchicalDomainForm.html similarity index 100% rename from public/javascript/app/maintenance/domains/templates/forms/HierarchicalDomainForm.html rename to client-app/javascript/app/maintenance/domains/templates/forms/HierarchicalDomainForm.html diff --git a/public/javascript/app/maintenance/models/AccessModel.js b/client-app/javascript/app/maintenance/models/AccessModel.js similarity index 100% rename from public/javascript/app/maintenance/models/AccessModel.js rename to client-app/javascript/app/maintenance/models/AccessModel.js diff --git a/public/javascript/app/maintenance/models/PermissionsModel.js b/client-app/javascript/app/maintenance/models/PermissionsModel.js similarity index 100% rename from public/javascript/app/maintenance/models/PermissionsModel.js rename to client-app/javascript/app/maintenance/models/PermissionsModel.js diff --git a/public/javascript/app/maintenance/views/DomainView.js b/client-app/javascript/app/maintenance/views/DomainView.js similarity index 100% rename from public/javascript/app/maintenance/views/DomainView.js rename to client-app/javascript/app/maintenance/views/DomainView.js diff --git a/public/javascript/app/maintenance/views/PermissionsView.js b/client-app/javascript/app/maintenance/views/PermissionsView.js similarity index 100% rename from public/javascript/app/maintenance/views/PermissionsView.js rename to client-app/javascript/app/maintenance/views/PermissionsView.js diff --git a/public/javascript/app/maintenance/views/ServiceOGCView.js b/client-app/javascript/app/maintenance/views/ServiceOGCView.js similarity index 100% rename from public/javascript/app/maintenance/views/ServiceOGCView.js rename to client-app/javascript/app/maintenance/views/ServiceOGCView.js diff --git a/public/javascript/app/maintenance/views/templates/forms/AccessForm.html b/client-app/javascript/app/maintenance/views/templates/forms/AccessForm.html similarity index 100% rename from public/javascript/app/maintenance/views/templates/forms/AccessForm.html rename to client-app/javascript/app/maintenance/views/templates/forms/AccessForm.html diff --git a/public/javascript/app/maintenance/views/templates/forms/CategoryLayerForm.html b/client-app/javascript/app/maintenance/views/templates/forms/CategoryLayerForm.html similarity index 100% rename from public/javascript/app/maintenance/views/templates/forms/CategoryLayerForm.html rename to client-app/javascript/app/maintenance/views/templates/forms/CategoryLayerForm.html diff --git a/public/javascript/app/maintenance/views/templates/forms/DownloadsForm.html b/client-app/javascript/app/maintenance/views/templates/forms/DownloadsForm.html similarity index 100% rename from public/javascript/app/maintenance/views/templates/forms/DownloadsForm.html rename to client-app/javascript/app/maintenance/views/templates/forms/DownloadsForm.html diff --git a/public/javascript/app/maintenance/views/templates/forms/PermissionsForm.html b/client-app/javascript/app/maintenance/views/templates/forms/PermissionsForm.html similarity index 100% rename from public/javascript/app/maintenance/views/templates/forms/PermissionsForm.html rename to client-app/javascript/app/maintenance/views/templates/forms/PermissionsForm.html diff --git a/public/javascript/app/maintenance/views/templates/forms/ProtocolsForm.html b/client-app/javascript/app/maintenance/views/templates/forms/ProtocolsForm.html similarity index 100% rename from public/javascript/app/maintenance/views/templates/forms/ProtocolsForm.html rename to client-app/javascript/app/maintenance/views/templates/forms/ProtocolsForm.html diff --git a/public/javascript/app/maintenance/views/templates/forms/ServiceOGCForm.html b/client-app/javascript/app/maintenance/views/templates/forms/ServiceOGCForm.html similarity index 100% rename from public/javascript/app/maintenance/views/templates/forms/ServiceOGCForm.html rename to client-app/javascript/app/maintenance/views/templates/forms/ServiceOGCForm.html diff --git a/public/javascript/app/maintenance/views/templates/forms/ServiceOGCLayerSearchForm.html b/client-app/javascript/app/maintenance/views/templates/forms/ServiceOGCLayerSearchForm.html similarity index 100% rename from public/javascript/app/maintenance/views/templates/forms/ServiceOGCLayerSearchForm.html rename to client-app/javascript/app/maintenance/views/templates/forms/ServiceOGCLayerSearchForm.html diff --git a/public/javascript/app/nls/es/translation.js b/client-app/javascript/app/nls/es/translation.js similarity index 100% rename from public/javascript/app/nls/es/translation.js rename to client-app/javascript/app/nls/es/translation.js diff --git a/public/javascript/app/nls/translation.js b/client-app/javascript/app/nls/translation.js similarity index 100% rename from public/javascript/app/nls/translation.js rename to client-app/javascript/app/nls/translation.js diff --git a/public/javascript/app/products/views/OpenMapView.js b/client-app/javascript/app/products/views/OpenMapView.js similarity index 100% rename from public/javascript/app/products/views/OpenMapView.js rename to client-app/javascript/app/products/views/OpenMapView.js diff --git a/public/javascript/app/products/views/ServiceOGCCatalogView.js b/client-app/javascript/app/products/views/ServiceOGCCatalogView.js similarity index 100% rename from public/javascript/app/products/views/ServiceOGCCatalogView.js rename to client-app/javascript/app/products/views/ServiceOGCCatalogView.js diff --git a/public/javascript/app/redmicConfig.js b/client-app/javascript/app/redmicConfig.js similarity index 100% rename from public/javascript/app/redmicConfig.js rename to client-app/javascript/app/redmicConfig.js diff --git a/public/javascript/app/user/models/FeedbackModel.js b/client-app/javascript/app/user/models/FeedbackModel.js similarity index 100% rename from public/javascript/app/user/models/FeedbackModel.js rename to client-app/javascript/app/user/models/FeedbackModel.js diff --git a/public/javascript/app/user/models/PasswordModel.js b/client-app/javascript/app/user/models/PasswordModel.js similarity index 100% rename from public/javascript/app/user/models/PasswordModel.js rename to client-app/javascript/app/user/models/PasswordModel.js diff --git a/public/javascript/app/user/models/RegisterModel.js b/client-app/javascript/app/user/models/RegisterModel.js similarity index 100% rename from public/javascript/app/user/models/RegisterModel.js rename to client-app/javascript/app/user/models/RegisterModel.js diff --git a/public/javascript/app/user/models/UserEmailModel.js b/client-app/javascript/app/user/models/UserEmailModel.js similarity index 100% rename from public/javascript/app/user/models/UserEmailModel.js rename to client-app/javascript/app/user/models/UserEmailModel.js diff --git a/public/javascript/app/user/models/UserImageModel.js b/client-app/javascript/app/user/models/UserImageModel.js similarity index 100% rename from public/javascript/app/user/models/UserImageModel.js rename to client-app/javascript/app/user/models/UserImageModel.js diff --git a/public/javascript/app/user/models/UserNameModel.js b/client-app/javascript/app/user/models/UserNameModel.js similarity index 100% rename from public/javascript/app/user/models/UserNameModel.js rename to client-app/javascript/app/user/models/UserNameModel.js diff --git a/public/javascript/app/user/models/UserSectorModel.js b/client-app/javascript/app/user/models/UserSectorModel.js similarity index 100% rename from public/javascript/app/user/models/UserSectorModel.js rename to client-app/javascript/app/user/models/UserSectorModel.js diff --git a/public/javascript/app/user/views/ConfirmResettingView.js b/client-app/javascript/app/user/views/ConfirmResettingView.js similarity index 100% rename from public/javascript/app/user/views/ConfirmResettingView.js rename to client-app/javascript/app/user/views/ConfirmResettingView.js diff --git a/public/javascript/app/user/views/FeedbackView.js b/client-app/javascript/app/user/views/FeedbackView.js similarity index 100% rename from public/javascript/app/user/views/FeedbackView.js rename to client-app/javascript/app/user/views/FeedbackView.js diff --git a/public/javascript/app/user/views/InnerWhatIsRedmicView.js b/client-app/javascript/app/user/views/InnerWhatIsRedmicView.js similarity index 100% rename from public/javascript/app/user/views/InnerWhatIsRedmicView.js rename to client-app/javascript/app/user/views/InnerWhatIsRedmicView.js diff --git a/public/javascript/app/user/views/LoginView.js b/client-app/javascript/app/user/views/LoginView.js similarity index 100% rename from public/javascript/app/user/views/LoginView.js rename to client-app/javascript/app/user/views/LoginView.js diff --git a/public/javascript/app/user/views/RegisterView.js b/client-app/javascript/app/user/views/RegisterView.js similarity index 100% rename from public/javascript/app/user/views/RegisterView.js rename to client-app/javascript/app/user/views/RegisterView.js diff --git a/public/javascript/app/user/views/ResettingView.js b/client-app/javascript/app/user/views/ResettingView.js similarity index 100% rename from public/javascript/app/user/views/ResettingView.js rename to client-app/javascript/app/user/views/ResettingView.js diff --git a/public/javascript/app/user/views/TermsAndConditionsView.js b/client-app/javascript/app/user/views/TermsAndConditionsView.js similarity index 100% rename from public/javascript/app/user/views/TermsAndConditionsView.js rename to client-app/javascript/app/user/views/TermsAndConditionsView.js diff --git a/public/javascript/app/user/views/UserProfileView.js b/client-app/javascript/app/user/views/UserProfileView.js similarity index 100% rename from public/javascript/app/user/views/UserProfileView.js rename to client-app/javascript/app/user/views/UserProfileView.js diff --git a/public/javascript/app/user/views/WhatIsRedmicView.js b/client-app/javascript/app/user/views/WhatIsRedmicView.js similarity index 100% rename from public/javascript/app/user/views/WhatIsRedmicView.js rename to client-app/javascript/app/user/views/WhatIsRedmicView.js diff --git a/public/javascript/app/user/views/_ExternalUserBaseView.js b/client-app/javascript/app/user/views/_ExternalUserBaseView.js similarity index 100% rename from public/javascript/app/user/views/_ExternalUserBaseView.js rename to client-app/javascript/app/user/views/_ExternalUserBaseView.js diff --git a/public/javascript/app/user/views/templates/ConfirmResetting.html b/client-app/javascript/app/user/views/templates/ConfirmResetting.html similarity index 100% rename from public/javascript/app/user/views/templates/ConfirmResetting.html rename to client-app/javascript/app/user/views/templates/ConfirmResetting.html diff --git a/public/javascript/app/user/views/templates/ExternalUserBase.html b/client-app/javascript/app/user/views/templates/ExternalUserBase.html similarity index 100% rename from public/javascript/app/user/views/templates/ExternalUserBase.html rename to client-app/javascript/app/user/views/templates/ExternalUserBase.html diff --git a/public/javascript/app/user/views/templates/Feedback.html b/client-app/javascript/app/user/views/templates/Feedback.html similarity index 100% rename from public/javascript/app/user/views/templates/Feedback.html rename to client-app/javascript/app/user/views/templates/Feedback.html diff --git a/public/javascript/app/user/views/templates/Login.html b/client-app/javascript/app/user/views/templates/Login.html similarity index 100% rename from public/javascript/app/user/views/templates/Login.html rename to client-app/javascript/app/user/views/templates/Login.html diff --git a/public/javascript/app/user/views/templates/Register.html b/client-app/javascript/app/user/views/templates/Register.html similarity index 100% rename from public/javascript/app/user/views/templates/Register.html rename to client-app/javascript/app/user/views/templates/Register.html diff --git a/public/javascript/app/user/views/templates/Resetting.html b/client-app/javascript/app/user/views/templates/Resetting.html similarity index 100% rename from public/javascript/app/user/views/templates/Resetting.html rename to client-app/javascript/app/user/views/templates/Resetting.html diff --git a/public/javascript/app/user/views/templates/TermsAndConditions.html b/client-app/javascript/app/user/views/templates/TermsAndConditions.html similarity index 100% rename from public/javascript/app/user/views/templates/TermsAndConditions.html rename to client-app/javascript/app/user/views/templates/TermsAndConditions.html diff --git a/public/javascript/app/user/views/templates/WhatIsRedmic.html b/client-app/javascript/app/user/views/templates/WhatIsRedmic.html similarity index 100% rename from public/javascript/app/user/views/templates/WhatIsRedmic.html rename to client-app/javascript/app/user/views/templates/WhatIsRedmic.html diff --git a/public/javascript/app/user/views/templates/forms/ChangePasswordForm.html b/client-app/javascript/app/user/views/templates/forms/ChangePasswordForm.html similarity index 100% rename from public/javascript/app/user/views/templates/forms/ChangePasswordForm.html rename to client-app/javascript/app/user/views/templates/forms/ChangePasswordForm.html diff --git a/public/javascript/app/user/views/templates/forms/FeedbackForm.html b/client-app/javascript/app/user/views/templates/forms/FeedbackForm.html similarity index 100% rename from public/javascript/app/user/views/templates/forms/FeedbackForm.html rename to client-app/javascript/app/user/views/templates/forms/FeedbackForm.html diff --git a/public/javascript/app/user/views/templates/forms/RegisterForm.html b/client-app/javascript/app/user/views/templates/forms/RegisterForm.html similarity index 100% rename from public/javascript/app/user/views/templates/forms/RegisterForm.html rename to client-app/javascript/app/user/views/templates/forms/RegisterForm.html diff --git a/public/javascript/app/user/views/templates/forms/UserEmailForm.html b/client-app/javascript/app/user/views/templates/forms/UserEmailForm.html similarity index 100% rename from public/javascript/app/user/views/templates/forms/UserEmailForm.html rename to client-app/javascript/app/user/views/templates/forms/UserEmailForm.html diff --git a/public/javascript/app/user/views/templates/forms/UserImageForm.html b/client-app/javascript/app/user/views/templates/forms/UserImageForm.html similarity index 100% rename from public/javascript/app/user/views/templates/forms/UserImageForm.html rename to client-app/javascript/app/user/views/templates/forms/UserImageForm.html diff --git a/public/javascript/app/user/views/templates/forms/UserNameForm.html b/client-app/javascript/app/user/views/templates/forms/UserNameForm.html similarity index 100% rename from public/javascript/app/user/views/templates/forms/UserNameForm.html rename to client-app/javascript/app/user/views/templates/forms/UserNameForm.html diff --git a/public/javascript/app/user/views/templates/forms/UserSectorForm.html b/client-app/javascript/app/user/views/templates/forms/UserSectorForm.html similarity index 100% rename from public/javascript/app/user/views/templates/forms/UserSectorForm.html rename to client-app/javascript/app/user/views/templates/forms/UserSectorForm.html diff --git a/public/javascript/app/viewers/models/PointClusterCategorizeModel.js b/client-app/javascript/app/viewers/models/PointClusterCategorizeModel.js similarity index 100% rename from public/javascript/app/viewers/models/PointClusterCategorizeModel.js rename to client-app/javascript/app/viewers/models/PointClusterCategorizeModel.js diff --git a/public/javascript/app/viewers/models/PointClusterModel.js b/client-app/javascript/app/viewers/models/PointClusterModel.js similarity index 100% rename from public/javascript/app/viewers/models/PointClusterModel.js rename to client-app/javascript/app/viewers/models/PointClusterModel.js diff --git a/public/javascript/app/viewers/views/BibliographyView.js b/client-app/javascript/app/viewers/views/BibliographyView.js similarity index 100% rename from public/javascript/app/viewers/views/BibliographyView.js rename to client-app/javascript/app/viewers/views/BibliographyView.js diff --git a/public/javascript/app/viewers/views/ChartsView.js b/client-app/javascript/app/viewers/views/ChartsView.js similarity index 100% rename from public/javascript/app/viewers/views/ChartsView.js rename to client-app/javascript/app/viewers/views/ChartsView.js diff --git a/public/javascript/app/viewers/views/RealTimeDashboardView.js b/client-app/javascript/app/viewers/views/RealTimeDashboardView.js similarity index 100% rename from public/javascript/app/viewers/views/RealTimeDashboardView.js rename to client-app/javascript/app/viewers/views/RealTimeDashboardView.js diff --git a/public/javascript/app/viewers/views/RealTimeView.js b/client-app/javascript/app/viewers/views/RealTimeView.js similarity index 100% rename from public/javascript/app/viewers/views/RealTimeView.js rename to client-app/javascript/app/viewers/views/RealTimeView.js diff --git a/public/javascript/app/viewers/views/SpeciesDistributionView.js b/client-app/javascript/app/viewers/views/SpeciesDistributionView.js similarity index 100% rename from public/javascript/app/viewers/views/SpeciesDistributionView.js rename to client-app/javascript/app/viewers/views/SpeciesDistributionView.js diff --git a/public/javascript/app/viewers/views/StacBrowserView.js b/client-app/javascript/app/viewers/views/StacBrowserView.js similarity index 100% rename from public/javascript/app/viewers/views/StacBrowserView.js rename to client-app/javascript/app/viewers/views/StacBrowserView.js diff --git a/public/javascript/app/viewers/views/TrackingView.js b/client-app/javascript/app/viewers/views/TrackingView.js similarity index 100% rename from public/javascript/app/viewers/views/TrackingView.js rename to client-app/javascript/app/viewers/views/TrackingView.js diff --git a/public/javascript/app/viewers/views/TrashCharts.js b/client-app/javascript/app/viewers/views/TrashCharts.js similarity index 100% rename from public/javascript/app/viewers/views/TrashCharts.js rename to client-app/javascript/app/viewers/views/TrashCharts.js diff --git a/public/javascript/app/viewers/views/TrashCollectionView.js b/client-app/javascript/app/viewers/views/TrashCollectionView.js similarity index 100% rename from public/javascript/app/viewers/views/TrashCollectionView.js rename to client-app/javascript/app/viewers/views/TrashCollectionView.js diff --git a/public/javascript/app/viewers/views/TrashDetails.js b/client-app/javascript/app/viewers/views/TrashDetails.js similarity index 100% rename from public/javascript/app/viewers/views/TrashDetails.js rename to client-app/javascript/app/viewers/views/TrashDetails.js diff --git a/public/javascript/app/viewers/views/TrashInfo.js b/client-app/javascript/app/viewers/views/TrashInfo.js similarity index 100% rename from public/javascript/app/viewers/views/TrashInfo.js rename to client-app/javascript/app/viewers/views/TrashInfo.js diff --git a/public/javascript/app/viewers/views/_ObjectCollectionSeriesSelectionManagement.js b/client-app/javascript/app/viewers/views/_ObjectCollectionSeriesSelectionManagement.js similarity index 100% rename from public/javascript/app/viewers/views/_ObjectCollectionSeriesSelectionManagement.js rename to client-app/javascript/app/viewers/views/_ObjectCollectionSeriesSelectionManagement.js diff --git a/public/javascript/app/viewers/views/_SelectTimeInterval.js b/client-app/javascript/app/viewers/views/_SelectTimeInterval.js similarity index 100% rename from public/javascript/app/viewers/views/_SelectTimeInterval.js rename to client-app/javascript/app/viewers/views/_SelectTimeInterval.js diff --git a/public/javascript/app/viewers/views/_TimeSeriesDataManagement.js b/client-app/javascript/app/viewers/views/_TimeSeriesDataManagement.js similarity index 100% rename from public/javascript/app/viewers/views/_TimeSeriesDataManagement.js rename to client-app/javascript/app/viewers/views/_TimeSeriesDataManagement.js diff --git a/public/javascript/app/viewers/views/_TimeSeriesSelectionManagement.js b/client-app/javascript/app/viewers/views/_TimeSeriesSelectionManagement.js similarity index 100% rename from public/javascript/app/viewers/views/_TimeSeriesSelectionManagement.js rename to client-app/javascript/app/viewers/views/_TimeSeriesSelectionManagement.js diff --git a/public/javascript/app/viewers/views/templates/forms/PointClusterCategorizeForm.html b/client-app/javascript/app/viewers/views/templates/forms/PointClusterCategorizeForm.html similarity index 100% rename from public/javascript/app/viewers/views/templates/forms/PointClusterCategorizeForm.html rename to client-app/javascript/app/viewers/views/templates/forms/PointClusterCategorizeForm.html diff --git a/public/javascript/app/viewers/views/templates/forms/PointClusterForm.html b/client-app/javascript/app/viewers/views/templates/forms/PointClusterForm.html similarity index 100% rename from public/javascript/app/viewers/views/templates/forms/PointClusterForm.html rename to client-app/javascript/app/viewers/views/templates/forms/PointClusterForm.html diff --git a/public/javascript/app/viewers/views/templates/forms/SpeciesDistributionForm.html b/client-app/javascript/app/viewers/views/templates/forms/SpeciesDistributionForm.html similarity index 100% rename from public/javascript/app/viewers/views/templates/forms/SpeciesDistributionForm.html rename to client-app/javascript/app/viewers/views/templates/forms/SpeciesDistributionForm.html diff --git a/public/javascript/app/viewers/views/templates/forms/TrackingForm.html b/client-app/javascript/app/viewers/views/templates/forms/TrackingForm.html similarity index 100% rename from public/javascript/app/viewers/views/templates/forms/TrackingForm.html rename to client-app/javascript/app/viewers/views/templates/forms/TrackingForm.html diff --git a/public/javascript/app/views/404.js b/client-app/javascript/app/views/404.js similarity index 100% rename from public/javascript/app/views/404.js rename to client-app/javascript/app/views/404.js diff --git a/public/javascript/app/views/ActivateAccount.js b/client-app/javascript/app/views/ActivateAccount.js similarity index 100% rename from public/javascript/app/views/ActivateAccount.js rename to client-app/javascript/app/views/ActivateAccount.js diff --git a/public/javascript/app/views/NoSupportBrowser.js b/client-app/javascript/app/views/NoSupportBrowser.js similarity index 100% rename from public/javascript/app/views/NoSupportBrowser.js rename to client-app/javascript/app/views/NoSupportBrowser.js diff --git a/public/javascript/app/views/UnderConstructionView.js b/client-app/javascript/app/views/UnderConstructionView.js similarity index 100% rename from public/javascript/app/views/UnderConstructionView.js rename to client-app/javascript/app/views/UnderConstructionView.js diff --git a/public/javascript/app/views/nls/es/translation.js b/client-app/javascript/app/views/nls/es/translation.js similarity index 100% rename from public/javascript/app/views/nls/es/translation.js rename to client-app/javascript/app/views/nls/es/translation.js diff --git a/public/javascript/app/views/nls/translation.js b/client-app/javascript/app/views/nls/translation.js similarity index 100% rename from public/javascript/app/views/nls/translation.js rename to client-app/javascript/app/views/nls/translation.js diff --git a/public/javascript/app/views/templates/NoSupportBrowser.html b/client-app/javascript/app/views/templates/NoSupportBrowser.html similarity index 100% rename from public/javascript/app/views/templates/NoSupportBrowser.html rename to client-app/javascript/app/views/templates/NoSupportBrowser.html diff --git a/public/javascript/cbtree b/client-app/javascript/cbtree similarity index 100% rename from public/javascript/cbtree rename to client-app/javascript/cbtree diff --git a/public/javascript/color-js b/client-app/javascript/color-js similarity index 100% rename from public/javascript/color-js rename to client-app/javascript/color-js diff --git a/public/javascript/d3 b/client-app/javascript/d3 similarity index 100% rename from public/javascript/d3 rename to client-app/javascript/d3 diff --git a/public/javascript/d3-v6-tip b/client-app/javascript/d3-v6-tip similarity index 100% rename from public/javascript/d3-v6-tip rename to client-app/javascript/d3-v6-tip diff --git a/public/javascript/deepmerge b/client-app/javascript/deepmerge similarity index 100% rename from public/javascript/deepmerge rename to client-app/javascript/deepmerge diff --git a/public/javascript/dijit b/client-app/javascript/dijit similarity index 100% rename from public/javascript/dijit rename to client-app/javascript/dijit diff --git a/public/javascript/dojo b/client-app/javascript/dojo similarity index 100% rename from public/javascript/dojo rename to client-app/javascript/dojo diff --git a/public/javascript/dojoConfig.js b/client-app/javascript/dojoConfig.js similarity index 100% rename from public/javascript/dojoConfig.js rename to client-app/javascript/dojoConfig.js diff --git a/public/javascript/dojoConfigBuild.js b/client-app/javascript/dojoConfigBuild.js similarity index 100% rename from public/javascript/dojoConfigBuild.js rename to client-app/javascript/dojoConfigBuild.js diff --git a/public/javascript/dojox b/client-app/javascript/dojox similarity index 100% rename from public/javascript/dojox rename to client-app/javascript/dojox diff --git a/public/javascript/draggabilly b/client-app/javascript/draggabilly similarity index 100% rename from public/javascript/draggabilly rename to client-app/javascript/draggabilly diff --git a/public/javascript/dropzone b/client-app/javascript/dropzone similarity index 100% rename from public/javascript/dropzone rename to client-app/javascript/dropzone diff --git a/public/javascript/handlebars b/client-app/javascript/handlebars similarity index 100% rename from public/javascript/handlebars rename to client-app/javascript/handlebars diff --git a/public/javascript/json-schema-ref-parser b/client-app/javascript/json-schema-ref-parser similarity index 100% rename from public/javascript/json-schema-ref-parser rename to client-app/javascript/json-schema-ref-parser diff --git a/public/javascript/leaflet b/client-app/javascript/leaflet similarity index 100% rename from public/javascript/leaflet rename to client-app/javascript/leaflet diff --git a/public/javascript/leaflet-areaselect b/client-app/javascript/leaflet-areaselect similarity index 100% rename from public/javascript/leaflet-areaselect rename to client-app/javascript/leaflet-areaselect diff --git a/public/javascript/leaflet-awesome-markers b/client-app/javascript/leaflet-awesome-markers similarity index 100% rename from public/javascript/leaflet-awesome-markers rename to client-app/javascript/leaflet-awesome-markers diff --git a/public/javascript/leaflet-coordinates b/client-app/javascript/leaflet-coordinates similarity index 100% rename from public/javascript/leaflet-coordinates rename to client-app/javascript/leaflet-coordinates diff --git a/public/javascript/leaflet-draw b/client-app/javascript/leaflet-draw similarity index 100% rename from public/javascript/leaflet-draw rename to client-app/javascript/leaflet-draw diff --git a/public/javascript/leaflet-measure b/client-app/javascript/leaflet-measure similarity index 100% rename from public/javascript/leaflet-measure rename to client-app/javascript/leaflet-measure diff --git a/public/javascript/leaflet-minimap b/client-app/javascript/leaflet-minimap similarity index 100% rename from public/javascript/leaflet-minimap rename to client-app/javascript/leaflet-minimap diff --git a/public/javascript/leaflet-navbar b/client-app/javascript/leaflet-navbar similarity index 100% rename from public/javascript/leaflet-navbar rename to client-app/javascript/leaflet-navbar diff --git a/public/javascript/leaflet-nontiledlayer b/client-app/javascript/leaflet-nontiledlayer similarity index 100% rename from public/javascript/leaflet-nontiledlayer rename to client-app/javascript/leaflet-nontiledlayer diff --git a/public/javascript/mediatorjs b/client-app/javascript/mediatorjs similarity index 100% rename from public/javascript/mediatorjs rename to client-app/javascript/mediatorjs diff --git a/public/javascript/moment b/client-app/javascript/moment similarity index 100% rename from public/javascript/moment rename to client-app/javascript/moment diff --git a/public/javascript/packery b/client-app/javascript/packery similarity index 100% rename from public/javascript/packery rename to client-app/javascript/packery diff --git a/public/javascript/pdfjs b/client-app/javascript/pdfjs similarity index 100% rename from public/javascript/pdfjs rename to client-app/javascript/pdfjs diff --git a/public/javascript/proj4 b/client-app/javascript/proj4 similarity index 100% rename from public/javascript/proj4 rename to client-app/javascript/proj4 diff --git a/public/javascript/pruneCluster b/client-app/javascript/pruneCluster similarity index 100% rename from public/javascript/pruneCluster rename to client-app/javascript/pruneCluster diff --git a/public/javascript/put-selector b/client-app/javascript/put-selector similarity index 100% rename from public/javascript/put-selector rename to client-app/javascript/put-selector diff --git a/public/javascript/redmic/base/CheckBrowser.js b/client-app/javascript/redmic/base/CheckBrowser.js similarity index 100% rename from public/javascript/redmic/base/CheckBrowser.js rename to client-app/javascript/redmic/base/CheckBrowser.js diff --git a/public/javascript/redmic/base/Credentials.js b/client-app/javascript/redmic/base/Credentials.js similarity index 100% rename from public/javascript/redmic/base/Credentials.js rename to client-app/javascript/redmic/base/Credentials.js diff --git a/public/javascript/redmic/base/GuestChecker.js b/client-app/javascript/redmic/base/GuestChecker.js similarity index 100% rename from public/javascript/redmic/base/GuestChecker.js rename to client-app/javascript/redmic/base/GuestChecker.js diff --git a/public/javascript/redmic/base/Mediator.js b/client-app/javascript/redmic/base/Mediator.js similarity index 100% rename from public/javascript/redmic/base/Mediator.js rename to client-app/javascript/redmic/base/Mediator.js diff --git a/public/javascript/redmic/base/RedmicLocalStorage.js b/client-app/javascript/redmic/base/RedmicLocalStorage.js similarity index 100% rename from public/javascript/redmic/base/RedmicLocalStorage.js rename to client-app/javascript/redmic/base/RedmicLocalStorage.js diff --git a/public/javascript/redmic/base/tv4.js b/client-app/javascript/redmic/base/tv4.js similarity index 100% rename from public/javascript/redmic/base/tv4.js rename to client-app/javascript/redmic/base/tv4.js diff --git a/public/javascript/redmic/dialog/LockDialogImpl.js b/client-app/javascript/redmic/dialog/LockDialogImpl.js similarity index 100% rename from public/javascript/redmic/dialog/LockDialogImpl.js rename to client-app/javascript/redmic/dialog/LockDialogImpl.js diff --git a/public/javascript/redmic/dialog/_DialogComplexItfc.js b/client-app/javascript/redmic/dialog/_DialogComplexItfc.js similarity index 100% rename from public/javascript/redmic/dialog/_DialogComplexItfc.js rename to client-app/javascript/redmic/dialog/_DialogComplexItfc.js diff --git a/public/javascript/redmic/form/FormContainer.js b/client-app/javascript/redmic/form/FormContainer.js similarity index 100% rename from public/javascript/redmic/form/FormContainer.js rename to client-app/javascript/redmic/form/FormContainer.js diff --git a/public/javascript/redmic/form/Select.js b/client-app/javascript/redmic/form/Select.js similarity index 100% rename from public/javascript/redmic/form/Select.js rename to client-app/javascript/redmic/form/Select.js diff --git a/public/javascript/redmic/form/UploadInput.js b/client-app/javascript/redmic/form/UploadInput.js similarity index 100% rename from public/javascript/redmic/form/UploadInput.js rename to client-app/javascript/redmic/form/UploadInput.js diff --git a/public/javascript/redmic/form/nls/UploadInput.js b/client-app/javascript/redmic/form/nls/UploadInput.js similarity index 100% rename from public/javascript/redmic/form/nls/UploadInput.js rename to client-app/javascript/redmic/form/nls/UploadInput.js diff --git a/public/javascript/redmic/form/nls/es/UploadInput.js b/client-app/javascript/redmic/form/nls/es/UploadInput.js similarity index 100% rename from public/javascript/redmic/form/nls/es/UploadInput.js rename to client-app/javascript/redmic/form/nls/es/UploadInput.js diff --git a/public/javascript/redmic/form/templates/Select.html b/client-app/javascript/redmic/form/templates/Select.html similarity index 100% rename from public/javascript/redmic/form/templates/Select.html rename to client-app/javascript/redmic/form/templates/Select.html diff --git a/public/javascript/redmic/form/templates/UploadInput.html b/client-app/javascript/redmic/form/templates/UploadInput.html similarity index 100% rename from public/javascript/redmic/form/templates/UploadInput.html rename to client-app/javascript/redmic/form/templates/UploadInput.html diff --git a/public/javascript/redmic/layout/DialogComplex.js b/client-app/javascript/redmic/layout/DialogComplex.js similarity index 100% rename from public/javascript/redmic/layout/DialogComplex.js rename to client-app/javascript/redmic/layout/DialogComplex.js diff --git a/public/javascript/redmic/layout/DialogSimple.js b/client-app/javascript/redmic/layout/DialogSimple.js similarity index 100% rename from public/javascript/redmic/layout/DialogSimple.js rename to client-app/javascript/redmic/layout/DialogSimple.js diff --git a/public/javascript/redmic/layout/_DialogBase.js b/client-app/javascript/redmic/layout/_DialogBase.js similarity index 100% rename from public/javascript/redmic/layout/_DialogBase.js rename to client-app/javascript/redmic/layout/_DialogBase.js diff --git a/public/javascript/redmic/modules/app/App.js b/client-app/javascript/redmic/modules/app/App.js similarity index 100% rename from public/javascript/redmic/modules/app/App.js rename to client-app/javascript/redmic/modules/app/App.js diff --git a/public/javascript/redmic/modules/app/ModuleStore.js b/client-app/javascript/redmic/modules/app/ModuleStore.js similarity index 100% rename from public/javascript/redmic/modules/app/ModuleStore.js rename to client-app/javascript/redmic/modules/app/ModuleStore.js diff --git a/public/javascript/redmic/modules/app/Router.js b/client-app/javascript/redmic/modules/app/Router.js similarity index 100% rename from public/javascript/redmic/modules/app/Router.js rename to client-app/javascript/redmic/modules/app/Router.js diff --git a/public/javascript/redmic/modules/app/_app.js b/client-app/javascript/redmic/modules/app/_app.js similarity index 100% rename from public/javascript/redmic/modules/app/_app.js rename to client-app/javascript/redmic/modules/app/_app.js diff --git a/public/javascript/redmic/modules/app/_appItfc.js b/client-app/javascript/redmic/modules/app/_appItfc.js similarity index 100% rename from public/javascript/redmic/modules/app/_appItfc.js rename to client-app/javascript/redmic/modules/app/_appItfc.js diff --git a/public/javascript/redmic/modules/app/innerApp.js b/client-app/javascript/redmic/modules/app/innerApp.js similarity index 100% rename from public/javascript/redmic/modules/app/innerApp.js rename to client-app/javascript/redmic/modules/app/innerApp.js diff --git a/public/javascript/redmic/modules/app/outerApp.js b/client-app/javascript/redmic/modules/app/outerApp.js similarity index 100% rename from public/javascript/redmic/modules/app/outerApp.js rename to client-app/javascript/redmic/modules/app/outerApp.js diff --git a/public/javascript/redmic/modules/atlas/Atlas.js b/client-app/javascript/redmic/modules/atlas/Atlas.js similarity index 100% rename from public/javascript/redmic/modules/atlas/Atlas.js rename to client-app/javascript/redmic/modules/atlas/Atlas.js diff --git a/public/javascript/redmic/modules/atlas/_AtlasLayersManagement.js b/client-app/javascript/redmic/modules/atlas/_AtlasLayersManagement.js similarity index 100% rename from public/javascript/redmic/modules/atlas/_AtlasLayersManagement.js rename to client-app/javascript/redmic/modules/atlas/_AtlasLayersManagement.js diff --git a/public/javascript/redmic/modules/atlas/_AtlasLegendManagement.js b/client-app/javascript/redmic/modules/atlas/_AtlasLegendManagement.js similarity index 100% rename from public/javascript/redmic/modules/atlas/_AtlasLegendManagement.js rename to client-app/javascript/redmic/modules/atlas/_AtlasLegendManagement.js diff --git a/public/javascript/redmic/modules/base/Analytics.js b/client-app/javascript/redmic/modules/base/Analytics.js similarity index 100% rename from public/javascript/redmic/modules/base/Analytics.js rename to client-app/javascript/redmic/modules/base/Analytics.js diff --git a/public/javascript/redmic/modules/base/Credentials.js b/client-app/javascript/redmic/modules/base/Credentials.js similarity index 100% rename from public/javascript/redmic/modules/base/Credentials.js rename to client-app/javascript/redmic/modules/base/Credentials.js diff --git a/public/javascript/redmic/modules/base/Loading.js b/client-app/javascript/redmic/modules/base/Loading.js similarity index 100% rename from public/javascript/redmic/modules/base/Loading.js rename to client-app/javascript/redmic/modules/base/Loading.js diff --git a/public/javascript/redmic/modules/base/Manager.js b/client-app/javascript/redmic/modules/base/Manager.js similarity index 100% rename from public/javascript/redmic/modules/base/Manager.js rename to client-app/javascript/redmic/modules/base/Manager.js diff --git a/public/javascript/redmic/modules/base/_AuthFirewall.js b/client-app/javascript/redmic/modules/base/_AuthFirewall.js similarity index 100% rename from public/javascript/redmic/modules/base/_AuthFirewall.js rename to client-app/javascript/redmic/modules/base/_AuthFirewall.js diff --git a/public/javascript/redmic/modules/base/_ChkCollection.js b/client-app/javascript/redmic/modules/base/_ChkCollection.js similarity index 100% rename from public/javascript/redmic/modules/base/_ChkCollection.js rename to client-app/javascript/redmic/modules/base/_ChkCollection.js diff --git a/public/javascript/redmic/modules/base/_CommunicationCenter.js b/client-app/javascript/redmic/modules/base/_CommunicationCenter.js similarity index 100% rename from public/javascript/redmic/modules/base/_CommunicationCenter.js rename to client-app/javascript/redmic/modules/base/_CommunicationCenter.js diff --git a/public/javascript/redmic/modules/base/_ExternalConfig.js b/client-app/javascript/redmic/modules/base/_ExternalConfig.js similarity index 100% rename from public/javascript/redmic/modules/base/_ExternalConfig.js rename to client-app/javascript/redmic/modules/base/_ExternalConfig.js diff --git a/public/javascript/redmic/modules/base/_Filter.js b/client-app/javascript/redmic/modules/base/_Filter.js similarity index 100% rename from public/javascript/redmic/modules/base/_Filter.js rename to client-app/javascript/redmic/modules/base/_Filter.js diff --git a/public/javascript/redmic/modules/base/_FilterItfc.js b/client-app/javascript/redmic/modules/base/_FilterItfc.js similarity index 100% rename from public/javascript/redmic/modules/base/_FilterItfc.js rename to client-app/javascript/redmic/modules/base/_FilterItfc.js diff --git a/public/javascript/redmic/modules/base/_Itfc.js b/client-app/javascript/redmic/modules/base/_Itfc.js similarity index 100% rename from public/javascript/redmic/modules/base/_Itfc.js rename to client-app/javascript/redmic/modules/base/_Itfc.js diff --git a/public/javascript/redmic/modules/base/_ListenQueryParams.js b/client-app/javascript/redmic/modules/base/_ListenQueryParams.js similarity index 100% rename from public/javascript/redmic/modules/base/_ListenQueryParams.js rename to client-app/javascript/redmic/modules/base/_ListenQueryParams.js diff --git a/public/javascript/redmic/modules/base/_ListenQueryParamsItfc.js b/client-app/javascript/redmic/modules/base/_ListenQueryParamsItfc.js similarity index 100% rename from public/javascript/redmic/modules/base/_ListenQueryParamsItfc.js rename to client-app/javascript/redmic/modules/base/_ListenQueryParamsItfc.js diff --git a/public/javascript/redmic/modules/base/_ListenWindowResize.js b/client-app/javascript/redmic/modules/base/_ListenWindowResize.js similarity index 100% rename from public/javascript/redmic/modules/base/_ListenWindowResize.js rename to client-app/javascript/redmic/modules/base/_ListenWindowResize.js diff --git a/public/javascript/redmic/modules/base/_ManageClickEvent.js b/client-app/javascript/redmic/modules/base/_ManageClickEvent.js similarity index 100% rename from public/javascript/redmic/modules/base/_ManageClickEvent.js rename to client-app/javascript/redmic/modules/base/_ManageClickEvent.js diff --git a/public/javascript/redmic/modules/base/_Module.js b/client-app/javascript/redmic/modules/base/_Module.js similarity index 100% rename from public/javascript/redmic/modules/base/_Module.js rename to client-app/javascript/redmic/modules/base/_Module.js diff --git a/public/javascript/redmic/modules/base/_ModuleItfc.js b/client-app/javascript/redmic/modules/base/_ModuleItfc.js similarity index 100% rename from public/javascript/redmic/modules/base/_ModuleItfc.js rename to client-app/javascript/redmic/modules/base/_ModuleItfc.js diff --git a/public/javascript/redmic/modules/base/_Persistence.js b/client-app/javascript/redmic/modules/base/_Persistence.js similarity index 100% rename from public/javascript/redmic/modules/base/_Persistence.js rename to client-app/javascript/redmic/modules/base/_Persistence.js diff --git a/public/javascript/redmic/modules/base/_PersistenceItfc.js b/client-app/javascript/redmic/modules/base/_PersistenceItfc.js similarity index 100% rename from public/javascript/redmic/modules/base/_PersistenceItfc.js rename to client-app/javascript/redmic/modules/base/_PersistenceItfc.js diff --git a/public/javascript/redmic/modules/base/_Selection.js b/client-app/javascript/redmic/modules/base/_Selection.js similarity index 100% rename from public/javascript/redmic/modules/base/_Selection.js rename to client-app/javascript/redmic/modules/base/_Selection.js diff --git a/public/javascript/redmic/modules/base/_SelectionBase.js b/client-app/javascript/redmic/modules/base/_SelectionBase.js similarity index 100% rename from public/javascript/redmic/modules/base/_SelectionBase.js rename to client-app/javascript/redmic/modules/base/_SelectionBase.js diff --git a/public/javascript/redmic/modules/base/_SelectionItfc.js b/client-app/javascript/redmic/modules/base/_SelectionItfc.js similarity index 100% rename from public/javascript/redmic/modules/base/_SelectionItfc.js rename to client-app/javascript/redmic/modules/base/_SelectionItfc.js diff --git a/public/javascript/redmic/modules/base/_Show.js b/client-app/javascript/redmic/modules/base/_Show.js similarity index 100% rename from public/javascript/redmic/modules/base/_Show.js rename to client-app/javascript/redmic/modules/base/_Show.js diff --git a/public/javascript/redmic/modules/base/_ShowInPopup.js b/client-app/javascript/redmic/modules/base/_ShowInPopup.js similarity index 100% rename from public/javascript/redmic/modules/base/_ShowInPopup.js rename to client-app/javascript/redmic/modules/base/_ShowInPopup.js diff --git a/public/javascript/redmic/modules/base/_ShowInTooltip.js b/client-app/javascript/redmic/modules/base/_ShowInTooltip.js similarity index 100% rename from public/javascript/redmic/modules/base/_ShowInTooltip.js rename to client-app/javascript/redmic/modules/base/_ShowInTooltip.js diff --git a/public/javascript/redmic/modules/base/_ShowItfc.js b/client-app/javascript/redmic/modules/base/_ShowItfc.js similarity index 100% rename from public/javascript/redmic/modules/base/_ShowItfc.js rename to client-app/javascript/redmic/modules/base/_ShowItfc.js diff --git a/public/javascript/redmic/modules/base/_ShowOnEvt.js b/client-app/javascript/redmic/modules/base/_ShowOnEvt.js similarity index 100% rename from public/javascript/redmic/modules/base/_ShowOnEvt.js rename to client-app/javascript/redmic/modules/base/_ShowOnEvt.js diff --git a/public/javascript/redmic/modules/base/_Store.js b/client-app/javascript/redmic/modules/base/_Store.js similarity index 100% rename from public/javascript/redmic/modules/base/_Store.js rename to client-app/javascript/redmic/modules/base/_Store.js diff --git a/public/javascript/redmic/modules/base/_StoreItfc.js b/client-app/javascript/redmic/modules/base/_StoreItfc.js similarity index 100% rename from public/javascript/redmic/modules/base/_StoreItfc.js rename to client-app/javascript/redmic/modules/base/_StoreItfc.js diff --git a/public/javascript/redmic/modules/base/_Window.js b/client-app/javascript/redmic/modules/base/_Window.js similarity index 100% rename from public/javascript/redmic/modules/base/_Window.js rename to client-app/javascript/redmic/modules/base/_Window.js diff --git a/public/javascript/redmic/modules/browser/Browser.js b/client-app/javascript/redmic/modules/browser/Browser.js similarity index 100% rename from public/javascript/redmic/modules/browser/Browser.js rename to client-app/javascript/redmic/modules/browser/Browser.js diff --git a/public/javascript/redmic/modules/browser/HierarchicalImpl.js b/client-app/javascript/redmic/modules/browser/HierarchicalImpl.js similarity index 100% rename from public/javascript/redmic/modules/browser/HierarchicalImpl.js rename to client-app/javascript/redmic/modules/browser/HierarchicalImpl.js diff --git a/public/javascript/redmic/modules/browser/ListImpl.js b/client-app/javascript/redmic/modules/browser/ListImpl.js similarity index 100% rename from public/javascript/redmic/modules/browser/ListImpl.js rename to client-app/javascript/redmic/modules/browser/ListImpl.js diff --git a/public/javascript/redmic/modules/browser/_BrowserItfc.js b/client-app/javascript/redmic/modules/browser/_BrowserItfc.js similarity index 100% rename from public/javascript/redmic/modules/browser/_BrowserItfc.js rename to client-app/javascript/redmic/modules/browser/_BrowserItfc.js diff --git a/public/javascript/redmic/modules/browser/_ButtonsInRow.js b/client-app/javascript/redmic/modules/browser/_ButtonsInRow.js similarity index 100% rename from public/javascript/redmic/modules/browser/_ButtonsInRow.js rename to client-app/javascript/redmic/modules/browser/_ButtonsInRow.js diff --git a/public/javascript/redmic/modules/browser/_DataTypeParser.js b/client-app/javascript/redmic/modules/browser/_DataTypeParser.js similarity index 100% rename from public/javascript/redmic/modules/browser/_DataTypeParser.js rename to client-app/javascript/redmic/modules/browser/_DataTypeParser.js diff --git a/public/javascript/redmic/modules/browser/_DragAndDrop.js b/client-app/javascript/redmic/modules/browser/_DragAndDrop.js similarity index 100% rename from public/javascript/redmic/modules/browser/_DragAndDrop.js rename to client-app/javascript/redmic/modules/browser/_DragAndDrop.js diff --git a/public/javascript/redmic/modules/browser/_EditionTable.js b/client-app/javascript/redmic/modules/browser/_EditionTable.js similarity index 100% rename from public/javascript/redmic/modules/browser/_EditionTable.js rename to client-app/javascript/redmic/modules/browser/_EditionTable.js diff --git a/public/javascript/redmic/modules/browser/_Framework.js b/client-app/javascript/redmic/modules/browser/_Framework.js similarity index 100% rename from public/javascript/redmic/modules/browser/_Framework.js rename to client-app/javascript/redmic/modules/browser/_Framework.js diff --git a/public/javascript/redmic/modules/browser/_GeoJsonParser.js b/client-app/javascript/redmic/modules/browser/_GeoJsonParser.js similarity index 100% rename from public/javascript/redmic/modules/browser/_GeoJsonParser.js rename to client-app/javascript/redmic/modules/browser/_GeoJsonParser.js diff --git a/public/javascript/redmic/modules/browser/_HierarchicalDragAndDrop.js b/client-app/javascript/redmic/modules/browser/_HierarchicalDragAndDrop.js similarity index 100% rename from public/javascript/redmic/modules/browser/_HierarchicalDragAndDrop.js rename to client-app/javascript/redmic/modules/browser/_HierarchicalDragAndDrop.js diff --git a/public/javascript/redmic/modules/browser/_HierarchicalLazyLoad.js b/client-app/javascript/redmic/modules/browser/_HierarchicalLazyLoad.js similarity index 100% rename from public/javascript/redmic/modules/browser/_HierarchicalLazyLoad.js rename to client-app/javascript/redmic/modules/browser/_HierarchicalLazyLoad.js diff --git a/public/javascript/redmic/modules/browser/_HierarchicalSelect.js b/client-app/javascript/redmic/modules/browser/_HierarchicalSelect.js similarity index 100% rename from public/javascript/redmic/modules/browser/_HierarchicalSelect.js rename to client-app/javascript/redmic/modules/browser/_HierarchicalSelect.js diff --git a/public/javascript/redmic/modules/browser/_HierarchicalTable.js b/client-app/javascript/redmic/modules/browser/_HierarchicalTable.js similarity index 100% rename from public/javascript/redmic/modules/browser/_HierarchicalTable.js rename to client-app/javascript/redmic/modules/browser/_HierarchicalTable.js diff --git a/public/javascript/redmic/modules/browser/_MultiTemplate.js b/client-app/javascript/redmic/modules/browser/_MultiTemplate.js similarity index 100% rename from public/javascript/redmic/modules/browser/_MultiTemplate.js rename to client-app/javascript/redmic/modules/browser/_MultiTemplate.js diff --git a/public/javascript/redmic/modules/browser/_NoDataTemplate.js b/client-app/javascript/redmic/modules/browser/_NoDataTemplate.js similarity index 100% rename from public/javascript/redmic/modules/browser/_NoDataTemplate.js rename to client-app/javascript/redmic/modules/browser/_NoDataTemplate.js diff --git a/public/javascript/redmic/modules/browser/_Select.js b/client-app/javascript/redmic/modules/browser/_Select.js similarity index 100% rename from public/javascript/redmic/modules/browser/_Select.js rename to client-app/javascript/redmic/modules/browser/_Select.js diff --git a/public/javascript/redmic/modules/browser/_Table.js b/client-app/javascript/redmic/modules/browser/_Table.js similarity index 100% rename from public/javascript/redmic/modules/browser/_Table.js rename to client-app/javascript/redmic/modules/browser/_Table.js diff --git a/public/javascript/redmic/modules/browser/bars/Order.js b/client-app/javascript/redmic/modules/browser/bars/Order.js similarity index 100% rename from public/javascript/redmic/modules/browser/bars/Order.js rename to client-app/javascript/redmic/modules/browser/bars/Order.js diff --git a/public/javascript/redmic/modules/browser/bars/Pagination.js b/client-app/javascript/redmic/modules/browser/bars/Pagination.js similarity index 100% rename from public/javascript/redmic/modules/browser/bars/Pagination.js rename to client-app/javascript/redmic/modules/browser/bars/Pagination.js diff --git a/public/javascript/redmic/modules/browser/bars/SelectionBox.js b/client-app/javascript/redmic/modules/browser/bars/SelectionBox.js similarity index 100% rename from public/javascript/redmic/modules/browser/bars/SelectionBox.js rename to client-app/javascript/redmic/modules/browser/bars/SelectionBox.js diff --git a/public/javascript/redmic/modules/browser/bars/Total.js b/client-app/javascript/redmic/modules/browser/bars/Total.js similarity index 100% rename from public/javascript/redmic/modules/browser/bars/Total.js rename to client-app/javascript/redmic/modules/browser/bars/Total.js diff --git a/public/javascript/redmic/modules/browser/bars/_SelectBox.js b/client-app/javascript/redmic/modules/browser/bars/_SelectBox.js similarity index 100% rename from public/javascript/redmic/modules/browser/bars/_SelectBox.js rename to client-app/javascript/redmic/modules/browser/bars/_SelectBox.js diff --git a/public/javascript/redmic/modules/browser/buttons/Buttons.js b/client-app/javascript/redmic/modules/browser/buttons/Buttons.js similarity index 100% rename from public/javascript/redmic/modules/browser/buttons/Buttons.js rename to client-app/javascript/redmic/modules/browser/buttons/Buttons.js diff --git a/public/javascript/redmic/modules/browser/buttons/_ButtonsItfc.js b/client-app/javascript/redmic/modules/browser/buttons/_ButtonsItfc.js similarity index 100% rename from public/javascript/redmic/modules/browser/buttons/_ButtonsItfc.js rename to client-app/javascript/redmic/modules/browser/buttons/_ButtonsItfc.js diff --git a/public/javascript/redmic/modules/browser/buttons/_GroupButtons.js b/client-app/javascript/redmic/modules/browser/buttons/_GroupButtons.js similarity index 100% rename from public/javascript/redmic/modules/browser/buttons/_GroupButtons.js rename to client-app/javascript/redmic/modules/browser/buttons/_GroupButtons.js diff --git a/public/javascript/redmic/modules/browser/row/Row.js b/client-app/javascript/redmic/modules/browser/row/Row.js similarity index 100% rename from public/javascript/redmic/modules/browser/row/Row.js rename to client-app/javascript/redmic/modules/browser/row/Row.js diff --git a/public/javascript/redmic/modules/browser/row/_Buttons.js b/client-app/javascript/redmic/modules/browser/row/_Buttons.js similarity index 100% rename from public/javascript/redmic/modules/browser/row/_Buttons.js rename to client-app/javascript/redmic/modules/browser/row/_Buttons.js diff --git a/public/javascript/redmic/modules/browser/row/_Hierarchical.js b/client-app/javascript/redmic/modules/browser/row/_Hierarchical.js similarity index 100% rename from public/javascript/redmic/modules/browser/row/_Hierarchical.js rename to client-app/javascript/redmic/modules/browser/row/_Hierarchical.js diff --git a/public/javascript/redmic/modules/browser/row/_HierarchicalSelect.js b/client-app/javascript/redmic/modules/browser/row/_HierarchicalSelect.js similarity index 100% rename from public/javascript/redmic/modules/browser/row/_HierarchicalSelect.js rename to client-app/javascript/redmic/modules/browser/row/_HierarchicalSelect.js diff --git a/public/javascript/redmic/modules/browser/row/_HierarchicalTable.js b/client-app/javascript/redmic/modules/browser/row/_HierarchicalTable.js similarity index 100% rename from public/javascript/redmic/modules/browser/row/_HierarchicalTable.js rename to client-app/javascript/redmic/modules/browser/row/_HierarchicalTable.js diff --git a/public/javascript/redmic/modules/browser/row/_RowItfc.js b/client-app/javascript/redmic/modules/browser/row/_RowItfc.js similarity index 100% rename from public/javascript/redmic/modules/browser/row/_RowItfc.js rename to client-app/javascript/redmic/modules/browser/row/_RowItfc.js diff --git a/public/javascript/redmic/modules/browser/row/_Select.js b/client-app/javascript/redmic/modules/browser/row/_Select.js similarity index 100% rename from public/javascript/redmic/modules/browser/row/_Select.js rename to client-app/javascript/redmic/modules/browser/row/_Select.js diff --git a/public/javascript/redmic/modules/browser/row/_Table.js b/client-app/javascript/redmic/modules/browser/row/_Table.js similarity index 100% rename from public/javascript/redmic/modules/browser/row/_Table.js rename to client-app/javascript/redmic/modules/browser/row/_Table.js diff --git a/public/javascript/redmic/modules/chart/ChartsContainer/ChartsContainer.js b/client-app/javascript/redmic/modules/chart/ChartsContainer/ChartsContainer.js similarity index 100% rename from public/javascript/redmic/modules/chart/ChartsContainer/ChartsContainer.js rename to client-app/javascript/redmic/modules/chart/ChartsContainer/ChartsContainer.js diff --git a/public/javascript/redmic/modules/chart/ChartsContainer/InfoChartsContainerImpl.js b/client-app/javascript/redmic/modules/chart/ChartsContainer/InfoChartsContainerImpl.js similarity index 100% rename from public/javascript/redmic/modules/chart/ChartsContainer/InfoChartsContainerImpl.js rename to client-app/javascript/redmic/modules/chart/ChartsContainer/InfoChartsContainerImpl.js diff --git a/public/javascript/redmic/modules/chart/ChartsContainer/SliderChartsContainerImpl.js b/client-app/javascript/redmic/modules/chart/ChartsContainer/SliderChartsContainerImpl.js similarity index 100% rename from public/javascript/redmic/modules/chart/ChartsContainer/SliderChartsContainerImpl.js rename to client-app/javascript/redmic/modules/chart/ChartsContainer/SliderChartsContainerImpl.js diff --git a/public/javascript/redmic/modules/chart/ChartsContainer/_AngularAxisDrawing.js b/client-app/javascript/redmic/modules/chart/ChartsContainer/_AngularAxisDrawing.js similarity index 100% rename from public/javascript/redmic/modules/chart/ChartsContainer/_AngularAxisDrawing.js rename to client-app/javascript/redmic/modules/chart/ChartsContainer/_AngularAxisDrawing.js diff --git a/public/javascript/redmic/modules/chart/ChartsContainer/_AngularAxisWithGridDrawing.js b/client-app/javascript/redmic/modules/chart/ChartsContainer/_AngularAxisWithGridDrawing.js similarity index 100% rename from public/javascript/redmic/modules/chart/ChartsContainer/_AngularAxisWithGridDrawing.js rename to client-app/javascript/redmic/modules/chart/ChartsContainer/_AngularAxisWithGridDrawing.js diff --git a/public/javascript/redmic/modules/chart/ChartsContainer/_AxesDrawing.js b/client-app/javascript/redmic/modules/chart/ChartsContainer/_AxesDrawing.js similarity index 100% rename from public/javascript/redmic/modules/chart/ChartsContainer/_AxesDrawing.js rename to client-app/javascript/redmic/modules/chart/ChartsContainer/_AxesDrawing.js diff --git a/public/javascript/redmic/modules/chart/ChartsContainer/_AxesDrawingItfc.js b/client-app/javascript/redmic/modules/chart/ChartsContainer/_AxesDrawingItfc.js similarity index 100% rename from public/javascript/redmic/modules/chart/ChartsContainer/_AxesDrawingItfc.js rename to client-app/javascript/redmic/modules/chart/ChartsContainer/_AxesDrawingItfc.js diff --git a/public/javascript/redmic/modules/chart/ChartsContainer/_BreadcrumbsBar.js b/client-app/javascript/redmic/modules/chart/ChartsContainer/_BreadcrumbsBar.js similarity index 100% rename from public/javascript/redmic/modules/chart/ChartsContainer/_BreadcrumbsBar.js rename to client-app/javascript/redmic/modules/chart/ChartsContainer/_BreadcrumbsBar.js diff --git a/public/javascript/redmic/modules/chart/ChartsContainer/_ChartsContainerItfc.js b/client-app/javascript/redmic/modules/chart/ChartsContainer/_ChartsContainerItfc.js similarity index 100% rename from public/javascript/redmic/modules/chart/ChartsContainer/_ChartsContainerItfc.js rename to client-app/javascript/redmic/modules/chart/ChartsContainer/_ChartsContainerItfc.js diff --git a/public/javascript/redmic/modules/chart/ChartsContainer/_ColorSelection.js b/client-app/javascript/redmic/modules/chart/ChartsContainer/_ColorSelection.js similarity index 100% rename from public/javascript/redmic/modules/chart/ChartsContainer/_ColorSelection.js rename to client-app/javascript/redmic/modules/chart/ChartsContainer/_ColorSelection.js diff --git a/public/javascript/redmic/modules/chart/ChartsContainer/_ColorSelectionItfc.js b/client-app/javascript/redmic/modules/chart/ChartsContainer/_ColorSelectionItfc.js similarity index 100% rename from public/javascript/redmic/modules/chart/ChartsContainer/_ColorSelectionItfc.js rename to client-app/javascript/redmic/modules/chart/ChartsContainer/_ColorSelectionItfc.js diff --git a/public/javascript/redmic/modules/chart/ChartsContainer/_DomainHistoryNavigation.js b/client-app/javascript/redmic/modules/chart/ChartsContainer/_DomainHistoryNavigation.js similarity index 100% rename from public/javascript/redmic/modules/chart/ChartsContainer/_DomainHistoryNavigation.js rename to client-app/javascript/redmic/modules/chart/ChartsContainer/_DomainHistoryNavigation.js diff --git a/public/javascript/redmic/modules/chart/ChartsContainer/_GroupedLegendBar.js b/client-app/javascript/redmic/modules/chart/ChartsContainer/_GroupedLegendBar.js similarity index 100% rename from public/javascript/redmic/modules/chart/ChartsContainer/_GroupedLegendBar.js rename to client-app/javascript/redmic/modules/chart/ChartsContainer/_GroupedLegendBar.js diff --git a/public/javascript/redmic/modules/chart/ChartsContainer/_InfoOnEmptyData.js b/client-app/javascript/redmic/modules/chart/ChartsContainer/_InfoOnEmptyData.js similarity index 100% rename from public/javascript/redmic/modules/chart/ChartsContainer/_InfoOnEmptyData.js rename to client-app/javascript/redmic/modules/chart/ChartsContainer/_InfoOnEmptyData.js diff --git a/public/javascript/redmic/modules/chart/ChartsContainer/_InfoOnLayerEvent.js b/client-app/javascript/redmic/modules/chart/ChartsContainer/_InfoOnLayerEvent.js similarity index 100% rename from public/javascript/redmic/modules/chart/ChartsContainer/_InfoOnLayerEvent.js rename to client-app/javascript/redmic/modules/chart/ChartsContainer/_InfoOnLayerEvent.js diff --git a/public/javascript/redmic/modules/chart/ChartsContainer/_InfoOnLayerEventItfc.js b/client-app/javascript/redmic/modules/chart/ChartsContainer/_InfoOnLayerEventItfc.js similarity index 100% rename from public/javascript/redmic/modules/chart/ChartsContainer/_InfoOnLayerEventItfc.js rename to client-app/javascript/redmic/modules/chart/ChartsContainer/_InfoOnLayerEventItfc.js diff --git a/public/javascript/redmic/modules/chart/ChartsContainer/_InfoOnMouseOver.js b/client-app/javascript/redmic/modules/chart/ChartsContainer/_InfoOnMouseOver.js similarity index 100% rename from public/javascript/redmic/modules/chart/ChartsContainer/_InfoOnMouseOver.js rename to client-app/javascript/redmic/modules/chart/ChartsContainer/_InfoOnMouseOver.js diff --git a/public/javascript/redmic/modules/chart/ChartsContainer/_InfoOnZeroValueData.js b/client-app/javascript/redmic/modules/chart/ChartsContainer/_InfoOnZeroValueData.js similarity index 100% rename from public/javascript/redmic/modules/chart/ChartsContainer/_InfoOnZeroValueData.js rename to client-app/javascript/redmic/modules/chart/ChartsContainer/_InfoOnZeroValueData.js diff --git a/public/javascript/redmic/modules/chart/ChartsContainer/_InfoTooltipManagement.js b/client-app/javascript/redmic/modules/chart/ChartsContainer/_InfoTooltipManagement.js similarity index 100% rename from public/javascript/redmic/modules/chart/ChartsContainer/_InfoTooltipManagement.js rename to client-app/javascript/redmic/modules/chart/ChartsContainer/_InfoTooltipManagement.js diff --git a/public/javascript/redmic/modules/chart/ChartsContainer/_LayerColorSelection.js b/client-app/javascript/redmic/modules/chart/ChartsContainer/_LayerColorSelection.js similarity index 100% rename from public/javascript/redmic/modules/chart/ChartsContainer/_LayerColorSelection.js rename to client-app/javascript/redmic/modules/chart/ChartsContainer/_LayerColorSelection.js diff --git a/public/javascript/redmic/modules/chart/ChartsContainer/_LegendBar.js b/client-app/javascript/redmic/modules/chart/ChartsContainer/_LegendBar.js similarity index 100% rename from public/javascript/redmic/modules/chart/ChartsContainer/_LegendBar.js rename to client-app/javascript/redmic/modules/chart/ChartsContainer/_LegendBar.js diff --git a/public/javascript/redmic/modules/chart/ChartsContainer/_LegendBarCommons.js b/client-app/javascript/redmic/modules/chart/ChartsContainer/_LegendBarCommons.js similarity index 100% rename from public/javascript/redmic/modules/chart/ChartsContainer/_LegendBarCommons.js rename to client-app/javascript/redmic/modules/chart/ChartsContainer/_LegendBarCommons.js diff --git a/public/javascript/redmic/modules/chart/ChartsContainer/_LegendBarCommonsItfc.js b/client-app/javascript/redmic/modules/chart/ChartsContainer/_LegendBarCommonsItfc.js similarity index 100% rename from public/javascript/redmic/modules/chart/ChartsContainer/_LegendBarCommonsItfc.js rename to client-app/javascript/redmic/modules/chart/ChartsContainer/_LegendBarCommonsItfc.js diff --git a/public/javascript/redmic/modules/chart/ChartsContainer/_RadialAxisDrawing.js b/client-app/javascript/redmic/modules/chart/ChartsContainer/_RadialAxisDrawing.js similarity index 100% rename from public/javascript/redmic/modules/chart/ChartsContainer/_RadialAxisDrawing.js rename to client-app/javascript/redmic/modules/chart/ChartsContainer/_RadialAxisDrawing.js diff --git a/public/javascript/redmic/modules/chart/ChartsContainer/_RadialAxisWithGridDrawing.js b/client-app/javascript/redmic/modules/chart/ChartsContainer/_RadialAxisWithGridDrawing.js similarity index 100% rename from public/javascript/redmic/modules/chart/ChartsContainer/_RadialAxisWithGridDrawing.js rename to client-app/javascript/redmic/modules/chart/ChartsContainer/_RadialAxisWithGridDrawing.js diff --git a/public/javascript/redmic/modules/chart/ChartsContainer/_SummaryBox.js b/client-app/javascript/redmic/modules/chart/ChartsContainer/_SummaryBox.js similarity index 100% rename from public/javascript/redmic/modules/chart/ChartsContainer/_SummaryBox.js rename to client-app/javascript/redmic/modules/chart/ChartsContainer/_SummaryBox.js diff --git a/public/javascript/redmic/modules/chart/ChartsContainer/_TemporalAxisDrawing.js b/client-app/javascript/redmic/modules/chart/ChartsContainer/_TemporalAxisDrawing.js similarity index 100% rename from public/javascript/redmic/modules/chart/ChartsContainer/_TemporalAxisDrawing.js rename to client-app/javascript/redmic/modules/chart/ChartsContainer/_TemporalAxisDrawing.js diff --git a/public/javascript/redmic/modules/chart/ChartsContainer/_TemporalAxisWithGridDrawing.js b/client-app/javascript/redmic/modules/chart/ChartsContainer/_TemporalAxisWithGridDrawing.js similarity index 100% rename from public/javascript/redmic/modules/chart/ChartsContainer/_TemporalAxisWithGridDrawing.js rename to client-app/javascript/redmic/modules/chart/ChartsContainer/_TemporalAxisWithGridDrawing.js diff --git a/public/javascript/redmic/modules/chart/ChartsContainer/_VerticalAxesDrawing.js b/client-app/javascript/redmic/modules/chart/ChartsContainer/_VerticalAxesDrawing.js similarity index 100% rename from public/javascript/redmic/modules/chart/ChartsContainer/_VerticalAxesDrawing.js rename to client-app/javascript/redmic/modules/chart/ChartsContainer/_VerticalAxesDrawing.js diff --git a/public/javascript/redmic/modules/chart/ChartsContainer/_VerticalAxesWithGridDrawing.js b/client-app/javascript/redmic/modules/chart/ChartsContainer/_VerticalAxesWithGridDrawing.js similarity index 100% rename from public/javascript/redmic/modules/chart/ChartsContainer/_VerticalAxesWithGridDrawing.js rename to client-app/javascript/redmic/modules/chart/ChartsContainer/_VerticalAxesWithGridDrawing.js diff --git a/public/javascript/redmic/modules/chart/ChartsContainer/_ZoomByDragging.js b/client-app/javascript/redmic/modules/chart/ChartsContainer/_ZoomByDragging.js similarity index 100% rename from public/javascript/redmic/modules/chart/ChartsContainer/_ZoomByDragging.js rename to client-app/javascript/redmic/modules/chart/ChartsContainer/_ZoomByDragging.js diff --git a/public/javascript/redmic/modules/chart/SmartLegend/SmartLegend.js b/client-app/javascript/redmic/modules/chart/SmartLegend/SmartLegend.js similarity index 100% rename from public/javascript/redmic/modules/chart/SmartLegend/SmartLegend.js rename to client-app/javascript/redmic/modules/chart/SmartLegend/SmartLegend.js diff --git a/public/javascript/redmic/modules/chart/SmartLegend/TimeSeriesSmartLegendImpl.js b/client-app/javascript/redmic/modules/chart/SmartLegend/TimeSeriesSmartLegendImpl.js similarity index 100% rename from public/javascript/redmic/modules/chart/SmartLegend/TimeSeriesSmartLegendImpl.js rename to client-app/javascript/redmic/modules/chart/SmartLegend/TimeSeriesSmartLegendImpl.js diff --git a/public/javascript/redmic/modules/chart/SmartLegend/_SmartLegendItfc.js b/client-app/javascript/redmic/modules/chart/SmartLegend/_SmartLegendItfc.js similarity index 100% rename from public/javascript/redmic/modules/chart/SmartLegend/_SmartLegendItfc.js rename to client-app/javascript/redmic/modules/chart/SmartLegend/_SmartLegendItfc.js diff --git a/public/javascript/redmic/modules/chart/Toolbar/AggregationToolImpl.js b/client-app/javascript/redmic/modules/chart/Toolbar/AggregationToolImpl.js similarity index 100% rename from public/javascript/redmic/modules/chart/Toolbar/AggregationToolImpl.js rename to client-app/javascript/redmic/modules/chart/Toolbar/AggregationToolImpl.js diff --git a/public/javascript/redmic/modules/chart/Toolbar/DataSelectorImpl.js b/client-app/javascript/redmic/modules/chart/Toolbar/DataSelectorImpl.js similarity index 100% rename from public/javascript/redmic/modules/chart/Toolbar/DataSelectorImpl.js rename to client-app/javascript/redmic/modules/chart/Toolbar/DataSelectorImpl.js diff --git a/public/javascript/redmic/modules/chart/Toolbar/DateFilterImpl.js b/client-app/javascript/redmic/modules/chart/Toolbar/DateFilterImpl.js similarity index 100% rename from public/javascript/redmic/modules/chart/Toolbar/DateFilterImpl.js rename to client-app/javascript/redmic/modules/chart/Toolbar/DateFilterImpl.js diff --git a/public/javascript/redmic/modules/chart/Toolbar/GridManagementImpl.js b/client-app/javascript/redmic/modules/chart/Toolbar/GridManagementImpl.js similarity index 100% rename from public/javascript/redmic/modules/chart/Toolbar/GridManagementImpl.js rename to client-app/javascript/redmic/modules/chart/Toolbar/GridManagementImpl.js diff --git a/public/javascript/redmic/modules/chart/Toolbar/SliderSelectorImpl.js b/client-app/javascript/redmic/modules/chart/Toolbar/SliderSelectorImpl.js similarity index 100% rename from public/javascript/redmic/modules/chart/Toolbar/SliderSelectorImpl.js rename to client-app/javascript/redmic/modules/chart/Toolbar/SliderSelectorImpl.js diff --git a/public/javascript/redmic/modules/chart/Toolbar/Toolbar.js b/client-app/javascript/redmic/modules/chart/Toolbar/Toolbar.js similarity index 100% rename from public/javascript/redmic/modules/chart/Toolbar/Toolbar.js rename to client-app/javascript/redmic/modules/chart/Toolbar/Toolbar.js diff --git a/public/javascript/redmic/modules/chart/Toolbar/_ToolbarItfc.js b/client-app/javascript/redmic/modules/chart/Toolbar/_ToolbarItfc.js similarity index 100% rename from public/javascript/redmic/modules/chart/Toolbar/_ToolbarItfc.js rename to client-app/javascript/redmic/modules/chart/Toolbar/_ToolbarItfc.js diff --git a/public/javascript/redmic/modules/chart/layer/Axis/AngularAxisImpl.js b/client-app/javascript/redmic/modules/chart/layer/Axis/AngularAxisImpl.js similarity index 100% rename from public/javascript/redmic/modules/chart/layer/Axis/AngularAxisImpl.js rename to client-app/javascript/redmic/modules/chart/layer/Axis/AngularAxisImpl.js diff --git a/public/javascript/redmic/modules/chart/layer/Axis/AngularGridAxisImpl.js b/client-app/javascript/redmic/modules/chart/layer/Axis/AngularGridAxisImpl.js similarity index 100% rename from public/javascript/redmic/modules/chart/layer/Axis/AngularGridAxisImpl.js rename to client-app/javascript/redmic/modules/chart/layer/Axis/AngularGridAxisImpl.js diff --git a/public/javascript/redmic/modules/chart/layer/Axis/Axis.js b/client-app/javascript/redmic/modules/chart/layer/Axis/Axis.js similarity index 100% rename from public/javascript/redmic/modules/chart/layer/Axis/Axis.js rename to client-app/javascript/redmic/modules/chart/layer/Axis/Axis.js diff --git a/public/javascript/redmic/modules/chart/layer/Axis/HorizontalGridAxisImpl.js b/client-app/javascript/redmic/modules/chart/layer/Axis/HorizontalGridAxisImpl.js similarity index 100% rename from public/javascript/redmic/modules/chart/layer/Axis/HorizontalGridAxisImpl.js rename to client-app/javascript/redmic/modules/chart/layer/Axis/HorizontalGridAxisImpl.js diff --git a/public/javascript/redmic/modules/chart/layer/Axis/RadialAxisImpl.js b/client-app/javascript/redmic/modules/chart/layer/Axis/RadialAxisImpl.js similarity index 100% rename from public/javascript/redmic/modules/chart/layer/Axis/RadialAxisImpl.js rename to client-app/javascript/redmic/modules/chart/layer/Axis/RadialAxisImpl.js diff --git a/public/javascript/redmic/modules/chart/layer/Axis/RadialGridAxisImpl.js b/client-app/javascript/redmic/modules/chart/layer/Axis/RadialGridAxisImpl.js similarity index 100% rename from public/javascript/redmic/modules/chart/layer/Axis/RadialGridAxisImpl.js rename to client-app/javascript/redmic/modules/chart/layer/Axis/RadialGridAxisImpl.js diff --git a/public/javascript/redmic/modules/chart/layer/Axis/TemporalAxisImpl.js b/client-app/javascript/redmic/modules/chart/layer/Axis/TemporalAxisImpl.js similarity index 100% rename from public/javascript/redmic/modules/chart/layer/Axis/TemporalAxisImpl.js rename to client-app/javascript/redmic/modules/chart/layer/Axis/TemporalAxisImpl.js diff --git a/public/javascript/redmic/modules/chart/layer/Axis/VerticalAxisImpl.js b/client-app/javascript/redmic/modules/chart/layer/Axis/VerticalAxisImpl.js similarity index 100% rename from public/javascript/redmic/modules/chart/layer/Axis/VerticalAxisImpl.js rename to client-app/javascript/redmic/modules/chart/layer/Axis/VerticalAxisImpl.js diff --git a/public/javascript/redmic/modules/chart/layer/Axis/VerticalGridAxisImpl.js b/client-app/javascript/redmic/modules/chart/layer/Axis/VerticalGridAxisImpl.js similarity index 100% rename from public/javascript/redmic/modules/chart/layer/Axis/VerticalGridAxisImpl.js rename to client-app/javascript/redmic/modules/chart/layer/Axis/VerticalGridAxisImpl.js diff --git a/public/javascript/redmic/modules/chart/layer/Axis/_AxisItfc.js b/client-app/javascript/redmic/modules/chart/layer/Axis/_AxisItfc.js similarity index 100% rename from public/javascript/redmic/modules/chart/layer/Axis/_AxisItfc.js rename to client-app/javascript/redmic/modules/chart/layer/Axis/_AxisItfc.js diff --git a/public/javascript/redmic/modules/chart/layer/Axis/_HorizontalCommons.js b/client-app/javascript/redmic/modules/chart/layer/Axis/_HorizontalCommons.js similarity index 100% rename from public/javascript/redmic/modules/chart/layer/Axis/_HorizontalCommons.js rename to client-app/javascript/redmic/modules/chart/layer/Axis/_HorizontalCommons.js diff --git a/public/javascript/redmic/modules/chart/layer/Axis/_VerticalCommons.js b/client-app/javascript/redmic/modules/chart/layer/Axis/_VerticalCommons.js similarity index 100% rename from public/javascript/redmic/modules/chart/layer/Axis/_VerticalCommons.js rename to client-app/javascript/redmic/modules/chart/layer/Axis/_VerticalCommons.js diff --git a/public/javascript/redmic/modules/chart/layer/Axis/_VerticalCommonsItfc.js b/client-app/javascript/redmic/modules/chart/layer/Axis/_VerticalCommonsItfc.js similarity index 100% rename from public/javascript/redmic/modules/chart/layer/Axis/_VerticalCommonsItfc.js rename to client-app/javascript/redmic/modules/chart/layer/Axis/_VerticalCommonsItfc.js diff --git a/public/javascript/redmic/modules/chart/layer/ChartLayer/ChartLayer.js b/client-app/javascript/redmic/modules/chart/layer/ChartLayer/ChartLayer.js similarity index 100% rename from public/javascript/redmic/modules/chart/layer/ChartLayer/ChartLayer.js rename to client-app/javascript/redmic/modules/chart/layer/ChartLayer/ChartLayer.js diff --git a/public/javascript/redmic/modules/chart/layer/ChartLayer/LinearChartImpl.js b/client-app/javascript/redmic/modules/chart/layer/ChartLayer/LinearChartImpl.js similarity index 100% rename from public/javascript/redmic/modules/chart/layer/ChartLayer/LinearChartImpl.js rename to client-app/javascript/redmic/modules/chart/layer/ChartLayer/LinearChartImpl.js diff --git a/public/javascript/redmic/modules/chart/layer/ChartLayer/MultiPieChartImpl.js b/client-app/javascript/redmic/modules/chart/layer/ChartLayer/MultiPieChartImpl.js similarity index 100% rename from public/javascript/redmic/modules/chart/layer/ChartLayer/MultiPieChartImpl.js rename to client-app/javascript/redmic/modules/chart/layer/ChartLayer/MultiPieChartImpl.js diff --git a/public/javascript/redmic/modules/chart/layer/ChartLayer/PieChartImpl.js b/client-app/javascript/redmic/modules/chart/layer/ChartLayer/PieChartImpl.js similarity index 100% rename from public/javascript/redmic/modules/chart/layer/ChartLayer/PieChartImpl.js rename to client-app/javascript/redmic/modules/chart/layer/ChartLayer/PieChartImpl.js diff --git a/public/javascript/redmic/modules/chart/layer/ChartLayer/WindRoseChartImpl.js b/client-app/javascript/redmic/modules/chart/layer/ChartLayer/WindRoseChartImpl.js similarity index 100% rename from public/javascript/redmic/modules/chart/layer/ChartLayer/WindRoseChartImpl.js rename to client-app/javascript/redmic/modules/chart/layer/ChartLayer/WindRoseChartImpl.js diff --git a/public/javascript/redmic/modules/chart/layer/ChartLayer/_CategoryLayerCommons.js b/client-app/javascript/redmic/modules/chart/layer/ChartLayer/_CategoryLayerCommons.js similarity index 100% rename from public/javascript/redmic/modules/chart/layer/ChartLayer/_CategoryLayerCommons.js rename to client-app/javascript/redmic/modules/chart/layer/ChartLayer/_CategoryLayerCommons.js diff --git a/public/javascript/redmic/modules/chart/layer/ChartLayer/_CategoryLayerCommonsItfc.js b/client-app/javascript/redmic/modules/chart/layer/ChartLayer/_CategoryLayerCommonsItfc.js similarity index 100% rename from public/javascript/redmic/modules/chart/layer/ChartLayer/_CategoryLayerCommonsItfc.js rename to client-app/javascript/redmic/modules/chart/layer/ChartLayer/_CategoryLayerCommonsItfc.js diff --git a/public/javascript/redmic/modules/chart/layer/ChartLayer/_ChartHoleManagement.js b/client-app/javascript/redmic/modules/chart/layer/ChartLayer/_ChartHoleManagement.js similarity index 100% rename from public/javascript/redmic/modules/chart/layer/ChartLayer/_ChartHoleManagement.js rename to client-app/javascript/redmic/modules/chart/layer/ChartLayer/_ChartHoleManagement.js diff --git a/public/javascript/redmic/modules/chart/layer/ChartLayer/_ChartLayerItfc.js b/client-app/javascript/redmic/modules/chart/layer/ChartLayer/_ChartLayerItfc.js similarity index 100% rename from public/javascript/redmic/modules/chart/layer/ChartLayer/_ChartLayerItfc.js rename to client-app/javascript/redmic/modules/chart/layer/ChartLayer/_ChartLayerItfc.js diff --git a/public/javascript/redmic/modules/chart/layer/ChartLayer/_CircularLayerCommons.js b/client-app/javascript/redmic/modules/chart/layer/ChartLayer/_CircularLayerCommons.js similarity index 100% rename from public/javascript/redmic/modules/chart/layer/ChartLayer/_CircularLayerCommons.js rename to client-app/javascript/redmic/modules/chart/layer/ChartLayer/_CircularLayerCommons.js diff --git a/public/javascript/redmic/modules/chart/layer/ChartLayer/_CircularLayerCommonsItfc.js b/client-app/javascript/redmic/modules/chart/layer/ChartLayer/_CircularLayerCommonsItfc.js similarity index 100% rename from public/javascript/redmic/modules/chart/layer/ChartLayer/_CircularLayerCommonsItfc.js rename to client-app/javascript/redmic/modules/chart/layer/ChartLayer/_CircularLayerCommonsItfc.js diff --git a/public/javascript/redmic/modules/chart/layer/ChartLayer/_ColorHierarchyGeneration.js b/client-app/javascript/redmic/modules/chart/layer/ChartLayer/_ColorHierarchyGeneration.js similarity index 100% rename from public/javascript/redmic/modules/chart/layer/ChartLayer/_ColorHierarchyGeneration.js rename to client-app/javascript/redmic/modules/chart/layer/ChartLayer/_ColorHierarchyGeneration.js diff --git a/public/javascript/redmic/modules/chart/layer/ChartLayer/_LevelNavigation.js b/client-app/javascript/redmic/modules/chart/layer/ChartLayer/_LevelNavigation.js similarity index 100% rename from public/javascript/redmic/modules/chart/layer/ChartLayer/_LevelNavigation.js rename to client-app/javascript/redmic/modules/chart/layer/ChartLayer/_LevelNavigation.js diff --git a/public/javascript/redmic/modules/chart/layer/ChartLayer/_MultipleWindRose.js b/client-app/javascript/redmic/modules/chart/layer/ChartLayer/_MultipleWindRose.js similarity index 100% rename from public/javascript/redmic/modules/chart/layer/ChartLayer/_MultipleWindRose.js rename to client-app/javascript/redmic/modules/chart/layer/ChartLayer/_MultipleWindRose.js diff --git a/public/javascript/redmic/modules/chart/layer/ChartLayer/_ObtainableValue.js b/client-app/javascript/redmic/modules/chart/layer/ChartLayer/_ObtainableValue.js similarity index 100% rename from public/javascript/redmic/modules/chart/layer/ChartLayer/_ObtainableValue.js rename to client-app/javascript/redmic/modules/chart/layer/ChartLayer/_ObtainableValue.js diff --git a/public/javascript/redmic/modules/chart/layer/ChartLayer/_ObtainableValueItfc.js b/client-app/javascript/redmic/modules/chart/layer/ChartLayer/_ObtainableValueItfc.js similarity index 100% rename from public/javascript/redmic/modules/chart/layer/ChartLayer/_ObtainableValueItfc.js rename to client-app/javascript/redmic/modules/chart/layer/ChartLayer/_ObtainableValueItfc.js diff --git a/public/javascript/redmic/modules/chart/layer/ChartLayer/_PieCommons.js b/client-app/javascript/redmic/modules/chart/layer/ChartLayer/_PieCommons.js similarity index 100% rename from public/javascript/redmic/modules/chart/layer/ChartLayer/_PieCommons.js rename to client-app/javascript/redmic/modules/chart/layer/ChartLayer/_PieCommons.js diff --git a/public/javascript/redmic/modules/chart/layer/ChartLayer/_PutButtonInHole.js b/client-app/javascript/redmic/modules/chart/layer/ChartLayer/_PutButtonInHole.js similarity index 100% rename from public/javascript/redmic/modules/chart/layer/ChartLayer/_PutButtonInHole.js rename to client-app/javascript/redmic/modules/chart/layer/ChartLayer/_PutButtonInHole.js diff --git a/public/javascript/redmic/modules/chart/layer/ChartLayer/_PutButtonInHoleItfc.js b/client-app/javascript/redmic/modules/chart/layer/ChartLayer/_PutButtonInHoleItfc.js similarity index 100% rename from public/javascript/redmic/modules/chart/layer/ChartLayer/_PutButtonInHoleItfc.js rename to client-app/javascript/redmic/modules/chart/layer/ChartLayer/_PutButtonInHoleItfc.js diff --git a/public/javascript/redmic/modules/chart/layer/ChartLayer/_QueryableValue.js b/client-app/javascript/redmic/modules/chart/layer/ChartLayer/_QueryableValue.js similarity index 100% rename from public/javascript/redmic/modules/chart/layer/ChartLayer/_QueryableValue.js rename to client-app/javascript/redmic/modules/chart/layer/ChartLayer/_QueryableValue.js diff --git a/public/javascript/redmic/modules/chart/layer/ChartLayer/_ShowInfoInHole.js b/client-app/javascript/redmic/modules/chart/layer/ChartLayer/_ShowInfoInHole.js similarity index 100% rename from public/javascript/redmic/modules/chart/layer/ChartLayer/_ShowInfoInHole.js rename to client-app/javascript/redmic/modules/chart/layer/ChartLayer/_ShowInfoInHole.js diff --git a/public/javascript/redmic/modules/chart/layer/ChartLayer/_SimplePieCommons.js b/client-app/javascript/redmic/modules/chart/layer/ChartLayer/_SimplePieCommons.js similarity index 100% rename from public/javascript/redmic/modules/chart/layer/ChartLayer/_SimplePieCommons.js rename to client-app/javascript/redmic/modules/chart/layer/ChartLayer/_SimplePieCommons.js diff --git a/public/javascript/redmic/modules/chart/layer/ChartLayer/_SimpleWindRose.js b/client-app/javascript/redmic/modules/chart/layer/ChartLayer/_SimpleWindRose.js similarity index 100% rename from public/javascript/redmic/modules/chart/layer/ChartLayer/_SimpleWindRose.js rename to client-app/javascript/redmic/modules/chart/layer/ChartLayer/_SimpleWindRose.js diff --git a/public/javascript/redmic/modules/chart/layer/ChartLayer/_VariableRadiusByDepth.js b/client-app/javascript/redmic/modules/chart/layer/ChartLayer/_VariableRadiusByDepth.js similarity index 100% rename from public/javascript/redmic/modules/chart/layer/ChartLayer/_VariableRadiusByDepth.js rename to client-app/javascript/redmic/modules/chart/layer/ChartLayer/_VariableRadiusByDepth.js diff --git a/public/javascript/redmic/modules/chart/layer/_LayerCommons.js b/client-app/javascript/redmic/modules/chart/layer/_LayerCommons.js similarity index 100% rename from public/javascript/redmic/modules/chart/layer/_LayerCommons.js rename to client-app/javascript/redmic/modules/chart/layer/_LayerCommons.js diff --git a/public/javascript/redmic/modules/chart/layer/_LayerCommonsItfc.js b/client-app/javascript/redmic/modules/chart/layer/_LayerCommonsItfc.js similarity index 100% rename from public/javascript/redmic/modules/chart/layer/_LayerCommonsItfc.js rename to client-app/javascript/redmic/modules/chart/layer/_LayerCommonsItfc.js diff --git a/public/javascript/redmic/modules/chart/layer/_PolarLayerCommons.js b/client-app/javascript/redmic/modules/chart/layer/_PolarLayerCommons.js similarity index 100% rename from public/javascript/redmic/modules/chart/layer/_PolarLayerCommons.js rename to client-app/javascript/redmic/modules/chart/layer/_PolarLayerCommons.js diff --git a/public/javascript/redmic/modules/chart/layer/_PolarLayerCommonsItfc.js b/client-app/javascript/redmic/modules/chart/layer/_PolarLayerCommonsItfc.js similarity index 100% rename from public/javascript/redmic/modules/chart/layer/_PolarLayerCommonsItfc.js rename to client-app/javascript/redmic/modules/chart/layer/_PolarLayerCommonsItfc.js diff --git a/public/javascript/redmic/modules/components/ExternalConfig.js b/client-app/javascript/redmic/modules/components/ExternalConfig.js similarity index 100% rename from public/javascript/redmic/modules/components/ExternalConfig.js rename to client-app/javascript/redmic/modules/components/ExternalConfig.js diff --git a/public/javascript/redmic/modules/components/Keypad/IconKeypadImpl.js b/client-app/javascript/redmic/modules/components/Keypad/IconKeypadImpl.js similarity index 100% rename from public/javascript/redmic/modules/components/Keypad/IconKeypadImpl.js rename to client-app/javascript/redmic/modules/components/Keypad/IconKeypadImpl.js diff --git a/public/javascript/redmic/modules/components/Keypad/Keypad.js b/client-app/javascript/redmic/modules/components/Keypad/Keypad.js similarity index 100% rename from public/javascript/redmic/modules/components/Keypad/Keypad.js rename to client-app/javascript/redmic/modules/components/Keypad/Keypad.js diff --git a/public/javascript/redmic/modules/components/Keypad/TrizoneKeypadImpl.js b/client-app/javascript/redmic/modules/components/Keypad/TrizoneKeypadImpl.js similarity index 100% rename from public/javascript/redmic/modules/components/Keypad/TrizoneKeypadImpl.js rename to client-app/javascript/redmic/modules/components/Keypad/TrizoneKeypadImpl.js diff --git a/public/javascript/redmic/modules/components/Keypad/_KeypadItfc.js b/client-app/javascript/redmic/modules/components/Keypad/_KeypadItfc.js similarity index 100% rename from public/javascript/redmic/modules/components/Keypad/_KeypadItfc.js rename to client-app/javascript/redmic/modules/components/Keypad/_KeypadItfc.js diff --git a/public/javascript/redmic/modules/components/PDFViewer/PDFViewer.js b/client-app/javascript/redmic/modules/components/PDFViewer/PDFViewer.js similarity index 100% rename from public/javascript/redmic/modules/components/PDFViewer/PDFViewer.js rename to client-app/javascript/redmic/modules/components/PDFViewer/PDFViewer.js diff --git a/public/javascript/redmic/modules/components/ProgressSlider/ProgressSlider.js b/client-app/javascript/redmic/modules/components/ProgressSlider/ProgressSlider.js similarity index 100% rename from public/javascript/redmic/modules/components/ProgressSlider/ProgressSlider.js rename to client-app/javascript/redmic/modules/components/ProgressSlider/ProgressSlider.js diff --git a/public/javascript/redmic/modules/components/ProgressSlider/StepAndRateEditor.js b/client-app/javascript/redmic/modules/components/ProgressSlider/StepAndRateEditor.js similarity index 100% rename from public/javascript/redmic/modules/components/ProgressSlider/StepAndRateEditor.js rename to client-app/javascript/redmic/modules/components/ProgressSlider/StepAndRateEditor.js diff --git a/public/javascript/redmic/modules/components/Sidebar/MainSidebarImpl.js b/client-app/javascript/redmic/modules/components/Sidebar/MainSidebarImpl.js similarity index 100% rename from public/javascript/redmic/modules/components/Sidebar/MainSidebarImpl.js rename to client-app/javascript/redmic/modules/components/Sidebar/MainSidebarImpl.js diff --git a/public/javascript/redmic/modules/components/Sidebar/Sidebar.js b/client-app/javascript/redmic/modules/components/Sidebar/Sidebar.js similarity index 100% rename from public/javascript/redmic/modules/components/Sidebar/Sidebar.js rename to client-app/javascript/redmic/modules/components/Sidebar/Sidebar.js diff --git a/public/javascript/redmic/modules/components/Sidebar/_Secondary.js b/client-app/javascript/redmic/modules/components/Sidebar/_Secondary.js similarity index 100% rename from public/javascript/redmic/modules/components/Sidebar/_Secondary.js rename to client-app/javascript/redmic/modules/components/Sidebar/_Secondary.js diff --git a/public/javascript/redmic/modules/components/Topbar.js b/client-app/javascript/redmic/modules/components/Topbar.js similarity index 100% rename from public/javascript/redmic/modules/components/Topbar.js rename to client-app/javascript/redmic/modules/components/Topbar.js diff --git a/public/javascript/redmic/modules/filter/Filter.js b/client-app/javascript/redmic/modules/filter/Filter.js similarity index 100% rename from public/javascript/redmic/modules/filter/Filter.js rename to client-app/javascript/redmic/modules/filter/Filter.js diff --git a/public/javascript/redmic/modules/form/Form.js b/client-app/javascript/redmic/modules/form/Form.js similarity index 100% rename from public/javascript/redmic/modules/form/Form.js rename to client-app/javascript/redmic/modules/form/Form.js diff --git a/public/javascript/redmic/modules/form/FormContainerImpl.js b/client-app/javascript/redmic/modules/form/FormContainerImpl.js similarity index 100% rename from public/javascript/redmic/modules/form/FormContainerImpl.js rename to client-app/javascript/redmic/modules/form/FormContainerImpl.js diff --git a/public/javascript/redmic/modules/form/_BaseCreateKeypad.js b/client-app/javascript/redmic/modules/form/_BaseCreateKeypad.js similarity index 100% rename from public/javascript/redmic/modules/form/_BaseCreateKeypad.js rename to client-app/javascript/redmic/modules/form/_BaseCreateKeypad.js diff --git a/public/javascript/redmic/modules/form/_CreateInternalKeypad.js b/client-app/javascript/redmic/modules/form/_CreateInternalKeypad.js similarity index 100% rename from public/javascript/redmic/modules/form/_CreateInternalKeypad.js rename to client-app/javascript/redmic/modules/form/_CreateInternalKeypad.js diff --git a/public/javascript/redmic/modules/form/_CreateKeypad.js b/client-app/javascript/redmic/modules/form/_CreateKeypad.js similarity index 100% rename from public/javascript/redmic/modules/form/_CreateKeypad.js rename to client-app/javascript/redmic/modules/form/_CreateKeypad.js diff --git a/public/javascript/redmic/modules/form/_FormItfc.js b/client-app/javascript/redmic/modules/form/_FormItfc.js similarity index 100% rename from public/javascript/redmic/modules/form/_FormItfc.js rename to client-app/javascript/redmic/modules/form/_FormItfc.js diff --git a/public/javascript/redmic/modules/form/_ListenModelHasChanged.js b/client-app/javascript/redmic/modules/form/_ListenModelHasChanged.js similarity index 100% rename from public/javascript/redmic/modules/form/_ListenModelHasChanged.js rename to client-app/javascript/redmic/modules/form/_ListenModelHasChanged.js diff --git a/public/javascript/redmic/modules/form/_PublicateChanges.js b/client-app/javascript/redmic/modules/form/_PublicateChanges.js similarity index 100% rename from public/javascript/redmic/modules/form/_PublicateChanges.js rename to client-app/javascript/redmic/modules/form/_PublicateChanges.js diff --git a/public/javascript/redmic/modules/form/_ShowInDialog.js b/client-app/javascript/redmic/modules/form/_ShowInDialog.js similarity index 100% rename from public/javascript/redmic/modules/form/_ShowInDialog.js rename to client-app/javascript/redmic/modules/form/_ShowInDialog.js diff --git a/public/javascript/redmic/modules/form/_ShowInTableList.js b/client-app/javascript/redmic/modules/form/_ShowInTableList.js similarity index 100% rename from public/javascript/redmic/modules/form/_ShowInTableList.js rename to client-app/javascript/redmic/modules/form/_ShowInTableList.js diff --git a/public/javascript/redmic/modules/form/input/AnnotationImpl.js b/client-app/javascript/redmic/modules/form/input/AnnotationImpl.js similarity index 100% rename from public/javascript/redmic/modules/form/input/AnnotationImpl.js rename to client-app/javascript/redmic/modules/form/input/AnnotationImpl.js diff --git a/public/javascript/redmic/modules/form/input/ButtonImpl.js b/client-app/javascript/redmic/modules/form/input/ButtonImpl.js similarity index 100% rename from public/javascript/redmic/modules/form/input/ButtonImpl.js rename to client-app/javascript/redmic/modules/form/input/ButtonImpl.js diff --git a/public/javascript/redmic/modules/form/input/CheckBoxGroupImpl.js b/client-app/javascript/redmic/modules/form/input/CheckBoxGroupImpl.js similarity index 100% rename from public/javascript/redmic/modules/form/input/CheckBoxGroupImpl.js rename to client-app/javascript/redmic/modules/form/input/CheckBoxGroupImpl.js diff --git a/public/javascript/redmic/modules/form/input/CheckBoxImpl.js b/client-app/javascript/redmic/modules/form/input/CheckBoxImpl.js similarity index 100% rename from public/javascript/redmic/modules/form/input/CheckBoxImpl.js rename to client-app/javascript/redmic/modules/form/input/CheckBoxImpl.js diff --git a/public/javascript/redmic/modules/form/input/ColorImpl.js b/client-app/javascript/redmic/modules/form/input/ColorImpl.js similarity index 100% rename from public/javascript/redmic/modules/form/input/ColorImpl.js rename to client-app/javascript/redmic/modules/form/input/ColorImpl.js diff --git a/public/javascript/redmic/modules/form/input/ColorPickerImpl.js b/client-app/javascript/redmic/modules/form/input/ColorPickerImpl.js similarity index 100% rename from public/javascript/redmic/modules/form/input/ColorPickerImpl.js rename to client-app/javascript/redmic/modules/form/input/ColorPickerImpl.js diff --git a/public/javascript/redmic/modules/form/input/ColorPickerTextBoxImpl.js b/client-app/javascript/redmic/modules/form/input/ColorPickerTextBoxImpl.js similarity index 100% rename from public/javascript/redmic/modules/form/input/ColorPickerTextBoxImpl.js rename to client-app/javascript/redmic/modules/form/input/ColorPickerTextBoxImpl.js diff --git a/public/javascript/redmic/modules/form/input/ColorsRampImpl.js b/client-app/javascript/redmic/modules/form/input/ColorsRampImpl.js similarity index 100% rename from public/javascript/redmic/modules/form/input/ColorsRampImpl.js rename to client-app/javascript/redmic/modules/form/input/ColorsRampImpl.js diff --git a/public/javascript/redmic/modules/form/input/DateRangeComplexImpl.js b/client-app/javascript/redmic/modules/form/input/DateRangeComplexImpl.js similarity index 100% rename from public/javascript/redmic/modules/form/input/DateRangeComplexImpl.js rename to client-app/javascript/redmic/modules/form/input/DateRangeComplexImpl.js diff --git a/public/javascript/redmic/modules/form/input/DateRangeImpl.js b/client-app/javascript/redmic/modules/form/input/DateRangeImpl.js similarity index 100% rename from public/javascript/redmic/modules/form/input/DateRangeImpl.js rename to client-app/javascript/redmic/modules/form/input/DateRangeImpl.js diff --git a/public/javascript/redmic/modules/form/input/DateRangeTextBoxImpl.js b/client-app/javascript/redmic/modules/form/input/DateRangeTextBoxImpl.js similarity index 100% rename from public/javascript/redmic/modules/form/input/DateRangeTextBoxImpl.js rename to client-app/javascript/redmic/modules/form/input/DateRangeTextBoxImpl.js diff --git a/public/javascript/redmic/modules/form/input/DateTextBoxImpl.js b/client-app/javascript/redmic/modules/form/input/DateTextBoxImpl.js similarity index 100% rename from public/javascript/redmic/modules/form/input/DateTextBoxImpl.js rename to client-app/javascript/redmic/modules/form/input/DateTextBoxImpl.js diff --git a/public/javascript/redmic/modules/form/input/DateTimeImpl.js b/client-app/javascript/redmic/modules/form/input/DateTimeImpl.js similarity index 100% rename from public/javascript/redmic/modules/form/input/DateTimeImpl.js rename to client-app/javascript/redmic/modules/form/input/DateTimeImpl.js diff --git a/public/javascript/redmic/modules/form/input/DateTimeTextBoxImpl.js b/client-app/javascript/redmic/modules/form/input/DateTimeTextBoxImpl.js similarity index 100% rename from public/javascript/redmic/modules/form/input/DateTimeTextBoxImpl.js rename to client-app/javascript/redmic/modules/form/input/DateTimeTextBoxImpl.js diff --git a/public/javascript/redmic/modules/form/input/FilteringSelectImpl.js b/client-app/javascript/redmic/modules/form/input/FilteringSelectImpl.js similarity index 100% rename from public/javascript/redmic/modules/form/input/FilteringSelectImpl.js rename to client-app/javascript/redmic/modules/form/input/FilteringSelectImpl.js diff --git a/public/javascript/redmic/modules/form/input/GeographicCoordinatesComponentImpl.js b/client-app/javascript/redmic/modules/form/input/GeographicCoordinatesComponentImpl.js similarity index 100% rename from public/javascript/redmic/modules/form/input/GeographicCoordinatesComponentImpl.js rename to client-app/javascript/redmic/modules/form/input/GeographicCoordinatesComponentImpl.js diff --git a/public/javascript/redmic/modules/form/input/GeometryImpl.js b/client-app/javascript/redmic/modules/form/input/GeometryImpl.js similarity index 100% rename from public/javascript/redmic/modules/form/input/GeometryImpl.js rename to client-app/javascript/redmic/modules/form/input/GeometryImpl.js diff --git a/public/javascript/redmic/modules/form/input/Input.js b/client-app/javascript/redmic/modules/form/input/Input.js similarity index 100% rename from public/javascript/redmic/modules/form/input/Input.js rename to client-app/javascript/redmic/modules/form/input/Input.js diff --git a/public/javascript/redmic/modules/form/input/KeywordsImpl.js b/client-app/javascript/redmic/modules/form/input/KeywordsImpl.js similarity index 100% rename from public/javascript/redmic/modules/form/input/KeywordsImpl.js rename to client-app/javascript/redmic/modules/form/input/KeywordsImpl.js diff --git a/public/javascript/redmic/modules/form/input/MapSearchImpl.js b/client-app/javascript/redmic/modules/form/input/MapSearchImpl.js similarity index 100% rename from public/javascript/redmic/modules/form/input/MapSearchImpl.js rename to client-app/javascript/redmic/modules/form/input/MapSearchImpl.js diff --git a/public/javascript/redmic/modules/form/input/MultiSelectImpl.js b/client-app/javascript/redmic/modules/form/input/MultiSelectImpl.js similarity index 100% rename from public/javascript/redmic/modules/form/input/MultiSelectImpl.js rename to client-app/javascript/redmic/modules/form/input/MultiSelectImpl.js diff --git a/public/javascript/redmic/modules/form/input/NumberSpinnerImpl.js b/client-app/javascript/redmic/modules/form/input/NumberSpinnerImpl.js similarity index 100% rename from public/javascript/redmic/modules/form/input/NumberSpinnerImpl.js rename to client-app/javascript/redmic/modules/form/input/NumberSpinnerImpl.js diff --git a/public/javascript/redmic/modules/form/input/NumberTextBoxImpl.js b/client-app/javascript/redmic/modules/form/input/NumberTextBoxImpl.js similarity index 100% rename from public/javascript/redmic/modules/form/input/NumberTextBoxImpl.js rename to client-app/javascript/redmic/modules/form/input/NumberTextBoxImpl.js diff --git a/public/javascript/redmic/modules/form/input/PointImpl.js b/client-app/javascript/redmic/modules/form/input/PointImpl.js similarity index 100% rename from public/javascript/redmic/modules/form/input/PointImpl.js rename to client-app/javascript/redmic/modules/form/input/PointImpl.js diff --git a/public/javascript/redmic/modules/form/input/RadioButtonGroupImpl.js b/client-app/javascript/redmic/modules/form/input/RadioButtonGroupImpl.js similarity index 100% rename from public/javascript/redmic/modules/form/input/RadioButtonGroupImpl.js rename to client-app/javascript/redmic/modules/form/input/RadioButtonGroupImpl.js diff --git a/public/javascript/redmic/modules/form/input/RadioButtonImpl.js b/client-app/javascript/redmic/modules/form/input/RadioButtonImpl.js similarity index 100% rename from public/javascript/redmic/modules/form/input/RadioButtonImpl.js rename to client-app/javascript/redmic/modules/form/input/RadioButtonImpl.js diff --git a/public/javascript/redmic/modules/form/input/RangeImpl.js b/client-app/javascript/redmic/modules/form/input/RangeImpl.js similarity index 100% rename from public/javascript/redmic/modules/form/input/RangeImpl.js rename to client-app/javascript/redmic/modules/form/input/RangeImpl.js diff --git a/public/javascript/redmic/modules/form/input/RangeSliderImpl.js b/client-app/javascript/redmic/modules/form/input/RangeSliderImpl.js similarity index 100% rename from public/javascript/redmic/modules/form/input/RangeSliderImpl.js rename to client-app/javascript/redmic/modules/form/input/RangeSliderImpl.js diff --git a/public/javascript/redmic/modules/form/input/SelectImpl.js b/client-app/javascript/redmic/modules/form/input/SelectImpl.js similarity index 100% rename from public/javascript/redmic/modules/form/input/SelectImpl.js rename to client-app/javascript/redmic/modules/form/input/SelectImpl.js diff --git a/public/javascript/redmic/modules/form/input/SelectOnListPopupImpl.js b/client-app/javascript/redmic/modules/form/input/SelectOnListPopupImpl.js similarity index 100% rename from public/javascript/redmic/modules/form/input/SelectOnListPopupImpl.js rename to client-app/javascript/redmic/modules/form/input/SelectOnListPopupImpl.js diff --git a/public/javascript/redmic/modules/form/input/SliderImpl.js b/client-app/javascript/redmic/modules/form/input/SliderImpl.js similarity index 100% rename from public/javascript/redmic/modules/form/input/SliderImpl.js rename to client-app/javascript/redmic/modules/form/input/SliderImpl.js diff --git a/public/javascript/redmic/modules/form/input/TextAreaImpl.js b/client-app/javascript/redmic/modules/form/input/TextAreaImpl.js similarity index 100% rename from public/javascript/redmic/modules/form/input/TextAreaImpl.js rename to client-app/javascript/redmic/modules/form/input/TextAreaImpl.js diff --git a/public/javascript/redmic/modules/form/input/TextBoxImpl.js b/client-app/javascript/redmic/modules/form/input/TextBoxImpl.js similarity index 100% rename from public/javascript/redmic/modules/form/input/TextBoxImpl.js rename to client-app/javascript/redmic/modules/form/input/TextBoxImpl.js diff --git a/public/javascript/redmic/modules/form/input/UploadFileImpl.js b/client-app/javascript/redmic/modules/form/input/UploadFileImpl.js similarity index 100% rename from public/javascript/redmic/modules/form/input/UploadFileImpl.js rename to client-app/javascript/redmic/modules/form/input/UploadFileImpl.js diff --git a/public/javascript/redmic/modules/form/input/ValueAndUnitSelectorImpl.js b/client-app/javascript/redmic/modules/form/input/ValueAndUnitSelectorImpl.js similarity index 100% rename from public/javascript/redmic/modules/form/input/ValueAndUnitSelectorImpl.js rename to client-app/javascript/redmic/modules/form/input/ValueAndUnitSelectorImpl.js diff --git a/public/javascript/redmic/modules/form/input/_BaseDateTime.js b/client-app/javascript/redmic/modules/form/input/_BaseDateTime.js similarity index 100% rename from public/javascript/redmic/modules/form/input/_BaseDateTime.js rename to client-app/javascript/redmic/modules/form/input/_BaseDateTime.js diff --git a/public/javascript/redmic/modules/form/input/_BaseMultiSelectImpl.js b/client-app/javascript/redmic/modules/form/input/_BaseMultiSelectImpl.js similarity index 100% rename from public/javascript/redmic/modules/form/input/_BaseMultiSelectImpl.js rename to client-app/javascript/redmic/modules/form/input/_BaseMultiSelectImpl.js diff --git a/public/javascript/redmic/modules/form/input/_BaseRange.js b/client-app/javascript/redmic/modules/form/input/_BaseRange.js similarity index 100% rename from public/javascript/redmic/modules/form/input/_BaseRange.js rename to client-app/javascript/redmic/modules/form/input/_BaseRange.js diff --git a/public/javascript/redmic/modules/form/input/_BaseTextBoxWidthExpandTooltipImpl.js b/client-app/javascript/redmic/modules/form/input/_BaseTextBoxWidthExpandTooltipImpl.js similarity index 100% rename from public/javascript/redmic/modules/form/input/_BaseTextBoxWidthExpandTooltipImpl.js rename to client-app/javascript/redmic/modules/form/input/_BaseTextBoxWidthExpandTooltipImpl.js diff --git a/public/javascript/redmic/modules/form/input/_BaseWidthExpandTooltipImpl.js b/client-app/javascript/redmic/modules/form/input/_BaseWidthExpandTooltipImpl.js similarity index 100% rename from public/javascript/redmic/modules/form/input/_BaseWidthExpandTooltipImpl.js rename to client-app/javascript/redmic/modules/form/input/_BaseWidthExpandTooltipImpl.js diff --git a/public/javascript/redmic/modules/form/input/_DeleteOnClear.js b/client-app/javascript/redmic/modules/form/input/_DeleteOnClear.js similarity index 100% rename from public/javascript/redmic/modules/form/input/_DeleteOnClear.js rename to client-app/javascript/redmic/modules/form/input/_DeleteOnClear.js diff --git a/public/javascript/redmic/modules/form/input/_Dependence.js b/client-app/javascript/redmic/modules/form/input/_Dependence.js similarity index 100% rename from public/javascript/redmic/modules/form/input/_Dependence.js rename to client-app/javascript/redmic/modules/form/input/_Dependence.js diff --git a/public/javascript/redmic/modules/form/input/_DisableInput.js b/client-app/javascript/redmic/modules/form/input/_DisableInput.js similarity index 100% rename from public/javascript/redmic/modules/form/input/_DisableInput.js rename to client-app/javascript/redmic/modules/form/input/_DisableInput.js diff --git a/public/javascript/redmic/modules/form/input/_IgnoreNonexistentProperty.js b/client-app/javascript/redmic/modules/form/input/_IgnoreNonexistentProperty.js similarity index 100% rename from public/javascript/redmic/modules/form/input/_IgnoreNonexistentProperty.js rename to client-app/javascript/redmic/modules/form/input/_IgnoreNonexistentProperty.js diff --git a/public/javascript/redmic/modules/form/input/_InputItfc.js b/client-app/javascript/redmic/modules/form/input/_InputItfc.js similarity index 100% rename from public/javascript/redmic/modules/form/input/_InputItfc.js rename to client-app/javascript/redmic/modules/form/input/_InputItfc.js diff --git a/public/javascript/redmic/modules/form/input/_NodesCreation.js b/client-app/javascript/redmic/modules/form/input/_NodesCreation.js similarity index 100% rename from public/javascript/redmic/modules/form/input/_NodesCreation.js rename to client-app/javascript/redmic/modules/form/input/_NodesCreation.js diff --git a/public/javascript/redmic/modules/form/input/_SelectOnPopupImpl.js b/client-app/javascript/redmic/modules/form/input/_SelectOnPopupImpl.js similarity index 100% rename from public/javascript/redmic/modules/form/input/_SelectOnPopupImpl.js rename to client-app/javascript/redmic/modules/form/input/_SelectOnPopupImpl.js diff --git a/public/javascript/redmic/modules/gateway/AddItemGatewayImpl.js b/client-app/javascript/redmic/modules/gateway/AddItemGatewayImpl.js similarity index 100% rename from public/javascript/redmic/modules/gateway/AddItemGatewayImpl.js rename to client-app/javascript/redmic/modules/gateway/AddItemGatewayImpl.js diff --git a/public/javascript/redmic/modules/gateway/Gateway.js b/client-app/javascript/redmic/modules/gateway/Gateway.js similarity index 100% rename from public/javascript/redmic/modules/gateway/Gateway.js rename to client-app/javascript/redmic/modules/gateway/Gateway.js diff --git a/public/javascript/redmic/modules/gateway/LocalSelectorGatewayImpl.js b/client-app/javascript/redmic/modules/gateway/LocalSelectorGatewayImpl.js similarity index 100% rename from public/javascript/redmic/modules/gateway/LocalSelectorGatewayImpl.js rename to client-app/javascript/redmic/modules/gateway/LocalSelectorGatewayImpl.js diff --git a/public/javascript/redmic/modules/gateway/MapCenteringGatewayImpl.js b/client-app/javascript/redmic/modules/gateway/MapCenteringGatewayImpl.js similarity index 100% rename from public/javascript/redmic/modules/gateway/MapCenteringGatewayImpl.js rename to client-app/javascript/redmic/modules/gateway/MapCenteringGatewayImpl.js diff --git a/public/javascript/redmic/modules/gateway/_GatewayItfc.js b/client-app/javascript/redmic/modules/gateway/_GatewayItfc.js similarity index 100% rename from public/javascript/redmic/modules/gateway/_GatewayItfc.js rename to client-app/javascript/redmic/modules/gateway/_GatewayItfc.js diff --git a/public/javascript/redmic/modules/layout/TabsDisplayer.js b/client-app/javascript/redmic/modules/layout/TabsDisplayer.js similarity index 100% rename from public/javascript/redmic/modules/layout/TabsDisplayer.js rename to client-app/javascript/redmic/modules/layout/TabsDisplayer.js diff --git a/public/javascript/redmic/modules/layout/dataDisplayer/DataDisplayer.js b/client-app/javascript/redmic/modules/layout/dataDisplayer/DataDisplayer.js similarity index 100% rename from public/javascript/redmic/modules/layout/dataDisplayer/DataDisplayer.js rename to client-app/javascript/redmic/modules/layout/dataDisplayer/DataDisplayer.js diff --git a/public/javascript/redmic/modules/layout/genericDisplayer/GenericDisplayer.js b/client-app/javascript/redmic/modules/layout/genericDisplayer/GenericDisplayer.js similarity index 100% rename from public/javascript/redmic/modules/layout/genericDisplayer/GenericDisplayer.js rename to client-app/javascript/redmic/modules/layout/genericDisplayer/GenericDisplayer.js diff --git a/public/javascript/redmic/modules/layout/genericDisplayer/GenericWithTopbarDisplayerImpl.js b/client-app/javascript/redmic/modules/layout/genericDisplayer/GenericWithTopbarDisplayerImpl.js similarity index 100% rename from public/javascript/redmic/modules/layout/genericDisplayer/GenericWithTopbarDisplayerImpl.js rename to client-app/javascript/redmic/modules/layout/genericDisplayer/GenericWithTopbarDisplayerImpl.js diff --git a/public/javascript/redmic/modules/layout/listMenu/ListMenu.js b/client-app/javascript/redmic/modules/layout/listMenu/ListMenu.js similarity index 100% rename from public/javascript/redmic/modules/layout/listMenu/ListMenu.js rename to client-app/javascript/redmic/modules/layout/listMenu/ListMenu.js diff --git a/public/javascript/redmic/modules/layout/nestedContent/NestedBrowsersImpl.js b/client-app/javascript/redmic/modules/layout/nestedContent/NestedBrowsersImpl.js similarity index 100% rename from public/javascript/redmic/modules/layout/nestedContent/NestedBrowsersImpl.js rename to client-app/javascript/redmic/modules/layout/nestedContent/NestedBrowsersImpl.js diff --git a/public/javascript/redmic/modules/layout/nestedContent/NestedContent.js b/client-app/javascript/redmic/modules/layout/nestedContent/NestedContent.js similarity index 100% rename from public/javascript/redmic/modules/layout/nestedContent/NestedContent.js rename to client-app/javascript/redmic/modules/layout/nestedContent/NestedContent.js diff --git a/public/javascript/redmic/modules/layout/templateDisplayer/TemplateDisplayer.js b/client-app/javascript/redmic/modules/layout/templateDisplayer/TemplateDisplayer.js similarity index 100% rename from public/javascript/redmic/modules/layout/templateDisplayer/TemplateDisplayer.js rename to client-app/javascript/redmic/modules/layout/templateDisplayer/TemplateDisplayer.js diff --git a/public/javascript/redmic/modules/layout/wizard/Wizard.js b/client-app/javascript/redmic/modules/layout/wizard/Wizard.js similarity index 100% rename from public/javascript/redmic/modules/layout/wizard/Wizard.js rename to client-app/javascript/redmic/modules/layout/wizard/Wizard.js diff --git a/public/javascript/redmic/modules/layout/wizard/_CompleteBySelection.js b/client-app/javascript/redmic/modules/layout/wizard/_CompleteBySelection.js similarity index 100% rename from public/javascript/redmic/modules/layout/wizard/_CompleteBySelection.js rename to client-app/javascript/redmic/modules/layout/wizard/_CompleteBySelection.js diff --git a/public/javascript/redmic/modules/layout/wizard/_StepBreadcrumbs.js b/client-app/javascript/redmic/modules/layout/wizard/_StepBreadcrumbs.js similarity index 100% rename from public/javascript/redmic/modules/layout/wizard/_StepBreadcrumbs.js rename to client-app/javascript/redmic/modules/layout/wizard/_StepBreadcrumbs.js diff --git a/public/javascript/redmic/modules/layout/wizard/_StepNavigation.js b/client-app/javascript/redmic/modules/layout/wizard/_StepNavigation.js similarity index 100% rename from public/javascript/redmic/modules/layout/wizard/_StepNavigation.js rename to client-app/javascript/redmic/modules/layout/wizard/_StepNavigation.js diff --git a/public/javascript/redmic/modules/layout/wizard/_WizardStep.js b/client-app/javascript/redmic/modules/layout/wizard/_WizardStep.js similarity index 100% rename from public/javascript/redmic/modules/layout/wizard/_WizardStep.js rename to client-app/javascript/redmic/modules/layout/wizard/_WizardStep.js diff --git a/public/javascript/redmic/modules/layout/wizard/_WizardStepItfc.js b/client-app/javascript/redmic/modules/layout/wizard/_WizardStepItfc.js similarity index 100% rename from public/javascript/redmic/modules/layout/wizard/_WizardStepItfc.js rename to client-app/javascript/redmic/modules/layout/wizard/_WizardStepItfc.js diff --git a/public/javascript/redmic/modules/map/LeafletImpl.js b/client-app/javascript/redmic/modules/map/LeafletImpl.js similarity index 100% rename from public/javascript/redmic/modules/map/LeafletImpl.js rename to client-app/javascript/redmic/modules/map/LeafletImpl.js diff --git a/public/javascript/redmic/modules/map/Map.js b/client-app/javascript/redmic/modules/map/Map.js similarity index 100% rename from public/javascript/redmic/modules/map/Map.js rename to client-app/javascript/redmic/modules/map/Map.js diff --git a/public/javascript/redmic/modules/map/MapButton.js b/client-app/javascript/redmic/modules/map/MapButton.js similarity index 100% rename from public/javascript/redmic/modules/map/MapButton.js rename to client-app/javascript/redmic/modules/map/MapButton.js diff --git a/public/javascript/redmic/modules/map/StaticLayersDefinition.js b/client-app/javascript/redmic/modules/map/StaticLayersDefinition.js similarity index 100% rename from public/javascript/redmic/modules/map/StaticLayersDefinition.js rename to client-app/javascript/redmic/modules/map/StaticLayersDefinition.js diff --git a/public/javascript/redmic/modules/map/_ImportWkt.js b/client-app/javascript/redmic/modules/map/_ImportWkt.js similarity index 100% rename from public/javascript/redmic/modules/map/_ImportWkt.js rename to client-app/javascript/redmic/modules/map/_ImportWkt.js diff --git a/public/javascript/redmic/modules/map/_LeafletDraw.js b/client-app/javascript/redmic/modules/map/_LeafletDraw.js similarity index 100% rename from public/javascript/redmic/modules/map/_LeafletDraw.js rename to client-app/javascript/redmic/modules/map/_LeafletDraw.js diff --git a/public/javascript/redmic/modules/map/_LeafletImplItfc.js b/client-app/javascript/redmic/modules/map/_LeafletImplItfc.js similarity index 100% rename from public/javascript/redmic/modules/map/_LeafletImplItfc.js rename to client-app/javascript/redmic/modules/map/_LeafletImplItfc.js diff --git a/public/javascript/redmic/modules/map/_LeafletWidgetsManagement.js b/client-app/javascript/redmic/modules/map/_LeafletWidgetsManagement.js similarity index 100% rename from public/javascript/redmic/modules/map/_LeafletWidgetsManagement.js rename to client-app/javascript/redmic/modules/map/_LeafletWidgetsManagement.js diff --git a/public/javascript/redmic/modules/map/_ListenContainers.js b/client-app/javascript/redmic/modules/map/_ListenContainers.js similarity index 100% rename from public/javascript/redmic/modules/map/_ListenContainers.js rename to client-app/javascript/redmic/modules/map/_ListenContainers.js diff --git a/public/javascript/redmic/modules/map/_MapItfc.js b/client-app/javascript/redmic/modules/map/_MapItfc.js similarity index 100% rename from public/javascript/redmic/modules/map/_MapItfc.js rename to client-app/javascript/redmic/modules/map/_MapItfc.js diff --git a/public/javascript/redmic/modules/map/_OverlayLayersManagement.js b/client-app/javascript/redmic/modules/map/_OverlayLayersManagement.js similarity index 100% rename from public/javascript/redmic/modules/map/_OverlayLayersManagement.js rename to client-app/javascript/redmic/modules/map/_OverlayLayersManagement.js diff --git a/public/javascript/redmic/modules/map/_PlaceNamesButton.js b/client-app/javascript/redmic/modules/map/_PlaceNamesButton.js similarity index 100% rename from public/javascript/redmic/modules/map/_PlaceNamesButton.js rename to client-app/javascript/redmic/modules/map/_PlaceNamesButton.js diff --git a/public/javascript/redmic/modules/map/_StaticLayersManagement.js b/client-app/javascript/redmic/modules/map/_StaticLayersManagement.js similarity index 100% rename from public/javascript/redmic/modules/map/_StaticLayersManagement.js rename to client-app/javascript/redmic/modules/map/_StaticLayersManagement.js diff --git a/public/javascript/redmic/modules/map/layer/DrawingLayerImpl.js b/client-app/javascript/redmic/modules/map/layer/DrawingLayerImpl.js similarity index 100% rename from public/javascript/redmic/modules/map/layer/DrawingLayerImpl.js rename to client-app/javascript/redmic/modules/map/layer/DrawingLayerImpl.js diff --git a/public/javascript/redmic/modules/map/layer/GeoJsonLayerImpl.js b/client-app/javascript/redmic/modules/map/layer/GeoJsonLayerImpl.js similarity index 100% rename from public/javascript/redmic/modules/map/layer/GeoJsonLayerImpl.js rename to client-app/javascript/redmic/modules/map/layer/GeoJsonLayerImpl.js diff --git a/public/javascript/redmic/modules/map/layer/GridLayerImpl.js b/client-app/javascript/redmic/modules/map/layer/GridLayerImpl.js similarity index 100% rename from public/javascript/redmic/modules/map/layer/GridLayerImpl.js rename to client-app/javascript/redmic/modules/map/layer/GridLayerImpl.js diff --git a/public/javascript/redmic/modules/map/layer/MapLayer.js b/client-app/javascript/redmic/modules/map/layer/MapLayer.js similarity index 100% rename from public/javascript/redmic/modules/map/layer/MapLayer.js rename to client-app/javascript/redmic/modules/map/layer/MapLayer.js diff --git a/public/javascript/redmic/modules/map/layer/PruneClusterLayerImpl.js b/client-app/javascript/redmic/modules/map/layer/PruneClusterLayerImpl.js similarity index 100% rename from public/javascript/redmic/modules/map/layer/PruneClusterLayerImpl.js rename to client-app/javascript/redmic/modules/map/layer/PruneClusterLayerImpl.js diff --git a/public/javascript/redmic/modules/map/layer/TrackingLayerImpl.js b/client-app/javascript/redmic/modules/map/layer/TrackingLayerImpl.js similarity index 100% rename from public/javascript/redmic/modules/map/layer/TrackingLayerImpl.js rename to client-app/javascript/redmic/modules/map/layer/TrackingLayerImpl.js diff --git a/public/javascript/redmic/modules/map/layer/TrackingLine.js b/client-app/javascript/redmic/modules/map/layer/TrackingLine.js similarity index 100% rename from public/javascript/redmic/modules/map/layer/TrackingLine.js rename to client-app/javascript/redmic/modules/map/layer/TrackingLine.js diff --git a/public/javascript/redmic/modules/map/layer/WmsLayerImpl.js b/client-app/javascript/redmic/modules/map/layer/WmsLayerImpl.js similarity index 100% rename from public/javascript/redmic/modules/map/layer/WmsLayerImpl.js rename to client-app/javascript/redmic/modules/map/layer/WmsLayerImpl.js diff --git a/public/javascript/redmic/modules/map/layer/_AddFilter.js b/client-app/javascript/redmic/modules/map/layer/_AddFilter.js similarity index 100% rename from public/javascript/redmic/modules/map/layer/_AddFilter.js rename to client-app/javascript/redmic/modules/map/layer/_AddFilter.js diff --git a/public/javascript/redmic/modules/map/layer/_AnimateMarker.js b/client-app/javascript/redmic/modules/map/layer/_AnimateMarker.js similarity index 100% rename from public/javascript/redmic/modules/map/layer/_AnimateMarker.js rename to client-app/javascript/redmic/modules/map/layer/_AnimateMarker.js diff --git a/public/javascript/redmic/modules/map/layer/_D3Expansion.js b/client-app/javascript/redmic/modules/map/layer/_D3Expansion.js similarity index 100% rename from public/javascript/redmic/modules/map/layer/_D3Expansion.js rename to client-app/javascript/redmic/modules/map/layer/_D3Expansion.js diff --git a/public/javascript/redmic/modules/map/layer/_Editable.js b/client-app/javascript/redmic/modules/map/layer/_Editable.js similarity index 100% rename from public/javascript/redmic/modules/map/layer/_Editable.js rename to client-app/javascript/redmic/modules/map/layer/_Editable.js diff --git a/public/javascript/redmic/modules/map/layer/_GeoJsonLayerItfc.js b/client-app/javascript/redmic/modules/map/layer/_GeoJsonLayerItfc.js similarity index 100% rename from public/javascript/redmic/modules/map/layer/_GeoJsonLayerItfc.js rename to client-app/javascript/redmic/modules/map/layer/_GeoJsonLayerItfc.js diff --git a/public/javascript/redmic/modules/map/layer/_Highlightable.js b/client-app/javascript/redmic/modules/map/layer/_Highlightable.js similarity index 100% rename from public/javascript/redmic/modules/map/layer/_Highlightable.js rename to client-app/javascript/redmic/modules/map/layer/_Highlightable.js diff --git a/public/javascript/redmic/modules/map/layer/_LayerProtocols.js b/client-app/javascript/redmic/modules/map/layer/_LayerProtocols.js similarity index 100% rename from public/javascript/redmic/modules/map/layer/_LayerProtocols.js rename to client-app/javascript/redmic/modules/map/layer/_LayerProtocols.js diff --git a/public/javascript/redmic/modules/map/layer/_ListenBounds.js b/client-app/javascript/redmic/modules/map/layer/_ListenBounds.js similarity index 100% rename from public/javascript/redmic/modules/map/layer/_ListenBounds.js rename to client-app/javascript/redmic/modules/map/layer/_ListenBounds.js diff --git a/public/javascript/redmic/modules/map/layer/_ListenZoom.js b/client-app/javascript/redmic/modules/map/layer/_ListenZoom.js similarity index 100% rename from public/javascript/redmic/modules/map/layer/_ListenZoom.js rename to client-app/javascript/redmic/modules/map/layer/_ListenZoom.js diff --git a/public/javascript/redmic/modules/map/layer/_MapLayerItfc.js b/client-app/javascript/redmic/modules/map/layer/_MapLayerItfc.js similarity index 100% rename from public/javascript/redmic/modules/map/layer/_MapLayerItfc.js rename to client-app/javascript/redmic/modules/map/layer/_MapLayerItfc.js diff --git a/public/javascript/redmic/modules/map/layer/_PruneClusterLayerItfc.js b/client-app/javascript/redmic/modules/map/layer/_PruneClusterLayerItfc.js similarity index 100% rename from public/javascript/redmic/modules/map/layer/_PruneClusterLayerItfc.js rename to client-app/javascript/redmic/modules/map/layer/_PruneClusterLayerItfc.js diff --git a/public/javascript/redmic/modules/map/layer/_PublishInfo.js b/client-app/javascript/redmic/modules/map/layer/_PublishInfo.js similarity index 100% rename from public/javascript/redmic/modules/map/layer/_PublishInfo.js rename to client-app/javascript/redmic/modules/map/layer/_PublishInfo.js diff --git a/public/javascript/redmic/modules/map/layer/_PublishInfoItfc.js b/client-app/javascript/redmic/modules/map/layer/_PublishInfoItfc.js similarity index 100% rename from public/javascript/redmic/modules/map/layer/_PublishInfoItfc.js rename to client-app/javascript/redmic/modules/map/layer/_PublishInfoItfc.js diff --git a/public/javascript/redmic/modules/map/layer/_RadiusCommons.js b/client-app/javascript/redmic/modules/map/layer/_RadiusCommons.js similarity index 100% rename from public/javascript/redmic/modules/map/layer/_RadiusCommons.js rename to client-app/javascript/redmic/modules/map/layer/_RadiusCommons.js diff --git a/public/javascript/redmic/modules/map/layer/_RadiusOnClick.js b/client-app/javascript/redmic/modules/map/layer/_RadiusOnClick.js similarity index 100% rename from public/javascript/redmic/modules/map/layer/_RadiusOnClick.js rename to client-app/javascript/redmic/modules/map/layer/_RadiusOnClick.js diff --git a/public/javascript/redmic/modules/map/layer/_RadiusOnSelect.js b/client-app/javascript/redmic/modules/map/layer/_RadiusOnSelect.js similarity index 100% rename from public/javascript/redmic/modules/map/layer/_RadiusOnSelect.js rename to client-app/javascript/redmic/modules/map/layer/_RadiusOnSelect.js diff --git a/public/javascript/redmic/modules/map/layer/_SelectOnClick.js b/client-app/javascript/redmic/modules/map/layer/_SelectOnClick.js similarity index 100% rename from public/javascript/redmic/modules/map/layer/_SelectOnClick.js rename to client-app/javascript/redmic/modules/map/layer/_SelectOnClick.js diff --git a/public/javascript/redmic/modules/map/layer/_Selectable.js b/client-app/javascript/redmic/modules/map/layer/_Selectable.js similarity index 100% rename from public/javascript/redmic/modules/map/layer/_Selectable.js rename to client-app/javascript/redmic/modules/map/layer/_Selectable.js diff --git a/public/javascript/redmic/modules/map/layer/_SelectableItfc.js b/client-app/javascript/redmic/modules/map/layer/_SelectableItfc.js similarity index 100% rename from public/javascript/redmic/modules/map/layer/_SelectableItfc.js rename to client-app/javascript/redmic/modules/map/layer/_SelectableItfc.js diff --git a/public/javascript/redmic/modules/map/layer/_TrackingDataManagement.js b/client-app/javascript/redmic/modules/map/layer/_TrackingDataManagement.js similarity index 100% rename from public/javascript/redmic/modules/map/layer/_TrackingDataManagement.js rename to client-app/javascript/redmic/modules/map/layer/_TrackingDataManagement.js diff --git a/public/javascript/redmic/modules/map/layer/_TrackingMarkersManagement.js b/client-app/javascript/redmic/modules/map/layer/_TrackingMarkersManagement.js similarity index 100% rename from public/javascript/redmic/modules/map/layer/_TrackingMarkersManagement.js rename to client-app/javascript/redmic/modules/map/layer/_TrackingMarkersManagement.js diff --git a/public/javascript/redmic/modules/mapQuery/QueryOnMap.js b/client-app/javascript/redmic/modules/mapQuery/QueryOnMap.js similarity index 100% rename from public/javascript/redmic/modules/mapQuery/QueryOnMap.js rename to client-app/javascript/redmic/modules/mapQuery/QueryOnMap.js diff --git a/public/javascript/redmic/modules/mapQuery/_ContentManagement.js b/client-app/javascript/redmic/modules/mapQuery/_ContentManagement.js similarity index 100% rename from public/javascript/redmic/modules/mapQuery/_ContentManagement.js rename to client-app/javascript/redmic/modules/mapQuery/_ContentManagement.js diff --git a/public/javascript/redmic/modules/mapQuery/_ResultsBrowser.js b/client-app/javascript/redmic/modules/mapQuery/_ResultsBrowser.js similarity index 100% rename from public/javascript/redmic/modules/mapQuery/_ResultsBrowser.js rename to client-app/javascript/redmic/modules/mapQuery/_ResultsBrowser.js diff --git a/public/javascript/redmic/modules/metaTags/MetaTags.js b/client-app/javascript/redmic/modules/metaTags/MetaTags.js similarity index 100% rename from public/javascript/redmic/modules/metaTags/MetaTags.js rename to client-app/javascript/redmic/modules/metaTags/MetaTags.js diff --git a/public/javascript/redmic/modules/metaTags/metaTagsContent.js b/client-app/javascript/redmic/modules/metaTags/metaTagsContent.js similarity index 100% rename from public/javascript/redmic/modules/metaTags/metaTagsContent.js rename to client-app/javascript/redmic/modules/metaTags/metaTagsContent.js diff --git a/public/javascript/redmic/modules/model/Model.js b/client-app/javascript/redmic/modules/model/Model.js similarity index 100% rename from public/javascript/redmic/modules/model/Model.js rename to client-app/javascript/redmic/modules/model/Model.js diff --git a/public/javascript/redmic/modules/model/ModelImpl.js b/client-app/javascript/redmic/modules/model/ModelImpl.js similarity index 100% rename from public/javascript/redmic/modules/model/ModelImpl.js rename to client-app/javascript/redmic/modules/model/ModelImpl.js diff --git a/public/javascript/redmic/modules/model/_ModelItfc.js b/client-app/javascript/redmic/modules/model/_ModelItfc.js similarity index 100% rename from public/javascript/redmic/modules/model/_ModelItfc.js rename to client-app/javascript/redmic/modules/model/_ModelItfc.js diff --git a/public/javascript/redmic/modules/notification/Alert.js b/client-app/javascript/redmic/modules/notification/Alert.js similarity index 100% rename from public/javascript/redmic/modules/notification/Alert.js rename to client-app/javascript/redmic/modules/notification/Alert.js diff --git a/public/javascript/redmic/modules/notification/CommunicationCenter.js b/client-app/javascript/redmic/modules/notification/CommunicationCenter.js similarity index 100% rename from public/javascript/redmic/modules/notification/CommunicationCenter.js rename to client-app/javascript/redmic/modules/notification/CommunicationCenter.js diff --git a/public/javascript/redmic/modules/notification/Notification.js b/client-app/javascript/redmic/modules/notification/Notification.js similarity index 100% rename from public/javascript/redmic/modules/notification/Notification.js rename to client-app/javascript/redmic/modules/notification/Notification.js diff --git a/public/javascript/redmic/modules/notification/NotificationSidebar.js b/client-app/javascript/redmic/modules/notification/NotificationSidebar.js similarity index 100% rename from public/javascript/redmic/modules/notification/NotificationSidebar.js rename to client-app/javascript/redmic/modules/notification/NotificationSidebar.js diff --git a/public/javascript/redmic/modules/notification/TaskNotification.js b/client-app/javascript/redmic/modules/notification/TaskNotification.js similarity index 100% rename from public/javascript/redmic/modules/notification/TaskNotification.js rename to client-app/javascript/redmic/modules/notification/TaskNotification.js diff --git a/public/javascript/redmic/modules/search/CompositeImpl.js b/client-app/javascript/redmic/modules/search/CompositeImpl.js similarity index 100% rename from public/javascript/redmic/modules/search/CompositeImpl.js rename to client-app/javascript/redmic/modules/search/CompositeImpl.js diff --git a/public/javascript/redmic/modules/search/DateRangeImpl.js b/client-app/javascript/redmic/modules/search/DateRangeImpl.js similarity index 100% rename from public/javascript/redmic/modules/search/DateRangeImpl.js rename to client-app/javascript/redmic/modules/search/DateRangeImpl.js diff --git a/public/javascript/redmic/modules/search/FacetsImpl.js b/client-app/javascript/redmic/modules/search/FacetsImpl.js similarity index 100% rename from public/javascript/redmic/modules/search/FacetsImpl.js rename to client-app/javascript/redmic/modules/search/FacetsImpl.js diff --git a/public/javascript/redmic/modules/search/GeographicImpl.js b/client-app/javascript/redmic/modules/search/GeographicImpl.js similarity index 100% rename from public/javascript/redmic/modules/search/GeographicImpl.js rename to client-app/javascript/redmic/modules/search/GeographicImpl.js diff --git a/public/javascript/redmic/modules/search/MultiSelectImpl.js b/client-app/javascript/redmic/modules/search/MultiSelectImpl.js similarity index 100% rename from public/javascript/redmic/modules/search/MultiSelectImpl.js rename to client-app/javascript/redmic/modules/search/MultiSelectImpl.js diff --git a/public/javascript/redmic/modules/search/RangeImpl.js b/client-app/javascript/redmic/modules/search/RangeImpl.js similarity index 100% rename from public/javascript/redmic/modules/search/RangeImpl.js rename to client-app/javascript/redmic/modules/search/RangeImpl.js diff --git a/public/javascript/redmic/modules/search/Search.js b/client-app/javascript/redmic/modules/search/Search.js similarity index 100% rename from public/javascript/redmic/modules/search/Search.js rename to client-app/javascript/redmic/modules/search/Search.js diff --git a/public/javascript/redmic/modules/search/TextImpl.js b/client-app/javascript/redmic/modules/search/TextImpl.js similarity index 100% rename from public/javascript/redmic/modules/search/TextImpl.js rename to client-app/javascript/redmic/modules/search/TextImpl.js diff --git a/public/javascript/redmic/modules/search/_HideFormByAction.js b/client-app/javascript/redmic/modules/search/_HideFormByAction.js similarity index 100% rename from public/javascript/redmic/modules/search/_HideFormByAction.js rename to client-app/javascript/redmic/modules/search/_HideFormByAction.js diff --git a/public/javascript/redmic/modules/search/_SearchItfc.js b/client-app/javascript/redmic/modules/search/_SearchItfc.js similarity index 100% rename from public/javascript/redmic/modules/search/_SearchItfc.js rename to client-app/javascript/redmic/modules/search/_SearchItfc.js diff --git a/public/javascript/redmic/modules/selection/SelectionBox.js b/client-app/javascript/redmic/modules/selection/SelectionBox.js similarity index 100% rename from public/javascript/redmic/modules/selection/SelectionBox.js rename to client-app/javascript/redmic/modules/selection/SelectionBox.js diff --git a/public/javascript/redmic/modules/selection/SelectionManager.js b/client-app/javascript/redmic/modules/selection/SelectionManager.js similarity index 100% rename from public/javascript/redmic/modules/selection/SelectionManager.js rename to client-app/javascript/redmic/modules/selection/SelectionManager.js diff --git a/public/javascript/redmic/modules/selection/Selector.js b/client-app/javascript/redmic/modules/selection/Selector.js similarity index 100% rename from public/javascript/redmic/modules/selection/Selector.js rename to client-app/javascript/redmic/modules/selection/Selector.js diff --git a/public/javascript/redmic/modules/selection/_SelectorItfc.js b/client-app/javascript/redmic/modules/selection/_SelectorItfc.js similarity index 100% rename from public/javascript/redmic/modules/selection/_SelectorItfc.js rename to client-app/javascript/redmic/modules/selection/_SelectorItfc.js diff --git a/public/javascript/redmic/modules/selection/_SelectorPersistence.js b/client-app/javascript/redmic/modules/selection/_SelectorPersistence.js similarity index 100% rename from public/javascript/redmic/modules/selection/_SelectorPersistence.js rename to client-app/javascript/redmic/modules/selection/_SelectorPersistence.js diff --git a/public/javascript/redmic/modules/socket/Socket.js b/client-app/javascript/redmic/modules/socket/Socket.js similarity index 100% rename from public/javascript/redmic/modules/socket/Socket.js rename to client-app/javascript/redmic/modules/socket/Socket.js diff --git a/public/javascript/redmic/modules/socket/Task.js b/client-app/javascript/redmic/modules/socket/Task.js similarity index 100% rename from public/javascript/redmic/modules/socket/Task.js rename to client-app/javascript/redmic/modules/socket/Task.js diff --git a/public/javascript/redmic/modules/socket/_IngestData.js b/client-app/javascript/redmic/modules/socket/_IngestData.js similarity index 100% rename from public/javascript/redmic/modules/socket/_IngestData.js rename to client-app/javascript/redmic/modules/socket/_IngestData.js diff --git a/public/javascript/redmic/modules/socket/_Report.js b/client-app/javascript/redmic/modules/socket/_Report.js similarity index 100% rename from public/javascript/redmic/modules/socket/_Report.js rename to client-app/javascript/redmic/modules/socket/_Report.js diff --git a/public/javascript/redmic/modules/socket/_Worms.js b/client-app/javascript/redmic/modules/socket/_Worms.js similarity index 100% rename from public/javascript/redmic/modules/socket/_Worms.js rename to client-app/javascript/redmic/modules/socket/_Worms.js diff --git a/public/javascript/redmic/modules/store/RequestJoiner/AtlasDataImpl.js b/client-app/javascript/redmic/modules/store/RequestJoiner/AtlasDataImpl.js similarity index 100% rename from public/javascript/redmic/modules/store/RequestJoiner/AtlasDataImpl.js rename to client-app/javascript/redmic/modules/store/RequestJoiner/AtlasDataImpl.js diff --git a/public/javascript/redmic/modules/store/RequestJoiner/RequestJoiner.js b/client-app/javascript/redmic/modules/store/RequestJoiner/RequestJoiner.js similarity index 100% rename from public/javascript/redmic/modules/store/RequestJoiner/RequestJoiner.js rename to client-app/javascript/redmic/modules/store/RequestJoiner/RequestJoiner.js diff --git a/public/javascript/redmic/modules/store/RequestJoiner/_RequestJoinerItfc.js b/client-app/javascript/redmic/modules/store/RequestJoiner/_RequestJoinerItfc.js similarity index 100% rename from public/javascript/redmic/modules/store/RequestJoiner/_RequestJoinerItfc.js rename to client-app/javascript/redmic/modules/store/RequestJoiner/_RequestJoinerItfc.js diff --git a/public/javascript/redmic/modules/store/RestManager.js b/client-app/javascript/redmic/modules/store/RestManager.js similarity index 100% rename from public/javascript/redmic/modules/store/RestManager.js rename to client-app/javascript/redmic/modules/store/RestManager.js diff --git a/public/javascript/redmic/modules/store/RestManagerImpl.js b/client-app/javascript/redmic/modules/store/RestManagerImpl.js similarity index 100% rename from public/javascript/redmic/modules/store/RestManagerImpl.js rename to client-app/javascript/redmic/modules/store/RestManagerImpl.js diff --git a/public/javascript/redmic/modules/store/_RestManagerItfc.js b/client-app/javascript/redmic/modules/store/_RestManagerItfc.js similarity index 100% rename from public/javascript/redmic/modules/store/_RestManagerItfc.js rename to client-app/javascript/redmic/modules/store/_RestManagerItfc.js diff --git a/public/javascript/redmic/modules/tree/CbtreeImpl.js b/client-app/javascript/redmic/modules/tree/CbtreeImpl.js similarity index 100% rename from public/javascript/redmic/modules/tree/CbtreeImpl.js rename to client-app/javascript/redmic/modules/tree/CbtreeImpl.js diff --git a/public/javascript/redmic/modules/tree/Tree.js b/client-app/javascript/redmic/modules/tree/Tree.js similarity index 100% rename from public/javascript/redmic/modules/tree/Tree.js rename to client-app/javascript/redmic/modules/tree/Tree.js diff --git a/public/javascript/redmic/modules/tree/_HierarchicalFilter.js b/client-app/javascript/redmic/modules/tree/_HierarchicalFilter.js similarity index 100% rename from public/javascript/redmic/modules/tree/_HierarchicalFilter.js rename to client-app/javascript/redmic/modules/tree/_HierarchicalFilter.js diff --git a/public/javascript/redmic/modules/tree/_LazyLoad.js b/client-app/javascript/redmic/modules/tree/_LazyLoad.js similarity index 100% rename from public/javascript/redmic/modules/tree/_LazyLoad.js rename to client-app/javascript/redmic/modules/tree/_LazyLoad.js diff --git a/public/javascript/redmic/modules/tree/_LeafSelection.js b/client-app/javascript/redmic/modules/tree/_LeafSelection.js similarity index 100% rename from public/javascript/redmic/modules/tree/_LeafSelection.js rename to client-app/javascript/redmic/modules/tree/_LeafSelection.js diff --git a/public/javascript/redmic/modules/tree/_SelectionBox.js b/client-app/javascript/redmic/modules/tree/_SelectionBox.js similarity index 100% rename from public/javascript/redmic/modules/tree/_SelectionBox.js rename to client-app/javascript/redmic/modules/tree/_SelectionBox.js diff --git a/public/javascript/redmic/modules/tree/_TreeItfc.js b/client-app/javascript/redmic/modules/tree/_TreeItfc.js similarity index 100% rename from public/javascript/redmic/modules/tree/_TreeItfc.js rename to client-app/javascript/redmic/modules/tree/_TreeItfc.js diff --git a/public/javascript/redmic/modules/user/FullscreenToggle.js b/client-app/javascript/redmic/modules/user/FullscreenToggle.js similarity index 100% rename from public/javascript/redmic/modules/user/FullscreenToggle.js rename to client-app/javascript/redmic/modules/user/FullscreenToggle.js diff --git a/public/javascript/redmic/modules/user/LanguageSelector.js b/client-app/javascript/redmic/modules/user/LanguageSelector.js similarity index 100% rename from public/javascript/redmic/modules/user/LanguageSelector.js rename to client-app/javascript/redmic/modules/user/LanguageSelector.js diff --git a/public/javascript/redmic/modules/user/UserArea.js b/client-app/javascript/redmic/modules/user/UserArea.js similarity index 100% rename from public/javascript/redmic/modules/user/UserArea.js rename to client-app/javascript/redmic/modules/user/UserArea.js diff --git a/public/javascript/redmic/validation/stringFormats.js b/client-app/javascript/redmic/validation/stringFormats.js similarity index 100% rename from public/javascript/redmic/validation/stringFormats.js rename to client-app/javascript/redmic/validation/stringFormats.js diff --git a/public/javascript/redmic/view/effects/Animation.js b/client-app/javascript/redmic/view/effects/Animation.js similarity index 100% rename from public/javascript/redmic/view/effects/Animation.js rename to client-app/javascript/redmic/view/effects/Animation.js diff --git a/public/javascript/redmic/widgets/Button.js b/client-app/javascript/redmic/widgets/Button.js similarity index 100% rename from public/javascript/redmic/widgets/Button.js rename to client-app/javascript/redmic/widgets/Button.js diff --git a/public/javascript/redmic/widgets/ComboButton.js b/client-app/javascript/redmic/widgets/ComboButton.js similarity index 100% rename from public/javascript/redmic/widgets/ComboButton.js rename to client-app/javascript/redmic/widgets/ComboButton.js diff --git a/public/javascript/redmic/widgets/Converter.js b/client-app/javascript/redmic/widgets/Converter.js similarity index 100% rename from public/javascript/redmic/widgets/Converter.js rename to client-app/javascript/redmic/widgets/Converter.js diff --git a/public/javascript/redmic/widgets/DatePicker.js b/client-app/javascript/redmic/widgets/DatePicker.js similarity index 100% rename from public/javascript/redmic/widgets/DatePicker.js rename to client-app/javascript/redmic/widgets/DatePicker.js diff --git a/public/javascript/redmic/widgets/Facet.js b/client-app/javascript/redmic/widgets/Facet.js similarity index 100% rename from public/javascript/redmic/widgets/Facet.js rename to client-app/javascript/redmic/widgets/Facet.js diff --git a/public/javascript/redmic/widgets/FilteringSelect.js b/client-app/javascript/redmic/widgets/FilteringSelect.js similarity index 100% rename from public/javascript/redmic/widgets/FilteringSelect.js rename to client-app/javascript/redmic/widgets/FilteringSelect.js diff --git a/public/javascript/redmic/widgets/KeywordsInput.js b/client-app/javascript/redmic/widgets/KeywordsInput.js similarity index 100% rename from public/javascript/redmic/widgets/KeywordsInput.js rename to client-app/javascript/redmic/widgets/KeywordsInput.js diff --git a/public/javascript/redmic/widgets/Map.js b/client-app/javascript/redmic/widgets/Map.js similarity index 100% rename from public/javascript/redmic/widgets/Map.js rename to client-app/javascript/redmic/widgets/Map.js diff --git a/public/javascript/redmic/widgets/ProgressSlider.js b/client-app/javascript/redmic/widgets/ProgressSlider.js similarity index 100% rename from public/javascript/redmic/widgets/ProgressSlider.js rename to client-app/javascript/redmic/widgets/ProgressSlider.js diff --git a/public/javascript/redmic/widgets/README.md b/client-app/javascript/redmic/widgets/README.md similarity index 100% rename from public/javascript/redmic/widgets/README.md rename to client-app/javascript/redmic/widgets/README.md diff --git a/public/javascript/redmic/widgets/RangeSlider.js b/client-app/javascript/redmic/widgets/RangeSlider.js similarity index 100% rename from public/javascript/redmic/widgets/RangeSlider.js rename to client-app/javascript/redmic/widgets/RangeSlider.js diff --git a/public/javascript/redmic/widgets/RedmicUtilities.js b/client-app/javascript/redmic/widgets/RedmicUtilities.js similarity index 100% rename from public/javascript/redmic/widgets/RedmicUtilities.js rename to client-app/javascript/redmic/widgets/RedmicUtilities.js diff --git a/public/javascript/redmic/widgets/Slider.js b/client-app/javascript/redmic/widgets/Slider.js similarity index 100% rename from public/javascript/redmic/widgets/Slider.js rename to client-app/javascript/redmic/widgets/Slider.js diff --git a/public/javascript/redmic/widgets/Switch.js b/client-app/javascript/redmic/widgets/Switch.js similarity index 100% rename from public/javascript/redmic/widgets/Switch.js rename to client-app/javascript/redmic/widgets/Switch.js diff --git a/public/javascript/redmic/widgets/TemplateWidget.js b/client-app/javascript/redmic/widgets/TemplateWidget.js similarity index 100% rename from public/javascript/redmic/widgets/TemplateWidget.js rename to client-app/javascript/redmic/widgets/TemplateWidget.js diff --git a/public/javascript/redmic/widgets/TextSearch.js b/client-app/javascript/redmic/widgets/TextSearch.js similarity index 100% rename from public/javascript/redmic/widgets/TextSearch.js rename to client-app/javascript/redmic/widgets/TextSearch.js diff --git a/public/javascript/redmic/widgets/TimeSelect.js b/client-app/javascript/redmic/widgets/TimeSelect.js similarity index 100% rename from public/javascript/redmic/widgets/TimeSelect.js rename to client-app/javascript/redmic/widgets/TimeSelect.js diff --git a/public/javascript/redmic/widgets/ToggleButton.js b/client-app/javascript/redmic/widgets/ToggleButton.js similarity index 100% rename from public/javascript/redmic/widgets/ToggleButton.js rename to client-app/javascript/redmic/widgets/ToggleButton.js diff --git a/public/javascript/redmic/widgets/Utilities.js b/client-app/javascript/redmic/widgets/Utilities.js similarity index 100% rename from public/javascript/redmic/widgets/Utilities.js rename to client-app/javascript/redmic/widgets/Utilities.js diff --git a/public/javascript/redmic/widgets/ValueAndUnitSelector.js b/client-app/javascript/redmic/widgets/ValueAndUnitSelector.js similarity index 100% rename from public/javascript/redmic/widgets/ValueAndUnitSelector.js rename to client-app/javascript/redmic/widgets/ValueAndUnitSelector.js diff --git a/public/javascript/redmic/widgets/extensions/_ShowValue.js b/client-app/javascript/redmic/widgets/extensions/_ShowValue.js similarity index 100% rename from public/javascript/redmic/widgets/extensions/_ShowValue.js rename to client-app/javascript/redmic/widgets/extensions/_ShowValue.js diff --git a/public/javascript/sockjs b/client-app/javascript/sockjs similarity index 100% rename from public/javascript/sockjs rename to client-app/javascript/sockjs diff --git a/public/javascript/src/view/detail/_WidgetDefinition.js b/client-app/javascript/src/view/detail/_WidgetDefinition.js similarity index 100% rename from public/javascript/src/view/detail/_WidgetDefinition.js rename to client-app/javascript/src/view/detail/_WidgetDefinition.js diff --git a/public/javascript/src/view/detail/activity/ActivityDetail.js b/client-app/javascript/src/view/detail/activity/ActivityDetail.js similarity index 100% rename from public/javascript/src/view/detail/activity/ActivityDetail.js rename to client-app/javascript/src/view/detail/activity/ActivityDetail.js diff --git a/public/javascript/src/view/detail/activity/_ActivityLayoutWidget.js b/client-app/javascript/src/view/detail/activity/_ActivityLayoutWidget.js similarity index 100% rename from public/javascript/src/view/detail/activity/_ActivityLayoutWidget.js rename to client-app/javascript/src/view/detail/activity/_ActivityLayoutWidget.js diff --git a/public/javascript/stomp-websocket b/client-app/javascript/stomp-websocket similarity index 100% rename from public/javascript/stomp-websocket rename to client-app/javascript/stomp-websocket diff --git a/public/javascript/templates b/client-app/javascript/templates similarity index 100% rename from public/javascript/templates rename to client-app/javascript/templates diff --git a/public/javascript/tv4 b/client-app/javascript/tv4 similarity index 100% rename from public/javascript/tv4 rename to client-app/javascript/tv4 diff --git a/public/javascript/util b/client-app/javascript/util similarity index 100% rename from public/javascript/util rename to client-app/javascript/util diff --git a/public/javascript/uuid b/client-app/javascript/uuid similarity index 100% rename from public/javascript/uuid rename to client-app/javascript/uuid diff --git a/public/javascript/wicket b/client-app/javascript/wicket similarity index 100% rename from public/javascript/wicket rename to client-app/javascript/wicket diff --git a/public/resources/documents/ModeloLogico.pdf b/client-app/resources/documents/ModeloLogico.pdf similarity index 100% rename from public/resources/documents/ModeloLogico.pdf rename to client-app/resources/documents/ModeloLogico.pdf diff --git a/public/resources/images/browsers/chrome.png b/client-app/resources/images/browsers/chrome.png similarity index 100% rename from public/resources/images/browsers/chrome.png rename to client-app/resources/images/browsers/chrome.png diff --git a/public/resources/images/browsers/ff.png b/client-app/resources/images/browsers/ff.png similarity index 100% rename from public/resources/images/browsers/ff.png rename to client-app/resources/images/browsers/ff.png diff --git a/public/resources/images/browsers/ie.png b/client-app/resources/images/browsers/ie.png similarity index 100% rename from public/resources/images/browsers/ie.png rename to client-app/resources/images/browsers/ie.png diff --git a/public/resources/images/browsers/opera.png b/client-app/resources/images/browsers/opera.png similarity index 100% rename from public/resources/images/browsers/opera.png rename to client-app/resources/images/browsers/opera.png diff --git a/public/resources/images/browsers/safari.png b/client-app/resources/images/browsers/safari.png similarity index 100% rename from public/resources/images/browsers/safari.png rename to client-app/resources/images/browsers/safari.png diff --git a/public/resources/images/favicon.ico b/client-app/resources/images/favicon.ico similarity index 100% rename from public/resources/images/favicon.ico rename to client-app/resources/images/favicon.ico diff --git a/public/resources/images/logos/gobcan-logos.png b/client-app/resources/images/logos/gobcan-logos.png similarity index 100% rename from public/resources/images/logos/gobcan-logos.png rename to client-app/resources/images/logos/gobcan-logos.png diff --git a/public/resources/images/logos/logo.svg b/client-app/resources/images/logos/logo.svg similarity index 100% rename from public/resources/images/logos/logo.svg rename to client-app/resources/images/logos/logo.svg diff --git a/public/resources/images/logos/redmic-logo-1200x1200.jpg b/client-app/resources/images/logos/redmic-logo-1200x1200.jpg similarity index 100% rename from public/resources/images/logos/redmic-logo-1200x1200.jpg rename to client-app/resources/images/logos/redmic-logo-1200x1200.jpg diff --git a/public/resources/images/logos/redmic-logo-og.jpg b/client-app/resources/images/logos/redmic-logo-og.jpg similarity index 100% rename from public/resources/images/logos/redmic-logo-og.jpg rename to client-app/resources/images/logos/redmic-logo-og.jpg diff --git a/public/resources/images/logos/redmic-logo-og.png b/client-app/resources/images/logos/redmic-logo-og.png similarity index 100% rename from public/resources/images/logos/redmic-logo-og.png rename to client-app/resources/images/logos/redmic-logo-og.png diff --git a/public/resources/images/logos/redmicSimple.png b/client-app/resources/images/logos/redmicSimple.png similarity index 100% rename from public/resources/images/logos/redmicSimple.png rename to client-app/resources/images/logos/redmicSimple.png diff --git a/public/resources/images/logos/twitter-light.png b/client-app/resources/images/logos/twitter-light.png similarity index 100% rename from public/resources/images/logos/twitter-light.png rename to client-app/resources/images/logos/twitter-light.png diff --git a/public/resources/images/map/layer-eoc-map.png b/client-app/resources/images/map/layer-eoc-map.png similarity index 100% rename from public/resources/images/map/layer-eoc-map.png rename to client-app/resources/images/map/layer-eoc-map.png diff --git a/public/resources/images/map/layer-ortofoto.png b/client-app/resources/images/map/layer-ortofoto.png similarity index 100% rename from public/resources/images/map/layer-ortofoto.png rename to client-app/resources/images/map/layer-ortofoto.png diff --git a/public/resources/images/map/layer-redmic.png b/client-app/resources/images/map/layer-redmic.png similarity index 100% rename from public/resources/images/map/layer-redmic.png rename to client-app/resources/images/map/layer-redmic.png diff --git a/public/resources/images/map/layer-topografico.png b/client-app/resources/images/map/layer-topografico.png similarity index 100% rename from public/resources/images/map/layer-topografico.png rename to client-app/resources/images/map/layer-topografico.png diff --git a/public/resources/images/noIMG.png b/client-app/resources/images/noIMG.png similarity index 100% rename from public/resources/images/noIMG.png rename to client-app/resources/images/noIMG.png diff --git a/public/resources/images/redmic_opciones_usuario.JPG b/client-app/resources/images/redmic_opciones_usuario.JPG similarity index 100% rename from public/resources/images/redmic_opciones_usuario.JPG rename to client-app/resources/images/redmic_opciones_usuario.JPG diff --git a/public/resources/images/redmic_tabla_geometrias.jpg b/client-app/resources/images/redmic_tabla_geometrias.jpg similarity index 100% rename from public/resources/images/redmic_tabla_geometrias.jpg rename to client-app/resources/images/redmic_tabla_geometrias.jpg diff --git a/public/stylesheets b/client-app/stylesheets similarity index 100% rename from public/stylesheets rename to client-app/stylesheets diff --git a/tests/IpGetter.js b/client-app/tests/IpGetter.js similarity index 100% rename from tests/IpGetter.js rename to client-app/tests/IpGetter.js diff --git a/tests/_dojoConfig.js b/client-app/tests/_dojoConfig.js similarity index 100% rename from tests/_dojoConfig.js rename to client-app/tests/_dojoConfig.js diff --git a/tests/_environments.js b/client-app/tests/_environments.js similarity index 100% rename from tests/_environments.js rename to client-app/tests/_environments.js diff --git a/tests/_functions.js b/client-app/tests/_functions.js similarity index 100% rename from tests/_functions.js rename to client-app/tests/_functions.js diff --git a/tests/_intern-functional.js b/client-app/tests/_intern-functional.js similarity index 100% rename from tests/_intern-functional.js rename to client-app/tests/_intern-functional.js diff --git a/tests/_intern-unit.js b/client-app/tests/_intern-unit.js similarity index 100% rename from tests/_intern-unit.js rename to client-app/tests/_intern-unit.js diff --git a/tests/_intern.js b/client-app/tests/_intern.js similarity index 100% rename from tests/_intern.js rename to client-app/tests/_intern.js diff --git a/tests/_remote.js b/client-app/tests/_remote.js similarity index 100% rename from tests/_remote.js rename to client-app/tests/_remote.js diff --git a/tests/apitest/app.js b/client-app/tests/apitest/app.js similarity index 100% rename from tests/apitest/app.js rename to client-app/tests/apitest/app.js diff --git a/tests/apitest/data/inputs/contacts.json b/client-app/tests/apitest/data/inputs/contacts.json similarity index 100% rename from tests/apitest/data/inputs/contacts.json rename to client-app/tests/apitest/data/inputs/contacts.json diff --git a/tests/apitest/data/inputs/organisations.json b/client-app/tests/apitest/data/inputs/organisations.json similarity index 100% rename from tests/apitest/data/inputs/organisations.json rename to client-app/tests/apitest/data/inputs/organisations.json diff --git a/tests/apitest/data/inputs/programs.json b/client-app/tests/apitest/data/inputs/programs.json similarity index 100% rename from tests/apitest/data/inputs/programs.json rename to client-app/tests/apitest/data/inputs/programs.json diff --git a/tests/apitest/data/inputs/projects.json b/client-app/tests/apitest/data/inputs/projects.json similarity index 100% rename from tests/apitest/data/inputs/projects.json rename to client-app/tests/apitest/data/inputs/projects.json diff --git a/tests/apitest/data/inputs/scopes.json b/client-app/tests/apitest/data/inputs/scopes.json similarity index 100% rename from tests/apitest/data/inputs/scopes.json rename to client-app/tests/apitest/data/inputs/scopes.json diff --git a/tests/apitest/package.json b/client-app/tests/apitest/package.json similarity index 100% rename from tests/apitest/package.json rename to client-app/tests/apitest/package.json diff --git a/tests/functional/administrative/Activity.js b/client-app/tests/functional/administrative/Activity.js similarity index 100% rename from tests/functional/administrative/Activity.js rename to client-app/tests/functional/administrative/Activity.js diff --git a/tests/functional/administrative/Animal.js b/client-app/tests/functional/administrative/Animal.js similarity index 100% rename from tests/functional/administrative/Animal.js rename to client-app/tests/functional/administrative/Animal.js diff --git a/tests/functional/administrative/Contact.js b/client-app/tests/functional/administrative/Contact.js similarity index 100% rename from tests/functional/administrative/Contact.js rename to client-app/tests/functional/administrative/Contact.js diff --git a/tests/functional/administrative/Device.js b/client-app/tests/functional/administrative/Device.js similarity index 100% rename from tests/functional/administrative/Device.js rename to client-app/tests/functional/administrative/Device.js diff --git a/tests/functional/administrative/Document.js b/client-app/tests/functional/administrative/Document.js similarity index 100% rename from tests/functional/administrative/Document.js rename to client-app/tests/functional/administrative/Document.js diff --git a/tests/functional/administrative/Organisation.js b/client-app/tests/functional/administrative/Organisation.js similarity index 100% rename from tests/functional/administrative/Organisation.js rename to client-app/tests/functional/administrative/Organisation.js diff --git a/tests/functional/administrative/Platform.js b/client-app/tests/functional/administrative/Platform.js similarity index 100% rename from tests/functional/administrative/Platform.js rename to client-app/tests/functional/administrative/Platform.js diff --git a/tests/functional/administrative/Program.js b/client-app/tests/functional/administrative/Program.js similarity index 100% rename from tests/functional/administrative/Program.js rename to client-app/tests/functional/administrative/Program.js diff --git a/tests/functional/administrative/Project.js b/client-app/tests/functional/administrative/Project.js similarity index 100% rename from tests/functional/administrative/Project.js rename to client-app/tests/functional/administrative/Project.js diff --git a/tests/functional/administrative/_Administrative.js b/client-app/tests/functional/administrative/_Administrative.js similarity index 100% rename from tests/functional/administrative/_Administrative.js rename to client-app/tests/functional/administrative/_Administrative.js diff --git a/tests/functional/administrative/_AdministrativeFacets.js b/client-app/tests/functional/administrative/_AdministrativeFacets.js similarity index 100% rename from tests/functional/administrative/_AdministrativeFacets.js rename to client-app/tests/functional/administrative/_AdministrativeFacets.js diff --git a/tests/functional/administrative/_AdministrativeFilter.js b/client-app/tests/functional/administrative/_AdministrativeFilter.js similarity index 100% rename from tests/functional/administrative/_AdministrativeFilter.js rename to client-app/tests/functional/administrative/_AdministrativeFilter.js diff --git a/tests/functional/administrative/_AdministrativeLinks.js b/client-app/tests/functional/administrative/_AdministrativeLinks.js similarity index 100% rename from tests/functional/administrative/_AdministrativeLinks.js rename to client-app/tests/functional/administrative/_AdministrativeLinks.js diff --git a/tests/functional/administrative/taxonomy/Class.js b/client-app/tests/functional/administrative/taxonomy/Class.js similarity index 100% rename from tests/functional/administrative/taxonomy/Class.js rename to client-app/tests/functional/administrative/taxonomy/Class.js diff --git a/tests/functional/administrative/taxonomy/Family.js b/client-app/tests/functional/administrative/taxonomy/Family.js similarity index 100% rename from tests/functional/administrative/taxonomy/Family.js rename to client-app/tests/functional/administrative/taxonomy/Family.js diff --git a/tests/functional/administrative/taxonomy/Genus.js b/client-app/tests/functional/administrative/taxonomy/Genus.js similarity index 100% rename from tests/functional/administrative/taxonomy/Genus.js rename to client-app/tests/functional/administrative/taxonomy/Genus.js diff --git a/tests/functional/administrative/taxonomy/Kingdom.js b/client-app/tests/functional/administrative/taxonomy/Kingdom.js similarity index 100% rename from tests/functional/administrative/taxonomy/Kingdom.js rename to client-app/tests/functional/administrative/taxonomy/Kingdom.js diff --git a/tests/functional/administrative/taxonomy/Misidentification.js b/client-app/tests/functional/administrative/taxonomy/Misidentification.js similarity index 100% rename from tests/functional/administrative/taxonomy/Misidentification.js rename to client-app/tests/functional/administrative/taxonomy/Misidentification.js diff --git a/tests/functional/administrative/taxonomy/Order.js b/client-app/tests/functional/administrative/taxonomy/Order.js similarity index 100% rename from tests/functional/administrative/taxonomy/Order.js rename to client-app/tests/functional/administrative/taxonomy/Order.js diff --git a/tests/functional/administrative/taxonomy/Phylum.js b/client-app/tests/functional/administrative/taxonomy/Phylum.js similarity index 100% rename from tests/functional/administrative/taxonomy/Phylum.js rename to client-app/tests/functional/administrative/taxonomy/Phylum.js diff --git a/tests/functional/administrative/taxonomy/Species.js b/client-app/tests/functional/administrative/taxonomy/Species.js similarity index 100% rename from tests/functional/administrative/taxonomy/Species.js rename to client-app/tests/functional/administrative/taxonomy/Species.js diff --git a/tests/functional/administrative/taxonomy/Subphylum.js b/client-app/tests/functional/administrative/taxonomy/Subphylum.js similarity index 100% rename from tests/functional/administrative/taxonomy/Subphylum.js rename to client-app/tests/functional/administrative/taxonomy/Subphylum.js diff --git a/tests/functional/administrative/taxonomy/_Taxonomy.js b/client-app/tests/functional/administrative/taxonomy/_Taxonomy.js similarity index 100% rename from tests/functional/administrative/taxonomy/_Taxonomy.js rename to client-app/tests/functional/administrative/taxonomy/_Taxonomy.js diff --git a/tests/functional/administrativeDetails/Activity.js b/client-app/tests/functional/administrativeDetails/Activity.js similarity index 100% rename from tests/functional/administrativeDetails/Activity.js rename to client-app/tests/functional/administrativeDetails/Activity.js diff --git a/tests/functional/administrativeDetails/Contact.js b/client-app/tests/functional/administrativeDetails/Contact.js similarity index 100% rename from tests/functional/administrativeDetails/Contact.js rename to client-app/tests/functional/administrativeDetails/Contact.js diff --git a/tests/functional/administrativeDetails/Document.js b/client-app/tests/functional/administrativeDetails/Document.js similarity index 100% rename from tests/functional/administrativeDetails/Document.js rename to client-app/tests/functional/administrativeDetails/Document.js diff --git a/tests/functional/administrativeDetails/Organisation.js b/client-app/tests/functional/administrativeDetails/Organisation.js similarity index 100% rename from tests/functional/administrativeDetails/Organisation.js rename to client-app/tests/functional/administrativeDetails/Organisation.js diff --git a/tests/functional/administrativeDetails/Platform.js b/client-app/tests/functional/administrativeDetails/Platform.js similarity index 100% rename from tests/functional/administrativeDetails/Platform.js rename to client-app/tests/functional/administrativeDetails/Platform.js diff --git a/tests/functional/administrativeDetails/Program.js b/client-app/tests/functional/administrativeDetails/Program.js similarity index 100% rename from tests/functional/administrativeDetails/Program.js rename to client-app/tests/functional/administrativeDetails/Program.js diff --git a/tests/functional/administrativeDetails/Project.js b/client-app/tests/functional/administrativeDetails/Project.js similarity index 100% rename from tests/functional/administrativeDetails/Project.js rename to client-app/tests/functional/administrativeDetails/Project.js diff --git a/tests/functional/administrativeDetails/ServiceOGC.js b/client-app/tests/functional/administrativeDetails/ServiceOGC.js similarity index 100% rename from tests/functional/administrativeDetails/ServiceOGC.js rename to client-app/tests/functional/administrativeDetails/ServiceOGC.js diff --git a/tests/functional/administrativeDetails/Species.js b/client-app/tests/functional/administrativeDetails/Species.js similarity index 100% rename from tests/functional/administrativeDetails/Species.js rename to client-app/tests/functional/administrativeDetails/Species.js diff --git a/tests/functional/administrativeDetails/Statistics.js b/client-app/tests/functional/administrativeDetails/Statistics.js similarity index 100% rename from tests/functional/administrativeDetails/Statistics.js rename to client-app/tests/functional/administrativeDetails/Statistics.js diff --git a/tests/functional/administrativeDetails/_DetailsBase.js b/client-app/tests/functional/administrativeDetails/_DetailsBase.js similarity index 100% rename from tests/functional/administrativeDetails/_DetailsBase.js rename to client-app/tests/functional/administrativeDetails/_DetailsBase.js diff --git a/tests/functional/administrativeDetails/_DetailsInfo.js b/client-app/tests/functional/administrativeDetails/_DetailsInfo.js similarity index 100% rename from tests/functional/administrativeDetails/_DetailsInfo.js rename to client-app/tests/functional/administrativeDetails/_DetailsInfo.js diff --git a/tests/functional/administrativeDetails/_DetailsMap.js b/client-app/tests/functional/administrativeDetails/_DetailsMap.js similarity index 100% rename from tests/functional/administrativeDetails/_DetailsMap.js rename to client-app/tests/functional/administrativeDetails/_DetailsMap.js diff --git a/tests/functional/administrativeDetails/_DetailsPDF.js b/client-app/tests/functional/administrativeDetails/_DetailsPDF.js similarity index 100% rename from tests/functional/administrativeDetails/_DetailsPDF.js rename to client-app/tests/functional/administrativeDetails/_DetailsPDF.js diff --git a/tests/functional/catalog/Activity.js b/client-app/tests/functional/catalog/Activity.js similarity index 100% rename from tests/functional/catalog/Activity.js rename to client-app/tests/functional/catalog/Activity.js diff --git a/tests/functional/catalog/Organisation.js b/client-app/tests/functional/catalog/Organisation.js similarity index 100% rename from tests/functional/catalog/Organisation.js rename to client-app/tests/functional/catalog/Organisation.js diff --git a/tests/functional/catalog/Platform.js b/client-app/tests/functional/catalog/Platform.js similarity index 100% rename from tests/functional/catalog/Platform.js rename to client-app/tests/functional/catalog/Platform.js diff --git a/tests/functional/catalog/Program.js b/client-app/tests/functional/catalog/Program.js similarity index 100% rename from tests/functional/catalog/Program.js rename to client-app/tests/functional/catalog/Program.js diff --git a/tests/functional/catalog/Project.js b/client-app/tests/functional/catalog/Project.js similarity index 100% rename from tests/functional/catalog/Project.js rename to client-app/tests/functional/catalog/Project.js diff --git a/tests/functional/catalog/Species.js b/client-app/tests/functional/catalog/Species.js similarity index 100% rename from tests/functional/catalog/Species.js rename to client-app/tests/functional/catalog/Species.js diff --git a/tests/functional/catalog/_Catalog.js b/client-app/tests/functional/catalog/_Catalog.js similarity index 100% rename from tests/functional/catalog/_Catalog.js rename to client-app/tests/functional/catalog/_Catalog.js diff --git a/tests/functional/catalog/_CatalogFilter.js b/client-app/tests/functional/catalog/_CatalogFilter.js similarity index 100% rename from tests/functional/catalog/_CatalogFilter.js rename to client-app/tests/functional/catalog/_CatalogFilter.js diff --git a/tests/functional/catalog/_CatalogWithReport.js b/client-app/tests/functional/catalog/_CatalogWithReport.js similarity index 100% rename from tests/functional/catalog/_CatalogWithReport.js rename to client-app/tests/functional/catalog/_CatalogWithReport.js diff --git a/tests/functional/catalogDetails/Activity.js b/client-app/tests/functional/catalogDetails/Activity.js similarity index 100% rename from tests/functional/catalogDetails/Activity.js rename to client-app/tests/functional/catalogDetails/Activity.js diff --git a/tests/functional/catalogDetails/Document.js b/client-app/tests/functional/catalogDetails/Document.js similarity index 100% rename from tests/functional/catalogDetails/Document.js rename to client-app/tests/functional/catalogDetails/Document.js diff --git a/tests/functional/catalogDetails/Organisation.js b/client-app/tests/functional/catalogDetails/Organisation.js similarity index 100% rename from tests/functional/catalogDetails/Organisation.js rename to client-app/tests/functional/catalogDetails/Organisation.js diff --git a/tests/functional/catalogDetails/Platform.js b/client-app/tests/functional/catalogDetails/Platform.js similarity index 100% rename from tests/functional/catalogDetails/Platform.js rename to client-app/tests/functional/catalogDetails/Platform.js diff --git a/tests/functional/catalogDetails/Program.js b/client-app/tests/functional/catalogDetails/Program.js similarity index 100% rename from tests/functional/catalogDetails/Program.js rename to client-app/tests/functional/catalogDetails/Program.js diff --git a/tests/functional/catalogDetails/Project.js b/client-app/tests/functional/catalogDetails/Project.js similarity index 100% rename from tests/functional/catalogDetails/Project.js rename to client-app/tests/functional/catalogDetails/Project.js diff --git a/tests/functional/catalogDetails/ServiceOGC.js b/client-app/tests/functional/catalogDetails/ServiceOGC.js similarity index 100% rename from tests/functional/catalogDetails/ServiceOGC.js rename to client-app/tests/functional/catalogDetails/ServiceOGC.js diff --git a/tests/functional/catalogDetails/Species.js b/client-app/tests/functional/catalogDetails/Species.js similarity index 100% rename from tests/functional/catalogDetails/Species.js rename to client-app/tests/functional/catalogDetails/Species.js diff --git a/tests/functional/common/Home.js b/client-app/tests/functional/common/Home.js similarity index 100% rename from tests/functional/common/Home.js rename to client-app/tests/functional/common/Home.js diff --git a/tests/functional/common/Login.js b/client-app/tests/functional/common/Login.js similarity index 100% rename from tests/functional/common/Login.js rename to client-app/tests/functional/common/Login.js diff --git a/tests/functional/common/Profile.js b/client-app/tests/functional/common/Profile.js similarity index 100% rename from tests/functional/common/Profile.js rename to client-app/tests/functional/common/Profile.js diff --git a/tests/functional/common/Sidebar.js b/client-app/tests/functional/common/Sidebar.js similarity index 100% rename from tests/functional/common/Sidebar.js rename to client-app/tests/functional/common/Sidebar.js diff --git a/tests/functional/common/Topbar.js b/client-app/tests/functional/common/Topbar.js similarity index 100% rename from tests/functional/common/Topbar.js rename to client-app/tests/functional/common/Topbar.js diff --git a/tests/functional/dataLoader/Area.js b/client-app/tests/functional/dataLoader/Area.js similarity index 100% rename from tests/functional/dataLoader/Area.js rename to client-app/tests/functional/dataLoader/Area.js diff --git a/tests/functional/dataLoader/Citation.js b/client-app/tests/functional/dataLoader/Citation.js similarity index 100% rename from tests/functional/dataLoader/Citation.js rename to client-app/tests/functional/dataLoader/Citation.js diff --git a/tests/functional/dataLoader/DataLoader.js b/client-app/tests/functional/dataLoader/DataLoader.js similarity index 100% rename from tests/functional/dataLoader/DataLoader.js rename to client-app/tests/functional/dataLoader/DataLoader.js diff --git a/tests/functional/dataLoader/Infrastructure.js b/client-app/tests/functional/dataLoader/Infrastructure.js similarity index 100% rename from tests/functional/dataLoader/Infrastructure.js rename to client-app/tests/functional/dataLoader/Infrastructure.js diff --git a/tests/functional/dataLoader/ObjectCollection.js b/client-app/tests/functional/dataLoader/ObjectCollection.js similarity index 100% rename from tests/functional/dataLoader/ObjectCollection.js rename to client-app/tests/functional/dataLoader/ObjectCollection.js diff --git a/tests/functional/dataLoader/SurveyStation.js b/client-app/tests/functional/dataLoader/SurveyStation.js similarity index 100% rename from tests/functional/dataLoader/SurveyStation.js rename to client-app/tests/functional/dataLoader/SurveyStation.js diff --git a/tests/functional/dataLoader/Tracking.js b/client-app/tests/functional/dataLoader/Tracking.js similarity index 100% rename from tests/functional/dataLoader/Tracking.js rename to client-app/tests/functional/dataLoader/Tracking.js diff --git a/tests/functional/maintenance/ServiceOGC.js b/client-app/tests/functional/maintenance/ServiceOGC.js similarity index 100% rename from tests/functional/maintenance/ServiceOGC.js rename to client-app/tests/functional/maintenance/ServiceOGC.js diff --git a/tests/functional/maintenance/domains/_Domain.js b/client-app/tests/functional/maintenance/domains/_Domain.js similarity index 100% rename from tests/functional/maintenance/domains/_Domain.js rename to client-app/tests/functional/maintenance/domains/_Domain.js diff --git a/tests/functional/maintenance/domains/_DomainBase.js b/client-app/tests/functional/maintenance/domains/_DomainBase.js similarity index 100% rename from tests/functional/maintenance/domains/_DomainBase.js rename to client-app/tests/functional/maintenance/domains/_DomainBase.js diff --git a/tests/functional/maintenance/domains/_DomainFacets.js b/client-app/tests/functional/maintenance/domains/_DomainFacets.js similarity index 100% rename from tests/functional/maintenance/domains/_DomainFacets.js rename to client-app/tests/functional/maintenance/domains/_DomainFacets.js diff --git a/tests/functional/maintenance/domains/_DomainFormEdition.js b/client-app/tests/functional/maintenance/domains/_DomainFormEdition.js similarity index 100% rename from tests/functional/maintenance/domains/_DomainFormEdition.js rename to client-app/tests/functional/maintenance/domains/_DomainFormEdition.js diff --git a/tests/functional/maintenance/domains/_DomainHierarchical.js b/client-app/tests/functional/maintenance/domains/_DomainHierarchical.js similarity index 100% rename from tests/functional/maintenance/domains/_DomainHierarchical.js rename to client-app/tests/functional/maintenance/domains/_DomainHierarchical.js diff --git a/tests/functional/maintenance/domains/_DomainWizardEdition.js b/client-app/tests/functional/maintenance/domains/_DomainWizardEdition.js similarity index 100% rename from tests/functional/maintenance/domains/_DomainWizardEdition.js rename to client-app/tests/functional/maintenance/domains/_DomainWizardEdition.js diff --git a/tests/functional/maintenance/domains/admin/Accessibility.js b/client-app/tests/functional/maintenance/domains/admin/Accessibility.js similarity index 100% rename from tests/functional/maintenance/domains/admin/Accessibility.js rename to client-app/tests/functional/maintenance/domains/admin/Accessibility.js diff --git a/tests/functional/maintenance/domains/admin/ActivityFields.js b/client-app/tests/functional/maintenance/domains/admin/ActivityFields.js similarity index 100% rename from tests/functional/maintenance/domains/admin/ActivityFields.js rename to client-app/tests/functional/maintenance/domains/admin/ActivityFields.js diff --git a/tests/functional/maintenance/domains/admin/ActivityTypes.js b/client-app/tests/functional/maintenance/domains/admin/ActivityTypes.js similarity index 100% rename from tests/functional/maintenance/domains/admin/ActivityTypes.js rename to client-app/tests/functional/maintenance/domains/admin/ActivityTypes.js diff --git a/tests/functional/maintenance/domains/admin/ContactRoles.js b/client-app/tests/functional/maintenance/domains/admin/ContactRoles.js similarity index 100% rename from tests/functional/maintenance/domains/admin/ContactRoles.js rename to client-app/tests/functional/maintenance/domains/admin/ContactRoles.js diff --git a/tests/functional/maintenance/domains/admin/Countries.js b/client-app/tests/functional/maintenance/domains/admin/Countries.js similarity index 100% rename from tests/functional/maintenance/domains/admin/Countries.js rename to client-app/tests/functional/maintenance/domains/admin/Countries.js diff --git a/tests/functional/maintenance/domains/admin/DeviceTypes.js b/client-app/tests/functional/maintenance/domains/admin/DeviceTypes.js similarity index 100% rename from tests/functional/maintenance/domains/admin/DeviceTypes.js rename to client-app/tests/functional/maintenance/domains/admin/DeviceTypes.js diff --git a/tests/functional/maintenance/domains/admin/DocumentTypes.js b/client-app/tests/functional/maintenance/domains/admin/DocumentTypes.js similarity index 100% rename from tests/functional/maintenance/domains/admin/DocumentTypes.js rename to client-app/tests/functional/maintenance/domains/admin/DocumentTypes.js diff --git a/tests/functional/maintenance/domains/admin/OrganisationRoles.js b/client-app/tests/functional/maintenance/domains/admin/OrganisationRoles.js similarity index 100% rename from tests/functional/maintenance/domains/admin/OrganisationRoles.js rename to client-app/tests/functional/maintenance/domains/admin/OrganisationRoles.js diff --git a/tests/functional/maintenance/domains/admin/OrganisationTypes.js b/client-app/tests/functional/maintenance/domains/admin/OrganisationTypes.js similarity index 100% rename from tests/functional/maintenance/domains/admin/OrganisationTypes.js rename to client-app/tests/functional/maintenance/domains/admin/OrganisationTypes.js diff --git a/tests/functional/maintenance/domains/admin/PlatformTypes.js b/client-app/tests/functional/maintenance/domains/admin/PlatformTypes.js similarity index 100% rename from tests/functional/maintenance/domains/admin/PlatformTypes.js rename to client-app/tests/functional/maintenance/domains/admin/PlatformTypes.js diff --git a/tests/functional/maintenance/domains/admin/ProjectGroups.js b/client-app/tests/functional/maintenance/domains/admin/ProjectGroups.js similarity index 100% rename from tests/functional/maintenance/domains/admin/ProjectGroups.js rename to client-app/tests/functional/maintenance/domains/admin/ProjectGroups.js diff --git a/tests/functional/maintenance/domains/admin/Scopes.js b/client-app/tests/functional/maintenance/domains/admin/Scopes.js similarity index 100% rename from tests/functional/maintenance/domains/admin/Scopes.js rename to client-app/tests/functional/maintenance/domains/admin/Scopes.js diff --git a/tests/functional/maintenance/domains/geometry/AreaTypes.js b/client-app/tests/functional/maintenance/domains/geometry/AreaTypes.js similarity index 100% rename from tests/functional/maintenance/domains/geometry/AreaTypes.js rename to client-app/tests/functional/maintenance/domains/geometry/AreaTypes.js diff --git a/tests/functional/maintenance/domains/geometry/Destiny.js b/client-app/tests/functional/maintenance/domains/geometry/Destiny.js similarity index 100% rename from tests/functional/maintenance/domains/geometry/Destiny.js rename to client-app/tests/functional/maintenance/domains/geometry/Destiny.js diff --git a/tests/functional/maintenance/domains/geometry/Ending.js b/client-app/tests/functional/maintenance/domains/geometry/Ending.js similarity index 100% rename from tests/functional/maintenance/domains/geometry/Ending.js rename to client-app/tests/functional/maintenance/domains/geometry/Ending.js diff --git a/tests/functional/maintenance/domains/geometry/InspireThemes.js b/client-app/tests/functional/maintenance/domains/geometry/InspireThemes.js similarity index 100% rename from tests/functional/maintenance/domains/geometry/InspireThemes.js rename to client-app/tests/functional/maintenance/domains/geometry/InspireThemes.js diff --git a/tests/functional/maintenance/domains/geometry/LineTypes.js b/client-app/tests/functional/maintenance/domains/geometry/LineTypes.js similarity index 100% rename from tests/functional/maintenance/domains/geometry/LineTypes.js rename to client-app/tests/functional/maintenance/domains/geometry/LineTypes.js diff --git a/tests/functional/maintenance/domains/geometry/MeshTypes.js b/client-app/tests/functional/maintenance/domains/geometry/MeshTypes.js similarity index 100% rename from tests/functional/maintenance/domains/geometry/MeshTypes.js rename to client-app/tests/functional/maintenance/domains/geometry/MeshTypes.js diff --git a/tests/functional/maintenance/domains/geometry/RasterTypes.js b/client-app/tests/functional/maintenance/domains/geometry/RasterTypes.js similarity index 100% rename from tests/functional/maintenance/domains/geometry/RasterTypes.js rename to client-app/tests/functional/maintenance/domains/geometry/RasterTypes.js diff --git a/tests/functional/maintenance/domains/geometry/RecordingTypes.js b/client-app/tests/functional/maintenance/domains/geometry/RecordingTypes.js similarity index 100% rename from tests/functional/maintenance/domains/geometry/RecordingTypes.js rename to client-app/tests/functional/maintenance/domains/geometry/RecordingTypes.js diff --git a/tests/functional/maintenance/domains/geometry/ShorelineTypes.js b/client-app/tests/functional/maintenance/domains/geometry/ShorelineTypes.js similarity index 100% rename from tests/functional/maintenance/domains/geometry/ShorelineTypes.js rename to client-app/tests/functional/maintenance/domains/geometry/ShorelineTypes.js diff --git a/tests/functional/maintenance/domains/geometry/ThematicTypes.js b/client-app/tests/functional/maintenance/domains/geometry/ThematicTypes.js similarity index 100% rename from tests/functional/maintenance/domains/geometry/ThematicTypes.js rename to client-app/tests/functional/maintenance/domains/geometry/ThematicTypes.js diff --git a/tests/functional/maintenance/domains/geometry/ToponymTypes.js b/client-app/tests/functional/maintenance/domains/geometry/ToponymTypes.js similarity index 100% rename from tests/functional/maintenance/domains/geometry/ToponymTypes.js rename to client-app/tests/functional/maintenance/domains/geometry/ToponymTypes.js diff --git a/tests/functional/maintenance/domains/observations/AttributeTypes.js b/client-app/tests/functional/maintenance/domains/observations/AttributeTypes.js similarity index 100% rename from tests/functional/maintenance/domains/observations/AttributeTypes.js rename to client-app/tests/functional/maintenance/domains/observations/AttributeTypes.js diff --git a/tests/functional/maintenance/domains/observations/CensusingStatus.js b/client-app/tests/functional/maintenance/domains/observations/CensusingStatus.js similarity index 100% rename from tests/functional/maintenance/domains/observations/CensusingStatus.js rename to client-app/tests/functional/maintenance/domains/observations/CensusingStatus.js diff --git a/tests/functional/maintenance/domains/observations/Confidence.js b/client-app/tests/functional/maintenance/domains/observations/Confidence.js similarity index 100% rename from tests/functional/maintenance/domains/observations/Confidence.js rename to client-app/tests/functional/maintenance/domains/observations/Confidence.js diff --git a/tests/functional/maintenance/domains/observations/InfrastructureType.js b/client-app/tests/functional/maintenance/domains/observations/InfrastructureType.js similarity index 100% rename from tests/functional/maintenance/domains/observations/InfrastructureType.js rename to client-app/tests/functional/maintenance/domains/observations/InfrastructureType.js diff --git a/tests/functional/maintenance/domains/observations/MetricGroups.js b/client-app/tests/functional/maintenance/domains/observations/MetricGroups.js similarity index 100% rename from tests/functional/maintenance/domains/observations/MetricGroups.js rename to client-app/tests/functional/maintenance/domains/observations/MetricGroups.js diff --git a/tests/functional/maintenance/domains/observations/MetricsDefinitions.js b/client-app/tests/functional/maintenance/domains/observations/MetricsDefinitions.js similarity index 100% rename from tests/functional/maintenance/domains/observations/MetricsDefinitions.js rename to client-app/tests/functional/maintenance/domains/observations/MetricsDefinitions.js diff --git a/tests/functional/maintenance/domains/observations/ObjectTypes.js b/client-app/tests/functional/maintenance/domains/observations/ObjectTypes.js similarity index 100% rename from tests/functional/maintenance/domains/observations/ObjectTypes.js rename to client-app/tests/functional/maintenance/domains/observations/ObjectTypes.js diff --git a/tests/functional/maintenance/domains/observations/ParameterTypes.js b/client-app/tests/functional/maintenance/domains/observations/ParameterTypes.js similarity index 100% rename from tests/functional/maintenance/domains/observations/ParameterTypes.js rename to client-app/tests/functional/maintenance/domains/observations/ParameterTypes.js diff --git a/tests/functional/maintenance/domains/observations/Parameters.js b/client-app/tests/functional/maintenance/domains/observations/Parameters.js similarity index 100% rename from tests/functional/maintenance/domains/observations/Parameters.js rename to client-app/tests/functional/maintenance/domains/observations/Parameters.js diff --git a/tests/functional/maintenance/domains/observations/SampleTypes.js b/client-app/tests/functional/maintenance/domains/observations/SampleTypes.js similarity index 100% rename from tests/functional/maintenance/domains/observations/SampleTypes.js rename to client-app/tests/functional/maintenance/domains/observations/SampleTypes.js diff --git a/tests/functional/maintenance/domains/observations/SeaConditions.js b/client-app/tests/functional/maintenance/domains/observations/SeaConditions.js similarity index 100% rename from tests/functional/maintenance/domains/observations/SeaConditions.js rename to client-app/tests/functional/maintenance/domains/observations/SeaConditions.js diff --git a/tests/functional/maintenance/domains/observations/UnitTypes.js b/client-app/tests/functional/maintenance/domains/observations/UnitTypes.js similarity index 100% rename from tests/functional/maintenance/domains/observations/UnitTypes.js rename to client-app/tests/functional/maintenance/domains/observations/UnitTypes.js diff --git a/tests/functional/maintenance/domains/observations/Units.js b/client-app/tests/functional/maintenance/domains/observations/Units.js similarity index 100% rename from tests/functional/maintenance/domains/observations/Units.js rename to client-app/tests/functional/maintenance/domains/observations/Units.js diff --git a/tests/functional/maintenance/domains/taxon/CanaryProtection.js b/client-app/tests/functional/maintenance/domains/taxon/CanaryProtection.js similarity index 100% rename from tests/functional/maintenance/domains/taxon/CanaryProtection.js rename to client-app/tests/functional/maintenance/domains/taxon/CanaryProtection.js diff --git a/tests/functional/maintenance/domains/taxon/EUProtection.js b/client-app/tests/functional/maintenance/domains/taxon/EUProtection.js similarity index 100% rename from tests/functional/maintenance/domains/taxon/EUProtection.js rename to client-app/tests/functional/maintenance/domains/taxon/EUProtection.js diff --git a/tests/functional/maintenance/domains/taxon/Ecology.js b/client-app/tests/functional/maintenance/domains/taxon/Ecology.js similarity index 100% rename from tests/functional/maintenance/domains/taxon/Ecology.js rename to client-app/tests/functional/maintenance/domains/taxon/Ecology.js diff --git a/tests/functional/maintenance/domains/taxon/Endemicity.js b/client-app/tests/functional/maintenance/domains/taxon/Endemicity.js similarity index 100% rename from tests/functional/maintenance/domains/taxon/Endemicity.js rename to client-app/tests/functional/maintenance/domains/taxon/Endemicity.js diff --git a/tests/functional/maintenance/domains/taxon/Interest.js b/client-app/tests/functional/maintenance/domains/taxon/Interest.js similarity index 100% rename from tests/functional/maintenance/domains/taxon/Interest.js rename to client-app/tests/functional/maintenance/domains/taxon/Interest.js diff --git a/tests/functional/maintenance/domains/taxon/LifeStages.js b/client-app/tests/functional/maintenance/domains/taxon/LifeStages.js similarity index 100% rename from tests/functional/maintenance/domains/taxon/LifeStages.js rename to client-app/tests/functional/maintenance/domains/taxon/LifeStages.js diff --git a/tests/functional/maintenance/domains/taxon/Origin.js b/client-app/tests/functional/maintenance/domains/taxon/Origin.js similarity index 100% rename from tests/functional/maintenance/domains/taxon/Origin.js rename to client-app/tests/functional/maintenance/domains/taxon/Origin.js diff --git a/tests/functional/maintenance/domains/taxon/Permanence.js b/client-app/tests/functional/maintenance/domains/taxon/Permanence.js similarity index 100% rename from tests/functional/maintenance/domains/taxon/Permanence.js rename to client-app/tests/functional/maintenance/domains/taxon/Permanence.js diff --git a/tests/functional/maintenance/domains/taxon/Rank.js b/client-app/tests/functional/maintenance/domains/taxon/Rank.js similarity index 100% rename from tests/functional/maintenance/domains/taxon/Rank.js rename to client-app/tests/functional/maintenance/domains/taxon/Rank.js diff --git a/tests/functional/maintenance/domains/taxon/Sex.js b/client-app/tests/functional/maintenance/domains/taxon/Sex.js similarity index 100% rename from tests/functional/maintenance/domains/taxon/Sex.js rename to client-app/tests/functional/maintenance/domains/taxon/Sex.js diff --git a/tests/functional/maintenance/domains/taxon/SpainProtection.js b/client-app/tests/functional/maintenance/domains/taxon/SpainProtection.js similarity index 100% rename from tests/functional/maintenance/domains/taxon/SpainProtection.js rename to client-app/tests/functional/maintenance/domains/taxon/SpainProtection.js diff --git a/tests/functional/maintenance/domains/taxon/Status.js b/client-app/tests/functional/maintenance/domains/taxon/Status.js similarity index 100% rename from tests/functional/maintenance/domains/taxon/Status.js rename to client-app/tests/functional/maintenance/domains/taxon/Status.js diff --git a/tests/functional/maintenance/domains/taxon/TrophicRegime.js b/client-app/tests/functional/maintenance/domains/taxon/TrophicRegime.js similarity index 100% rename from tests/functional/maintenance/domains/taxon/TrophicRegime.js rename to client-app/tests/functional/maintenance/domains/taxon/TrophicRegime.js diff --git a/tests/functional/modules/components/Keypad/testKeypad.js b/client-app/tests/functional/modules/components/Keypad/testKeypad.js similarity index 100% rename from tests/functional/modules/components/Keypad/testKeypad.js rename to client-app/tests/functional/modules/components/Keypad/testKeypad.js diff --git a/tests/functional/modules/components/Keypad/testKeypadScript.js b/client-app/tests/functional/modules/components/Keypad/testKeypadScript.js similarity index 100% rename from tests/functional/modules/components/Keypad/testKeypadScript.js rename to client-app/tests/functional/modules/components/Keypad/testKeypadScript.js diff --git a/tests/functional/modules/form/input/MapSearchImpl/testMapSearchImpl.js b/client-app/tests/functional/modules/form/input/MapSearchImpl/testMapSearchImpl.js similarity index 100% rename from tests/functional/modules/form/input/MapSearchImpl/testMapSearchImpl.js rename to client-app/tests/functional/modules/form/input/MapSearchImpl/testMapSearchImpl.js diff --git a/tests/functional/modules/form/input/MapSearchImpl/testMapSearchImplScript.js b/client-app/tests/functional/modules/form/input/MapSearchImpl/testMapSearchImplScript.js similarity index 100% rename from tests/functional/modules/form/input/MapSearchImpl/testMapSearchImplScript.js rename to client-app/tests/functional/modules/form/input/MapSearchImpl/testMapSearchImplScript.js diff --git a/tests/functional/modules/form/input/UploadFileImpl/testUploadFileImpl.js b/client-app/tests/functional/modules/form/input/UploadFileImpl/testUploadFileImpl.js similarity index 100% rename from tests/functional/modules/form/input/UploadFileImpl/testUploadFileImpl.js rename to client-app/tests/functional/modules/form/input/UploadFileImpl/testUploadFileImpl.js diff --git a/tests/functional/modules/form/input/UploadFileImpl/testUploadFileImplScript.js b/client-app/tests/functional/modules/form/input/UploadFileImpl/testUploadFileImplScript.js similarity index 100% rename from tests/functional/modules/form/input/UploadFileImpl/testUploadFileImplScript.js rename to client-app/tests/functional/modules/form/input/UploadFileImpl/testUploadFileImplScript.js diff --git a/tests/functional/modules/form/testFormWithKeypad.js b/client-app/tests/functional/modules/form/testFormWithKeypad.js similarity index 100% rename from tests/functional/modules/form/testFormWithKeypad.js rename to client-app/tests/functional/modules/form/testFormWithKeypad.js diff --git a/tests/functional/modules/form/testFormWithKeypadScript.js b/client-app/tests/functional/modules/form/testFormWithKeypadScript.js similarity index 100% rename from tests/functional/modules/form/testFormWithKeypadScript.js rename to client-app/tests/functional/modules/form/testFormWithKeypadScript.js diff --git a/tests/functional/modules/search/testFacetsImpl.js b/client-app/tests/functional/modules/search/testFacetsImpl.js similarity index 100% rename from tests/functional/modules/search/testFacetsImpl.js rename to client-app/tests/functional/modules/search/testFacetsImpl.js diff --git a/tests/functional/modules/search/testFacetsImplScript.js b/client-app/tests/functional/modules/search/testFacetsImplScript.js similarity index 100% rename from tests/functional/modules/search/testFacetsImplScript.js rename to client-app/tests/functional/modules/search/testFacetsImplScript.js diff --git a/tests/functional/products/Atlas.js b/client-app/tests/functional/products/Atlas.js similarity index 100% rename from tests/functional/products/Atlas.js rename to client-app/tests/functional/products/Atlas.js diff --git a/tests/functional/products/ServiceOGC.js b/client-app/tests/functional/products/ServiceOGC.js similarity index 100% rename from tests/functional/products/ServiceOGC.js rename to client-app/tests/functional/products/ServiceOGC.js diff --git a/tests/functional/viewers/Bibliography.js b/client-app/tests/functional/viewers/Bibliography.js similarity index 100% rename from tests/functional/viewers/Bibliography.js rename to client-app/tests/functional/viewers/Bibliography.js diff --git a/tests/functional/viewers/SpeciesDistribution.js b/client-app/tests/functional/viewers/SpeciesDistribution.js similarity index 100% rename from tests/functional/viewers/SpeciesDistribution.js rename to client-app/tests/functional/viewers/SpeciesDistribution.js diff --git a/tests/intern-functional-local.js b/client-app/tests/intern-functional-local.js similarity index 100% rename from tests/intern-functional-local.js rename to client-app/tests/intern-functional-local.js diff --git a/tests/intern-functional-remote.js b/client-app/tests/intern-functional-remote.js similarity index 100% rename from tests/intern-functional-remote.js rename to client-app/tests/intern-functional-remote.js diff --git a/tests/intern-unit-local.js b/client-app/tests/intern-unit-local.js similarity index 100% rename from tests/intern-unit-local.js rename to client-app/tests/intern-unit-local.js diff --git a/tests/intern-unit-remote.js b/client-app/tests/intern-unit-remote.js similarity index 100% rename from tests/intern-unit-remote.js rename to client-app/tests/intern-unit-remote.js diff --git a/tests/sockTest/app.js b/client-app/tests/sockTest/app.js similarity index 100% rename from tests/sockTest/app.js rename to client-app/tests/sockTest/app.js diff --git a/tests/sockTest/stomp.js b/client-app/tests/sockTest/stomp.js similarity index 100% rename from tests/sockTest/stomp.js rename to client-app/tests/sockTest/stomp.js diff --git a/tests/sockTest/websocket.mock.js b/client-app/tests/sockTest/websocket.mock.js similarity index 100% rename from tests/sockTest/websocket.mock.js rename to client-app/tests/sockTest/websocket.mock.js diff --git a/tests/support/Config.js b/client-app/tests/support/Config.js similarity index 100% rename from tests/support/Config.js rename to client-app/tests/support/Config.js diff --git a/tests/support/CustomReporter.js b/client-app/tests/support/CustomReporter.js similarity index 100% rename from tests/support/CustomReporter.js rename to client-app/tests/support/CustomReporter.js diff --git a/tests/support/Utils.js b/client-app/tests/support/Utils.js similarity index 100% rename from tests/support/Utils.js rename to client-app/tests/support/Utils.js diff --git a/tests/support/pages/Filter.js b/client-app/tests/support/pages/Filter.js similarity index 100% rename from tests/support/pages/Filter.js rename to client-app/tests/support/pages/Filter.js diff --git a/tests/support/pages/List.js b/client-app/tests/support/pages/List.js similarity index 100% rename from tests/support/pages/List.js rename to client-app/tests/support/pages/List.js diff --git a/tests/support/pages/ListHierarchical.js b/client-app/tests/support/pages/ListHierarchical.js similarity index 100% rename from tests/support/pages/ListHierarchical.js rename to client-app/tests/support/pages/ListHierarchical.js diff --git a/tests/support/pages/ListWithTextSearch.js b/client-app/tests/support/pages/ListWithTextSearch.js similarity index 100% rename from tests/support/pages/ListWithTextSearch.js rename to client-app/tests/support/pages/ListWithTextSearch.js diff --git a/tests/support/pages/ListWithTextSearchAndFacets.js b/client-app/tests/support/pages/ListWithTextSearchAndFacets.js similarity index 100% rename from tests/support/pages/ListWithTextSearchAndFacets.js rename to client-app/tests/support/pages/ListWithTextSearchAndFacets.js diff --git a/tests/support/pages/ListWithTreeFilter.js b/client-app/tests/support/pages/ListWithTreeFilter.js similarity index 100% rename from tests/support/pages/ListWithTreeFilter.js rename to client-app/tests/support/pages/ListWithTreeFilter.js diff --git a/tests/support/pages/Login.js b/client-app/tests/support/pages/Login.js similarity index 100% rename from tests/support/pages/Login.js rename to client-app/tests/support/pages/Login.js diff --git a/tests/support/pages/Map.js b/client-app/tests/support/pages/Map.js similarity index 100% rename from tests/support/pages/Map.js rename to client-app/tests/support/pages/Map.js diff --git a/tests/support/pages/Wizard.js b/client-app/tests/support/pages/Wizard.js similarity index 100% rename from tests/support/pages/Wizard.js rename to client-app/tests/support/pages/Wizard.js diff --git a/tests/support/pages/_Page.js b/client-app/tests/support/pages/_Page.js similarity index 100% rename from tests/support/pages/_Page.js rename to client-app/tests/support/pages/_Page.js diff --git a/tests/support/pages/steps/DoubleList.js b/client-app/tests/support/pages/steps/DoubleList.js similarity index 100% rename from tests/support/pages/steps/DoubleList.js rename to client-app/tests/support/pages/steps/DoubleList.js diff --git a/tests/support/pages/steps/DoubleListFiltered.js b/client-app/tests/support/pages/steps/DoubleListFiltered.js similarity index 100% rename from tests/support/pages/steps/DoubleListFiltered.js rename to client-app/tests/support/pages/steps/DoubleListFiltered.js diff --git a/tests/support/pages/steps/Form.js b/client-app/tests/support/pages/steps/Form.js similarity index 100% rename from tests/support/pages/steps/Form.js rename to client-app/tests/support/pages/steps/Form.js diff --git a/tests/support/pages/steps/FormList.js b/client-app/tests/support/pages/steps/FormList.js similarity index 100% rename from tests/support/pages/steps/FormList.js rename to client-app/tests/support/pages/steps/FormList.js diff --git a/tests/support/pages/steps/LayerImage.js b/client-app/tests/support/pages/steps/LayerImage.js similarity index 100% rename from tests/support/pages/steps/LayerImage.js rename to client-app/tests/support/pages/steps/LayerImage.js diff --git a/tests/support/pages/steps/LineGeometry.js b/client-app/tests/support/pages/steps/LineGeometry.js similarity index 100% rename from tests/support/pages/steps/LineGeometry.js rename to client-app/tests/support/pages/steps/LineGeometry.js diff --git a/tests/support/pages/steps/List.js b/client-app/tests/support/pages/steps/List.js similarity index 100% rename from tests/support/pages/steps/List.js rename to client-app/tests/support/pages/steps/List.js diff --git a/tests/support/pages/steps/PointGeometry.js b/client-app/tests/support/pages/steps/PointGeometry.js similarity index 100% rename from tests/support/pages/steps/PointGeometry.js rename to client-app/tests/support/pages/steps/PointGeometry.js diff --git a/tests/support/pages/steps/RelationData.js b/client-app/tests/support/pages/steps/RelationData.js similarity index 100% rename from tests/support/pages/steps/RelationData.js rename to client-app/tests/support/pages/steps/RelationData.js diff --git a/tests/support/pages/steps/ReorderLayerList.js b/client-app/tests/support/pages/steps/ReorderLayerList.js similarity index 100% rename from tests/support/pages/steps/ReorderLayerList.js rename to client-app/tests/support/pages/steps/ReorderLayerList.js diff --git a/tests/support/pages/test.html b/client-app/tests/support/pages/test.html similarity index 100% rename from tests/support/pages/test.html rename to client-app/tests/support/pages/test.html diff --git a/tests/support/resources/DomainModel.js b/client-app/tests/support/resources/DomainModel.js similarity index 100% rename from tests/support/resources/DomainModel.js rename to client-app/tests/support/resources/DomainModel.js diff --git a/tests/support/resources/doc.pdf b/client-app/tests/support/resources/doc.pdf similarity index 100% rename from tests/support/resources/doc.pdf rename to client-app/tests/support/resources/doc.pdf diff --git a/tests/support/resources/fileForLoadData/ar.zip b/client-app/tests/support/resources/fileForLoadData/ar.zip similarity index 100% rename from tests/support/resources/fileForLoadData/ar.zip rename to client-app/tests/support/resources/fileForLoadData/ar.zip diff --git a/tests/support/resources/fileForLoadData/document.csv b/client-app/tests/support/resources/fileForLoadData/document.csv similarity index 100% rename from tests/support/resources/fileForLoadData/document.csv rename to client-app/tests/support/resources/fileForLoadData/document.csv diff --git a/tests/support/resources/fileForLoadData/ft.csv b/client-app/tests/support/resources/fileForLoadData/ft.csv similarity index 100% rename from tests/support/resources/fileForLoadData/ft.csv rename to client-app/tests/support/resources/fileForLoadData/ft.csv diff --git a/tests/support/resources/fileForLoadData/oc.csv b/client-app/tests/support/resources/fileForLoadData/oc.csv similarity index 100% rename from tests/support/resources/fileForLoadData/oc.csv rename to client-app/tests/support/resources/fileForLoadData/oc.csv diff --git a/tests/support/resources/fileForLoadData/pt.csv b/client-app/tests/support/resources/fileForLoadData/pt.csv similarity index 100% rename from tests/support/resources/fileForLoadData/pt.csv rename to client-app/tests/support/resources/fileForLoadData/pt.csv diff --git a/tests/support/resources/profile.png b/client-app/tests/support/resources/profile.png similarity index 100% rename from tests/support/resources/profile.png rename to client-app/tests/support/resources/profile.png diff --git a/tests/support/tests/Atlas.js b/client-app/tests/support/tests/Atlas.js similarity index 100% rename from tests/support/tests/Atlas.js rename to client-app/tests/support/tests/Atlas.js diff --git a/tests/support/tests/AtlasWithClickMap.js b/client-app/tests/support/tests/AtlasWithClickMap.js similarity index 100% rename from tests/support/tests/AtlasWithClickMap.js rename to client-app/tests/support/tests/AtlasWithClickMap.js diff --git a/tests/support/tests/CatalogFacets.js b/client-app/tests/support/tests/CatalogFacets.js similarity index 100% rename from tests/support/tests/CatalogFacets.js rename to client-app/tests/support/tests/CatalogFacets.js diff --git a/tests/support/tests/CatalogFacetsTotal.js b/client-app/tests/support/tests/CatalogFacetsTotal.js similarity index 100% rename from tests/support/tests/CatalogFacetsTotal.js rename to client-app/tests/support/tests/CatalogFacetsTotal.js diff --git a/tests/support/tests/CatalogGuestReport.js b/client-app/tests/support/tests/CatalogGuestReport.js similarity index 100% rename from tests/support/tests/CatalogGuestReport.js rename to client-app/tests/support/tests/CatalogGuestReport.js diff --git a/tests/support/tests/CatalogLinks.js b/client-app/tests/support/tests/CatalogLinks.js similarity index 100% rename from tests/support/tests/CatalogLinks.js rename to client-app/tests/support/tests/CatalogLinks.js diff --git a/tests/support/tests/CatalogUserReport.js b/client-app/tests/support/tests/CatalogUserReport.js similarity index 100% rename from tests/support/tests/CatalogUserReport.js rename to client-app/tests/support/tests/CatalogUserReport.js diff --git a/tests/support/tests/CatalogWizardEdition.js b/client-app/tests/support/tests/CatalogWizardEdition.js similarity index 100% rename from tests/support/tests/CatalogWizardEdition.js rename to client-app/tests/support/tests/CatalogWizardEdition.js diff --git a/tests/support/tests/Citation.js b/client-app/tests/support/tests/Citation.js similarity index 100% rename from tests/support/tests/Citation.js rename to client-app/tests/support/tests/Citation.js diff --git a/tests/support/tests/Dashboard.js b/client-app/tests/support/tests/Dashboard.js similarity index 100% rename from tests/support/tests/Dashboard.js rename to client-app/tests/support/tests/Dashboard.js diff --git a/tests/support/tests/DetailsBase.js b/client-app/tests/support/tests/DetailsBase.js similarity index 100% rename from tests/support/tests/DetailsBase.js rename to client-app/tests/support/tests/DetailsBase.js diff --git a/tests/support/tests/DetailsEditionLink.js b/client-app/tests/support/tests/DetailsEditionLink.js similarity index 100% rename from tests/support/tests/DetailsEditionLink.js rename to client-app/tests/support/tests/DetailsEditionLink.js diff --git a/tests/support/tests/DetailsInfo.js b/client-app/tests/support/tests/DetailsInfo.js similarity index 100% rename from tests/support/tests/DetailsInfo.js rename to client-app/tests/support/tests/DetailsInfo.js diff --git a/tests/support/tests/DetailsPDF.js b/client-app/tests/support/tests/DetailsPDF.js similarity index 100% rename from tests/support/tests/DetailsPDF.js rename to client-app/tests/support/tests/DetailsPDF.js diff --git a/tests/support/tests/DetailsTabs.js b/client-app/tests/support/tests/DetailsTabs.js similarity index 100% rename from tests/support/tests/DetailsTabs.js rename to client-app/tests/support/tests/DetailsTabs.js diff --git a/tests/support/tests/Filter.js b/client-app/tests/support/tests/Filter.js similarity index 100% rename from tests/support/tests/Filter.js rename to client-app/tests/support/tests/Filter.js diff --git a/tests/support/tests/FormAddition.js b/client-app/tests/support/tests/FormAddition.js similarity index 100% rename from tests/support/tests/FormAddition.js rename to client-app/tests/support/tests/FormAddition.js diff --git a/tests/support/tests/FormEdition.js b/client-app/tests/support/tests/FormEdition.js similarity index 100% rename from tests/support/tests/FormEdition.js rename to client-app/tests/support/tests/FormEdition.js diff --git a/tests/support/tests/ListFilterByTree.js b/client-app/tests/support/tests/ListFilterByTree.js similarity index 100% rename from tests/support/tests/ListFilterByTree.js rename to client-app/tests/support/tests/ListFilterByTree.js diff --git a/tests/support/tests/ListHierarchical.js b/client-app/tests/support/tests/ListHierarchical.js similarity index 100% rename from tests/support/tests/ListHierarchical.js rename to client-app/tests/support/tests/ListHierarchical.js diff --git a/tests/support/tests/ListHierarchicalWithSelection.js b/client-app/tests/support/tests/ListHierarchicalWithSelection.js similarity index 100% rename from tests/support/tests/ListHierarchicalWithSelection.js rename to client-app/tests/support/tests/ListHierarchicalWithSelection.js diff --git a/tests/support/tests/ListSelection.js b/client-app/tests/support/tests/ListSelection.js similarity index 100% rename from tests/support/tests/ListSelection.js rename to client-app/tests/support/tests/ListSelection.js diff --git a/tests/support/tests/ListWithOrder.js b/client-app/tests/support/tests/ListWithOrder.js similarity index 100% rename from tests/support/tests/ListWithOrder.js rename to client-app/tests/support/tests/ListWithOrder.js diff --git a/tests/support/tests/ListWithTextSearch.js b/client-app/tests/support/tests/ListWithTextSearch.js similarity index 100% rename from tests/support/tests/ListWithTextSearch.js rename to client-app/tests/support/tests/ListWithTextSearch.js diff --git a/tests/support/tests/Map.js b/client-app/tests/support/tests/Map.js similarity index 100% rename from tests/support/tests/Map.js rename to client-app/tests/support/tests/Map.js diff --git a/tests/support/tests/SpeciesDistribution.js b/client-app/tests/support/tests/SpeciesDistribution.js similarity index 100% rename from tests/support/tests/SpeciesDistribution.js rename to client-app/tests/support/tests/SpeciesDistribution.js diff --git a/tests/support/tests/WizardAddition.js b/client-app/tests/support/tests/WizardAddition.js similarity index 100% rename from tests/support/tests/WizardAddition.js rename to client-app/tests/support/tests/WizardAddition.js diff --git a/tests/support/tests/WizardEdition.js b/client-app/tests/support/tests/WizardEdition.js similarity index 100% rename from tests/support/tests/WizardEdition.js rename to client-app/tests/support/tests/WizardEdition.js diff --git a/tests/support/tests/WizardWorms.js b/client-app/tests/support/tests/WizardWorms.js similarity index 100% rename from tests/support/tests/WizardWorms.js rename to client-app/tests/support/tests/WizardWorms.js diff --git a/tests/support/tests/_BaseCommons.js b/client-app/tests/support/tests/_BaseCommons.js similarity index 100% rename from tests/support/tests/_BaseCommons.js rename to client-app/tests/support/tests/_BaseCommons.js diff --git a/tests/support/tests/_CatalogBase.js b/client-app/tests/support/tests/_CatalogBase.js similarity index 100% rename from tests/support/tests/_CatalogBase.js rename to client-app/tests/support/tests/_CatalogBase.js diff --git a/tests/support/tests/_Commons.js b/client-app/tests/support/tests/_Commons.js similarity index 100% rename from tests/support/tests/_Commons.js rename to client-app/tests/support/tests/_Commons.js diff --git a/tests/support/tests/_DataLoader.js b/client-app/tests/support/tests/_DataLoader.js similarity index 100% rename from tests/support/tests/_DataLoader.js rename to client-app/tests/support/tests/_DataLoader.js diff --git a/tests/unit/app/base/models/_ModelTestCommons.js b/client-app/tests/unit/app/base/models/_ModelTestCommons.js similarity index 100% rename from tests/unit/app/base/models/_ModelTestCommons.js rename to client-app/tests/unit/app/base/models/_ModelTestCommons.js diff --git a/tests/unit/app/base/models/attr/testArrayAttr.js b/client-app/tests/unit/app/base/models/attr/testArrayAttr.js similarity index 100% rename from tests/unit/app/base/models/attr/testArrayAttr.js rename to client-app/tests/unit/app/base/models/attr/testArrayAttr.js diff --git a/tests/unit/app/base/models/attr/testAttr.js b/client-app/tests/unit/app/base/models/attr/testAttr.js similarity index 100% rename from tests/unit/app/base/models/attr/testAttr.js rename to client-app/tests/unit/app/base/models/attr/testAttr.js diff --git a/tests/unit/app/base/models/attr/testObjAttr.js b/client-app/tests/unit/app/base/models/attr/testObjAttr.js similarity index 100% rename from tests/unit/app/base/models/attr/testObjAttr.js rename to client-app/tests/unit/app/base/models/attr/testObjAttr.js diff --git a/tests/unit/app/base/models/attr/testRelationAttr.js b/client-app/tests/unit/app/base/models/attr/testRelationAttr.js similarity index 100% rename from tests/unit/app/base/models/attr/testRelationAttr.js rename to client-app/tests/unit/app/base/models/attr/testRelationAttr.js diff --git a/tests/unit/app/base/models/test_Model.js b/client-app/tests/unit/app/base/models/test_Model.js similarity index 100% rename from tests/unit/app/base/models/test_Model.js rename to client-app/tests/unit/app/base/models/test_Model.js diff --git a/tests/unit/app/base/views/extensions/test_EditionView.js b/client-app/tests/unit/app/base/views/extensions/test_EditionView.js similarity index 100% rename from tests/unit/app/base/views/extensions/test_EditionView.js rename to client-app/tests/unit/app/base/views/extensions/test_EditionView.js diff --git a/tests/unit/app/viewers/views/test_ChartsView.js b/client-app/tests/unit/app/viewers/views/test_ChartsView.js similarity index 100% rename from tests/unit/app/viewers/views/test_ChartsView.js rename to client-app/tests/unit/app/viewers/views/test_ChartsView.js diff --git a/tests/unit/app/viewers/views/test_TimeSeriesSelectionManagement.js b/client-app/tests/unit/app/viewers/views/test_TimeSeriesSelectionManagement.js similarity index 100% rename from tests/unit/app/viewers/views/test_TimeSeriesSelectionManagement.js rename to client-app/tests/unit/app/viewers/views/test_TimeSeriesSelectionManagement.js diff --git a/tests/unit/redmic/base/testCredentials.js b/client-app/tests/unit/redmic/base/testCredentials.js similarity index 100% rename from tests/unit/redmic/base/testCredentials.js rename to client-app/tests/unit/redmic/base/testCredentials.js diff --git a/tests/unit/redmic/base/testMediator.js b/client-app/tests/unit/redmic/base/testMediator.js similarity index 100% rename from tests/unit/redmic/base/testMediator.js rename to client-app/tests/unit/redmic/base/testMediator.js diff --git a/tests/unit/redmic/base/testRedmicLocalStorage.js b/client-app/tests/unit/redmic/base/testRedmicLocalStorage.js similarity index 100% rename from tests/unit/redmic/base/testRedmicLocalStorage.js rename to client-app/tests/unit/redmic/base/testRedmicLocalStorage.js diff --git a/tests/unit/redmic/form/testUploadInput.js b/client-app/tests/unit/redmic/form/testUploadInput.js similarity index 100% rename from tests/unit/redmic/form/testUploadInput.js rename to client-app/tests/unit/redmic/form/testUploadInput.js diff --git a/tests/unit/redmic/modules/base/testManager.js b/client-app/tests/unit/redmic/modules/base/testManager.js similarity index 100% rename from tests/unit/redmic/modules/base/testManager.js rename to client-app/tests/unit/redmic/modules/base/testManager.js diff --git a/tests/unit/redmic/modules/base/testNotification.js b/client-app/tests/unit/redmic/modules/base/testNotification.js similarity index 100% rename from tests/unit/redmic/modules/base/testNotification.js rename to client-app/tests/unit/redmic/modules/base/testNotification.js diff --git a/tests/unit/redmic/modules/base/testSelectionBox.js b/client-app/tests/unit/redmic/modules/base/testSelectionBox.js similarity index 100% rename from tests/unit/redmic/modules/base/testSelectionBox.js rename to client-app/tests/unit/redmic/modules/base/testSelectionBox.js diff --git a/tests/unit/redmic/modules/base/test_Module.js b/client-app/tests/unit/redmic/modules/base/test_Module.js similarity index 100% rename from tests/unit/redmic/modules/base/test_Module.js rename to client-app/tests/unit/redmic/modules/base/test_Module.js diff --git a/tests/unit/redmic/modules/browser/bars/testOrder.js b/client-app/tests/unit/redmic/modules/browser/bars/testOrder.js similarity index 100% rename from tests/unit/redmic/modules/browser/bars/testOrder.js rename to client-app/tests/unit/redmic/modules/browser/bars/testOrder.js diff --git a/tests/unit/redmic/modules/browser/bars/testPagination.js b/client-app/tests/unit/redmic/modules/browser/bars/testPagination.js similarity index 100% rename from tests/unit/redmic/modules/browser/bars/testPagination.js rename to client-app/tests/unit/redmic/modules/browser/bars/testPagination.js diff --git a/tests/unit/redmic/modules/browser/bars/testSelectionBox.js b/client-app/tests/unit/redmic/modules/browser/bars/testSelectionBox.js similarity index 100% rename from tests/unit/redmic/modules/browser/bars/testSelectionBox.js rename to client-app/tests/unit/redmic/modules/browser/bars/testSelectionBox.js diff --git a/tests/unit/redmic/modules/browser/bars/testTotal.js b/client-app/tests/unit/redmic/modules/browser/bars/testTotal.js similarity index 100% rename from tests/unit/redmic/modules/browser/bars/testTotal.js rename to client-app/tests/unit/redmic/modules/browser/bars/testTotal.js diff --git a/tests/unit/redmic/modules/browser/buttons/testButtons.js b/client-app/tests/unit/redmic/modules/browser/buttons/testButtons.js similarity index 100% rename from tests/unit/redmic/modules/browser/buttons/testButtons.js rename to client-app/tests/unit/redmic/modules/browser/buttons/testButtons.js diff --git a/tests/unit/redmic/modules/browser/row/testRow.js b/client-app/tests/unit/redmic/modules/browser/row/testRow.js similarity index 100% rename from tests/unit/redmic/modules/browser/row/testRow.js rename to client-app/tests/unit/redmic/modules/browser/row/testRow.js diff --git a/tests/unit/redmic/modules/browser/testHierarchicalImpl.js b/client-app/tests/unit/redmic/modules/browser/testHierarchicalImpl.js similarity index 100% rename from tests/unit/redmic/modules/browser/testHierarchicalImpl.js rename to client-app/tests/unit/redmic/modules/browser/testHierarchicalImpl.js diff --git a/tests/unit/redmic/modules/browser/testListImpl.js b/client-app/tests/unit/redmic/modules/browser/testListImpl.js similarity index 100% rename from tests/unit/redmic/modules/browser/testListImpl.js rename to client-app/tests/unit/redmic/modules/browser/testListImpl.js diff --git a/tests/unit/redmic/modules/chart/ChartsContainer/testInfoChartsContainerImpl.js b/client-app/tests/unit/redmic/modules/chart/ChartsContainer/testInfoChartsContainerImpl.js similarity index 100% rename from tests/unit/redmic/modules/chart/ChartsContainer/testInfoChartsContainerImpl.js rename to client-app/tests/unit/redmic/modules/chart/ChartsContainer/testInfoChartsContainerImpl.js diff --git a/tests/unit/redmic/modules/chart/Toolbar/testSliderSelectorImpl.js b/client-app/tests/unit/redmic/modules/chart/Toolbar/testSliderSelectorImpl.js similarity index 100% rename from tests/unit/redmic/modules/chart/Toolbar/testSliderSelectorImpl.js rename to client-app/tests/unit/redmic/modules/chart/Toolbar/testSliderSelectorImpl.js diff --git a/tests/unit/redmic/modules/chart/layer/ChartLayer/testLinearChartImpl.js b/client-app/tests/unit/redmic/modules/chart/layer/ChartLayer/testLinearChartImpl.js similarity index 100% rename from tests/unit/redmic/modules/chart/layer/ChartLayer/testLinearChartImpl.js rename to client-app/tests/unit/redmic/modules/chart/layer/ChartLayer/testLinearChartImpl.js diff --git a/tests/unit/redmic/modules/form/inputs/testCheckBoxImpl.js b/client-app/tests/unit/redmic/modules/form/inputs/testCheckBoxImpl.js similarity index 100% rename from tests/unit/redmic/modules/form/inputs/testCheckBoxImpl.js rename to client-app/tests/unit/redmic/modules/form/inputs/testCheckBoxImpl.js diff --git a/tests/unit/redmic/modules/form/inputs/testDateTextBoxImpl.js b/client-app/tests/unit/redmic/modules/form/inputs/testDateTextBoxImpl.js similarity index 100% rename from tests/unit/redmic/modules/form/inputs/testDateTextBoxImpl.js rename to client-app/tests/unit/redmic/modules/form/inputs/testDateTextBoxImpl.js diff --git a/tests/unit/redmic/modules/form/inputs/testFilteringInputImpl.js b/client-app/tests/unit/redmic/modules/form/inputs/testFilteringInputImpl.js similarity index 100% rename from tests/unit/redmic/modules/form/inputs/testFilteringInputImpl.js rename to client-app/tests/unit/redmic/modules/form/inputs/testFilteringInputImpl.js diff --git a/tests/unit/redmic/modules/form/inputs/testNumberSpinnerImpl.js b/client-app/tests/unit/redmic/modules/form/inputs/testNumberSpinnerImpl.js similarity index 100% rename from tests/unit/redmic/modules/form/inputs/testNumberSpinnerImpl.js rename to client-app/tests/unit/redmic/modules/form/inputs/testNumberSpinnerImpl.js diff --git a/tests/unit/redmic/modules/form/inputs/testNumberTextBoxImpl.js b/client-app/tests/unit/redmic/modules/form/inputs/testNumberTextBoxImpl.js similarity index 100% rename from tests/unit/redmic/modules/form/inputs/testNumberTextBoxImpl.js rename to client-app/tests/unit/redmic/modules/form/inputs/testNumberTextBoxImpl.js diff --git a/tests/unit/redmic/modules/form/inputs/testTextAreaImpl.js b/client-app/tests/unit/redmic/modules/form/inputs/testTextAreaImpl.js similarity index 100% rename from tests/unit/redmic/modules/form/inputs/testTextAreaImpl.js rename to client-app/tests/unit/redmic/modules/form/inputs/testTextAreaImpl.js diff --git a/tests/unit/redmic/modules/form/inputs/testTextBoxImpl.js b/client-app/tests/unit/redmic/modules/form/inputs/testTextBoxImpl.js similarity index 100% rename from tests/unit/redmic/modules/form/inputs/testTextBoxImpl.js rename to client-app/tests/unit/redmic/modules/form/inputs/testTextBoxImpl.js diff --git a/tests/unit/redmic/modules/form/testForm.js b/client-app/tests/unit/redmic/modules/form/testForm.js similarity index 100% rename from tests/unit/redmic/modules/form/testForm.js rename to client-app/tests/unit/redmic/modules/form/testForm.js diff --git a/tests/unit/redmic/modules/gateway/testGateway.js b/client-app/tests/unit/redmic/modules/gateway/testGateway.js similarity index 100% rename from tests/unit/redmic/modules/gateway/testGateway.js rename to client-app/tests/unit/redmic/modules/gateway/testGateway.js diff --git a/tests/unit/redmic/modules/layout/details/testDetails.js b/client-app/tests/unit/redmic/modules/layout/details/testDetails.js similarity index 100% rename from tests/unit/redmic/modules/layout/details/testDetails.js rename to client-app/tests/unit/redmic/modules/layout/details/testDetails.js diff --git a/tests/unit/redmic/modules/layout/wizard/testWizard.js b/client-app/tests/unit/redmic/modules/layout/wizard/testWizard.js similarity index 100% rename from tests/unit/redmic/modules/layout/wizard/testWizard.js rename to client-app/tests/unit/redmic/modules/layout/wizard/testWizard.js diff --git a/tests/unit/redmic/modules/map/testLeafletImpl.js b/client-app/tests/unit/redmic/modules/map/testLeafletImpl.js similarity index 100% rename from tests/unit/redmic/modules/map/testLeafletImpl.js rename to client-app/tests/unit/redmic/modules/map/testLeafletImpl.js diff --git a/tests/unit/redmic/modules/model/testModelImpl.js b/client-app/tests/unit/redmic/modules/model/testModelImpl.js similarity index 100% rename from tests/unit/redmic/modules/model/testModelImpl.js rename to client-app/tests/unit/redmic/modules/model/testModelImpl.js diff --git a/tests/unit/redmic/modules/notification/test_Communication.js b/client-app/tests/unit/redmic/modules/notification/test_Communication.js similarity index 100% rename from tests/unit/redmic/modules/notification/test_Communication.js rename to client-app/tests/unit/redmic/modules/notification/test_Communication.js diff --git a/tests/unit/redmic/modules/notification/test_Notification.js b/client-app/tests/unit/redmic/modules/notification/test_Notification.js similarity index 100% rename from tests/unit/redmic/modules/notification/test_Notification.js rename to client-app/tests/unit/redmic/modules/notification/test_Notification.js diff --git a/tests/unit/redmic/modules/search/testFacetsImpl.js b/client-app/tests/unit/redmic/modules/search/testFacetsImpl.js similarity index 100% rename from tests/unit/redmic/modules/search/testFacetsImpl.js rename to client-app/tests/unit/redmic/modules/search/testFacetsImpl.js diff --git a/tests/unit/redmic/modules/search/testSearch.js b/client-app/tests/unit/redmic/modules/search/testSearch.js similarity index 100% rename from tests/unit/redmic/modules/search/testSearch.js rename to client-app/tests/unit/redmic/modules/search/testSearch.js diff --git a/tests/unit/redmic/modules/selection/testSelector.js b/client-app/tests/unit/redmic/modules/selection/testSelector.js similarity index 100% rename from tests/unit/redmic/modules/selection/testSelector.js rename to client-app/tests/unit/redmic/modules/selection/testSelector.js diff --git a/tests/unit/redmic/modules/socket/testSocket.js b/client-app/tests/unit/redmic/modules/socket/testSocket.js similarity index 100% rename from tests/unit/redmic/modules/socket/testSocket.js rename to client-app/tests/unit/redmic/modules/socket/testSocket.js diff --git a/tests/unit/redmic/modules/store/testRestManager.js b/client-app/tests/unit/redmic/modules/store/testRestManager.js similarity index 100% rename from tests/unit/redmic/modules/store/testRestManager.js rename to client-app/tests/unit/redmic/modules/store/testRestManager.js diff --git a/tests/unit/redmic/modules/tree/testTree.js b/client-app/tests/unit/redmic/modules/tree/testTree.js similarity index 100% rename from tests/unit/redmic/modules/tree/testTree.js rename to client-app/tests/unit/redmic/modules/tree/testTree.js diff --git a/tests/unit/redmic/modules/wizard/testWizard.js b/client-app/tests/unit/redmic/modules/wizard/testWizard.js similarity index 100% rename from tests/unit/redmic/modules/wizard/testWizard.js rename to client-app/tests/unit/redmic/modules/wizard/testWizard.js diff --git a/grunt/config/buildModules.js b/grunt/config/buildModules.js index 3889395b..33b3250b 100644 --- a/grunt/config/buildModules.js +++ b/grunt/config/buildModules.js @@ -3,17 +3,17 @@ module.exports = function(grunt) { var preBuildCmds = ['yarn install']; grunt.config('redmicConfig.buildModules', { - 'public/javascript/pruneCluster': [ + 'client-app/javascript/pruneCluster': [ 'npm install', 'grunt build:dist --force' ], - 'public/javascript/wicket': [ + 'client-app/javascript/wicket': [ 'npm run build' ], - 'public/javascript/templates': preBuildCmds.concat([ + 'client-app/javascript/templates': preBuildCmds.concat([ 'grunt' ]), - 'public/stylesheets': preBuildCmds.concat([ + 'client-app/stylesheets': preBuildCmds.concat([ 'grunt addModules buildModules' ]) }); diff --git a/grunt/config/ownModules.js b/grunt/config/ownModules.js index e4777c18..060ce043 100644 --- a/grunt/config/ownModules.js +++ b/grunt/config/ownModules.js @@ -1,7 +1,7 @@ module.exports = function(grunt) { grunt.config('redmicConfig.ownModules', [ - 'public/javascript/templates', - 'public/stylesheets' + 'client-app/javascript/templates', + 'client-app/stylesheets' ]); }; diff --git a/package.json b/package.json index 47de4133..e503399c 100644 --- a/package.json +++ b/package.json @@ -80,12 +80,12 @@ "tv4": "1.3.0", "wicket": "1.3.8" }, - "files": ["views", "dist"], + "files": ["dist"], "engines": { "node": ">=16.0", "npm": ">=8.19" }, "main": "server-app", "license": "AGPL-3.0-or-later", - "dojoBuild": "redmic.profile.js" + "dojoBuild": "client-app/app.profile.js" } diff --git a/server-app/src/exposure.js b/server-app/src/exposure.js index 4a9e4bcd..27af5d98 100644 --- a/server-app/src/exposure.js +++ b/server-app/src/exposure.js @@ -129,7 +129,7 @@ function expose(app) { exposeContents(app, 'dist'); } else { require('./styles')(app); - exposeContents(app, 'public'); + exposeContents(app, 'client-app'); exposeContents(app, 'node_modules'); } diff --git a/server-app/src/styles.js b/server-app/src/styles.js index 389bfe40..541014ec 100644 --- a/server-app/src/styles.js +++ b/server-app/src/styles.js @@ -24,7 +24,7 @@ function compileStylus(str, filePath) { function generateStylesheets(app) { - const stylesParentPath = path.join(__dirname, '../..', 'public'); + const stylesParentPath = path.join(__dirname, '../..', 'client-app'); app.use(stylus.middleware({ src: stylesParentPath, diff --git a/server-app/views/layout.pug b/server-app/views/layout.pug index 2a73fa5d..2863f384 100644 --- a/server-app/views/layout.pug +++ b/server-app/views/layout.pug @@ -29,7 +29,7 @@ html altLocale1 = esLocale; } - const basePath = '/' + (env.useBuilt ? 'dist' : 'public'), + const basePath = '/' + (env.useBuilt ? 'dist' : 'client-app'), jsPath = basePath + '/javascript/'; meta(name = 'og:locale' content = locale) -- GitLab From 8318acdadc9c00e5395e1a525d14f8583783515a Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Mon, 22 Jul 2024 11:37:56 +0100 Subject: [PATCH 014/249] Corrige rutas desactualizadas --- .gitlab-ci/build.yml | 12 ++++++------ client-app/tests/support/pages/test.html | 6 +++--- grunt/config/jshint.js | 2 +- grunt/config/test.js | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.gitlab-ci/build.yml b/.gitlab-ci/build.yml index be6c3857..8f712ef8 100644 --- a/.gitlab-ci/build.yml +++ b/.gitlab-ci/build.yml @@ -10,8 +10,8 @@ cache: paths: - node_modules/ - - public/javascript/templates/node_modules/ - - public/stylesheets/node_modules/ + - client-app/javascript/templates/node_modules/ + - client-app/stylesheets/node_modules/ prepare-unbuilt-version: extends: .web-build @@ -26,10 +26,10 @@ prepare-unbuilt-version: expire_in: 1 week paths: - node_modules/ - - public/javascript/templates/dist/ - - public/stylesheets/style.styl - - public/stylesheets/src/ - - public/stylesheets/submodules/ + - client-app/javascript/templates/dist/ + - client-app/stylesheets/style.styl + - client-app/stylesheets/src/ + - client-app/stylesheets/submodules/ rules: - if: $CI_MERGE_REQUEST_ID || $CI_COMMIT_TAG || diff --git a/client-app/tests/support/pages/test.html b/client-app/tests/support/pages/test.html index 38c9b355..65adf324 100644 --- a/client-app/tests/support/pages/test.html +++ b/client-app/tests/support/pages/test.html @@ -4,18 +4,18 @@ Test page - + - + - +
diff --git a/grunt/config/jshint.js b/grunt/config/jshint.js index 7270db0b..a54d3470 100644 --- a/grunt/config/jshint.js +++ b/grunt/config/jshint.js @@ -11,7 +11,7 @@ module.exports = function(grunt) { src: [ srcPath + '/app/**/*.js' , srcPath + '/redmic/**/*.js' - , 'app/**/*.js' + , 'server-app/**/*.js' , 'grunt/**/*.js' , '*.js' ] diff --git a/grunt/config/test.js b/grunt/config/test.js index edc2385d..996bf0b5 100644 --- a/grunt/config/test.js +++ b/grunt/config/test.js @@ -11,7 +11,7 @@ module.exports = function(grunt) { rootPath = grunt.config('redmicConfig.rootPath'), srcPath = grunt.config('redmicConfig.srcPath'), - testsPath = 'tests', + testsPath = 'client-app/tests', outputPath = 'test_reports', ownServerHost = grunt.option('ownServerHost') || '', -- GitLab From d4cb9f131db249422b1305d9579c7900b6a298ce Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Mon, 22 Jul 2024 12:21:25 +0100 Subject: [PATCH 015/249] =?UTF-8?q?Prepara=20rutas=20a=20nuevas=20ubicacio?= =?UTF-8?q?nes=20de=20c=C3=B3digo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci/build.yml | 4 ++-- .gitmodules | 4 ++-- Gruntfile.js | 3 ++- client-app/app.profile.js | 4 ++-- client-app/tests/support/pages/test.html | 4 ++-- grunt/config/buildModules.js | 6 +++--- grunt/config/copy.js | 4 ++-- grunt/config/jshint.js | 3 +-- grunt/config/ownModules.js | 2 +- grunt/config/test.js | 3 +-- server-app/views/layout.pug | 7 +++---- 11 files changed, 21 insertions(+), 23 deletions(-) diff --git a/.gitlab-ci/build.yml b/.gitlab-ci/build.yml index 8f712ef8..a0e327f1 100644 --- a/.gitlab-ci/build.yml +++ b/.gitlab-ci/build.yml @@ -10,7 +10,7 @@ cache: paths: - node_modules/ - - client-app/javascript/templates/node_modules/ + - client-app/deps/templates/node_modules/ - client-app/stylesheets/node_modules/ prepare-unbuilt-version: @@ -26,7 +26,7 @@ prepare-unbuilt-version: expire_in: 1 week paths: - node_modules/ - - client-app/javascript/templates/dist/ + - client-app/deps/templates/dist/ - client-app/stylesheets/style.styl - client-app/stylesheets/src/ - client-app/stylesheets/submodules/ diff --git a/.gitmodules b/.gitmodules index f09c2f55..c9c00f44 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,8 +3,8 @@ url = ../style.git branch = master ignore = dirty -[submodule "client-app/javascript/templates"] - path = client-app/javascript/templates +[submodule "client-app/deps/templates"] + path = client-app/deps/templates url = ../templates.git branch = master ignore = dirty diff --git a/Gruntfile.js b/Gruntfile.js index 42270a68..acd50b46 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -12,7 +12,8 @@ module.exports = function(grunt) { grunt.initConfig({ redmicConfig: { rootPath: __dirname, - srcPath: 'client-app/javascript', + srcPath: 'client-app/src', + depsPath: 'client-app/deps', distPath: 'dist', destDir: 'javascript' }, diff --git a/client-app/app.profile.js b/client-app/app.profile.js index cffc0ec9..601cdb37 100644 --- a/client-app/app.profile.js +++ b/client-app/app.profile.js @@ -25,9 +25,9 @@ var declarativeTagger = function(filename) { }; var profileObj = { - basePath: './javascript', + basePath: './src', releaseDir: '../../dist', - releaseName: 'javascript', + releaseName: 'src', action: 'release', layerOptimize: 'closure', optimize: 'closure', diff --git a/client-app/tests/support/pages/test.html b/client-app/tests/support/pages/test.html index 65adf324..a861db83 100644 --- a/client-app/tests/support/pages/test.html +++ b/client-app/tests/support/pages/test.html @@ -8,14 +8,14 @@ - + - +
diff --git a/grunt/config/buildModules.js b/grunt/config/buildModules.js index 33b3250b..bcb24db9 100644 --- a/grunt/config/buildModules.js +++ b/grunt/config/buildModules.js @@ -3,14 +3,14 @@ module.exports = function(grunt) { var preBuildCmds = ['yarn install']; grunt.config('redmicConfig.buildModules', { - 'client-app/javascript/pruneCluster': [ + 'client-app/deps/pruneCluster': [ 'npm install', 'grunt build:dist --force' ], - 'client-app/javascript/wicket': [ + 'client-app/deps/wicket': [ 'npm run build' ], - 'client-app/javascript/templates': preBuildCmds.concat([ + 'client-app/deps/templates': preBuildCmds.concat([ 'grunt' ]), 'client-app/stylesheets': preBuildCmds.concat([ diff --git a/grunt/config/copy.js b/grunt/config/copy.js index 67c310ef..87ad826c 100644 --- a/grunt/config/copy.js +++ b/grunt/config/copy.js @@ -10,11 +10,11 @@ module.exports = function(grunt) { stylesDistPath = stylesPath + '/dist', distStylesSubPath = distPath + '/stylesheets', - leafletPath = '/javascript/leaflet/', + leafletPath = '/deps/leaflet/', srcLeafletPath = publicPath + leafletPath, distLeafletPath = distPath + leafletPath, - pdfjsPath = '/javascript/pdfjs/', + pdfjsPath = '/deps/pdfjs/', srcPdfjsPath = publicPath + pdfjsPath, distPdfjsPath = distPath + pdfjsPath, pdfjsWebName = 'web', diff --git a/grunt/config/jshint.js b/grunt/config/jshint.js index a54d3470..91866983 100644 --- a/grunt/config/jshint.js +++ b/grunt/config/jshint.js @@ -9,8 +9,7 @@ module.exports = function(grunt) { }, files: { src: [ - srcPath + '/app/**/*.js' - , srcPath + '/redmic/**/*.js' + srcPath + '/**/*.js' , 'server-app/**/*.js' , 'grunt/**/*.js' , '*.js' diff --git a/grunt/config/ownModules.js b/grunt/config/ownModules.js index 060ce043..7db78656 100644 --- a/grunt/config/ownModules.js +++ b/grunt/config/ownModules.js @@ -1,7 +1,7 @@ module.exports = function(grunt) { grunt.config('redmicConfig.ownModules', [ - 'client-app/javascript/templates', + 'client-app/deps/templates', 'client-app/stylesheets' ]); }; diff --git a/grunt/config/test.js b/grunt/config/test.js index 996bf0b5..b44039e5 100644 --- a/grunt/config/test.js +++ b/grunt/config/test.js @@ -48,8 +48,7 @@ module.exports = function(grunt) { if (!coverage && coverage === undefined) { coverage = [ - path.join(srcPath, 'app', '**', '*.js'), - path.join(srcPath, 'redmic', '**', '*.js') + path.join(srcPath, '**', '*.js') ]; } diff --git a/server-app/views/layout.pug b/server-app/views/layout.pug index 2863f384..26c43ed0 100644 --- a/server-app/views/layout.pug +++ b/server-app/views/layout.pug @@ -29,8 +29,7 @@ html altLocale1 = esLocale; } - const basePath = '/' + (env.useBuilt ? 'dist' : 'client-app'), - jsPath = basePath + '/javascript/'; + const basePath = '/' + (env.useBuilt ? 'dist' : 'client-app'); meta(name = 'og:locale' content = locale) meta(name = 'og:locale:alternate' content = altLocale1) @@ -39,8 +38,8 @@ html meta(name = 'twitter:card' content = 'summary') meta(name = 'twitter:site' content = '@redmic_project') - script(src = jsPath + 'dojoConfig.js') - script(src = jsPath + 'dojo/dojo.js' data-dojo-config = 'locale:"' + env.lang + '"') + script(src = basePath + '/src/dojoConfig.js') + script(src = basePath + '/deps/dojo/dojo.js' data-dojo-config = 'locale:"' + env.lang + '"') link(rel='shortcut icon', href=basePath + '/resources/images/favicon.ico') -- GitLab From da98889b11205ae3bafb10c30c557c75961c3f68 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Mon, 22 Jul 2024 12:32:43 +0100 Subject: [PATCH 016/249] Mueve recursos a nuevas rutas --- client-app/{javascript => deps}/alertify | 0 client-app/{javascript => deps}/cbtree | 0 client-app/{javascript => deps}/color-js | 0 client-app/{javascript => deps}/d3 | 0 client-app/{javascript => deps}/d3-v6-tip | 0 client-app/{javascript => deps}/deepmerge | 0 client-app/{javascript => deps}/dijit | 0 client-app/{javascript => deps}/dojo | 0 client-app/{javascript => deps}/dojox | 0 client-app/{javascript => deps}/draggabilly | 0 client-app/{javascript => deps}/dropzone | 0 client-app/{javascript => deps}/handlebars | 0 client-app/{javascript => deps}/json-schema-ref-parser | 0 client-app/{javascript => deps}/leaflet | 0 client-app/{javascript => deps}/leaflet-areaselect | 0 client-app/{javascript => deps}/leaflet-awesome-markers | 0 client-app/{javascript => deps}/leaflet-coordinates | 0 client-app/{javascript => deps}/leaflet-draw | 0 client-app/{javascript => deps}/leaflet-measure | 0 client-app/{javascript => deps}/leaflet-minimap | 0 client-app/{javascript => deps}/leaflet-navbar | 0 client-app/{javascript => deps}/leaflet-nontiledlayer | 0 client-app/{javascript => deps}/mediatorjs | 0 client-app/{javascript => deps}/moment | 0 client-app/{javascript => deps}/packery | 0 client-app/{javascript => deps}/pdfjs | 0 client-app/{javascript => deps}/proj4 | 0 client-app/{javascript => deps}/pruneCluster | 0 client-app/{javascript => deps}/put-selector | 0 client-app/{javascript => deps}/sockjs | 0 client-app/{javascript => deps}/stomp-websocket | 0 client-app/{javascript => deps}/templates | 0 client-app/{javascript => deps}/tv4 | 0 client-app/{javascript => deps}/util | 0 client-app/{javascript => deps}/uuid | 0 client-app/{javascript => deps}/wicket | 0 .../app/administrative/taxonomy/views/ClassView.js | 0 .../app/administrative/taxonomy/views/FamilyView.js | 0 .../app/administrative/taxonomy/views/GenusView.js | 0 .../app/administrative/taxonomy/views/KingdomView.js | 0 .../taxonomy/views/MisIdentificationView.js | 0 .../app/administrative/taxonomy/views/OrderView.js | 0 .../app/administrative/taxonomy/views/PhylumView.js | 0 .../app/administrative/taxonomy/views/SpeciesView.js | 0 .../app/administrative/taxonomy/views/SubphylumView.js | 0 .../app/administrative/taxonomy/views/TaxonomyView.js | 0 .../administrative/taxonomy/views/_AddCompositeTaxon.js | 0 .../taxonomy/views/templates/forms/KingdomForm.html | 0 .../views/templates/forms/MisIdentificationForm.html | 0 .../taxonomy/views/templates/forms/PeculiarityForm.html | 0 .../taxonomy/views/templates/forms/RecoveryForm.html | 0 .../taxonomy/views/templates/forms/SpeciesForm.html | 0 .../taxonomy/views/templates/forms/SpecimenTagForm.html | 0 .../taxonomy/views/templates/forms/TaxonForm.html | 0 .../app/administrative/views/ActivityView.js | 0 .../app/administrative/views/AnimalView.js | 0 .../app/administrative/views/ContactView.js | 0 .../app/administrative/views/DeviceView.js | 0 .../app/administrative/views/DocumentView.js | 0 .../app/administrative/views/OrganisationView.js | 0 .../app/administrative/views/PlatformView.js | 0 .../app/administrative/views/ProgramView.js | 0 .../app/administrative/views/ProjectView.js | 0 .../views/templates/forms/ActivityContactForm.html | 0 .../templates/forms/ActivityEmbeddedContentForm.html | 0 .../views/templates/forms/ActivityForm.html | 0 .../views/templates/forms/ActivityOrganisationForm.html | 0 .../views/templates/forms/ActivityPlatformForm.html | 0 .../views/templates/forms/ActivityResourceForm.html | 0 .../administrative/views/templates/forms/AnimalForm.html | 0 .../views/templates/forms/CalibrationForm.html | 0 .../views/templates/forms/ConditionForm.html | 0 .../administrative/views/templates/forms/ContactForm.html | 0 .../administrative/views/templates/forms/DeviceForm.html | 0 .../views/templates/forms/DocumentForm.html | 0 .../views/templates/forms/MetricsDefinitionForm.html | 0 .../views/templates/forms/OrganisationForm.html | 0 .../views/templates/forms/ParameterForm.html | 0 .../views/templates/forms/PlatformForm.html | 0 .../administrative/views/templates/forms/ProgramForm.html | 0 .../administrative/views/templates/forms/ProjectForm.html | 0 .../administrative/views/templates/forms/UnitForm.html | 0 client-app/{javascript => src}/app/base/models/_Model.js | 0 .../{javascript => src}/app/base/models/attr/ArrayAttr.js | 0 .../{javascript => src}/app/base/models/attr/Attr.js | 0 .../{javascript => src}/app/base/models/attr/ObjAttr.js | 0 .../app/base/models/attr/RelationAttr.js | 0 .../{javascript => src}/app/base/models/attr/_Attr.js | 0 .../app/base/models/attr/_ComplexAttr.js | 0 .../app/base/views/EditorLayerWithVariableForm.js | 0 client-app/{javascript => src}/app/base/views/Module.js | 0 .../app/base/views/_ListenRequestError.js | 0 .../{javascript => src}/app/base/views/_LoadingWidget.js | 0 .../app/base/views/_SettingsHandler.js | 0 client-app/{javascript => src}/app/base/views/_View.js | 0 .../{javascript => src}/app/base/views/_ViewHandle.js | 0 .../{javascript => src}/app/base/views/_ViewListBase.js | 0 .../app/base/views/extensions/_ActivityClosed.js | 0 .../app/base/views/extensions/_AddAtlasCategory.js | 0 .../_AddCompositeSearchInTooltipFromTextSearch.js | 0 .../app/base/views/extensions/_AddForm.js | 0 .../app/base/views/extensions/_AddFormItfc.js | 0 .../app/base/views/extensions/_AddSelectInput.js | 0 .../app/base/views/extensions/_AddSelectInputItfc.js | 0 .../base/views/extensions/_AddSelectionHandlerKeypad.js | 0 .../app/base/views/extensions/_AddTextSearchInput.js | 0 .../app/base/views/extensions/_AddTextSearchInputItfc.js | 0 .../views/extensions/_CompositeInTooltipFromIconKeypad.js | 0 .../base/views/extensions/_CompositeSearchInTooltip.js | 0 .../app/base/views/extensions/_Edition.js | 0 .../app/base/views/extensions/_EditionCommons.js | 0 .../app/base/views/extensions/_EditionFormList.js | 0 .../app/base/views/extensions/_EditionLayerView.js | 0 .../app/base/views/extensions/_EditionView.js | 0 .../app/base/views/extensions/_EditionWizardView.js | 0 .../app/base/views/extensions/_FormInDialogView.js | 0 .../app/base/views/extensions/_GetActivityData.js | 0 .../app/base/views/extensions/_GetActivityDataItfc.js | 0 .../app/base/views/extensions/_InterceptCloseUpView.js | 0 .../_ListenActivityDataAndAccessByActivityCategory.js | 0 .../app/base/views/extensions/_LocalSelectionView.js | 0 .../app/base/views/extensions/_LocalSelectionViewItfc.js | 0 .../app/base/views/extensions/_OnShownAndRefresh.js | 0 .../app/base/views/extensions/_ProcessInterval.js | 0 .../app/base/views/extensions/_SelectInDoubleList.js | 0 .../app/catalog/views/ActivitiesCatalogView.js | 0 .../app/catalog/views/OrganisationsCatalogView.js | 0 .../app/catalog/views/PlatformsCatalogView.js | 0 .../app/catalog/views/ProgramsCatalogView.js | 0 .../app/catalog/views/ProjectsCatalogView.js | 0 .../app/catalog/views/SpeciesCatalogView.js | 0 .../{javascript => src}/app/components/CookieLoader.js | 0 .../{javascript => src}/app/components/ReCaptcha.js | 0 .../app/components/steps/AccessSetStep.js | 0 .../app/components/steps/ActivitySetStep.js | 0 .../app/components/steps/AddGeomSiteStep.js | 0 .../app/components/steps/AreaClassificationsSetStep.js | 0 .../app/components/steps/CalibrationSetStep.js | 0 .../app/components/steps/CitationStep.js | 0 .../app/components/steps/ClassificationsStep.js | 0 .../app/components/steps/ContactSetStep.js | 0 .../app/components/steps/DataDefinitionSetStep.js | 0 .../app/components/steps/DescribeSiteStep.js | 0 .../app/components/steps/DocumentSetStep.js | 0 .../app/components/steps/DocumentStepFiltered.js | 0 .../app/components/steps/DownloadsSetStep.js | 0 .../app/components/steps/EmbeddedContentSetStep.js | 0 .../app/components/steps/MainDataStep.js | 0 .../app/components/steps/MapSelectAreaStep.js | 0 .../app/components/steps/OrganisationSetStep.js | 0 .../app/components/steps/PlatformSetStep.js | 0 .../app/components/steps/PreLoadMainDataStep.js | 0 .../app/components/steps/ProtocolsSetStep.js | 0 .../app/components/steps/RecoverySetStep.js | 0 .../app/components/steps/RelationDataSetStep.js | 0 .../app/components/steps/ResourceSetStep.js | 0 .../app/components/steps/SelectActivityCategoryStep.js | 0 .../app/components/steps/SelectLayerStep.js | 0 .../app/components/steps/SelectRegisterTypeStep.js | 0 .../app/components/steps/SpeciesMainDataStep.js | 0 .../app/components/steps/SpecimenTagSetStep.js | 0 .../app/components/steps/UnitSetStep.js | 0 .../app/components/steps/_ClassificationsRelationData.js | 0 .../app/components/steps/_DataListAndSaveRelationData.js | 0 .../app/components/steps/_DateRelationData.js | 0 .../{javascript => src}/app/components/steps/_MainData.js | 0 .../app/components/steps/_ParametersRelationData.js | 0 .../app/components/steps/_RememberDeleteItems.js | 0 .../app/components/steps/_SelectOptionBox.js | 0 .../viewCustomization/addGeomSite/views/Line.js | 0 .../viewCustomization/addGeomSite/views/MultiPolygon.js | 0 .../viewCustomization/addGeomSite/views/Point.js | 0 .../addGeomSite/views/_BaseGeometryForm.js | 0 .../addGeomSite/views/templates/LineForm.html | 0 .../addGeomSite/views/templates/PointForm.html | 0 .../describeSite/views/SelectStationByActivity.js | 0 .../describeSite/views/_AdditionalKeyGetter.js | 0 .../describeSite/views/templates/ARForm.html | 0 .../describeSite/views/templates/DescribeSiteForm.html | 0 .../describeSite/views/templates/IFForm.html | 0 .../viewCustomization/loadFile/models/LoadFileModel.js | 0 .../loadFile/views/templates/ARFileForm.html | 0 .../loadFile/views/templates/LoadFileForm.html | 0 .../parameter/views/templates/FTForm.html | 0 .../parameter/views/templates/OCForm.html | 0 .../relationData/views/templates/AreaTypeForm.html | 0 .../relationData/views/templates/DateForm.html | 0 .../relationData/views/templates/DefaultForm.html | 0 .../relationData/views/templates/DeviceForm.html | 0 .../relationData/views/templates/PointGeometryForm.html | 0 .../app/dataLoader/areas/views/AreaView.js | 0 .../areas/views/templates/AreaClassificationsForm.html | 0 .../app/dataLoader/base/_GeographicBase.js | 0 .../app/dataLoader/citation/views/CitationView.js | 0 .../dataLoader/citation/views/templates/CitationForm.html | 0 .../infrastructure/views/InfrastructureAttributesView.js | 0 .../dataLoader/infrastructure/views/InfrastructureView.js | 0 .../views/templates/form/AttributesForm.html | 0 .../app/dataLoader/sightings/models/SightingsModel.js | 0 .../app/dataLoader/sightings/views/SightingsView.js | 0 .../sightings/views/templates/SightingsForm.html | 0 .../views/ObjectCollectingSeriesDataView.js | 0 .../surveyParameters/views/ObjectCollectionView.js | 0 .../surveyParameters/views/SurveyStationSeriesDataView.js | 0 .../surveyParameters/views/SurveyStationView.js | 0 .../views/_DataLoadedByStationManagement.js | 0 .../dataLoader/surveyParameters/views/_SeriesDataView.js | 0 .../views/templates/ObjectCollectingForm.html | 0 .../surveyParameters/views/templates/TimeSeriesForm.html | 0 .../app/dataLoader/tracking/views/TrackingDataView.js | 0 .../app/dataLoader/tracking/views/TrackingView.js | 0 .../tracking/views/templates/form/TrackingPointForm.html | 0 .../{javascript => src}/app/designs/base/_Browser.js | 0 .../{javascript => src}/app/designs/base/_Controller.js | 0 .../app/designs/base/_ControllerItfc.js | 0 .../{javascript => src}/app/designs/base/_Layout.js | 0 .../{javascript => src}/app/designs/base/_LayoutItfc.js | 0 client-app/{javascript => src}/app/designs/base/_Main.js | 0 .../{javascript => src}/app/designs/base/_MainItfc.js | 0 .../{javascript => src}/app/designs/base/_ServiceOGC.js | 0 .../{javascript => src}/app/designs/chart/Controller.js | 0 .../designs/chart/layout/SideAndTopAndBottomContent.js | 0 .../app/designs/chart/layout/TopAndBottomContent.js | 0 .../app/designs/chart/layout/TopContent.js | 0 .../chart/main/ChartsWithLegendAndToolbarsAndSlider.js | 0 .../app/designs/chart/main/ChartsWithToolbarsAndSlider.js | 0 .../app/designs/chart/main/MultiPieChartWithToolbar.js | 0 .../designs/chart/main/MultiWindRoseChartWithToolbar.js | 0 .../app/designs/chart/main/WindRoseChartWithToolbar.js | 0 .../designs/chart/main/_ChartsWithToolbarsAndSlider.js | 0 .../chart/main/_ChartsWithToolbarsAndSliderItfc.js | 0 .../chart/main/_ProcessDataDefinitionAndGetTimeSeries.js | 0 .../{javascript => src}/app/designs/details/Controller.js | 0 .../{javascript => src}/app/designs/details/Layout.js | 0 .../app/designs/details/_AddBasicTitle.js | 0 .../{javascript => src}/app/designs/details/_AddTitle.js | 0 .../app/designs/details/_ControllerItfc.js | 0 .../app/designs/details/main/ActivityLayerMap.js | 0 .../app/designs/details/main/ActivityMap.js | 0 .../app/designs/details/main/ActivityTrackingMap.js | 0 .../app/designs/details/main/Contact.js | 0 .../app/designs/details/main/Document.js | 0 .../app/designs/details/main/DocumentPDF.js | 0 .../app/designs/details/main/Organisation.js | 0 .../app/designs/details/main/Platform.js | 0 .../app/designs/details/main/Program.js | 0 .../app/designs/details/main/Project.js | 0 .../app/designs/details/main/ServiceOGC.js | 0 .../app/designs/details/main/Species.js | 0 .../app/designs/details/main/SpeciesLocation.js | 0 .../app/designs/details/main/Statistics.js | 0 .../app/designs/details/main/_ActivityBase.js | 0 .../app/designs/details/main/_DetailsBase.js | 0 .../app/designs/doubleList/Controller.js | 0 .../app/designs/doubleList/layout/Layout.js | 0 .../doubleList/layout/TopLeftContentAndDoubleList.js | 0 .../designs/doubleList/main/textSearchAndDoubleList.js | 0 .../app/designs/dynamicDualContent/Controller.js | 0 .../layout/FacetsInLeftSecondaryContent.js | 0 .../dynamicDualContent/layout/LeftSecondaryContent.js | 0 .../dynamicDualContent/layout/TopSecondaryContent.js | 0 .../app/designs/dynamicDualContent/layout/_Layout.js | 0 .../main/FacetsWithDynamicRightContent.js | 0 .../{javascript => src}/app/designs/edition/Controller.js | 0 .../{javascript => src}/app/designs/edition/Layout.js | 0 .../app/designs/embeddedContent/Controller.js | 0 .../app/designs/embeddedContent/Layout.js | 0 .../app/designs/embeddedContentWithTopbar/Controller.js | 0 .../layout/TopAndCenterContent.js | 0 .../main/EmbeddedContentSelectionInTopbar.js | 0 .../app/designs/externalTextSearchList/Controller.js | 0 .../app/designs/externalTextSearchList/Layout.js | 0 .../app/designs/externalTextSearchList/main/PlaceNames.js | 0 .../app/designs/externalTextSearchList/main/Worms.js | 0 .../app/designs/formList/Controller.js | 0 .../app/designs/formList/_ControllerItfc.js | 0 .../app/designs/formList/layout/Layout.js | 0 .../app/designs/formList/layout/LayoutWithTopForm.js | 0 .../app/designs/formList/main/FormListByStep.js | 0 .../app/designs/formList/main/_RequestAndParseData.js | 0 .../{javascript => src}/app/designs/list/Controller.js | 0 .../{javascript => src}/app/designs/list/_AddFilter.js | 0 .../{javascript => src}/app/designs/list/layout/Layout.js | 0 .../app/designs/list/layout/ListWithTopContent.js | 0 .../app/designs/list/layout/NoTitle.js | 0 .../app/designs/mapWithSideContent/Controller.js | 0 .../designs/mapWithSideContent/layout/MapAndContent.js | 0 .../mapWithSideContent/layout/MapAndContentAndTopbar.js | 0 .../mapWithSideContent/main/FilterAndGeographic.js | 0 .../app/designs/mapWithSideContent/main/Geographic.js | 0 .../designs/mapWithSideContent/main/GeographicEditor.js | 0 .../app/designs/mapWithSideContent/main/Tracking.js | 0 .../designs/mapWithSideContent/main/_TrackingByFilter.js | 0 .../designs/mapWithSideContent/main/_TrackingWithList.js | 0 .../mapWithSideContent/main/_TrackingWithListByFilter.js | 0 .../app/designs/textSearchFacetsList/Controller.js | 0 .../app/designs/textSearchFacetsList/Layout.js | 0 .../app/designs/textSearchFacetsList/_AddFilter.js | 0 .../app/designs/textSearchFacetsList/main/Activity.js | 0 .../designs/textSearchFacetsList/main/Administrative.js | 0 .../app/designs/textSearchFacetsList/main/Bibliography.js | 0 .../app/designs/textSearchFacetsList/main/Domain.js | 0 .../app/designs/textSearchFacetsList/main/Organisation.js | 0 .../app/designs/textSearchFacetsList/main/Platform.js | 0 .../app/designs/textSearchFacetsList/main/Program.js | 0 .../app/designs/textSearchFacetsList/main/Project.js | 0 .../app/designs/textSearchFacetsList/main/ServiceOGC.js | 0 .../app/designs/textSearchFacetsList/main/Species.js | 0 .../app/designs/textSearchFacetsList/main/Taxon.js | 0 .../app/designs/textSearchList/Controller.js | 0 .../app/designs/textSearchList/_AddFilter.js | 0 .../textSearchList/layout/BasicAndButtonsTopZone.js | 0 .../app/designs/textSearchList/layout/BasicTopZone.js | 0 .../app/designs/textSearchList/main/Domain.js | 0 .../app/designs/textSearchList/main/Selection.js | 0 .../app/designs/textSearchList/main/ServiceOGC.js | 0 .../app/details/views/ActivityAreaMapBase.js | 0 .../app/details/views/ActivityCatalogDetailsView.js | 0 .../app/details/views/ActivityChart.js | 0 .../app/details/views/ActivityCitationMapBase.js | 0 .../app/details/views/ActivityDetailsView.js | 0 .../app/details/views/ActivityFixedTimeseriesChart.js | 0 .../app/details/views/ActivityFixedTimeseriesMap.js | 0 .../app/details/views/ActivityInfrastructureMapBase.js | 0 .../app/details/views/ActivityLayerMapBase.js | 0 .../app/details/views/BibliographyDetailsView.js | 0 .../app/details/views/ContactDetailsView.js | 0 .../app/details/views/DocumentDetailsView.js | 0 .../app/details/views/OrganisationCatalogDetailsView.js | 0 .../app/details/views/OrganisationDetailsView.js | 0 .../app/details/views/PlatformCatalogDetailsView.js | 0 .../app/details/views/PlatformDetailsView.js | 0 .../app/details/views/ProgramCatalogDetailsView.js | 0 .../app/details/views/ProgramDetailsView.js | 0 .../app/details/views/ProjectCatalogDetailsView.js | 0 .../app/details/views/ProjectDetailsView.js | 0 .../app/details/views/ServiceOGCCatalogDetailsView.js | 0 .../app/details/views/ServiceOGCDetailsView.js | 0 .../app/details/views/SpeciesCatalogDetailsView.js | 0 .../app/details/views/SpeciesDetailsView.js | 0 .../app/details/views/StatisticsDetailsView.js | 0 .../details/views/_ActivityTimeSeriesDataManagement.js | 0 .../app/edition/views/ActivityEditionView.js | 0 .../app/edition/views/AnimalEditionView.js | 0 .../app/edition/views/ConditionEditionView.js | 0 .../app/edition/views/ContactEditionView.js | 0 .../app/edition/views/DeviceEditionView.js | 0 .../app/edition/views/DocumentEditionView.js | 0 .../app/edition/views/LoadDataDocumentEditionView.js | 0 .../app/edition/views/LoadDataToActivityEditionView.js | 0 .../app/edition/views/MetricsDefinitionEditionView.js | 0 .../app/edition/views/MisIdentificationEditionView.js | 0 .../app/edition/views/OrganisationEditionView.js | 0 .../app/edition/views/ParameterEditionView.js | 0 .../app/edition/views/PermissionsEditionView.js | 0 .../app/edition/views/PlatformEditionView.js | 0 .../app/edition/views/ProgramEditionView.js | 0 .../app/edition/views/ProjectEditionView.js | 0 .../app/edition/views/ServiceOGCEditionView.js | 0 .../app/edition/views/SpeciesEditionView.js | 0 .../app/edition/views/UnitEditionView.js | 0 .../app/edition/views/dataLoader/AddDataFT.js | 0 .../app/edition/views/dataLoader/AddDataIF.js | 0 .../app/edition/views/dataLoader/AddDataOC.js | 0 .../app/edition/views/dataLoader/EditDataAR.js | 0 .../app/edition/views/dataLoader/LoadDataAR.js | 0 .../app/edition/views/dataLoader/LoadDataFT.js | 0 .../app/edition/views/dataLoader/LoadDataOC.js | 0 .../app/edition/views/dataLoader/LoadDataTR.js | 0 .../views/dataLoader/_BaseDataToActivityEdition.js | 0 .../views/dataLoader/_BaseDataToActivityEditionItfc.js | 0 .../views/dataLoader/_BaseLoadDataToActivityEdition.js | 0 .../dataLoader/_BaseLoadDataToActivityEditionItfc.js | 0 client-app/{javascript => src}/app/home/views/HomeView.js | 0 .../{javascript => src}/app/home/views/ProductWidget.js | 0 .../{javascript => src}/app/home/views/SearchBarWidget.js | 0 .../app/home/views/SearchFastFilterWidget.js | 0 .../app/home/views/SearchFilterWidget.js | 0 .../app/home/views/SearchResultsWidget.js | 0 .../{javascript => src}/app/home/views/SocialWidget.js | 0 .../{javascript => src}/app/home/views/StatsWidget.js | 0 .../{javascript => src}/app/home/views/_DashboardItem.js | 0 .../app/maintenance/domains/_HierarchicalDomain.js | 0 .../maintenance/domains/admin/views/AccessibilityView.js | 0 .../maintenance/domains/admin/views/ActivityFieldsView.js | 0 .../maintenance/domains/admin/views/ActivityTypesView.js | 0 .../maintenance/domains/admin/views/ContactRolesView.js | 0 .../app/maintenance/domains/admin/views/CountriesView.js | 0 .../maintenance/domains/admin/views/DeviceTypesView.js | 0 .../maintenance/domains/admin/views/DocumentTypesView.js | 0 .../domains/admin/views/OrganisationRolesView.js | 0 .../domains/admin/views/OrganisationTypesView.js | 0 .../maintenance/domains/admin/views/PlatformTypesView.js | 0 .../maintenance/domains/admin/views/ProjectGroupsView.js | 0 .../app/maintenance/domains/admin/views/ScopesView.js | 0 .../admin/views/templates/forms/ActivityTypesForm.html | 0 .../admin/views/templates/forms/CountriesForm.html | 0 .../maintenance/domains/geometry/views/AreaTypesView.js | 0 .../app/maintenance/domains/geometry/views/DestinyView.js | 0 .../app/maintenance/domains/geometry/views/EndingView.js | 0 .../domains/geometry/views/InspireThemesView.js | 0 .../maintenance/domains/geometry/views/LineTypesView.js | 0 .../maintenance/domains/geometry/views/MeshTypesView.js | 0 .../maintenance/domains/geometry/views/RasterTypesView.js | 0 .../domains/geometry/views/RecordingTypesView.js | 0 .../domains/geometry/views/ShorelineTypesView.js | 0 .../domains/geometry/views/ThematicTypeView.js | 0 .../domains/geometry/views/ToponymTypesView.js | 0 .../geometry/views/templates/forms/InspireThemesForm.html | 0 .../geometry/views/templates/forms/LineTypesForm.html | 0 .../geometry/views/templates/forms/ThematicTypeForm.html | 0 .../domains/observations/views/AttributeTypesView.js | 0 .../domains/observations/views/CensingStatusView.js | 0 .../domains/observations/views/ConfidenceView.js | 0 .../domains/observations/views/EventGroupsView.js | 0 .../domains/observations/views/InfrastructureTypeView.js | 0 .../domains/observations/views/MetricGroupsView.js | 0 .../domains/observations/views/MetricsDefinitionsView.js | 0 .../domains/observations/views/ObjectTypesView.js | 0 .../domains/observations/views/ObservationTypesView.js | 0 .../domains/observations/views/ParameterTypesView.js | 0 .../domains/observations/views/ParametersView.js | 0 .../domains/observations/views/SampleTypesView.js | 0 .../domains/observations/views/SeaConditionsView.js | 0 .../domains/observations/views/UnitTypesView.js | 0 .../maintenance/domains/observations/views/UnitsView.js | 0 .../domains/taxon/views/CanaryProtectionView.js | 0 .../maintenance/domains/taxon/views/EUProtectionView.js | 0 .../app/maintenance/domains/taxon/views/EcologyView.js | 0 .../app/maintenance/domains/taxon/views/EndemicityView.js | 0 .../app/maintenance/domains/taxon/views/InterestView.js | 0 .../app/maintenance/domains/taxon/views/LifeStagesView.js | 0 .../app/maintenance/domains/taxon/views/OriginView.js | 0 .../app/maintenance/domains/taxon/views/PermanenceView.js | 0 .../app/maintenance/domains/taxon/views/RankView.js | 0 .../app/maintenance/domains/taxon/views/SexView.js | 0 .../domains/taxon/views/SpainProtectionView.js | 0 .../app/maintenance/domains/taxon/views/StatusView.js | 0 .../maintenance/domains/taxon/views/TrophicRegimeView.js | 0 .../maintenance/domains/templates/forms/DomainForm.html | 0 .../domains/templates/forms/HierarchicalDomainForm.html | 0 .../app/maintenance/models/AccessModel.js | 0 .../app/maintenance/models/PermissionsModel.js | 0 .../app/maintenance/views/DomainView.js | 0 .../app/maintenance/views/PermissionsView.js | 0 .../app/maintenance/views/ServiceOGCView.js | 0 .../app/maintenance/views/templates/forms/AccessForm.html | 0 .../views/templates/forms/CategoryLayerForm.html | 0 .../maintenance/views/templates/forms/DownloadsForm.html | 0 .../views/templates/forms/PermissionsForm.html | 0 .../maintenance/views/templates/forms/ProtocolsForm.html | 0 .../maintenance/views/templates/forms/ServiceOGCForm.html | 0 .../views/templates/forms/ServiceOGCLayerSearchForm.html | 0 client-app/{javascript => src}/app/nls/es/translation.js | 0 client-app/{javascript => src}/app/nls/translation.js | 0 .../{javascript => src}/app/products/views/OpenMapView.js | 0 .../app/products/views/ServiceOGCCatalogView.js | 0 client-app/{javascript => src}/app/redmicConfig.js | 0 .../{javascript => src}/app/user/models/FeedbackModel.js | 0 .../{javascript => src}/app/user/models/PasswordModel.js | 0 .../{javascript => src}/app/user/models/RegisterModel.js | 0 .../{javascript => src}/app/user/models/UserEmailModel.js | 0 .../{javascript => src}/app/user/models/UserImageModel.js | 0 .../{javascript => src}/app/user/models/UserNameModel.js | 0 .../app/user/models/UserSectorModel.js | 0 .../app/user/views/ConfirmResettingView.js | 0 .../{javascript => src}/app/user/views/FeedbackView.js | 0 .../app/user/views/InnerWhatIsRedmicView.js | 0 .../{javascript => src}/app/user/views/LoginView.js | 0 .../{javascript => src}/app/user/views/RegisterView.js | 0 .../{javascript => src}/app/user/views/ResettingView.js | 0 .../app/user/views/TermsAndConditionsView.js | 0 .../{javascript => src}/app/user/views/UserProfileView.js | 0 .../app/user/views/WhatIsRedmicView.js | 0 .../app/user/views/_ExternalUserBaseView.js | 0 .../app/user/views/templates/ConfirmResetting.html | 0 .../app/user/views/templates/ExternalUserBase.html | 0 .../app/user/views/templates/Feedback.html | 0 .../app/user/views/templates/Login.html | 0 .../app/user/views/templates/Register.html | 0 .../app/user/views/templates/Resetting.html | 0 .../app/user/views/templates/TermsAndConditions.html | 0 .../app/user/views/templates/WhatIsRedmic.html | 0 .../user/views/templates/forms/ChangePasswordForm.html | 0 .../app/user/views/templates/forms/FeedbackForm.html | 0 .../app/user/views/templates/forms/RegisterForm.html | 0 .../app/user/views/templates/forms/UserEmailForm.html | 0 .../app/user/views/templates/forms/UserImageForm.html | 0 .../app/user/views/templates/forms/UserNameForm.html | 0 .../app/user/views/templates/forms/UserSectorForm.html | 0 .../app/viewers/models/PointClusterCategorizeModel.js | 0 .../app/viewers/models/PointClusterModel.js | 0 .../app/viewers/views/BibliographyView.js | 0 .../{javascript => src}/app/viewers/views/ChartsView.js | 0 .../app/viewers/views/RealTimeDashboardView.js | 0 .../{javascript => src}/app/viewers/views/RealTimeView.js | 0 .../app/viewers/views/SpeciesDistributionView.js | 0 .../app/viewers/views/StacBrowserView.js | 0 .../{javascript => src}/app/viewers/views/TrackingView.js | 0 .../{javascript => src}/app/viewers/views/TrashCharts.js | 0 .../app/viewers/views/TrashCollectionView.js | 0 .../{javascript => src}/app/viewers/views/TrashDetails.js | 0 .../{javascript => src}/app/viewers/views/TrashInfo.js | 0 .../views/_ObjectCollectionSeriesSelectionManagement.js | 0 .../app/viewers/views/_SelectTimeInterval.js | 0 .../app/viewers/views/_TimeSeriesDataManagement.js | 0 .../app/viewers/views/_TimeSeriesSelectionManagement.js | 0 .../views/templates/forms/PointClusterCategorizeForm.html | 0 .../viewers/views/templates/forms/PointClusterForm.html | 0 .../views/templates/forms/SpeciesDistributionForm.html | 0 .../app/viewers/views/templates/forms/TrackingForm.html | 0 client-app/{javascript => src}/app/views/404.js | 0 .../{javascript => src}/app/views/ActivateAccount.js | 0 .../{javascript => src}/app/views/NoSupportBrowser.js | 0 .../app/views/UnderConstructionView.js | 0 .../{javascript => src}/app/views/nls/es/translation.js | 0 .../{javascript => src}/app/views/nls/translation.js | 0 .../app/views/templates/NoSupportBrowser.html | 0 client-app/{javascript => src}/dojoConfig.js | 8 ++++---- client-app/{javascript => src}/dojoConfigBuild.js | 0 .../{javascript => src}/redmic/base/CheckBrowser.js | 0 client-app/{javascript => src}/redmic/base/Credentials.js | 0 .../{javascript => src}/redmic/base/GuestChecker.js | 0 client-app/{javascript => src}/redmic/base/Mediator.js | 0 .../{javascript => src}/redmic/base/RedmicLocalStorage.js | 0 client-app/{javascript => src}/redmic/base/tv4.js | 0 .../{javascript => src}/redmic/dialog/LockDialogImpl.js | 0 .../redmic/dialog/_DialogComplexItfc.js | 0 .../{javascript => src}/redmic/form/FormContainer.js | 0 client-app/{javascript => src}/redmic/form/Select.js | 0 client-app/{javascript => src}/redmic/form/UploadInput.js | 0 .../{javascript => src}/redmic/form/nls/UploadInput.js | 0 .../{javascript => src}/redmic/form/nls/es/UploadInput.js | 0 .../{javascript => src}/redmic/form/templates/Select.html | 0 .../redmic/form/templates/UploadInput.html | 0 .../{javascript => src}/redmic/layout/DialogComplex.js | 0 .../{javascript => src}/redmic/layout/DialogSimple.js | 0 .../{javascript => src}/redmic/layout/_DialogBase.js | 0 client-app/{javascript => src}/redmic/modules/app/App.js | 0 .../{javascript => src}/redmic/modules/app/ModuleStore.js | 0 .../{javascript => src}/redmic/modules/app/Router.js | 0 client-app/{javascript => src}/redmic/modules/app/_app.js | 0 .../{javascript => src}/redmic/modules/app/_appItfc.js | 0 .../{javascript => src}/redmic/modules/app/innerApp.js | 0 .../{javascript => src}/redmic/modules/app/outerApp.js | 0 .../{javascript => src}/redmic/modules/atlas/Atlas.js | 0 .../redmic/modules/atlas/_AtlasLayersManagement.js | 0 .../redmic/modules/atlas/_AtlasLegendManagement.js | 0 .../{javascript => src}/redmic/modules/base/Analytics.js | 0 .../redmic/modules/base/Credentials.js | 0 .../{javascript => src}/redmic/modules/base/Loading.js | 0 .../{javascript => src}/redmic/modules/base/Manager.js | 0 .../redmic/modules/base/_AuthFirewall.js | 0 .../redmic/modules/base/_ChkCollection.js | 0 .../redmic/modules/base/_CommunicationCenter.js | 0 .../redmic/modules/base/_ExternalConfig.js | 0 .../{javascript => src}/redmic/modules/base/_Filter.js | 0 .../redmic/modules/base/_FilterItfc.js | 0 .../{javascript => src}/redmic/modules/base/_Itfc.js | 0 .../redmic/modules/base/_ListenQueryParams.js | 0 .../redmic/modules/base/_ListenQueryParamsItfc.js | 0 .../redmic/modules/base/_ListenWindowResize.js | 0 .../redmic/modules/base/_ManageClickEvent.js | 0 .../{javascript => src}/redmic/modules/base/_Module.js | 0 .../redmic/modules/base/_ModuleItfc.js | 0 .../redmic/modules/base/_Persistence.js | 0 .../redmic/modules/base/_PersistenceItfc.js | 0 .../{javascript => src}/redmic/modules/base/_Selection.js | 0 .../redmic/modules/base/_SelectionBase.js | 0 .../redmic/modules/base/_SelectionItfc.js | 0 .../{javascript => src}/redmic/modules/base/_Show.js | 0 .../redmic/modules/base/_ShowInPopup.js | 0 .../redmic/modules/base/_ShowInTooltip.js | 0 .../{javascript => src}/redmic/modules/base/_ShowItfc.js | 0 .../{javascript => src}/redmic/modules/base/_ShowOnEvt.js | 0 .../{javascript => src}/redmic/modules/base/_Store.js | 0 .../{javascript => src}/redmic/modules/base/_StoreItfc.js | 0 .../{javascript => src}/redmic/modules/base/_Window.js | 0 .../{javascript => src}/redmic/modules/browser/Browser.js | 0 .../redmic/modules/browser/HierarchicalImpl.js | 0 .../redmic/modules/browser/ListImpl.js | 0 .../redmic/modules/browser/_BrowserItfc.js | 0 .../redmic/modules/browser/_ButtonsInRow.js | 0 .../redmic/modules/browser/_DataTypeParser.js | 0 .../redmic/modules/browser/_DragAndDrop.js | 0 .../redmic/modules/browser/_EditionTable.js | 0 .../redmic/modules/browser/_Framework.js | 0 .../redmic/modules/browser/_GeoJsonParser.js | 0 .../redmic/modules/browser/_HierarchicalDragAndDrop.js | 0 .../redmic/modules/browser/_HierarchicalLazyLoad.js | 0 .../redmic/modules/browser/_HierarchicalSelect.js | 0 .../redmic/modules/browser/_HierarchicalTable.js | 0 .../redmic/modules/browser/_MultiTemplate.js | 0 .../redmic/modules/browser/_NoDataTemplate.js | 0 .../{javascript => src}/redmic/modules/browser/_Select.js | 0 .../{javascript => src}/redmic/modules/browser/_Table.js | 0 .../redmic/modules/browser/bars/Order.js | 0 .../redmic/modules/browser/bars/Pagination.js | 0 .../redmic/modules/browser/bars/SelectionBox.js | 0 .../redmic/modules/browser/bars/Total.js | 0 .../redmic/modules/browser/bars/_SelectBox.js | 0 .../redmic/modules/browser/buttons/Buttons.js | 0 .../redmic/modules/browser/buttons/_ButtonsItfc.js | 0 .../redmic/modules/browser/buttons/_GroupButtons.js | 0 .../{javascript => src}/redmic/modules/browser/row/Row.js | 0 .../redmic/modules/browser/row/_Buttons.js | 0 .../redmic/modules/browser/row/_Hierarchical.js | 0 .../redmic/modules/browser/row/_HierarchicalSelect.js | 0 .../redmic/modules/browser/row/_HierarchicalTable.js | 0 .../redmic/modules/browser/row/_RowItfc.js | 0 .../redmic/modules/browser/row/_Select.js | 0 .../redmic/modules/browser/row/_Table.js | 0 .../modules/chart/ChartsContainer/ChartsContainer.js | 0 .../chart/ChartsContainer/InfoChartsContainerImpl.js | 0 .../chart/ChartsContainer/SliderChartsContainerImpl.js | 0 .../modules/chart/ChartsContainer/_AngularAxisDrawing.js | 0 .../chart/ChartsContainer/_AngularAxisWithGridDrawing.js | 0 .../redmic/modules/chart/ChartsContainer/_AxesDrawing.js | 0 .../modules/chart/ChartsContainer/_AxesDrawingItfc.js | 0 .../modules/chart/ChartsContainer/_BreadcrumbsBar.js | 0 .../modules/chart/ChartsContainer/_ChartsContainerItfc.js | 0 .../modules/chart/ChartsContainer/_ColorSelection.js | 0 .../modules/chart/ChartsContainer/_ColorSelectionItfc.js | 0 .../chart/ChartsContainer/_DomainHistoryNavigation.js | 0 .../modules/chart/ChartsContainer/_GroupedLegendBar.js | 0 .../modules/chart/ChartsContainer/_InfoOnEmptyData.js | 0 .../modules/chart/ChartsContainer/_InfoOnLayerEvent.js | 0 .../chart/ChartsContainer/_InfoOnLayerEventItfc.js | 0 .../modules/chart/ChartsContainer/_InfoOnMouseOver.js | 0 .../modules/chart/ChartsContainer/_InfoOnZeroValueData.js | 0 .../chart/ChartsContainer/_InfoTooltipManagement.js | 0 .../modules/chart/ChartsContainer/_LayerColorSelection.js | 0 .../redmic/modules/chart/ChartsContainer/_LegendBar.js | 0 .../modules/chart/ChartsContainer/_LegendBarCommons.js | 0 .../chart/ChartsContainer/_LegendBarCommonsItfc.js | 0 .../modules/chart/ChartsContainer/_RadialAxisDrawing.js | 0 .../chart/ChartsContainer/_RadialAxisWithGridDrawing.js | 0 .../redmic/modules/chart/ChartsContainer/_SummaryBox.js | 0 .../modules/chart/ChartsContainer/_TemporalAxisDrawing.js | 0 .../chart/ChartsContainer/_TemporalAxisWithGridDrawing.js | 0 .../modules/chart/ChartsContainer/_VerticalAxesDrawing.js | 0 .../chart/ChartsContainer/_VerticalAxesWithGridDrawing.js | 0 .../modules/chart/ChartsContainer/_ZoomByDragging.js | 0 .../redmic/modules/chart/SmartLegend/SmartLegend.js | 0 .../chart/SmartLegend/TimeSeriesSmartLegendImpl.js | 0 .../redmic/modules/chart/SmartLegend/_SmartLegendItfc.js | 0 .../redmic/modules/chart/Toolbar/AggregationToolImpl.js | 0 .../redmic/modules/chart/Toolbar/DataSelectorImpl.js | 0 .../redmic/modules/chart/Toolbar/DateFilterImpl.js | 0 .../redmic/modules/chart/Toolbar/GridManagementImpl.js | 0 .../redmic/modules/chart/Toolbar/SliderSelectorImpl.js | 0 .../redmic/modules/chart/Toolbar/Toolbar.js | 0 .../redmic/modules/chart/Toolbar/_ToolbarItfc.js | 0 .../redmic/modules/chart/layer/Axis/AngularAxisImpl.js | 0 .../modules/chart/layer/Axis/AngularGridAxisImpl.js | 0 .../redmic/modules/chart/layer/Axis/Axis.js | 0 .../modules/chart/layer/Axis/HorizontalGridAxisImpl.js | 0 .../redmic/modules/chart/layer/Axis/RadialAxisImpl.js | 0 .../redmic/modules/chart/layer/Axis/RadialGridAxisImpl.js | 0 .../redmic/modules/chart/layer/Axis/TemporalAxisImpl.js | 0 .../redmic/modules/chart/layer/Axis/VerticalAxisImpl.js | 0 .../modules/chart/layer/Axis/VerticalGridAxisImpl.js | 0 .../redmic/modules/chart/layer/Axis/_AxisItfc.js | 0 .../redmic/modules/chart/layer/Axis/_HorizontalCommons.js | 0 .../redmic/modules/chart/layer/Axis/_VerticalCommons.js | 0 .../modules/chart/layer/Axis/_VerticalCommonsItfc.js | 0 .../redmic/modules/chart/layer/ChartLayer/ChartLayer.js | 0 .../modules/chart/layer/ChartLayer/LinearChartImpl.js | 0 .../modules/chart/layer/ChartLayer/MultiPieChartImpl.js | 0 .../redmic/modules/chart/layer/ChartLayer/PieChartImpl.js | 0 .../modules/chart/layer/ChartLayer/WindRoseChartImpl.js | 0 .../chart/layer/ChartLayer/_CategoryLayerCommons.js | 0 .../chart/layer/ChartLayer/_CategoryLayerCommonsItfc.js | 0 .../chart/layer/ChartLayer/_ChartHoleManagement.js | 0 .../modules/chart/layer/ChartLayer/_ChartLayerItfc.js | 0 .../chart/layer/ChartLayer/_CircularLayerCommons.js | 0 .../chart/layer/ChartLayer/_CircularLayerCommonsItfc.js | 0 .../chart/layer/ChartLayer/_ColorHierarchyGeneration.js | 0 .../modules/chart/layer/ChartLayer/_LevelNavigation.js | 0 .../modules/chart/layer/ChartLayer/_MultipleWindRose.js | 0 .../modules/chart/layer/ChartLayer/_ObtainableValue.js | 0 .../chart/layer/ChartLayer/_ObtainableValueItfc.js | 0 .../redmic/modules/chart/layer/ChartLayer/_PieCommons.js | 0 .../modules/chart/layer/ChartLayer/_PutButtonInHole.js | 0 .../chart/layer/ChartLayer/_PutButtonInHoleItfc.js | 0 .../modules/chart/layer/ChartLayer/_QueryableValue.js | 0 .../modules/chart/layer/ChartLayer/_ShowInfoInHole.js | 0 .../modules/chart/layer/ChartLayer/_SimplePieCommons.js | 0 .../modules/chart/layer/ChartLayer/_SimpleWindRose.js | 0 .../chart/layer/ChartLayer/_VariableRadiusByDepth.js | 0 .../redmic/modules/chart/layer/_LayerCommons.js | 0 .../redmic/modules/chart/layer/_LayerCommonsItfc.js | 0 .../redmic/modules/chart/layer/_PolarLayerCommons.js | 0 .../redmic/modules/chart/layer/_PolarLayerCommonsItfc.js | 0 .../redmic/modules/components/ExternalConfig.js | 0 .../redmic/modules/components/Keypad/IconKeypadImpl.js | 0 .../redmic/modules/components/Keypad/Keypad.js | 0 .../redmic/modules/components/Keypad/TrizoneKeypadImpl.js | 0 .../redmic/modules/components/Keypad/_KeypadItfc.js | 0 .../redmic/modules/components/PDFViewer/PDFViewer.js | 0 .../modules/components/ProgressSlider/ProgressSlider.js | 0 .../components/ProgressSlider/StepAndRateEditor.js | 0 .../redmic/modules/components/Sidebar/MainSidebarImpl.js | 0 .../redmic/modules/components/Sidebar/Sidebar.js | 0 .../redmic/modules/components/Sidebar/_Secondary.js | 0 .../redmic/modules/components/Topbar.js | 0 .../{javascript => src}/redmic/modules/filter/Filter.js | 0 .../{javascript => src}/redmic/modules/form/Form.js | 0 .../redmic/modules/form/FormContainerImpl.js | 0 .../redmic/modules/form/_BaseCreateKeypad.js | 0 .../redmic/modules/form/_CreateInternalKeypad.js | 0 .../redmic/modules/form/_CreateKeypad.js | 0 .../{javascript => src}/redmic/modules/form/_FormItfc.js | 0 .../redmic/modules/form/_ListenModelHasChanged.js | 0 .../redmic/modules/form/_PublicateChanges.js | 0 .../redmic/modules/form/_ShowInDialog.js | 0 .../redmic/modules/form/_ShowInTableList.js | 0 .../redmic/modules/form/input/AnnotationImpl.js | 0 .../redmic/modules/form/input/ButtonImpl.js | 0 .../redmic/modules/form/input/CheckBoxGroupImpl.js | 0 .../redmic/modules/form/input/CheckBoxImpl.js | 0 .../redmic/modules/form/input/ColorImpl.js | 0 .../redmic/modules/form/input/ColorPickerImpl.js | 0 .../redmic/modules/form/input/ColorPickerTextBoxImpl.js | 0 .../redmic/modules/form/input/ColorsRampImpl.js | 0 .../redmic/modules/form/input/DateRangeComplexImpl.js | 0 .../redmic/modules/form/input/DateRangeImpl.js | 0 .../redmic/modules/form/input/DateRangeTextBoxImpl.js | 0 .../redmic/modules/form/input/DateTextBoxImpl.js | 0 .../redmic/modules/form/input/DateTimeImpl.js | 0 .../redmic/modules/form/input/DateTimeTextBoxImpl.js | 0 .../redmic/modules/form/input/FilteringSelectImpl.js | 0 .../form/input/GeographicCoordinatesComponentImpl.js | 0 .../redmic/modules/form/input/GeometryImpl.js | 0 .../redmic/modules/form/input/Input.js | 0 .../redmic/modules/form/input/KeywordsImpl.js | 0 .../redmic/modules/form/input/MapSearchImpl.js | 0 .../redmic/modules/form/input/MultiSelectImpl.js | 0 .../redmic/modules/form/input/NumberSpinnerImpl.js | 0 .../redmic/modules/form/input/NumberTextBoxImpl.js | 0 .../redmic/modules/form/input/PointImpl.js | 0 .../redmic/modules/form/input/RadioButtonGroupImpl.js | 0 .../redmic/modules/form/input/RadioButtonImpl.js | 0 .../redmic/modules/form/input/RangeImpl.js | 0 .../redmic/modules/form/input/RangeSliderImpl.js | 0 .../redmic/modules/form/input/SelectImpl.js | 0 .../redmic/modules/form/input/SelectOnListPopupImpl.js | 0 .../redmic/modules/form/input/SliderImpl.js | 0 .../redmic/modules/form/input/TextAreaImpl.js | 0 .../redmic/modules/form/input/TextBoxImpl.js | 0 .../redmic/modules/form/input/UploadFileImpl.js | 0 .../redmic/modules/form/input/ValueAndUnitSelectorImpl.js | 0 .../redmic/modules/form/input/_BaseDateTime.js | 0 .../redmic/modules/form/input/_BaseMultiSelectImpl.js | 0 .../redmic/modules/form/input/_BaseRange.js | 0 .../form/input/_BaseTextBoxWidthExpandTooltipImpl.js | 0 .../modules/form/input/_BaseWidthExpandTooltipImpl.js | 0 .../redmic/modules/form/input/_DeleteOnClear.js | 0 .../redmic/modules/form/input/_Dependence.js | 0 .../redmic/modules/form/input/_DisableInput.js | 0 .../modules/form/input/_IgnoreNonexistentProperty.js | 0 .../redmic/modules/form/input/_InputItfc.js | 0 .../redmic/modules/form/input/_NodesCreation.js | 0 .../redmic/modules/form/input/_SelectOnPopupImpl.js | 0 .../redmic/modules/gateway/AddItemGatewayImpl.js | 0 .../{javascript => src}/redmic/modules/gateway/Gateway.js | 0 .../redmic/modules/gateway/LocalSelectorGatewayImpl.js | 0 .../redmic/modules/gateway/MapCenteringGatewayImpl.js | 0 .../redmic/modules/gateway/_GatewayItfc.js | 0 .../redmic/modules/layout/TabsDisplayer.js | 0 .../redmic/modules/layout/dataDisplayer/DataDisplayer.js | 0 .../modules/layout/genericDisplayer/GenericDisplayer.js | 0 .../genericDisplayer/GenericWithTopbarDisplayerImpl.js | 0 .../redmic/modules/layout/listMenu/ListMenu.js | 0 .../modules/layout/nestedContent/NestedBrowsersImpl.js | 0 .../redmic/modules/layout/nestedContent/NestedContent.js | 0 .../modules/layout/templateDisplayer/TemplateDisplayer.js | 0 .../redmic/modules/layout/wizard/Wizard.js | 0 .../redmic/modules/layout/wizard/_CompleteBySelection.js | 0 .../redmic/modules/layout/wizard/_StepBreadcrumbs.js | 0 .../redmic/modules/layout/wizard/_StepNavigation.js | 0 .../redmic/modules/layout/wizard/_WizardStep.js | 0 .../redmic/modules/layout/wizard/_WizardStepItfc.js | 0 .../{javascript => src}/redmic/modules/map/LeafletImpl.js | 0 client-app/{javascript => src}/redmic/modules/map/Map.js | 0 .../{javascript => src}/redmic/modules/map/MapButton.js | 0 .../redmic/modules/map/StaticLayersDefinition.js | 0 .../{javascript => src}/redmic/modules/map/_ImportWkt.js | 0 .../redmic/modules/map/_LeafletDraw.js | 0 .../redmic/modules/map/_LeafletImplItfc.js | 0 .../redmic/modules/map/_LeafletWidgetsManagement.js | 0 .../redmic/modules/map/_ListenContainers.js | 0 .../{javascript => src}/redmic/modules/map/_MapItfc.js | 0 .../redmic/modules/map/_OverlayLayersManagement.js | 0 .../redmic/modules/map/_PlaceNamesButton.js | 0 .../redmic/modules/map/_StaticLayersManagement.js | 0 .../redmic/modules/map/layer/DrawingLayerImpl.js | 0 .../redmic/modules/map/layer/GeoJsonLayerImpl.js | 0 .../redmic/modules/map/layer/GridLayerImpl.js | 0 .../redmic/modules/map/layer/MapLayer.js | 0 .../redmic/modules/map/layer/PruneClusterLayerImpl.js | 0 .../redmic/modules/map/layer/TrackingLayerImpl.js | 0 .../redmic/modules/map/layer/TrackingLine.js | 0 .../redmic/modules/map/layer/WmsLayerImpl.js | 0 .../redmic/modules/map/layer/_AddFilter.js | 0 .../redmic/modules/map/layer/_AnimateMarker.js | 0 .../redmic/modules/map/layer/_D3Expansion.js | 0 .../redmic/modules/map/layer/_Editable.js | 0 .../redmic/modules/map/layer/_GeoJsonLayerItfc.js | 0 .../redmic/modules/map/layer/_Highlightable.js | 0 .../redmic/modules/map/layer/_LayerProtocols.js | 0 .../redmic/modules/map/layer/_ListenBounds.js | 0 .../redmic/modules/map/layer/_ListenZoom.js | 0 .../redmic/modules/map/layer/_MapLayerItfc.js | 0 .../redmic/modules/map/layer/_PruneClusterLayerItfc.js | 0 .../redmic/modules/map/layer/_PublishInfo.js | 0 .../redmic/modules/map/layer/_PublishInfoItfc.js | 0 .../redmic/modules/map/layer/_RadiusCommons.js | 0 .../redmic/modules/map/layer/_RadiusOnClick.js | 0 .../redmic/modules/map/layer/_RadiusOnSelect.js | 0 .../redmic/modules/map/layer/_SelectOnClick.js | 0 .../redmic/modules/map/layer/_Selectable.js | 0 .../redmic/modules/map/layer/_SelectableItfc.js | 0 .../redmic/modules/map/layer/_TrackingDataManagement.js | 0 .../modules/map/layer/_TrackingMarkersManagement.js | 0 .../redmic/modules/mapQuery/QueryOnMap.js | 0 .../redmic/modules/mapQuery/_ContentManagement.js | 0 .../redmic/modules/mapQuery/_ResultsBrowser.js | 0 .../redmic/modules/metaTags/MetaTags.js | 0 .../redmic/modules/metaTags/metaTagsContent.js | 0 .../{javascript => src}/redmic/modules/model/Model.js | 0 .../{javascript => src}/redmic/modules/model/ModelImpl.js | 0 .../redmic/modules/model/_ModelItfc.js | 0 .../redmic/modules/notification/Alert.js | 0 .../redmic/modules/notification/CommunicationCenter.js | 0 .../redmic/modules/notification/Notification.js | 0 .../redmic/modules/notification/NotificationSidebar.js | 0 .../redmic/modules/notification/TaskNotification.js | 0 .../redmic/modules/search/CompositeImpl.js | 0 .../redmic/modules/search/DateRangeImpl.js | 0 .../redmic/modules/search/FacetsImpl.js | 0 .../redmic/modules/search/GeographicImpl.js | 0 .../redmic/modules/search/MultiSelectImpl.js | 0 .../redmic/modules/search/RangeImpl.js | 0 .../{javascript => src}/redmic/modules/search/Search.js | 0 .../{javascript => src}/redmic/modules/search/TextImpl.js | 0 .../redmic/modules/search/_HideFormByAction.js | 0 .../redmic/modules/search/_SearchItfc.js | 0 .../redmic/modules/selection/SelectionBox.js | 0 .../redmic/modules/selection/SelectionManager.js | 0 .../redmic/modules/selection/Selector.js | 0 .../redmic/modules/selection/_SelectorItfc.js | 0 .../redmic/modules/selection/_SelectorPersistence.js | 0 .../{javascript => src}/redmic/modules/socket/Socket.js | 0 .../{javascript => src}/redmic/modules/socket/Task.js | 0 .../redmic/modules/socket/_IngestData.js | 0 .../{javascript => src}/redmic/modules/socket/_Report.js | 0 .../{javascript => src}/redmic/modules/socket/_Worms.js | 0 .../redmic/modules/store/RequestJoiner/AtlasDataImpl.js | 0 .../redmic/modules/store/RequestJoiner/RequestJoiner.js | 0 .../modules/store/RequestJoiner/_RequestJoinerItfc.js | 0 .../redmic/modules/store/RestManager.js | 0 .../redmic/modules/store/RestManagerImpl.js | 0 .../redmic/modules/store/_RestManagerItfc.js | 0 .../{javascript => src}/redmic/modules/tree/CbtreeImpl.js | 0 .../{javascript => src}/redmic/modules/tree/Tree.js | 0 .../redmic/modules/tree/_HierarchicalFilter.js | 0 .../{javascript => src}/redmic/modules/tree/_LazyLoad.js | 0 .../redmic/modules/tree/_LeafSelection.js | 0 .../redmic/modules/tree/_SelectionBox.js | 0 .../{javascript => src}/redmic/modules/tree/_TreeItfc.js | 0 .../redmic/modules/user/FullscreenToggle.js | 0 .../redmic/modules/user/LanguageSelector.js | 0 .../{javascript => src}/redmic/modules/user/UserArea.js | 0 .../redmic/validation/stringFormats.js | 0 .../{javascript => src}/redmic/view/effects/Animation.js | 0 client-app/{javascript => src}/redmic/widgets/Button.js | 0 .../{javascript => src}/redmic/widgets/ComboButton.js | 0 .../{javascript => src}/redmic/widgets/Converter.js | 0 .../{javascript => src}/redmic/widgets/DatePicker.js | 0 client-app/{javascript => src}/redmic/widgets/Facet.js | 0 .../{javascript => src}/redmic/widgets/FilteringSelect.js | 0 .../{javascript => src}/redmic/widgets/KeywordsInput.js | 0 client-app/{javascript => src}/redmic/widgets/Map.js | 0 .../{javascript => src}/redmic/widgets/ProgressSlider.js | 0 client-app/{javascript => src}/redmic/widgets/README.md | 0 .../{javascript => src}/redmic/widgets/RangeSlider.js | 0 .../{javascript => src}/redmic/widgets/RedmicUtilities.js | 0 client-app/{javascript => src}/redmic/widgets/Slider.js | 0 client-app/{javascript => src}/redmic/widgets/Switch.js | 0 .../{javascript => src}/redmic/widgets/TemplateWidget.js | 0 .../{javascript => src}/redmic/widgets/TextSearch.js | 0 .../{javascript => src}/redmic/widgets/TimeSelect.js | 0 .../{javascript => src}/redmic/widgets/ToggleButton.js | 0 .../{javascript => src}/redmic/widgets/Utilities.js | 0 .../redmic/widgets/ValueAndUnitSelector.js | 0 .../redmic/widgets/extensions/_ShowValue.js | 0 .../src/view/detail/_WidgetDefinition.js | 0 .../src/view/detail/activity/ActivityDetail.js | 0 .../src/view/detail/activity/_ActivityLayoutWidget.js | 0 900 files changed, 4 insertions(+), 4 deletions(-) rename client-app/{javascript => deps}/alertify (100%) rename client-app/{javascript => deps}/cbtree (100%) rename client-app/{javascript => deps}/color-js (100%) rename client-app/{javascript => deps}/d3 (100%) rename client-app/{javascript => deps}/d3-v6-tip (100%) rename client-app/{javascript => deps}/deepmerge (100%) rename client-app/{javascript => deps}/dijit (100%) rename client-app/{javascript => deps}/dojo (100%) rename client-app/{javascript => deps}/dojox (100%) rename client-app/{javascript => deps}/draggabilly (100%) rename client-app/{javascript => deps}/dropzone (100%) rename client-app/{javascript => deps}/handlebars (100%) rename client-app/{javascript => deps}/json-schema-ref-parser (100%) rename client-app/{javascript => deps}/leaflet (100%) rename client-app/{javascript => deps}/leaflet-areaselect (100%) rename client-app/{javascript => deps}/leaflet-awesome-markers (100%) rename client-app/{javascript => deps}/leaflet-coordinates (100%) rename client-app/{javascript => deps}/leaflet-draw (100%) rename client-app/{javascript => deps}/leaflet-measure (100%) rename client-app/{javascript => deps}/leaflet-minimap (100%) rename client-app/{javascript => deps}/leaflet-navbar (100%) rename client-app/{javascript => deps}/leaflet-nontiledlayer (100%) rename client-app/{javascript => deps}/mediatorjs (100%) rename client-app/{javascript => deps}/moment (100%) rename client-app/{javascript => deps}/packery (100%) rename client-app/{javascript => deps}/pdfjs (100%) rename client-app/{javascript => deps}/proj4 (100%) rename client-app/{javascript => deps}/pruneCluster (100%) rename client-app/{javascript => deps}/put-selector (100%) rename client-app/{javascript => deps}/sockjs (100%) rename client-app/{javascript => deps}/stomp-websocket (100%) rename client-app/{javascript => deps}/templates (100%) rename client-app/{javascript => deps}/tv4 (100%) rename client-app/{javascript => deps}/util (100%) rename client-app/{javascript => deps}/uuid (100%) rename client-app/{javascript => deps}/wicket (100%) rename client-app/{javascript => src}/app/administrative/taxonomy/views/ClassView.js (100%) rename client-app/{javascript => src}/app/administrative/taxonomy/views/FamilyView.js (100%) rename client-app/{javascript => src}/app/administrative/taxonomy/views/GenusView.js (100%) rename client-app/{javascript => src}/app/administrative/taxonomy/views/KingdomView.js (100%) rename client-app/{javascript => src}/app/administrative/taxonomy/views/MisIdentificationView.js (100%) rename client-app/{javascript => src}/app/administrative/taxonomy/views/OrderView.js (100%) rename client-app/{javascript => src}/app/administrative/taxonomy/views/PhylumView.js (100%) rename client-app/{javascript => src}/app/administrative/taxonomy/views/SpeciesView.js (100%) rename client-app/{javascript => src}/app/administrative/taxonomy/views/SubphylumView.js (100%) rename client-app/{javascript => src}/app/administrative/taxonomy/views/TaxonomyView.js (100%) rename client-app/{javascript => src}/app/administrative/taxonomy/views/_AddCompositeTaxon.js (100%) rename client-app/{javascript => src}/app/administrative/taxonomy/views/templates/forms/KingdomForm.html (100%) rename client-app/{javascript => src}/app/administrative/taxonomy/views/templates/forms/MisIdentificationForm.html (100%) rename client-app/{javascript => src}/app/administrative/taxonomy/views/templates/forms/PeculiarityForm.html (100%) rename client-app/{javascript => src}/app/administrative/taxonomy/views/templates/forms/RecoveryForm.html (100%) rename client-app/{javascript => src}/app/administrative/taxonomy/views/templates/forms/SpeciesForm.html (100%) rename client-app/{javascript => src}/app/administrative/taxonomy/views/templates/forms/SpecimenTagForm.html (100%) rename client-app/{javascript => src}/app/administrative/taxonomy/views/templates/forms/TaxonForm.html (100%) rename client-app/{javascript => src}/app/administrative/views/ActivityView.js (100%) rename client-app/{javascript => src}/app/administrative/views/AnimalView.js (100%) rename client-app/{javascript => src}/app/administrative/views/ContactView.js (100%) rename client-app/{javascript => src}/app/administrative/views/DeviceView.js (100%) rename client-app/{javascript => src}/app/administrative/views/DocumentView.js (100%) rename client-app/{javascript => src}/app/administrative/views/OrganisationView.js (100%) rename client-app/{javascript => src}/app/administrative/views/PlatformView.js (100%) rename client-app/{javascript => src}/app/administrative/views/ProgramView.js (100%) rename client-app/{javascript => src}/app/administrative/views/ProjectView.js (100%) rename client-app/{javascript => src}/app/administrative/views/templates/forms/ActivityContactForm.html (100%) rename client-app/{javascript => src}/app/administrative/views/templates/forms/ActivityEmbeddedContentForm.html (100%) rename client-app/{javascript => src}/app/administrative/views/templates/forms/ActivityForm.html (100%) rename client-app/{javascript => src}/app/administrative/views/templates/forms/ActivityOrganisationForm.html (100%) rename client-app/{javascript => src}/app/administrative/views/templates/forms/ActivityPlatformForm.html (100%) rename client-app/{javascript => src}/app/administrative/views/templates/forms/ActivityResourceForm.html (100%) rename client-app/{javascript => src}/app/administrative/views/templates/forms/AnimalForm.html (100%) rename client-app/{javascript => src}/app/administrative/views/templates/forms/CalibrationForm.html (100%) rename client-app/{javascript => src}/app/administrative/views/templates/forms/ConditionForm.html (100%) rename client-app/{javascript => src}/app/administrative/views/templates/forms/ContactForm.html (100%) rename client-app/{javascript => src}/app/administrative/views/templates/forms/DeviceForm.html (100%) rename client-app/{javascript => src}/app/administrative/views/templates/forms/DocumentForm.html (100%) rename client-app/{javascript => src}/app/administrative/views/templates/forms/MetricsDefinitionForm.html (100%) rename client-app/{javascript => src}/app/administrative/views/templates/forms/OrganisationForm.html (100%) rename client-app/{javascript => src}/app/administrative/views/templates/forms/ParameterForm.html (100%) rename client-app/{javascript => src}/app/administrative/views/templates/forms/PlatformForm.html (100%) rename client-app/{javascript => src}/app/administrative/views/templates/forms/ProgramForm.html (100%) rename client-app/{javascript => src}/app/administrative/views/templates/forms/ProjectForm.html (100%) rename client-app/{javascript => src}/app/administrative/views/templates/forms/UnitForm.html (100%) rename client-app/{javascript => src}/app/base/models/_Model.js (100%) rename client-app/{javascript => src}/app/base/models/attr/ArrayAttr.js (100%) rename client-app/{javascript => src}/app/base/models/attr/Attr.js (100%) rename client-app/{javascript => src}/app/base/models/attr/ObjAttr.js (100%) rename client-app/{javascript => src}/app/base/models/attr/RelationAttr.js (100%) rename client-app/{javascript => src}/app/base/models/attr/_Attr.js (100%) rename client-app/{javascript => src}/app/base/models/attr/_ComplexAttr.js (100%) rename client-app/{javascript => src}/app/base/views/EditorLayerWithVariableForm.js (100%) rename client-app/{javascript => src}/app/base/views/Module.js (100%) rename client-app/{javascript => src}/app/base/views/_ListenRequestError.js (100%) rename client-app/{javascript => src}/app/base/views/_LoadingWidget.js (100%) rename client-app/{javascript => src}/app/base/views/_SettingsHandler.js (100%) rename client-app/{javascript => src}/app/base/views/_View.js (100%) rename client-app/{javascript => src}/app/base/views/_ViewHandle.js (100%) rename client-app/{javascript => src}/app/base/views/_ViewListBase.js (100%) rename client-app/{javascript => src}/app/base/views/extensions/_ActivityClosed.js (100%) rename client-app/{javascript => src}/app/base/views/extensions/_AddAtlasCategory.js (100%) rename client-app/{javascript => src}/app/base/views/extensions/_AddCompositeSearchInTooltipFromTextSearch.js (100%) rename client-app/{javascript => src}/app/base/views/extensions/_AddForm.js (100%) rename client-app/{javascript => src}/app/base/views/extensions/_AddFormItfc.js (100%) rename client-app/{javascript => src}/app/base/views/extensions/_AddSelectInput.js (100%) rename client-app/{javascript => src}/app/base/views/extensions/_AddSelectInputItfc.js (100%) rename client-app/{javascript => src}/app/base/views/extensions/_AddSelectionHandlerKeypad.js (100%) rename client-app/{javascript => src}/app/base/views/extensions/_AddTextSearchInput.js (100%) rename client-app/{javascript => src}/app/base/views/extensions/_AddTextSearchInputItfc.js (100%) rename client-app/{javascript => src}/app/base/views/extensions/_CompositeInTooltipFromIconKeypad.js (100%) rename client-app/{javascript => src}/app/base/views/extensions/_CompositeSearchInTooltip.js (100%) rename client-app/{javascript => src}/app/base/views/extensions/_Edition.js (100%) rename client-app/{javascript => src}/app/base/views/extensions/_EditionCommons.js (100%) rename client-app/{javascript => src}/app/base/views/extensions/_EditionFormList.js (100%) rename client-app/{javascript => src}/app/base/views/extensions/_EditionLayerView.js (100%) rename client-app/{javascript => src}/app/base/views/extensions/_EditionView.js (100%) rename client-app/{javascript => src}/app/base/views/extensions/_EditionWizardView.js (100%) rename client-app/{javascript => src}/app/base/views/extensions/_FormInDialogView.js (100%) rename client-app/{javascript => src}/app/base/views/extensions/_GetActivityData.js (100%) rename client-app/{javascript => src}/app/base/views/extensions/_GetActivityDataItfc.js (100%) rename client-app/{javascript => src}/app/base/views/extensions/_InterceptCloseUpView.js (100%) rename client-app/{javascript => src}/app/base/views/extensions/_ListenActivityDataAndAccessByActivityCategory.js (100%) rename client-app/{javascript => src}/app/base/views/extensions/_LocalSelectionView.js (100%) rename client-app/{javascript => src}/app/base/views/extensions/_LocalSelectionViewItfc.js (100%) rename client-app/{javascript => src}/app/base/views/extensions/_OnShownAndRefresh.js (100%) rename client-app/{javascript => src}/app/base/views/extensions/_ProcessInterval.js (100%) rename client-app/{javascript => src}/app/base/views/extensions/_SelectInDoubleList.js (100%) rename client-app/{javascript => src}/app/catalog/views/ActivitiesCatalogView.js (100%) rename client-app/{javascript => src}/app/catalog/views/OrganisationsCatalogView.js (100%) rename client-app/{javascript => src}/app/catalog/views/PlatformsCatalogView.js (100%) rename client-app/{javascript => src}/app/catalog/views/ProgramsCatalogView.js (100%) rename client-app/{javascript => src}/app/catalog/views/ProjectsCatalogView.js (100%) rename client-app/{javascript => src}/app/catalog/views/SpeciesCatalogView.js (100%) rename client-app/{javascript => src}/app/components/CookieLoader.js (100%) rename client-app/{javascript => src}/app/components/ReCaptcha.js (100%) rename client-app/{javascript => src}/app/components/steps/AccessSetStep.js (100%) rename client-app/{javascript => src}/app/components/steps/ActivitySetStep.js (100%) rename client-app/{javascript => src}/app/components/steps/AddGeomSiteStep.js (100%) rename client-app/{javascript => src}/app/components/steps/AreaClassificationsSetStep.js (100%) rename client-app/{javascript => src}/app/components/steps/CalibrationSetStep.js (100%) rename client-app/{javascript => src}/app/components/steps/CitationStep.js (100%) rename client-app/{javascript => src}/app/components/steps/ClassificationsStep.js (100%) rename client-app/{javascript => src}/app/components/steps/ContactSetStep.js (100%) rename client-app/{javascript => src}/app/components/steps/DataDefinitionSetStep.js (100%) rename client-app/{javascript => src}/app/components/steps/DescribeSiteStep.js (100%) rename client-app/{javascript => src}/app/components/steps/DocumentSetStep.js (100%) rename client-app/{javascript => src}/app/components/steps/DocumentStepFiltered.js (100%) rename client-app/{javascript => src}/app/components/steps/DownloadsSetStep.js (100%) rename client-app/{javascript => src}/app/components/steps/EmbeddedContentSetStep.js (100%) rename client-app/{javascript => src}/app/components/steps/MainDataStep.js (100%) rename client-app/{javascript => src}/app/components/steps/MapSelectAreaStep.js (100%) rename client-app/{javascript => src}/app/components/steps/OrganisationSetStep.js (100%) rename client-app/{javascript => src}/app/components/steps/PlatformSetStep.js (100%) rename client-app/{javascript => src}/app/components/steps/PreLoadMainDataStep.js (100%) rename client-app/{javascript => src}/app/components/steps/ProtocolsSetStep.js (100%) rename client-app/{javascript => src}/app/components/steps/RecoverySetStep.js (100%) rename client-app/{javascript => src}/app/components/steps/RelationDataSetStep.js (100%) rename client-app/{javascript => src}/app/components/steps/ResourceSetStep.js (100%) rename client-app/{javascript => src}/app/components/steps/SelectActivityCategoryStep.js (100%) rename client-app/{javascript => src}/app/components/steps/SelectLayerStep.js (100%) rename client-app/{javascript => src}/app/components/steps/SelectRegisterTypeStep.js (100%) rename client-app/{javascript => src}/app/components/steps/SpeciesMainDataStep.js (100%) rename client-app/{javascript => src}/app/components/steps/SpecimenTagSetStep.js (100%) rename client-app/{javascript => src}/app/components/steps/UnitSetStep.js (100%) rename client-app/{javascript => src}/app/components/steps/_ClassificationsRelationData.js (100%) rename client-app/{javascript => src}/app/components/steps/_DataListAndSaveRelationData.js (100%) rename client-app/{javascript => src}/app/components/steps/_DateRelationData.js (100%) rename client-app/{javascript => src}/app/components/steps/_MainData.js (100%) rename client-app/{javascript => src}/app/components/steps/_ParametersRelationData.js (100%) rename client-app/{javascript => src}/app/components/steps/_RememberDeleteItems.js (100%) rename client-app/{javascript => src}/app/components/steps/_SelectOptionBox.js (100%) rename client-app/{javascript => src}/app/components/viewCustomization/addGeomSite/views/Line.js (100%) rename client-app/{javascript => src}/app/components/viewCustomization/addGeomSite/views/MultiPolygon.js (100%) rename client-app/{javascript => src}/app/components/viewCustomization/addGeomSite/views/Point.js (100%) rename client-app/{javascript => src}/app/components/viewCustomization/addGeomSite/views/_BaseGeometryForm.js (100%) rename client-app/{javascript => src}/app/components/viewCustomization/addGeomSite/views/templates/LineForm.html (100%) rename client-app/{javascript => src}/app/components/viewCustomization/addGeomSite/views/templates/PointForm.html (100%) rename client-app/{javascript => src}/app/components/viewCustomization/describeSite/views/SelectStationByActivity.js (100%) rename client-app/{javascript => src}/app/components/viewCustomization/describeSite/views/_AdditionalKeyGetter.js (100%) rename client-app/{javascript => src}/app/components/viewCustomization/describeSite/views/templates/ARForm.html (100%) rename client-app/{javascript => src}/app/components/viewCustomization/describeSite/views/templates/DescribeSiteForm.html (100%) rename client-app/{javascript => src}/app/components/viewCustomization/describeSite/views/templates/IFForm.html (100%) rename client-app/{javascript => src}/app/components/viewCustomization/loadFile/models/LoadFileModel.js (100%) rename client-app/{javascript => src}/app/components/viewCustomization/loadFile/views/templates/ARFileForm.html (100%) rename client-app/{javascript => src}/app/components/viewCustomization/loadFile/views/templates/LoadFileForm.html (100%) rename client-app/{javascript => src}/app/components/viewCustomization/parameter/views/templates/FTForm.html (100%) rename client-app/{javascript => src}/app/components/viewCustomization/parameter/views/templates/OCForm.html (100%) rename client-app/{javascript => src}/app/components/viewCustomization/relationData/views/templates/AreaTypeForm.html (100%) rename client-app/{javascript => src}/app/components/viewCustomization/relationData/views/templates/DateForm.html (100%) rename client-app/{javascript => src}/app/components/viewCustomization/relationData/views/templates/DefaultForm.html (100%) rename client-app/{javascript => src}/app/components/viewCustomization/relationData/views/templates/DeviceForm.html (100%) rename client-app/{javascript => src}/app/components/viewCustomization/relationData/views/templates/PointGeometryForm.html (100%) rename client-app/{javascript => src}/app/dataLoader/areas/views/AreaView.js (100%) rename client-app/{javascript => src}/app/dataLoader/areas/views/templates/AreaClassificationsForm.html (100%) rename client-app/{javascript => src}/app/dataLoader/base/_GeographicBase.js (100%) rename client-app/{javascript => src}/app/dataLoader/citation/views/CitationView.js (100%) rename client-app/{javascript => src}/app/dataLoader/citation/views/templates/CitationForm.html (100%) rename client-app/{javascript => src}/app/dataLoader/infrastructure/views/InfrastructureAttributesView.js (100%) rename client-app/{javascript => src}/app/dataLoader/infrastructure/views/InfrastructureView.js (100%) rename client-app/{javascript => src}/app/dataLoader/infrastructure/views/templates/form/AttributesForm.html (100%) rename client-app/{javascript => src}/app/dataLoader/sightings/models/SightingsModel.js (100%) rename client-app/{javascript => src}/app/dataLoader/sightings/views/SightingsView.js (100%) rename client-app/{javascript => src}/app/dataLoader/sightings/views/templates/SightingsForm.html (100%) rename client-app/{javascript => src}/app/dataLoader/surveyParameters/views/ObjectCollectingSeriesDataView.js (100%) rename client-app/{javascript => src}/app/dataLoader/surveyParameters/views/ObjectCollectionView.js (100%) rename client-app/{javascript => src}/app/dataLoader/surveyParameters/views/SurveyStationSeriesDataView.js (100%) rename client-app/{javascript => src}/app/dataLoader/surveyParameters/views/SurveyStationView.js (100%) rename client-app/{javascript => src}/app/dataLoader/surveyParameters/views/_DataLoadedByStationManagement.js (100%) rename client-app/{javascript => src}/app/dataLoader/surveyParameters/views/_SeriesDataView.js (100%) rename client-app/{javascript => src}/app/dataLoader/surveyParameters/views/templates/ObjectCollectingForm.html (100%) rename client-app/{javascript => src}/app/dataLoader/surveyParameters/views/templates/TimeSeriesForm.html (100%) rename client-app/{javascript => src}/app/dataLoader/tracking/views/TrackingDataView.js (100%) rename client-app/{javascript => src}/app/dataLoader/tracking/views/TrackingView.js (100%) rename client-app/{javascript => src}/app/dataLoader/tracking/views/templates/form/TrackingPointForm.html (100%) rename client-app/{javascript => src}/app/designs/base/_Browser.js (100%) rename client-app/{javascript => src}/app/designs/base/_Controller.js (100%) rename client-app/{javascript => src}/app/designs/base/_ControllerItfc.js (100%) rename client-app/{javascript => src}/app/designs/base/_Layout.js (100%) rename client-app/{javascript => src}/app/designs/base/_LayoutItfc.js (100%) rename client-app/{javascript => src}/app/designs/base/_Main.js (100%) rename client-app/{javascript => src}/app/designs/base/_MainItfc.js (100%) rename client-app/{javascript => src}/app/designs/base/_ServiceOGC.js (100%) rename client-app/{javascript => src}/app/designs/chart/Controller.js (100%) rename client-app/{javascript => src}/app/designs/chart/layout/SideAndTopAndBottomContent.js (100%) rename client-app/{javascript => src}/app/designs/chart/layout/TopAndBottomContent.js (100%) rename client-app/{javascript => src}/app/designs/chart/layout/TopContent.js (100%) rename client-app/{javascript => src}/app/designs/chart/main/ChartsWithLegendAndToolbarsAndSlider.js (100%) rename client-app/{javascript => src}/app/designs/chart/main/ChartsWithToolbarsAndSlider.js (100%) rename client-app/{javascript => src}/app/designs/chart/main/MultiPieChartWithToolbar.js (100%) rename client-app/{javascript => src}/app/designs/chart/main/MultiWindRoseChartWithToolbar.js (100%) rename client-app/{javascript => src}/app/designs/chart/main/WindRoseChartWithToolbar.js (100%) rename client-app/{javascript => src}/app/designs/chart/main/_ChartsWithToolbarsAndSlider.js (100%) rename client-app/{javascript => src}/app/designs/chart/main/_ChartsWithToolbarsAndSliderItfc.js (100%) rename client-app/{javascript => src}/app/designs/chart/main/_ProcessDataDefinitionAndGetTimeSeries.js (100%) rename client-app/{javascript => src}/app/designs/details/Controller.js (100%) rename client-app/{javascript => src}/app/designs/details/Layout.js (100%) rename client-app/{javascript => src}/app/designs/details/_AddBasicTitle.js (100%) rename client-app/{javascript => src}/app/designs/details/_AddTitle.js (100%) rename client-app/{javascript => src}/app/designs/details/_ControllerItfc.js (100%) rename client-app/{javascript => src}/app/designs/details/main/ActivityLayerMap.js (100%) rename client-app/{javascript => src}/app/designs/details/main/ActivityMap.js (100%) rename client-app/{javascript => src}/app/designs/details/main/ActivityTrackingMap.js (100%) rename client-app/{javascript => src}/app/designs/details/main/Contact.js (100%) rename client-app/{javascript => src}/app/designs/details/main/Document.js (100%) rename client-app/{javascript => src}/app/designs/details/main/DocumentPDF.js (100%) rename client-app/{javascript => src}/app/designs/details/main/Organisation.js (100%) rename client-app/{javascript => src}/app/designs/details/main/Platform.js (100%) rename client-app/{javascript => src}/app/designs/details/main/Program.js (100%) rename client-app/{javascript => src}/app/designs/details/main/Project.js (100%) rename client-app/{javascript => src}/app/designs/details/main/ServiceOGC.js (100%) rename client-app/{javascript => src}/app/designs/details/main/Species.js (100%) rename client-app/{javascript => src}/app/designs/details/main/SpeciesLocation.js (100%) rename client-app/{javascript => src}/app/designs/details/main/Statistics.js (100%) rename client-app/{javascript => src}/app/designs/details/main/_ActivityBase.js (100%) rename client-app/{javascript => src}/app/designs/details/main/_DetailsBase.js (100%) rename client-app/{javascript => src}/app/designs/doubleList/Controller.js (100%) rename client-app/{javascript => src}/app/designs/doubleList/layout/Layout.js (100%) rename client-app/{javascript => src}/app/designs/doubleList/layout/TopLeftContentAndDoubleList.js (100%) rename client-app/{javascript => src}/app/designs/doubleList/main/textSearchAndDoubleList.js (100%) rename client-app/{javascript => src}/app/designs/dynamicDualContent/Controller.js (100%) rename client-app/{javascript => src}/app/designs/dynamicDualContent/layout/FacetsInLeftSecondaryContent.js (100%) rename client-app/{javascript => src}/app/designs/dynamicDualContent/layout/LeftSecondaryContent.js (100%) rename client-app/{javascript => src}/app/designs/dynamicDualContent/layout/TopSecondaryContent.js (100%) rename client-app/{javascript => src}/app/designs/dynamicDualContent/layout/_Layout.js (100%) rename client-app/{javascript => src}/app/designs/dynamicDualContent/main/FacetsWithDynamicRightContent.js (100%) rename client-app/{javascript => src}/app/designs/edition/Controller.js (100%) rename client-app/{javascript => src}/app/designs/edition/Layout.js (100%) rename client-app/{javascript => src}/app/designs/embeddedContent/Controller.js (100%) rename client-app/{javascript => src}/app/designs/embeddedContent/Layout.js (100%) rename client-app/{javascript => src}/app/designs/embeddedContentWithTopbar/Controller.js (100%) rename client-app/{javascript => src}/app/designs/embeddedContentWithTopbar/layout/TopAndCenterContent.js (100%) rename client-app/{javascript => src}/app/designs/embeddedContentWithTopbar/main/EmbeddedContentSelectionInTopbar.js (100%) rename client-app/{javascript => src}/app/designs/externalTextSearchList/Controller.js (100%) rename client-app/{javascript => src}/app/designs/externalTextSearchList/Layout.js (100%) rename client-app/{javascript => src}/app/designs/externalTextSearchList/main/PlaceNames.js (100%) rename client-app/{javascript => src}/app/designs/externalTextSearchList/main/Worms.js (100%) rename client-app/{javascript => src}/app/designs/formList/Controller.js (100%) rename client-app/{javascript => src}/app/designs/formList/_ControllerItfc.js (100%) rename client-app/{javascript => src}/app/designs/formList/layout/Layout.js (100%) rename client-app/{javascript => src}/app/designs/formList/layout/LayoutWithTopForm.js (100%) rename client-app/{javascript => src}/app/designs/formList/main/FormListByStep.js (100%) rename client-app/{javascript => src}/app/designs/formList/main/_RequestAndParseData.js (100%) rename client-app/{javascript => src}/app/designs/list/Controller.js (100%) rename client-app/{javascript => src}/app/designs/list/_AddFilter.js (100%) rename client-app/{javascript => src}/app/designs/list/layout/Layout.js (100%) rename client-app/{javascript => src}/app/designs/list/layout/ListWithTopContent.js (100%) rename client-app/{javascript => src}/app/designs/list/layout/NoTitle.js (100%) rename client-app/{javascript => src}/app/designs/mapWithSideContent/Controller.js (100%) rename client-app/{javascript => src}/app/designs/mapWithSideContent/layout/MapAndContent.js (100%) rename client-app/{javascript => src}/app/designs/mapWithSideContent/layout/MapAndContentAndTopbar.js (100%) rename client-app/{javascript => src}/app/designs/mapWithSideContent/main/FilterAndGeographic.js (100%) rename client-app/{javascript => src}/app/designs/mapWithSideContent/main/Geographic.js (100%) rename client-app/{javascript => src}/app/designs/mapWithSideContent/main/GeographicEditor.js (100%) rename client-app/{javascript => src}/app/designs/mapWithSideContent/main/Tracking.js (100%) rename client-app/{javascript => src}/app/designs/mapWithSideContent/main/_TrackingByFilter.js (100%) rename client-app/{javascript => src}/app/designs/mapWithSideContent/main/_TrackingWithList.js (100%) rename client-app/{javascript => src}/app/designs/mapWithSideContent/main/_TrackingWithListByFilter.js (100%) rename client-app/{javascript => src}/app/designs/textSearchFacetsList/Controller.js (100%) rename client-app/{javascript => src}/app/designs/textSearchFacetsList/Layout.js (100%) rename client-app/{javascript => src}/app/designs/textSearchFacetsList/_AddFilter.js (100%) rename client-app/{javascript => src}/app/designs/textSearchFacetsList/main/Activity.js (100%) rename client-app/{javascript => src}/app/designs/textSearchFacetsList/main/Administrative.js (100%) rename client-app/{javascript => src}/app/designs/textSearchFacetsList/main/Bibliography.js (100%) rename client-app/{javascript => src}/app/designs/textSearchFacetsList/main/Domain.js (100%) rename client-app/{javascript => src}/app/designs/textSearchFacetsList/main/Organisation.js (100%) rename client-app/{javascript => src}/app/designs/textSearchFacetsList/main/Platform.js (100%) rename client-app/{javascript => src}/app/designs/textSearchFacetsList/main/Program.js (100%) rename client-app/{javascript => src}/app/designs/textSearchFacetsList/main/Project.js (100%) rename client-app/{javascript => src}/app/designs/textSearchFacetsList/main/ServiceOGC.js (100%) rename client-app/{javascript => src}/app/designs/textSearchFacetsList/main/Species.js (100%) rename client-app/{javascript => src}/app/designs/textSearchFacetsList/main/Taxon.js (100%) rename client-app/{javascript => src}/app/designs/textSearchList/Controller.js (100%) rename client-app/{javascript => src}/app/designs/textSearchList/_AddFilter.js (100%) rename client-app/{javascript => src}/app/designs/textSearchList/layout/BasicAndButtonsTopZone.js (100%) rename client-app/{javascript => src}/app/designs/textSearchList/layout/BasicTopZone.js (100%) rename client-app/{javascript => src}/app/designs/textSearchList/main/Domain.js (100%) rename client-app/{javascript => src}/app/designs/textSearchList/main/Selection.js (100%) rename client-app/{javascript => src}/app/designs/textSearchList/main/ServiceOGC.js (100%) rename client-app/{javascript => src}/app/details/views/ActivityAreaMapBase.js (100%) rename client-app/{javascript => src}/app/details/views/ActivityCatalogDetailsView.js (100%) rename client-app/{javascript => src}/app/details/views/ActivityChart.js (100%) rename client-app/{javascript => src}/app/details/views/ActivityCitationMapBase.js (100%) rename client-app/{javascript => src}/app/details/views/ActivityDetailsView.js (100%) rename client-app/{javascript => src}/app/details/views/ActivityFixedTimeseriesChart.js (100%) rename client-app/{javascript => src}/app/details/views/ActivityFixedTimeseriesMap.js (100%) rename client-app/{javascript => src}/app/details/views/ActivityInfrastructureMapBase.js (100%) rename client-app/{javascript => src}/app/details/views/ActivityLayerMapBase.js (100%) rename client-app/{javascript => src}/app/details/views/BibliographyDetailsView.js (100%) rename client-app/{javascript => src}/app/details/views/ContactDetailsView.js (100%) rename client-app/{javascript => src}/app/details/views/DocumentDetailsView.js (100%) rename client-app/{javascript => src}/app/details/views/OrganisationCatalogDetailsView.js (100%) rename client-app/{javascript => src}/app/details/views/OrganisationDetailsView.js (100%) rename client-app/{javascript => src}/app/details/views/PlatformCatalogDetailsView.js (100%) rename client-app/{javascript => src}/app/details/views/PlatformDetailsView.js (100%) rename client-app/{javascript => src}/app/details/views/ProgramCatalogDetailsView.js (100%) rename client-app/{javascript => src}/app/details/views/ProgramDetailsView.js (100%) rename client-app/{javascript => src}/app/details/views/ProjectCatalogDetailsView.js (100%) rename client-app/{javascript => src}/app/details/views/ProjectDetailsView.js (100%) rename client-app/{javascript => src}/app/details/views/ServiceOGCCatalogDetailsView.js (100%) rename client-app/{javascript => src}/app/details/views/ServiceOGCDetailsView.js (100%) rename client-app/{javascript => src}/app/details/views/SpeciesCatalogDetailsView.js (100%) rename client-app/{javascript => src}/app/details/views/SpeciesDetailsView.js (100%) rename client-app/{javascript => src}/app/details/views/StatisticsDetailsView.js (100%) rename client-app/{javascript => src}/app/details/views/_ActivityTimeSeriesDataManagement.js (100%) rename client-app/{javascript => src}/app/edition/views/ActivityEditionView.js (100%) rename client-app/{javascript => src}/app/edition/views/AnimalEditionView.js (100%) rename client-app/{javascript => src}/app/edition/views/ConditionEditionView.js (100%) rename client-app/{javascript => src}/app/edition/views/ContactEditionView.js (100%) rename client-app/{javascript => src}/app/edition/views/DeviceEditionView.js (100%) rename client-app/{javascript => src}/app/edition/views/DocumentEditionView.js (100%) rename client-app/{javascript => src}/app/edition/views/LoadDataDocumentEditionView.js (100%) rename client-app/{javascript => src}/app/edition/views/LoadDataToActivityEditionView.js (100%) rename client-app/{javascript => src}/app/edition/views/MetricsDefinitionEditionView.js (100%) rename client-app/{javascript => src}/app/edition/views/MisIdentificationEditionView.js (100%) rename client-app/{javascript => src}/app/edition/views/OrganisationEditionView.js (100%) rename client-app/{javascript => src}/app/edition/views/ParameterEditionView.js (100%) rename client-app/{javascript => src}/app/edition/views/PermissionsEditionView.js (100%) rename client-app/{javascript => src}/app/edition/views/PlatformEditionView.js (100%) rename client-app/{javascript => src}/app/edition/views/ProgramEditionView.js (100%) rename client-app/{javascript => src}/app/edition/views/ProjectEditionView.js (100%) rename client-app/{javascript => src}/app/edition/views/ServiceOGCEditionView.js (100%) rename client-app/{javascript => src}/app/edition/views/SpeciesEditionView.js (100%) rename client-app/{javascript => src}/app/edition/views/UnitEditionView.js (100%) rename client-app/{javascript => src}/app/edition/views/dataLoader/AddDataFT.js (100%) rename client-app/{javascript => src}/app/edition/views/dataLoader/AddDataIF.js (100%) rename client-app/{javascript => src}/app/edition/views/dataLoader/AddDataOC.js (100%) rename client-app/{javascript => src}/app/edition/views/dataLoader/EditDataAR.js (100%) rename client-app/{javascript => src}/app/edition/views/dataLoader/LoadDataAR.js (100%) rename client-app/{javascript => src}/app/edition/views/dataLoader/LoadDataFT.js (100%) rename client-app/{javascript => src}/app/edition/views/dataLoader/LoadDataOC.js (100%) rename client-app/{javascript => src}/app/edition/views/dataLoader/LoadDataTR.js (100%) rename client-app/{javascript => src}/app/edition/views/dataLoader/_BaseDataToActivityEdition.js (100%) rename client-app/{javascript => src}/app/edition/views/dataLoader/_BaseDataToActivityEditionItfc.js (100%) rename client-app/{javascript => src}/app/edition/views/dataLoader/_BaseLoadDataToActivityEdition.js (100%) rename client-app/{javascript => src}/app/edition/views/dataLoader/_BaseLoadDataToActivityEditionItfc.js (100%) rename client-app/{javascript => src}/app/home/views/HomeView.js (100%) rename client-app/{javascript => src}/app/home/views/ProductWidget.js (100%) rename client-app/{javascript => src}/app/home/views/SearchBarWidget.js (100%) rename client-app/{javascript => src}/app/home/views/SearchFastFilterWidget.js (100%) rename client-app/{javascript => src}/app/home/views/SearchFilterWidget.js (100%) rename client-app/{javascript => src}/app/home/views/SearchResultsWidget.js (100%) rename client-app/{javascript => src}/app/home/views/SocialWidget.js (100%) rename client-app/{javascript => src}/app/home/views/StatsWidget.js (100%) rename client-app/{javascript => src}/app/home/views/_DashboardItem.js (100%) rename client-app/{javascript => src}/app/maintenance/domains/_HierarchicalDomain.js (100%) rename client-app/{javascript => src}/app/maintenance/domains/admin/views/AccessibilityView.js (100%) rename client-app/{javascript => src}/app/maintenance/domains/admin/views/ActivityFieldsView.js (100%) rename client-app/{javascript => src}/app/maintenance/domains/admin/views/ActivityTypesView.js (100%) rename client-app/{javascript => src}/app/maintenance/domains/admin/views/ContactRolesView.js (100%) rename client-app/{javascript => src}/app/maintenance/domains/admin/views/CountriesView.js (100%) rename client-app/{javascript => src}/app/maintenance/domains/admin/views/DeviceTypesView.js (100%) rename client-app/{javascript => src}/app/maintenance/domains/admin/views/DocumentTypesView.js (100%) rename client-app/{javascript => src}/app/maintenance/domains/admin/views/OrganisationRolesView.js (100%) rename client-app/{javascript => src}/app/maintenance/domains/admin/views/OrganisationTypesView.js (100%) rename client-app/{javascript => src}/app/maintenance/domains/admin/views/PlatformTypesView.js (100%) rename client-app/{javascript => src}/app/maintenance/domains/admin/views/ProjectGroupsView.js (100%) rename client-app/{javascript => src}/app/maintenance/domains/admin/views/ScopesView.js (100%) rename client-app/{javascript => src}/app/maintenance/domains/admin/views/templates/forms/ActivityTypesForm.html (100%) rename client-app/{javascript => src}/app/maintenance/domains/admin/views/templates/forms/CountriesForm.html (100%) rename client-app/{javascript => src}/app/maintenance/domains/geometry/views/AreaTypesView.js (100%) rename client-app/{javascript => src}/app/maintenance/domains/geometry/views/DestinyView.js (100%) rename client-app/{javascript => src}/app/maintenance/domains/geometry/views/EndingView.js (100%) rename client-app/{javascript => src}/app/maintenance/domains/geometry/views/InspireThemesView.js (100%) rename client-app/{javascript => src}/app/maintenance/domains/geometry/views/LineTypesView.js (100%) rename client-app/{javascript => src}/app/maintenance/domains/geometry/views/MeshTypesView.js (100%) rename client-app/{javascript => src}/app/maintenance/domains/geometry/views/RasterTypesView.js (100%) rename client-app/{javascript => src}/app/maintenance/domains/geometry/views/RecordingTypesView.js (100%) rename client-app/{javascript => src}/app/maintenance/domains/geometry/views/ShorelineTypesView.js (100%) rename client-app/{javascript => src}/app/maintenance/domains/geometry/views/ThematicTypeView.js (100%) rename client-app/{javascript => src}/app/maintenance/domains/geometry/views/ToponymTypesView.js (100%) rename client-app/{javascript => src}/app/maintenance/domains/geometry/views/templates/forms/InspireThemesForm.html (100%) rename client-app/{javascript => src}/app/maintenance/domains/geometry/views/templates/forms/LineTypesForm.html (100%) rename client-app/{javascript => src}/app/maintenance/domains/geometry/views/templates/forms/ThematicTypeForm.html (100%) rename client-app/{javascript => src}/app/maintenance/domains/observations/views/AttributeTypesView.js (100%) rename client-app/{javascript => src}/app/maintenance/domains/observations/views/CensingStatusView.js (100%) rename client-app/{javascript => src}/app/maintenance/domains/observations/views/ConfidenceView.js (100%) rename client-app/{javascript => src}/app/maintenance/domains/observations/views/EventGroupsView.js (100%) rename client-app/{javascript => src}/app/maintenance/domains/observations/views/InfrastructureTypeView.js (100%) rename client-app/{javascript => src}/app/maintenance/domains/observations/views/MetricGroupsView.js (100%) rename client-app/{javascript => src}/app/maintenance/domains/observations/views/MetricsDefinitionsView.js (100%) rename client-app/{javascript => src}/app/maintenance/domains/observations/views/ObjectTypesView.js (100%) rename client-app/{javascript => src}/app/maintenance/domains/observations/views/ObservationTypesView.js (100%) rename client-app/{javascript => src}/app/maintenance/domains/observations/views/ParameterTypesView.js (100%) rename client-app/{javascript => src}/app/maintenance/domains/observations/views/ParametersView.js (100%) rename client-app/{javascript => src}/app/maintenance/domains/observations/views/SampleTypesView.js (100%) rename client-app/{javascript => src}/app/maintenance/domains/observations/views/SeaConditionsView.js (100%) rename client-app/{javascript => src}/app/maintenance/domains/observations/views/UnitTypesView.js (100%) rename client-app/{javascript => src}/app/maintenance/domains/observations/views/UnitsView.js (100%) rename client-app/{javascript => src}/app/maintenance/domains/taxon/views/CanaryProtectionView.js (100%) rename client-app/{javascript => src}/app/maintenance/domains/taxon/views/EUProtectionView.js (100%) rename client-app/{javascript => src}/app/maintenance/domains/taxon/views/EcologyView.js (100%) rename client-app/{javascript => src}/app/maintenance/domains/taxon/views/EndemicityView.js (100%) rename client-app/{javascript => src}/app/maintenance/domains/taxon/views/InterestView.js (100%) rename client-app/{javascript => src}/app/maintenance/domains/taxon/views/LifeStagesView.js (100%) rename client-app/{javascript => src}/app/maintenance/domains/taxon/views/OriginView.js (100%) rename client-app/{javascript => src}/app/maintenance/domains/taxon/views/PermanenceView.js (100%) rename client-app/{javascript => src}/app/maintenance/domains/taxon/views/RankView.js (100%) rename client-app/{javascript => src}/app/maintenance/domains/taxon/views/SexView.js (100%) rename client-app/{javascript => src}/app/maintenance/domains/taxon/views/SpainProtectionView.js (100%) rename client-app/{javascript => src}/app/maintenance/domains/taxon/views/StatusView.js (100%) rename client-app/{javascript => src}/app/maintenance/domains/taxon/views/TrophicRegimeView.js (100%) rename client-app/{javascript => src}/app/maintenance/domains/templates/forms/DomainForm.html (100%) rename client-app/{javascript => src}/app/maintenance/domains/templates/forms/HierarchicalDomainForm.html (100%) rename client-app/{javascript => src}/app/maintenance/models/AccessModel.js (100%) rename client-app/{javascript => src}/app/maintenance/models/PermissionsModel.js (100%) rename client-app/{javascript => src}/app/maintenance/views/DomainView.js (100%) rename client-app/{javascript => src}/app/maintenance/views/PermissionsView.js (100%) rename client-app/{javascript => src}/app/maintenance/views/ServiceOGCView.js (100%) rename client-app/{javascript => src}/app/maintenance/views/templates/forms/AccessForm.html (100%) rename client-app/{javascript => src}/app/maintenance/views/templates/forms/CategoryLayerForm.html (100%) rename client-app/{javascript => src}/app/maintenance/views/templates/forms/DownloadsForm.html (100%) rename client-app/{javascript => src}/app/maintenance/views/templates/forms/PermissionsForm.html (100%) rename client-app/{javascript => src}/app/maintenance/views/templates/forms/ProtocolsForm.html (100%) rename client-app/{javascript => src}/app/maintenance/views/templates/forms/ServiceOGCForm.html (100%) rename client-app/{javascript => src}/app/maintenance/views/templates/forms/ServiceOGCLayerSearchForm.html (100%) rename client-app/{javascript => src}/app/nls/es/translation.js (100%) rename client-app/{javascript => src}/app/nls/translation.js (100%) rename client-app/{javascript => src}/app/products/views/OpenMapView.js (100%) rename client-app/{javascript => src}/app/products/views/ServiceOGCCatalogView.js (100%) rename client-app/{javascript => src}/app/redmicConfig.js (100%) rename client-app/{javascript => src}/app/user/models/FeedbackModel.js (100%) rename client-app/{javascript => src}/app/user/models/PasswordModel.js (100%) rename client-app/{javascript => src}/app/user/models/RegisterModel.js (100%) rename client-app/{javascript => src}/app/user/models/UserEmailModel.js (100%) rename client-app/{javascript => src}/app/user/models/UserImageModel.js (100%) rename client-app/{javascript => src}/app/user/models/UserNameModel.js (100%) rename client-app/{javascript => src}/app/user/models/UserSectorModel.js (100%) rename client-app/{javascript => src}/app/user/views/ConfirmResettingView.js (100%) rename client-app/{javascript => src}/app/user/views/FeedbackView.js (100%) rename client-app/{javascript => src}/app/user/views/InnerWhatIsRedmicView.js (100%) rename client-app/{javascript => src}/app/user/views/LoginView.js (100%) rename client-app/{javascript => src}/app/user/views/RegisterView.js (100%) rename client-app/{javascript => src}/app/user/views/ResettingView.js (100%) rename client-app/{javascript => src}/app/user/views/TermsAndConditionsView.js (100%) rename client-app/{javascript => src}/app/user/views/UserProfileView.js (100%) rename client-app/{javascript => src}/app/user/views/WhatIsRedmicView.js (100%) rename client-app/{javascript => src}/app/user/views/_ExternalUserBaseView.js (100%) rename client-app/{javascript => src}/app/user/views/templates/ConfirmResetting.html (100%) rename client-app/{javascript => src}/app/user/views/templates/ExternalUserBase.html (100%) rename client-app/{javascript => src}/app/user/views/templates/Feedback.html (100%) rename client-app/{javascript => src}/app/user/views/templates/Login.html (100%) rename client-app/{javascript => src}/app/user/views/templates/Register.html (100%) rename client-app/{javascript => src}/app/user/views/templates/Resetting.html (100%) rename client-app/{javascript => src}/app/user/views/templates/TermsAndConditions.html (100%) rename client-app/{javascript => src}/app/user/views/templates/WhatIsRedmic.html (100%) rename client-app/{javascript => src}/app/user/views/templates/forms/ChangePasswordForm.html (100%) rename client-app/{javascript => src}/app/user/views/templates/forms/FeedbackForm.html (100%) rename client-app/{javascript => src}/app/user/views/templates/forms/RegisterForm.html (100%) rename client-app/{javascript => src}/app/user/views/templates/forms/UserEmailForm.html (100%) rename client-app/{javascript => src}/app/user/views/templates/forms/UserImageForm.html (100%) rename client-app/{javascript => src}/app/user/views/templates/forms/UserNameForm.html (100%) rename client-app/{javascript => src}/app/user/views/templates/forms/UserSectorForm.html (100%) rename client-app/{javascript => src}/app/viewers/models/PointClusterCategorizeModel.js (100%) rename client-app/{javascript => src}/app/viewers/models/PointClusterModel.js (100%) rename client-app/{javascript => src}/app/viewers/views/BibliographyView.js (100%) rename client-app/{javascript => src}/app/viewers/views/ChartsView.js (100%) rename client-app/{javascript => src}/app/viewers/views/RealTimeDashboardView.js (100%) rename client-app/{javascript => src}/app/viewers/views/RealTimeView.js (100%) rename client-app/{javascript => src}/app/viewers/views/SpeciesDistributionView.js (100%) rename client-app/{javascript => src}/app/viewers/views/StacBrowserView.js (100%) rename client-app/{javascript => src}/app/viewers/views/TrackingView.js (100%) rename client-app/{javascript => src}/app/viewers/views/TrashCharts.js (100%) rename client-app/{javascript => src}/app/viewers/views/TrashCollectionView.js (100%) rename client-app/{javascript => src}/app/viewers/views/TrashDetails.js (100%) rename client-app/{javascript => src}/app/viewers/views/TrashInfo.js (100%) rename client-app/{javascript => src}/app/viewers/views/_ObjectCollectionSeriesSelectionManagement.js (100%) rename client-app/{javascript => src}/app/viewers/views/_SelectTimeInterval.js (100%) rename client-app/{javascript => src}/app/viewers/views/_TimeSeriesDataManagement.js (100%) rename client-app/{javascript => src}/app/viewers/views/_TimeSeriesSelectionManagement.js (100%) rename client-app/{javascript => src}/app/viewers/views/templates/forms/PointClusterCategorizeForm.html (100%) rename client-app/{javascript => src}/app/viewers/views/templates/forms/PointClusterForm.html (100%) rename client-app/{javascript => src}/app/viewers/views/templates/forms/SpeciesDistributionForm.html (100%) rename client-app/{javascript => src}/app/viewers/views/templates/forms/TrackingForm.html (100%) rename client-app/{javascript => src}/app/views/404.js (100%) rename client-app/{javascript => src}/app/views/ActivateAccount.js (100%) rename client-app/{javascript => src}/app/views/NoSupportBrowser.js (100%) rename client-app/{javascript => src}/app/views/UnderConstructionView.js (100%) rename client-app/{javascript => src}/app/views/nls/es/translation.js (100%) rename client-app/{javascript => src}/app/views/nls/translation.js (100%) rename client-app/{javascript => src}/app/views/templates/NoSupportBrowser.html (100%) rename client-app/{javascript => src}/dojoConfig.js (95%) rename client-app/{javascript => src}/dojoConfigBuild.js (100%) rename client-app/{javascript => src}/redmic/base/CheckBrowser.js (100%) rename client-app/{javascript => src}/redmic/base/Credentials.js (100%) rename client-app/{javascript => src}/redmic/base/GuestChecker.js (100%) rename client-app/{javascript => src}/redmic/base/Mediator.js (100%) rename client-app/{javascript => src}/redmic/base/RedmicLocalStorage.js (100%) rename client-app/{javascript => src}/redmic/base/tv4.js (100%) rename client-app/{javascript => src}/redmic/dialog/LockDialogImpl.js (100%) rename client-app/{javascript => src}/redmic/dialog/_DialogComplexItfc.js (100%) rename client-app/{javascript => src}/redmic/form/FormContainer.js (100%) rename client-app/{javascript => src}/redmic/form/Select.js (100%) rename client-app/{javascript => src}/redmic/form/UploadInput.js (100%) rename client-app/{javascript => src}/redmic/form/nls/UploadInput.js (100%) rename client-app/{javascript => src}/redmic/form/nls/es/UploadInput.js (100%) rename client-app/{javascript => src}/redmic/form/templates/Select.html (100%) rename client-app/{javascript => src}/redmic/form/templates/UploadInput.html (100%) rename client-app/{javascript => src}/redmic/layout/DialogComplex.js (100%) rename client-app/{javascript => src}/redmic/layout/DialogSimple.js (100%) rename client-app/{javascript => src}/redmic/layout/_DialogBase.js (100%) rename client-app/{javascript => src}/redmic/modules/app/App.js (100%) rename client-app/{javascript => src}/redmic/modules/app/ModuleStore.js (100%) rename client-app/{javascript => src}/redmic/modules/app/Router.js (100%) rename client-app/{javascript => src}/redmic/modules/app/_app.js (100%) rename client-app/{javascript => src}/redmic/modules/app/_appItfc.js (100%) rename client-app/{javascript => src}/redmic/modules/app/innerApp.js (100%) rename client-app/{javascript => src}/redmic/modules/app/outerApp.js (100%) rename client-app/{javascript => src}/redmic/modules/atlas/Atlas.js (100%) rename client-app/{javascript => src}/redmic/modules/atlas/_AtlasLayersManagement.js (100%) rename client-app/{javascript => src}/redmic/modules/atlas/_AtlasLegendManagement.js (100%) rename client-app/{javascript => src}/redmic/modules/base/Analytics.js (100%) rename client-app/{javascript => src}/redmic/modules/base/Credentials.js (100%) rename client-app/{javascript => src}/redmic/modules/base/Loading.js (100%) rename client-app/{javascript => src}/redmic/modules/base/Manager.js (100%) rename client-app/{javascript => src}/redmic/modules/base/_AuthFirewall.js (100%) rename client-app/{javascript => src}/redmic/modules/base/_ChkCollection.js (100%) rename client-app/{javascript => src}/redmic/modules/base/_CommunicationCenter.js (100%) rename client-app/{javascript => src}/redmic/modules/base/_ExternalConfig.js (100%) rename client-app/{javascript => src}/redmic/modules/base/_Filter.js (100%) rename client-app/{javascript => src}/redmic/modules/base/_FilterItfc.js (100%) rename client-app/{javascript => src}/redmic/modules/base/_Itfc.js (100%) rename client-app/{javascript => src}/redmic/modules/base/_ListenQueryParams.js (100%) rename client-app/{javascript => src}/redmic/modules/base/_ListenQueryParamsItfc.js (100%) rename client-app/{javascript => src}/redmic/modules/base/_ListenWindowResize.js (100%) rename client-app/{javascript => src}/redmic/modules/base/_ManageClickEvent.js (100%) rename client-app/{javascript => src}/redmic/modules/base/_Module.js (100%) rename client-app/{javascript => src}/redmic/modules/base/_ModuleItfc.js (100%) rename client-app/{javascript => src}/redmic/modules/base/_Persistence.js (100%) rename client-app/{javascript => src}/redmic/modules/base/_PersistenceItfc.js (100%) rename client-app/{javascript => src}/redmic/modules/base/_Selection.js (100%) rename client-app/{javascript => src}/redmic/modules/base/_SelectionBase.js (100%) rename client-app/{javascript => src}/redmic/modules/base/_SelectionItfc.js (100%) rename client-app/{javascript => src}/redmic/modules/base/_Show.js (100%) rename client-app/{javascript => src}/redmic/modules/base/_ShowInPopup.js (100%) rename client-app/{javascript => src}/redmic/modules/base/_ShowInTooltip.js (100%) rename client-app/{javascript => src}/redmic/modules/base/_ShowItfc.js (100%) rename client-app/{javascript => src}/redmic/modules/base/_ShowOnEvt.js (100%) rename client-app/{javascript => src}/redmic/modules/base/_Store.js (100%) rename client-app/{javascript => src}/redmic/modules/base/_StoreItfc.js (100%) rename client-app/{javascript => src}/redmic/modules/base/_Window.js (100%) rename client-app/{javascript => src}/redmic/modules/browser/Browser.js (100%) rename client-app/{javascript => src}/redmic/modules/browser/HierarchicalImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/browser/ListImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/browser/_BrowserItfc.js (100%) rename client-app/{javascript => src}/redmic/modules/browser/_ButtonsInRow.js (100%) rename client-app/{javascript => src}/redmic/modules/browser/_DataTypeParser.js (100%) rename client-app/{javascript => src}/redmic/modules/browser/_DragAndDrop.js (100%) rename client-app/{javascript => src}/redmic/modules/browser/_EditionTable.js (100%) rename client-app/{javascript => src}/redmic/modules/browser/_Framework.js (100%) rename client-app/{javascript => src}/redmic/modules/browser/_GeoJsonParser.js (100%) rename client-app/{javascript => src}/redmic/modules/browser/_HierarchicalDragAndDrop.js (100%) rename client-app/{javascript => src}/redmic/modules/browser/_HierarchicalLazyLoad.js (100%) rename client-app/{javascript => src}/redmic/modules/browser/_HierarchicalSelect.js (100%) rename client-app/{javascript => src}/redmic/modules/browser/_HierarchicalTable.js (100%) rename client-app/{javascript => src}/redmic/modules/browser/_MultiTemplate.js (100%) rename client-app/{javascript => src}/redmic/modules/browser/_NoDataTemplate.js (100%) rename client-app/{javascript => src}/redmic/modules/browser/_Select.js (100%) rename client-app/{javascript => src}/redmic/modules/browser/_Table.js (100%) rename client-app/{javascript => src}/redmic/modules/browser/bars/Order.js (100%) rename client-app/{javascript => src}/redmic/modules/browser/bars/Pagination.js (100%) rename client-app/{javascript => src}/redmic/modules/browser/bars/SelectionBox.js (100%) rename client-app/{javascript => src}/redmic/modules/browser/bars/Total.js (100%) rename client-app/{javascript => src}/redmic/modules/browser/bars/_SelectBox.js (100%) rename client-app/{javascript => src}/redmic/modules/browser/buttons/Buttons.js (100%) rename client-app/{javascript => src}/redmic/modules/browser/buttons/_ButtonsItfc.js (100%) rename client-app/{javascript => src}/redmic/modules/browser/buttons/_GroupButtons.js (100%) rename client-app/{javascript => src}/redmic/modules/browser/row/Row.js (100%) rename client-app/{javascript => src}/redmic/modules/browser/row/_Buttons.js (100%) rename client-app/{javascript => src}/redmic/modules/browser/row/_Hierarchical.js (100%) rename client-app/{javascript => src}/redmic/modules/browser/row/_HierarchicalSelect.js (100%) rename client-app/{javascript => src}/redmic/modules/browser/row/_HierarchicalTable.js (100%) rename client-app/{javascript => src}/redmic/modules/browser/row/_RowItfc.js (100%) rename client-app/{javascript => src}/redmic/modules/browser/row/_Select.js (100%) rename client-app/{javascript => src}/redmic/modules/browser/row/_Table.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/ChartsContainer/ChartsContainer.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/ChartsContainer/InfoChartsContainerImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/ChartsContainer/SliderChartsContainerImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/ChartsContainer/_AngularAxisDrawing.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/ChartsContainer/_AngularAxisWithGridDrawing.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/ChartsContainer/_AxesDrawing.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/ChartsContainer/_AxesDrawingItfc.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/ChartsContainer/_BreadcrumbsBar.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/ChartsContainer/_ChartsContainerItfc.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/ChartsContainer/_ColorSelection.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/ChartsContainer/_ColorSelectionItfc.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/ChartsContainer/_DomainHistoryNavigation.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/ChartsContainer/_GroupedLegendBar.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/ChartsContainer/_InfoOnEmptyData.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/ChartsContainer/_InfoOnLayerEvent.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/ChartsContainer/_InfoOnLayerEventItfc.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/ChartsContainer/_InfoOnMouseOver.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/ChartsContainer/_InfoOnZeroValueData.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/ChartsContainer/_InfoTooltipManagement.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/ChartsContainer/_LayerColorSelection.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/ChartsContainer/_LegendBar.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/ChartsContainer/_LegendBarCommons.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/ChartsContainer/_LegendBarCommonsItfc.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/ChartsContainer/_RadialAxisDrawing.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/ChartsContainer/_RadialAxisWithGridDrawing.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/ChartsContainer/_SummaryBox.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/ChartsContainer/_TemporalAxisDrawing.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/ChartsContainer/_TemporalAxisWithGridDrawing.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/ChartsContainer/_VerticalAxesDrawing.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/ChartsContainer/_VerticalAxesWithGridDrawing.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/ChartsContainer/_ZoomByDragging.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/SmartLegend/SmartLegend.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/SmartLegend/TimeSeriesSmartLegendImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/SmartLegend/_SmartLegendItfc.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/Toolbar/AggregationToolImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/Toolbar/DataSelectorImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/Toolbar/DateFilterImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/Toolbar/GridManagementImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/Toolbar/SliderSelectorImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/Toolbar/Toolbar.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/Toolbar/_ToolbarItfc.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/layer/Axis/AngularAxisImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/layer/Axis/AngularGridAxisImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/layer/Axis/Axis.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/layer/Axis/HorizontalGridAxisImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/layer/Axis/RadialAxisImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/layer/Axis/RadialGridAxisImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/layer/Axis/TemporalAxisImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/layer/Axis/VerticalAxisImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/layer/Axis/VerticalGridAxisImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/layer/Axis/_AxisItfc.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/layer/Axis/_HorizontalCommons.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/layer/Axis/_VerticalCommons.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/layer/Axis/_VerticalCommonsItfc.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/layer/ChartLayer/ChartLayer.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/layer/ChartLayer/LinearChartImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/layer/ChartLayer/MultiPieChartImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/layer/ChartLayer/PieChartImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/layer/ChartLayer/WindRoseChartImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/layer/ChartLayer/_CategoryLayerCommons.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/layer/ChartLayer/_CategoryLayerCommonsItfc.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/layer/ChartLayer/_ChartHoleManagement.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/layer/ChartLayer/_ChartLayerItfc.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/layer/ChartLayer/_CircularLayerCommons.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/layer/ChartLayer/_CircularLayerCommonsItfc.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/layer/ChartLayer/_ColorHierarchyGeneration.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/layer/ChartLayer/_LevelNavigation.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/layer/ChartLayer/_MultipleWindRose.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/layer/ChartLayer/_ObtainableValue.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/layer/ChartLayer/_ObtainableValueItfc.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/layer/ChartLayer/_PieCommons.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/layer/ChartLayer/_PutButtonInHole.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/layer/ChartLayer/_PutButtonInHoleItfc.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/layer/ChartLayer/_QueryableValue.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/layer/ChartLayer/_ShowInfoInHole.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/layer/ChartLayer/_SimplePieCommons.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/layer/ChartLayer/_SimpleWindRose.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/layer/ChartLayer/_VariableRadiusByDepth.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/layer/_LayerCommons.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/layer/_LayerCommonsItfc.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/layer/_PolarLayerCommons.js (100%) rename client-app/{javascript => src}/redmic/modules/chart/layer/_PolarLayerCommonsItfc.js (100%) rename client-app/{javascript => src}/redmic/modules/components/ExternalConfig.js (100%) rename client-app/{javascript => src}/redmic/modules/components/Keypad/IconKeypadImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/components/Keypad/Keypad.js (100%) rename client-app/{javascript => src}/redmic/modules/components/Keypad/TrizoneKeypadImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/components/Keypad/_KeypadItfc.js (100%) rename client-app/{javascript => src}/redmic/modules/components/PDFViewer/PDFViewer.js (100%) rename client-app/{javascript => src}/redmic/modules/components/ProgressSlider/ProgressSlider.js (100%) rename client-app/{javascript => src}/redmic/modules/components/ProgressSlider/StepAndRateEditor.js (100%) rename client-app/{javascript => src}/redmic/modules/components/Sidebar/MainSidebarImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/components/Sidebar/Sidebar.js (100%) rename client-app/{javascript => src}/redmic/modules/components/Sidebar/_Secondary.js (100%) rename client-app/{javascript => src}/redmic/modules/components/Topbar.js (100%) rename client-app/{javascript => src}/redmic/modules/filter/Filter.js (100%) rename client-app/{javascript => src}/redmic/modules/form/Form.js (100%) rename client-app/{javascript => src}/redmic/modules/form/FormContainerImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/form/_BaseCreateKeypad.js (100%) rename client-app/{javascript => src}/redmic/modules/form/_CreateInternalKeypad.js (100%) rename client-app/{javascript => src}/redmic/modules/form/_CreateKeypad.js (100%) rename client-app/{javascript => src}/redmic/modules/form/_FormItfc.js (100%) rename client-app/{javascript => src}/redmic/modules/form/_ListenModelHasChanged.js (100%) rename client-app/{javascript => src}/redmic/modules/form/_PublicateChanges.js (100%) rename client-app/{javascript => src}/redmic/modules/form/_ShowInDialog.js (100%) rename client-app/{javascript => src}/redmic/modules/form/_ShowInTableList.js (100%) rename client-app/{javascript => src}/redmic/modules/form/input/AnnotationImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/form/input/ButtonImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/form/input/CheckBoxGroupImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/form/input/CheckBoxImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/form/input/ColorImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/form/input/ColorPickerImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/form/input/ColorPickerTextBoxImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/form/input/ColorsRampImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/form/input/DateRangeComplexImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/form/input/DateRangeImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/form/input/DateRangeTextBoxImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/form/input/DateTextBoxImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/form/input/DateTimeImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/form/input/DateTimeTextBoxImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/form/input/FilteringSelectImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/form/input/GeographicCoordinatesComponentImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/form/input/GeometryImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/form/input/Input.js (100%) rename client-app/{javascript => src}/redmic/modules/form/input/KeywordsImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/form/input/MapSearchImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/form/input/MultiSelectImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/form/input/NumberSpinnerImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/form/input/NumberTextBoxImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/form/input/PointImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/form/input/RadioButtonGroupImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/form/input/RadioButtonImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/form/input/RangeImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/form/input/RangeSliderImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/form/input/SelectImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/form/input/SelectOnListPopupImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/form/input/SliderImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/form/input/TextAreaImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/form/input/TextBoxImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/form/input/UploadFileImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/form/input/ValueAndUnitSelectorImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/form/input/_BaseDateTime.js (100%) rename client-app/{javascript => src}/redmic/modules/form/input/_BaseMultiSelectImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/form/input/_BaseRange.js (100%) rename client-app/{javascript => src}/redmic/modules/form/input/_BaseTextBoxWidthExpandTooltipImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/form/input/_BaseWidthExpandTooltipImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/form/input/_DeleteOnClear.js (100%) rename client-app/{javascript => src}/redmic/modules/form/input/_Dependence.js (100%) rename client-app/{javascript => src}/redmic/modules/form/input/_DisableInput.js (100%) rename client-app/{javascript => src}/redmic/modules/form/input/_IgnoreNonexistentProperty.js (100%) rename client-app/{javascript => src}/redmic/modules/form/input/_InputItfc.js (100%) rename client-app/{javascript => src}/redmic/modules/form/input/_NodesCreation.js (100%) rename client-app/{javascript => src}/redmic/modules/form/input/_SelectOnPopupImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/gateway/AddItemGatewayImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/gateway/Gateway.js (100%) rename client-app/{javascript => src}/redmic/modules/gateway/LocalSelectorGatewayImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/gateway/MapCenteringGatewayImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/gateway/_GatewayItfc.js (100%) rename client-app/{javascript => src}/redmic/modules/layout/TabsDisplayer.js (100%) rename client-app/{javascript => src}/redmic/modules/layout/dataDisplayer/DataDisplayer.js (100%) rename client-app/{javascript => src}/redmic/modules/layout/genericDisplayer/GenericDisplayer.js (100%) rename client-app/{javascript => src}/redmic/modules/layout/genericDisplayer/GenericWithTopbarDisplayerImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/layout/listMenu/ListMenu.js (100%) rename client-app/{javascript => src}/redmic/modules/layout/nestedContent/NestedBrowsersImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/layout/nestedContent/NestedContent.js (100%) rename client-app/{javascript => src}/redmic/modules/layout/templateDisplayer/TemplateDisplayer.js (100%) rename client-app/{javascript => src}/redmic/modules/layout/wizard/Wizard.js (100%) rename client-app/{javascript => src}/redmic/modules/layout/wizard/_CompleteBySelection.js (100%) rename client-app/{javascript => src}/redmic/modules/layout/wizard/_StepBreadcrumbs.js (100%) rename client-app/{javascript => src}/redmic/modules/layout/wizard/_StepNavigation.js (100%) rename client-app/{javascript => src}/redmic/modules/layout/wizard/_WizardStep.js (100%) rename client-app/{javascript => src}/redmic/modules/layout/wizard/_WizardStepItfc.js (100%) rename client-app/{javascript => src}/redmic/modules/map/LeafletImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/map/Map.js (100%) rename client-app/{javascript => src}/redmic/modules/map/MapButton.js (100%) rename client-app/{javascript => src}/redmic/modules/map/StaticLayersDefinition.js (100%) rename client-app/{javascript => src}/redmic/modules/map/_ImportWkt.js (100%) rename client-app/{javascript => src}/redmic/modules/map/_LeafletDraw.js (100%) rename client-app/{javascript => src}/redmic/modules/map/_LeafletImplItfc.js (100%) rename client-app/{javascript => src}/redmic/modules/map/_LeafletWidgetsManagement.js (100%) rename client-app/{javascript => src}/redmic/modules/map/_ListenContainers.js (100%) rename client-app/{javascript => src}/redmic/modules/map/_MapItfc.js (100%) rename client-app/{javascript => src}/redmic/modules/map/_OverlayLayersManagement.js (100%) rename client-app/{javascript => src}/redmic/modules/map/_PlaceNamesButton.js (100%) rename client-app/{javascript => src}/redmic/modules/map/_StaticLayersManagement.js (100%) rename client-app/{javascript => src}/redmic/modules/map/layer/DrawingLayerImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/map/layer/GeoJsonLayerImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/map/layer/GridLayerImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/map/layer/MapLayer.js (100%) rename client-app/{javascript => src}/redmic/modules/map/layer/PruneClusterLayerImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/map/layer/TrackingLayerImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/map/layer/TrackingLine.js (100%) rename client-app/{javascript => src}/redmic/modules/map/layer/WmsLayerImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/map/layer/_AddFilter.js (100%) rename client-app/{javascript => src}/redmic/modules/map/layer/_AnimateMarker.js (100%) rename client-app/{javascript => src}/redmic/modules/map/layer/_D3Expansion.js (100%) rename client-app/{javascript => src}/redmic/modules/map/layer/_Editable.js (100%) rename client-app/{javascript => src}/redmic/modules/map/layer/_GeoJsonLayerItfc.js (100%) rename client-app/{javascript => src}/redmic/modules/map/layer/_Highlightable.js (100%) rename client-app/{javascript => src}/redmic/modules/map/layer/_LayerProtocols.js (100%) rename client-app/{javascript => src}/redmic/modules/map/layer/_ListenBounds.js (100%) rename client-app/{javascript => src}/redmic/modules/map/layer/_ListenZoom.js (100%) rename client-app/{javascript => src}/redmic/modules/map/layer/_MapLayerItfc.js (100%) rename client-app/{javascript => src}/redmic/modules/map/layer/_PruneClusterLayerItfc.js (100%) rename client-app/{javascript => src}/redmic/modules/map/layer/_PublishInfo.js (100%) rename client-app/{javascript => src}/redmic/modules/map/layer/_PublishInfoItfc.js (100%) rename client-app/{javascript => src}/redmic/modules/map/layer/_RadiusCommons.js (100%) rename client-app/{javascript => src}/redmic/modules/map/layer/_RadiusOnClick.js (100%) rename client-app/{javascript => src}/redmic/modules/map/layer/_RadiusOnSelect.js (100%) rename client-app/{javascript => src}/redmic/modules/map/layer/_SelectOnClick.js (100%) rename client-app/{javascript => src}/redmic/modules/map/layer/_Selectable.js (100%) rename client-app/{javascript => src}/redmic/modules/map/layer/_SelectableItfc.js (100%) rename client-app/{javascript => src}/redmic/modules/map/layer/_TrackingDataManagement.js (100%) rename client-app/{javascript => src}/redmic/modules/map/layer/_TrackingMarkersManagement.js (100%) rename client-app/{javascript => src}/redmic/modules/mapQuery/QueryOnMap.js (100%) rename client-app/{javascript => src}/redmic/modules/mapQuery/_ContentManagement.js (100%) rename client-app/{javascript => src}/redmic/modules/mapQuery/_ResultsBrowser.js (100%) rename client-app/{javascript => src}/redmic/modules/metaTags/MetaTags.js (100%) rename client-app/{javascript => src}/redmic/modules/metaTags/metaTagsContent.js (100%) rename client-app/{javascript => src}/redmic/modules/model/Model.js (100%) rename client-app/{javascript => src}/redmic/modules/model/ModelImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/model/_ModelItfc.js (100%) rename client-app/{javascript => src}/redmic/modules/notification/Alert.js (100%) rename client-app/{javascript => src}/redmic/modules/notification/CommunicationCenter.js (100%) rename client-app/{javascript => src}/redmic/modules/notification/Notification.js (100%) rename client-app/{javascript => src}/redmic/modules/notification/NotificationSidebar.js (100%) rename client-app/{javascript => src}/redmic/modules/notification/TaskNotification.js (100%) rename client-app/{javascript => src}/redmic/modules/search/CompositeImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/search/DateRangeImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/search/FacetsImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/search/GeographicImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/search/MultiSelectImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/search/RangeImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/search/Search.js (100%) rename client-app/{javascript => src}/redmic/modules/search/TextImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/search/_HideFormByAction.js (100%) rename client-app/{javascript => src}/redmic/modules/search/_SearchItfc.js (100%) rename client-app/{javascript => src}/redmic/modules/selection/SelectionBox.js (100%) rename client-app/{javascript => src}/redmic/modules/selection/SelectionManager.js (100%) rename client-app/{javascript => src}/redmic/modules/selection/Selector.js (100%) rename client-app/{javascript => src}/redmic/modules/selection/_SelectorItfc.js (100%) rename client-app/{javascript => src}/redmic/modules/selection/_SelectorPersistence.js (100%) rename client-app/{javascript => src}/redmic/modules/socket/Socket.js (100%) rename client-app/{javascript => src}/redmic/modules/socket/Task.js (100%) rename client-app/{javascript => src}/redmic/modules/socket/_IngestData.js (100%) rename client-app/{javascript => src}/redmic/modules/socket/_Report.js (100%) rename client-app/{javascript => src}/redmic/modules/socket/_Worms.js (100%) rename client-app/{javascript => src}/redmic/modules/store/RequestJoiner/AtlasDataImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/store/RequestJoiner/RequestJoiner.js (100%) rename client-app/{javascript => src}/redmic/modules/store/RequestJoiner/_RequestJoinerItfc.js (100%) rename client-app/{javascript => src}/redmic/modules/store/RestManager.js (100%) rename client-app/{javascript => src}/redmic/modules/store/RestManagerImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/store/_RestManagerItfc.js (100%) rename client-app/{javascript => src}/redmic/modules/tree/CbtreeImpl.js (100%) rename client-app/{javascript => src}/redmic/modules/tree/Tree.js (100%) rename client-app/{javascript => src}/redmic/modules/tree/_HierarchicalFilter.js (100%) rename client-app/{javascript => src}/redmic/modules/tree/_LazyLoad.js (100%) rename client-app/{javascript => src}/redmic/modules/tree/_LeafSelection.js (100%) rename client-app/{javascript => src}/redmic/modules/tree/_SelectionBox.js (100%) rename client-app/{javascript => src}/redmic/modules/tree/_TreeItfc.js (100%) rename client-app/{javascript => src}/redmic/modules/user/FullscreenToggle.js (100%) rename client-app/{javascript => src}/redmic/modules/user/LanguageSelector.js (100%) rename client-app/{javascript => src}/redmic/modules/user/UserArea.js (100%) rename client-app/{javascript => src}/redmic/validation/stringFormats.js (100%) rename client-app/{javascript => src}/redmic/view/effects/Animation.js (100%) rename client-app/{javascript => src}/redmic/widgets/Button.js (100%) rename client-app/{javascript => src}/redmic/widgets/ComboButton.js (100%) rename client-app/{javascript => src}/redmic/widgets/Converter.js (100%) rename client-app/{javascript => src}/redmic/widgets/DatePicker.js (100%) rename client-app/{javascript => src}/redmic/widgets/Facet.js (100%) rename client-app/{javascript => src}/redmic/widgets/FilteringSelect.js (100%) rename client-app/{javascript => src}/redmic/widgets/KeywordsInput.js (100%) rename client-app/{javascript => src}/redmic/widgets/Map.js (100%) rename client-app/{javascript => src}/redmic/widgets/ProgressSlider.js (100%) rename client-app/{javascript => src}/redmic/widgets/README.md (100%) rename client-app/{javascript => src}/redmic/widgets/RangeSlider.js (100%) rename client-app/{javascript => src}/redmic/widgets/RedmicUtilities.js (100%) rename client-app/{javascript => src}/redmic/widgets/Slider.js (100%) rename client-app/{javascript => src}/redmic/widgets/Switch.js (100%) rename client-app/{javascript => src}/redmic/widgets/TemplateWidget.js (100%) rename client-app/{javascript => src}/redmic/widgets/TextSearch.js (100%) rename client-app/{javascript => src}/redmic/widgets/TimeSelect.js (100%) rename client-app/{javascript => src}/redmic/widgets/ToggleButton.js (100%) rename client-app/{javascript => src}/redmic/widgets/Utilities.js (100%) rename client-app/{javascript => src}/redmic/widgets/ValueAndUnitSelector.js (100%) rename client-app/{javascript => src}/redmic/widgets/extensions/_ShowValue.js (100%) rename client-app/{javascript => src}/src/view/detail/_WidgetDefinition.js (100%) rename client-app/{javascript => src}/src/view/detail/activity/ActivityDetail.js (100%) rename client-app/{javascript => src}/src/view/detail/activity/_ActivityLayoutWidget.js (100%) diff --git a/client-app/javascript/alertify b/client-app/deps/alertify similarity index 100% rename from client-app/javascript/alertify rename to client-app/deps/alertify diff --git a/client-app/javascript/cbtree b/client-app/deps/cbtree similarity index 100% rename from client-app/javascript/cbtree rename to client-app/deps/cbtree diff --git a/client-app/javascript/color-js b/client-app/deps/color-js similarity index 100% rename from client-app/javascript/color-js rename to client-app/deps/color-js diff --git a/client-app/javascript/d3 b/client-app/deps/d3 similarity index 100% rename from client-app/javascript/d3 rename to client-app/deps/d3 diff --git a/client-app/javascript/d3-v6-tip b/client-app/deps/d3-v6-tip similarity index 100% rename from client-app/javascript/d3-v6-tip rename to client-app/deps/d3-v6-tip diff --git a/client-app/javascript/deepmerge b/client-app/deps/deepmerge similarity index 100% rename from client-app/javascript/deepmerge rename to client-app/deps/deepmerge diff --git a/client-app/javascript/dijit b/client-app/deps/dijit similarity index 100% rename from client-app/javascript/dijit rename to client-app/deps/dijit diff --git a/client-app/javascript/dojo b/client-app/deps/dojo similarity index 100% rename from client-app/javascript/dojo rename to client-app/deps/dojo diff --git a/client-app/javascript/dojox b/client-app/deps/dojox similarity index 100% rename from client-app/javascript/dojox rename to client-app/deps/dojox diff --git a/client-app/javascript/draggabilly b/client-app/deps/draggabilly similarity index 100% rename from client-app/javascript/draggabilly rename to client-app/deps/draggabilly diff --git a/client-app/javascript/dropzone b/client-app/deps/dropzone similarity index 100% rename from client-app/javascript/dropzone rename to client-app/deps/dropzone diff --git a/client-app/javascript/handlebars b/client-app/deps/handlebars similarity index 100% rename from client-app/javascript/handlebars rename to client-app/deps/handlebars diff --git a/client-app/javascript/json-schema-ref-parser b/client-app/deps/json-schema-ref-parser similarity index 100% rename from client-app/javascript/json-schema-ref-parser rename to client-app/deps/json-schema-ref-parser diff --git a/client-app/javascript/leaflet b/client-app/deps/leaflet similarity index 100% rename from client-app/javascript/leaflet rename to client-app/deps/leaflet diff --git a/client-app/javascript/leaflet-areaselect b/client-app/deps/leaflet-areaselect similarity index 100% rename from client-app/javascript/leaflet-areaselect rename to client-app/deps/leaflet-areaselect diff --git a/client-app/javascript/leaflet-awesome-markers b/client-app/deps/leaflet-awesome-markers similarity index 100% rename from client-app/javascript/leaflet-awesome-markers rename to client-app/deps/leaflet-awesome-markers diff --git a/client-app/javascript/leaflet-coordinates b/client-app/deps/leaflet-coordinates similarity index 100% rename from client-app/javascript/leaflet-coordinates rename to client-app/deps/leaflet-coordinates diff --git a/client-app/javascript/leaflet-draw b/client-app/deps/leaflet-draw similarity index 100% rename from client-app/javascript/leaflet-draw rename to client-app/deps/leaflet-draw diff --git a/client-app/javascript/leaflet-measure b/client-app/deps/leaflet-measure similarity index 100% rename from client-app/javascript/leaflet-measure rename to client-app/deps/leaflet-measure diff --git a/client-app/javascript/leaflet-minimap b/client-app/deps/leaflet-minimap similarity index 100% rename from client-app/javascript/leaflet-minimap rename to client-app/deps/leaflet-minimap diff --git a/client-app/javascript/leaflet-navbar b/client-app/deps/leaflet-navbar similarity index 100% rename from client-app/javascript/leaflet-navbar rename to client-app/deps/leaflet-navbar diff --git a/client-app/javascript/leaflet-nontiledlayer b/client-app/deps/leaflet-nontiledlayer similarity index 100% rename from client-app/javascript/leaflet-nontiledlayer rename to client-app/deps/leaflet-nontiledlayer diff --git a/client-app/javascript/mediatorjs b/client-app/deps/mediatorjs similarity index 100% rename from client-app/javascript/mediatorjs rename to client-app/deps/mediatorjs diff --git a/client-app/javascript/moment b/client-app/deps/moment similarity index 100% rename from client-app/javascript/moment rename to client-app/deps/moment diff --git a/client-app/javascript/packery b/client-app/deps/packery similarity index 100% rename from client-app/javascript/packery rename to client-app/deps/packery diff --git a/client-app/javascript/pdfjs b/client-app/deps/pdfjs similarity index 100% rename from client-app/javascript/pdfjs rename to client-app/deps/pdfjs diff --git a/client-app/javascript/proj4 b/client-app/deps/proj4 similarity index 100% rename from client-app/javascript/proj4 rename to client-app/deps/proj4 diff --git a/client-app/javascript/pruneCluster b/client-app/deps/pruneCluster similarity index 100% rename from client-app/javascript/pruneCluster rename to client-app/deps/pruneCluster diff --git a/client-app/javascript/put-selector b/client-app/deps/put-selector similarity index 100% rename from client-app/javascript/put-selector rename to client-app/deps/put-selector diff --git a/client-app/javascript/sockjs b/client-app/deps/sockjs similarity index 100% rename from client-app/javascript/sockjs rename to client-app/deps/sockjs diff --git a/client-app/javascript/stomp-websocket b/client-app/deps/stomp-websocket similarity index 100% rename from client-app/javascript/stomp-websocket rename to client-app/deps/stomp-websocket diff --git a/client-app/javascript/templates b/client-app/deps/templates similarity index 100% rename from client-app/javascript/templates rename to client-app/deps/templates diff --git a/client-app/javascript/tv4 b/client-app/deps/tv4 similarity index 100% rename from client-app/javascript/tv4 rename to client-app/deps/tv4 diff --git a/client-app/javascript/util b/client-app/deps/util similarity index 100% rename from client-app/javascript/util rename to client-app/deps/util diff --git a/client-app/javascript/uuid b/client-app/deps/uuid similarity index 100% rename from client-app/javascript/uuid rename to client-app/deps/uuid diff --git a/client-app/javascript/wicket b/client-app/deps/wicket similarity index 100% rename from client-app/javascript/wicket rename to client-app/deps/wicket diff --git a/client-app/javascript/app/administrative/taxonomy/views/ClassView.js b/client-app/src/app/administrative/taxonomy/views/ClassView.js similarity index 100% rename from client-app/javascript/app/administrative/taxonomy/views/ClassView.js rename to client-app/src/app/administrative/taxonomy/views/ClassView.js diff --git a/client-app/javascript/app/administrative/taxonomy/views/FamilyView.js b/client-app/src/app/administrative/taxonomy/views/FamilyView.js similarity index 100% rename from client-app/javascript/app/administrative/taxonomy/views/FamilyView.js rename to client-app/src/app/administrative/taxonomy/views/FamilyView.js diff --git a/client-app/javascript/app/administrative/taxonomy/views/GenusView.js b/client-app/src/app/administrative/taxonomy/views/GenusView.js similarity index 100% rename from client-app/javascript/app/administrative/taxonomy/views/GenusView.js rename to client-app/src/app/administrative/taxonomy/views/GenusView.js diff --git a/client-app/javascript/app/administrative/taxonomy/views/KingdomView.js b/client-app/src/app/administrative/taxonomy/views/KingdomView.js similarity index 100% rename from client-app/javascript/app/administrative/taxonomy/views/KingdomView.js rename to client-app/src/app/administrative/taxonomy/views/KingdomView.js diff --git a/client-app/javascript/app/administrative/taxonomy/views/MisIdentificationView.js b/client-app/src/app/administrative/taxonomy/views/MisIdentificationView.js similarity index 100% rename from client-app/javascript/app/administrative/taxonomy/views/MisIdentificationView.js rename to client-app/src/app/administrative/taxonomy/views/MisIdentificationView.js diff --git a/client-app/javascript/app/administrative/taxonomy/views/OrderView.js b/client-app/src/app/administrative/taxonomy/views/OrderView.js similarity index 100% rename from client-app/javascript/app/administrative/taxonomy/views/OrderView.js rename to client-app/src/app/administrative/taxonomy/views/OrderView.js diff --git a/client-app/javascript/app/administrative/taxonomy/views/PhylumView.js b/client-app/src/app/administrative/taxonomy/views/PhylumView.js similarity index 100% rename from client-app/javascript/app/administrative/taxonomy/views/PhylumView.js rename to client-app/src/app/administrative/taxonomy/views/PhylumView.js diff --git a/client-app/javascript/app/administrative/taxonomy/views/SpeciesView.js b/client-app/src/app/administrative/taxonomy/views/SpeciesView.js similarity index 100% rename from client-app/javascript/app/administrative/taxonomy/views/SpeciesView.js rename to client-app/src/app/administrative/taxonomy/views/SpeciesView.js diff --git a/client-app/javascript/app/administrative/taxonomy/views/SubphylumView.js b/client-app/src/app/administrative/taxonomy/views/SubphylumView.js similarity index 100% rename from client-app/javascript/app/administrative/taxonomy/views/SubphylumView.js rename to client-app/src/app/administrative/taxonomy/views/SubphylumView.js diff --git a/client-app/javascript/app/administrative/taxonomy/views/TaxonomyView.js b/client-app/src/app/administrative/taxonomy/views/TaxonomyView.js similarity index 100% rename from client-app/javascript/app/administrative/taxonomy/views/TaxonomyView.js rename to client-app/src/app/administrative/taxonomy/views/TaxonomyView.js diff --git a/client-app/javascript/app/administrative/taxonomy/views/_AddCompositeTaxon.js b/client-app/src/app/administrative/taxonomy/views/_AddCompositeTaxon.js similarity index 100% rename from client-app/javascript/app/administrative/taxonomy/views/_AddCompositeTaxon.js rename to client-app/src/app/administrative/taxonomy/views/_AddCompositeTaxon.js diff --git a/client-app/javascript/app/administrative/taxonomy/views/templates/forms/KingdomForm.html b/client-app/src/app/administrative/taxonomy/views/templates/forms/KingdomForm.html similarity index 100% rename from client-app/javascript/app/administrative/taxonomy/views/templates/forms/KingdomForm.html rename to client-app/src/app/administrative/taxonomy/views/templates/forms/KingdomForm.html diff --git a/client-app/javascript/app/administrative/taxonomy/views/templates/forms/MisIdentificationForm.html b/client-app/src/app/administrative/taxonomy/views/templates/forms/MisIdentificationForm.html similarity index 100% rename from client-app/javascript/app/administrative/taxonomy/views/templates/forms/MisIdentificationForm.html rename to client-app/src/app/administrative/taxonomy/views/templates/forms/MisIdentificationForm.html diff --git a/client-app/javascript/app/administrative/taxonomy/views/templates/forms/PeculiarityForm.html b/client-app/src/app/administrative/taxonomy/views/templates/forms/PeculiarityForm.html similarity index 100% rename from client-app/javascript/app/administrative/taxonomy/views/templates/forms/PeculiarityForm.html rename to client-app/src/app/administrative/taxonomy/views/templates/forms/PeculiarityForm.html diff --git a/client-app/javascript/app/administrative/taxonomy/views/templates/forms/RecoveryForm.html b/client-app/src/app/administrative/taxonomy/views/templates/forms/RecoveryForm.html similarity index 100% rename from client-app/javascript/app/administrative/taxonomy/views/templates/forms/RecoveryForm.html rename to client-app/src/app/administrative/taxonomy/views/templates/forms/RecoveryForm.html diff --git a/client-app/javascript/app/administrative/taxonomy/views/templates/forms/SpeciesForm.html b/client-app/src/app/administrative/taxonomy/views/templates/forms/SpeciesForm.html similarity index 100% rename from client-app/javascript/app/administrative/taxonomy/views/templates/forms/SpeciesForm.html rename to client-app/src/app/administrative/taxonomy/views/templates/forms/SpeciesForm.html diff --git a/client-app/javascript/app/administrative/taxonomy/views/templates/forms/SpecimenTagForm.html b/client-app/src/app/administrative/taxonomy/views/templates/forms/SpecimenTagForm.html similarity index 100% rename from client-app/javascript/app/administrative/taxonomy/views/templates/forms/SpecimenTagForm.html rename to client-app/src/app/administrative/taxonomy/views/templates/forms/SpecimenTagForm.html diff --git a/client-app/javascript/app/administrative/taxonomy/views/templates/forms/TaxonForm.html b/client-app/src/app/administrative/taxonomy/views/templates/forms/TaxonForm.html similarity index 100% rename from client-app/javascript/app/administrative/taxonomy/views/templates/forms/TaxonForm.html rename to client-app/src/app/administrative/taxonomy/views/templates/forms/TaxonForm.html diff --git a/client-app/javascript/app/administrative/views/ActivityView.js b/client-app/src/app/administrative/views/ActivityView.js similarity index 100% rename from client-app/javascript/app/administrative/views/ActivityView.js rename to client-app/src/app/administrative/views/ActivityView.js diff --git a/client-app/javascript/app/administrative/views/AnimalView.js b/client-app/src/app/administrative/views/AnimalView.js similarity index 100% rename from client-app/javascript/app/administrative/views/AnimalView.js rename to client-app/src/app/administrative/views/AnimalView.js diff --git a/client-app/javascript/app/administrative/views/ContactView.js b/client-app/src/app/administrative/views/ContactView.js similarity index 100% rename from client-app/javascript/app/administrative/views/ContactView.js rename to client-app/src/app/administrative/views/ContactView.js diff --git a/client-app/javascript/app/administrative/views/DeviceView.js b/client-app/src/app/administrative/views/DeviceView.js similarity index 100% rename from client-app/javascript/app/administrative/views/DeviceView.js rename to client-app/src/app/administrative/views/DeviceView.js diff --git a/client-app/javascript/app/administrative/views/DocumentView.js b/client-app/src/app/administrative/views/DocumentView.js similarity index 100% rename from client-app/javascript/app/administrative/views/DocumentView.js rename to client-app/src/app/administrative/views/DocumentView.js diff --git a/client-app/javascript/app/administrative/views/OrganisationView.js b/client-app/src/app/administrative/views/OrganisationView.js similarity index 100% rename from client-app/javascript/app/administrative/views/OrganisationView.js rename to client-app/src/app/administrative/views/OrganisationView.js diff --git a/client-app/javascript/app/administrative/views/PlatformView.js b/client-app/src/app/administrative/views/PlatformView.js similarity index 100% rename from client-app/javascript/app/administrative/views/PlatformView.js rename to client-app/src/app/administrative/views/PlatformView.js diff --git a/client-app/javascript/app/administrative/views/ProgramView.js b/client-app/src/app/administrative/views/ProgramView.js similarity index 100% rename from client-app/javascript/app/administrative/views/ProgramView.js rename to client-app/src/app/administrative/views/ProgramView.js diff --git a/client-app/javascript/app/administrative/views/ProjectView.js b/client-app/src/app/administrative/views/ProjectView.js similarity index 100% rename from client-app/javascript/app/administrative/views/ProjectView.js rename to client-app/src/app/administrative/views/ProjectView.js diff --git a/client-app/javascript/app/administrative/views/templates/forms/ActivityContactForm.html b/client-app/src/app/administrative/views/templates/forms/ActivityContactForm.html similarity index 100% rename from client-app/javascript/app/administrative/views/templates/forms/ActivityContactForm.html rename to client-app/src/app/administrative/views/templates/forms/ActivityContactForm.html diff --git a/client-app/javascript/app/administrative/views/templates/forms/ActivityEmbeddedContentForm.html b/client-app/src/app/administrative/views/templates/forms/ActivityEmbeddedContentForm.html similarity index 100% rename from client-app/javascript/app/administrative/views/templates/forms/ActivityEmbeddedContentForm.html rename to client-app/src/app/administrative/views/templates/forms/ActivityEmbeddedContentForm.html diff --git a/client-app/javascript/app/administrative/views/templates/forms/ActivityForm.html b/client-app/src/app/administrative/views/templates/forms/ActivityForm.html similarity index 100% rename from client-app/javascript/app/administrative/views/templates/forms/ActivityForm.html rename to client-app/src/app/administrative/views/templates/forms/ActivityForm.html diff --git a/client-app/javascript/app/administrative/views/templates/forms/ActivityOrganisationForm.html b/client-app/src/app/administrative/views/templates/forms/ActivityOrganisationForm.html similarity index 100% rename from client-app/javascript/app/administrative/views/templates/forms/ActivityOrganisationForm.html rename to client-app/src/app/administrative/views/templates/forms/ActivityOrganisationForm.html diff --git a/client-app/javascript/app/administrative/views/templates/forms/ActivityPlatformForm.html b/client-app/src/app/administrative/views/templates/forms/ActivityPlatformForm.html similarity index 100% rename from client-app/javascript/app/administrative/views/templates/forms/ActivityPlatformForm.html rename to client-app/src/app/administrative/views/templates/forms/ActivityPlatformForm.html diff --git a/client-app/javascript/app/administrative/views/templates/forms/ActivityResourceForm.html b/client-app/src/app/administrative/views/templates/forms/ActivityResourceForm.html similarity index 100% rename from client-app/javascript/app/administrative/views/templates/forms/ActivityResourceForm.html rename to client-app/src/app/administrative/views/templates/forms/ActivityResourceForm.html diff --git a/client-app/javascript/app/administrative/views/templates/forms/AnimalForm.html b/client-app/src/app/administrative/views/templates/forms/AnimalForm.html similarity index 100% rename from client-app/javascript/app/administrative/views/templates/forms/AnimalForm.html rename to client-app/src/app/administrative/views/templates/forms/AnimalForm.html diff --git a/client-app/javascript/app/administrative/views/templates/forms/CalibrationForm.html b/client-app/src/app/administrative/views/templates/forms/CalibrationForm.html similarity index 100% rename from client-app/javascript/app/administrative/views/templates/forms/CalibrationForm.html rename to client-app/src/app/administrative/views/templates/forms/CalibrationForm.html diff --git a/client-app/javascript/app/administrative/views/templates/forms/ConditionForm.html b/client-app/src/app/administrative/views/templates/forms/ConditionForm.html similarity index 100% rename from client-app/javascript/app/administrative/views/templates/forms/ConditionForm.html rename to client-app/src/app/administrative/views/templates/forms/ConditionForm.html diff --git a/client-app/javascript/app/administrative/views/templates/forms/ContactForm.html b/client-app/src/app/administrative/views/templates/forms/ContactForm.html similarity index 100% rename from client-app/javascript/app/administrative/views/templates/forms/ContactForm.html rename to client-app/src/app/administrative/views/templates/forms/ContactForm.html diff --git a/client-app/javascript/app/administrative/views/templates/forms/DeviceForm.html b/client-app/src/app/administrative/views/templates/forms/DeviceForm.html similarity index 100% rename from client-app/javascript/app/administrative/views/templates/forms/DeviceForm.html rename to client-app/src/app/administrative/views/templates/forms/DeviceForm.html diff --git a/client-app/javascript/app/administrative/views/templates/forms/DocumentForm.html b/client-app/src/app/administrative/views/templates/forms/DocumentForm.html similarity index 100% rename from client-app/javascript/app/administrative/views/templates/forms/DocumentForm.html rename to client-app/src/app/administrative/views/templates/forms/DocumentForm.html diff --git a/client-app/javascript/app/administrative/views/templates/forms/MetricsDefinitionForm.html b/client-app/src/app/administrative/views/templates/forms/MetricsDefinitionForm.html similarity index 100% rename from client-app/javascript/app/administrative/views/templates/forms/MetricsDefinitionForm.html rename to client-app/src/app/administrative/views/templates/forms/MetricsDefinitionForm.html diff --git a/client-app/javascript/app/administrative/views/templates/forms/OrganisationForm.html b/client-app/src/app/administrative/views/templates/forms/OrganisationForm.html similarity index 100% rename from client-app/javascript/app/administrative/views/templates/forms/OrganisationForm.html rename to client-app/src/app/administrative/views/templates/forms/OrganisationForm.html diff --git a/client-app/javascript/app/administrative/views/templates/forms/ParameterForm.html b/client-app/src/app/administrative/views/templates/forms/ParameterForm.html similarity index 100% rename from client-app/javascript/app/administrative/views/templates/forms/ParameterForm.html rename to client-app/src/app/administrative/views/templates/forms/ParameterForm.html diff --git a/client-app/javascript/app/administrative/views/templates/forms/PlatformForm.html b/client-app/src/app/administrative/views/templates/forms/PlatformForm.html similarity index 100% rename from client-app/javascript/app/administrative/views/templates/forms/PlatformForm.html rename to client-app/src/app/administrative/views/templates/forms/PlatformForm.html diff --git a/client-app/javascript/app/administrative/views/templates/forms/ProgramForm.html b/client-app/src/app/administrative/views/templates/forms/ProgramForm.html similarity index 100% rename from client-app/javascript/app/administrative/views/templates/forms/ProgramForm.html rename to client-app/src/app/administrative/views/templates/forms/ProgramForm.html diff --git a/client-app/javascript/app/administrative/views/templates/forms/ProjectForm.html b/client-app/src/app/administrative/views/templates/forms/ProjectForm.html similarity index 100% rename from client-app/javascript/app/administrative/views/templates/forms/ProjectForm.html rename to client-app/src/app/administrative/views/templates/forms/ProjectForm.html diff --git a/client-app/javascript/app/administrative/views/templates/forms/UnitForm.html b/client-app/src/app/administrative/views/templates/forms/UnitForm.html similarity index 100% rename from client-app/javascript/app/administrative/views/templates/forms/UnitForm.html rename to client-app/src/app/administrative/views/templates/forms/UnitForm.html diff --git a/client-app/javascript/app/base/models/_Model.js b/client-app/src/app/base/models/_Model.js similarity index 100% rename from client-app/javascript/app/base/models/_Model.js rename to client-app/src/app/base/models/_Model.js diff --git a/client-app/javascript/app/base/models/attr/ArrayAttr.js b/client-app/src/app/base/models/attr/ArrayAttr.js similarity index 100% rename from client-app/javascript/app/base/models/attr/ArrayAttr.js rename to client-app/src/app/base/models/attr/ArrayAttr.js diff --git a/client-app/javascript/app/base/models/attr/Attr.js b/client-app/src/app/base/models/attr/Attr.js similarity index 100% rename from client-app/javascript/app/base/models/attr/Attr.js rename to client-app/src/app/base/models/attr/Attr.js diff --git a/client-app/javascript/app/base/models/attr/ObjAttr.js b/client-app/src/app/base/models/attr/ObjAttr.js similarity index 100% rename from client-app/javascript/app/base/models/attr/ObjAttr.js rename to client-app/src/app/base/models/attr/ObjAttr.js diff --git a/client-app/javascript/app/base/models/attr/RelationAttr.js b/client-app/src/app/base/models/attr/RelationAttr.js similarity index 100% rename from client-app/javascript/app/base/models/attr/RelationAttr.js rename to client-app/src/app/base/models/attr/RelationAttr.js diff --git a/client-app/javascript/app/base/models/attr/_Attr.js b/client-app/src/app/base/models/attr/_Attr.js similarity index 100% rename from client-app/javascript/app/base/models/attr/_Attr.js rename to client-app/src/app/base/models/attr/_Attr.js diff --git a/client-app/javascript/app/base/models/attr/_ComplexAttr.js b/client-app/src/app/base/models/attr/_ComplexAttr.js similarity index 100% rename from client-app/javascript/app/base/models/attr/_ComplexAttr.js rename to client-app/src/app/base/models/attr/_ComplexAttr.js diff --git a/client-app/javascript/app/base/views/EditorLayerWithVariableForm.js b/client-app/src/app/base/views/EditorLayerWithVariableForm.js similarity index 100% rename from client-app/javascript/app/base/views/EditorLayerWithVariableForm.js rename to client-app/src/app/base/views/EditorLayerWithVariableForm.js diff --git a/client-app/javascript/app/base/views/Module.js b/client-app/src/app/base/views/Module.js similarity index 100% rename from client-app/javascript/app/base/views/Module.js rename to client-app/src/app/base/views/Module.js diff --git a/client-app/javascript/app/base/views/_ListenRequestError.js b/client-app/src/app/base/views/_ListenRequestError.js similarity index 100% rename from client-app/javascript/app/base/views/_ListenRequestError.js rename to client-app/src/app/base/views/_ListenRequestError.js diff --git a/client-app/javascript/app/base/views/_LoadingWidget.js b/client-app/src/app/base/views/_LoadingWidget.js similarity index 100% rename from client-app/javascript/app/base/views/_LoadingWidget.js rename to client-app/src/app/base/views/_LoadingWidget.js diff --git a/client-app/javascript/app/base/views/_SettingsHandler.js b/client-app/src/app/base/views/_SettingsHandler.js similarity index 100% rename from client-app/javascript/app/base/views/_SettingsHandler.js rename to client-app/src/app/base/views/_SettingsHandler.js diff --git a/client-app/javascript/app/base/views/_View.js b/client-app/src/app/base/views/_View.js similarity index 100% rename from client-app/javascript/app/base/views/_View.js rename to client-app/src/app/base/views/_View.js diff --git a/client-app/javascript/app/base/views/_ViewHandle.js b/client-app/src/app/base/views/_ViewHandle.js similarity index 100% rename from client-app/javascript/app/base/views/_ViewHandle.js rename to client-app/src/app/base/views/_ViewHandle.js diff --git a/client-app/javascript/app/base/views/_ViewListBase.js b/client-app/src/app/base/views/_ViewListBase.js similarity index 100% rename from client-app/javascript/app/base/views/_ViewListBase.js rename to client-app/src/app/base/views/_ViewListBase.js diff --git a/client-app/javascript/app/base/views/extensions/_ActivityClosed.js b/client-app/src/app/base/views/extensions/_ActivityClosed.js similarity index 100% rename from client-app/javascript/app/base/views/extensions/_ActivityClosed.js rename to client-app/src/app/base/views/extensions/_ActivityClosed.js diff --git a/client-app/javascript/app/base/views/extensions/_AddAtlasCategory.js b/client-app/src/app/base/views/extensions/_AddAtlasCategory.js similarity index 100% rename from client-app/javascript/app/base/views/extensions/_AddAtlasCategory.js rename to client-app/src/app/base/views/extensions/_AddAtlasCategory.js diff --git a/client-app/javascript/app/base/views/extensions/_AddCompositeSearchInTooltipFromTextSearch.js b/client-app/src/app/base/views/extensions/_AddCompositeSearchInTooltipFromTextSearch.js similarity index 100% rename from client-app/javascript/app/base/views/extensions/_AddCompositeSearchInTooltipFromTextSearch.js rename to client-app/src/app/base/views/extensions/_AddCompositeSearchInTooltipFromTextSearch.js diff --git a/client-app/javascript/app/base/views/extensions/_AddForm.js b/client-app/src/app/base/views/extensions/_AddForm.js similarity index 100% rename from client-app/javascript/app/base/views/extensions/_AddForm.js rename to client-app/src/app/base/views/extensions/_AddForm.js diff --git a/client-app/javascript/app/base/views/extensions/_AddFormItfc.js b/client-app/src/app/base/views/extensions/_AddFormItfc.js similarity index 100% rename from client-app/javascript/app/base/views/extensions/_AddFormItfc.js rename to client-app/src/app/base/views/extensions/_AddFormItfc.js diff --git a/client-app/javascript/app/base/views/extensions/_AddSelectInput.js b/client-app/src/app/base/views/extensions/_AddSelectInput.js similarity index 100% rename from client-app/javascript/app/base/views/extensions/_AddSelectInput.js rename to client-app/src/app/base/views/extensions/_AddSelectInput.js diff --git a/client-app/javascript/app/base/views/extensions/_AddSelectInputItfc.js b/client-app/src/app/base/views/extensions/_AddSelectInputItfc.js similarity index 100% rename from client-app/javascript/app/base/views/extensions/_AddSelectInputItfc.js rename to client-app/src/app/base/views/extensions/_AddSelectInputItfc.js diff --git a/client-app/javascript/app/base/views/extensions/_AddSelectionHandlerKeypad.js b/client-app/src/app/base/views/extensions/_AddSelectionHandlerKeypad.js similarity index 100% rename from client-app/javascript/app/base/views/extensions/_AddSelectionHandlerKeypad.js rename to client-app/src/app/base/views/extensions/_AddSelectionHandlerKeypad.js diff --git a/client-app/javascript/app/base/views/extensions/_AddTextSearchInput.js b/client-app/src/app/base/views/extensions/_AddTextSearchInput.js similarity index 100% rename from client-app/javascript/app/base/views/extensions/_AddTextSearchInput.js rename to client-app/src/app/base/views/extensions/_AddTextSearchInput.js diff --git a/client-app/javascript/app/base/views/extensions/_AddTextSearchInputItfc.js b/client-app/src/app/base/views/extensions/_AddTextSearchInputItfc.js similarity index 100% rename from client-app/javascript/app/base/views/extensions/_AddTextSearchInputItfc.js rename to client-app/src/app/base/views/extensions/_AddTextSearchInputItfc.js diff --git a/client-app/javascript/app/base/views/extensions/_CompositeInTooltipFromIconKeypad.js b/client-app/src/app/base/views/extensions/_CompositeInTooltipFromIconKeypad.js similarity index 100% rename from client-app/javascript/app/base/views/extensions/_CompositeInTooltipFromIconKeypad.js rename to client-app/src/app/base/views/extensions/_CompositeInTooltipFromIconKeypad.js diff --git a/client-app/javascript/app/base/views/extensions/_CompositeSearchInTooltip.js b/client-app/src/app/base/views/extensions/_CompositeSearchInTooltip.js similarity index 100% rename from client-app/javascript/app/base/views/extensions/_CompositeSearchInTooltip.js rename to client-app/src/app/base/views/extensions/_CompositeSearchInTooltip.js diff --git a/client-app/javascript/app/base/views/extensions/_Edition.js b/client-app/src/app/base/views/extensions/_Edition.js similarity index 100% rename from client-app/javascript/app/base/views/extensions/_Edition.js rename to client-app/src/app/base/views/extensions/_Edition.js diff --git a/client-app/javascript/app/base/views/extensions/_EditionCommons.js b/client-app/src/app/base/views/extensions/_EditionCommons.js similarity index 100% rename from client-app/javascript/app/base/views/extensions/_EditionCommons.js rename to client-app/src/app/base/views/extensions/_EditionCommons.js diff --git a/client-app/javascript/app/base/views/extensions/_EditionFormList.js b/client-app/src/app/base/views/extensions/_EditionFormList.js similarity index 100% rename from client-app/javascript/app/base/views/extensions/_EditionFormList.js rename to client-app/src/app/base/views/extensions/_EditionFormList.js diff --git a/client-app/javascript/app/base/views/extensions/_EditionLayerView.js b/client-app/src/app/base/views/extensions/_EditionLayerView.js similarity index 100% rename from client-app/javascript/app/base/views/extensions/_EditionLayerView.js rename to client-app/src/app/base/views/extensions/_EditionLayerView.js diff --git a/client-app/javascript/app/base/views/extensions/_EditionView.js b/client-app/src/app/base/views/extensions/_EditionView.js similarity index 100% rename from client-app/javascript/app/base/views/extensions/_EditionView.js rename to client-app/src/app/base/views/extensions/_EditionView.js diff --git a/client-app/javascript/app/base/views/extensions/_EditionWizardView.js b/client-app/src/app/base/views/extensions/_EditionWizardView.js similarity index 100% rename from client-app/javascript/app/base/views/extensions/_EditionWizardView.js rename to client-app/src/app/base/views/extensions/_EditionWizardView.js diff --git a/client-app/javascript/app/base/views/extensions/_FormInDialogView.js b/client-app/src/app/base/views/extensions/_FormInDialogView.js similarity index 100% rename from client-app/javascript/app/base/views/extensions/_FormInDialogView.js rename to client-app/src/app/base/views/extensions/_FormInDialogView.js diff --git a/client-app/javascript/app/base/views/extensions/_GetActivityData.js b/client-app/src/app/base/views/extensions/_GetActivityData.js similarity index 100% rename from client-app/javascript/app/base/views/extensions/_GetActivityData.js rename to client-app/src/app/base/views/extensions/_GetActivityData.js diff --git a/client-app/javascript/app/base/views/extensions/_GetActivityDataItfc.js b/client-app/src/app/base/views/extensions/_GetActivityDataItfc.js similarity index 100% rename from client-app/javascript/app/base/views/extensions/_GetActivityDataItfc.js rename to client-app/src/app/base/views/extensions/_GetActivityDataItfc.js diff --git a/client-app/javascript/app/base/views/extensions/_InterceptCloseUpView.js b/client-app/src/app/base/views/extensions/_InterceptCloseUpView.js similarity index 100% rename from client-app/javascript/app/base/views/extensions/_InterceptCloseUpView.js rename to client-app/src/app/base/views/extensions/_InterceptCloseUpView.js diff --git a/client-app/javascript/app/base/views/extensions/_ListenActivityDataAndAccessByActivityCategory.js b/client-app/src/app/base/views/extensions/_ListenActivityDataAndAccessByActivityCategory.js similarity index 100% rename from client-app/javascript/app/base/views/extensions/_ListenActivityDataAndAccessByActivityCategory.js rename to client-app/src/app/base/views/extensions/_ListenActivityDataAndAccessByActivityCategory.js diff --git a/client-app/javascript/app/base/views/extensions/_LocalSelectionView.js b/client-app/src/app/base/views/extensions/_LocalSelectionView.js similarity index 100% rename from client-app/javascript/app/base/views/extensions/_LocalSelectionView.js rename to client-app/src/app/base/views/extensions/_LocalSelectionView.js diff --git a/client-app/javascript/app/base/views/extensions/_LocalSelectionViewItfc.js b/client-app/src/app/base/views/extensions/_LocalSelectionViewItfc.js similarity index 100% rename from client-app/javascript/app/base/views/extensions/_LocalSelectionViewItfc.js rename to client-app/src/app/base/views/extensions/_LocalSelectionViewItfc.js diff --git a/client-app/javascript/app/base/views/extensions/_OnShownAndRefresh.js b/client-app/src/app/base/views/extensions/_OnShownAndRefresh.js similarity index 100% rename from client-app/javascript/app/base/views/extensions/_OnShownAndRefresh.js rename to client-app/src/app/base/views/extensions/_OnShownAndRefresh.js diff --git a/client-app/javascript/app/base/views/extensions/_ProcessInterval.js b/client-app/src/app/base/views/extensions/_ProcessInterval.js similarity index 100% rename from client-app/javascript/app/base/views/extensions/_ProcessInterval.js rename to client-app/src/app/base/views/extensions/_ProcessInterval.js diff --git a/client-app/javascript/app/base/views/extensions/_SelectInDoubleList.js b/client-app/src/app/base/views/extensions/_SelectInDoubleList.js similarity index 100% rename from client-app/javascript/app/base/views/extensions/_SelectInDoubleList.js rename to client-app/src/app/base/views/extensions/_SelectInDoubleList.js diff --git a/client-app/javascript/app/catalog/views/ActivitiesCatalogView.js b/client-app/src/app/catalog/views/ActivitiesCatalogView.js similarity index 100% rename from client-app/javascript/app/catalog/views/ActivitiesCatalogView.js rename to client-app/src/app/catalog/views/ActivitiesCatalogView.js diff --git a/client-app/javascript/app/catalog/views/OrganisationsCatalogView.js b/client-app/src/app/catalog/views/OrganisationsCatalogView.js similarity index 100% rename from client-app/javascript/app/catalog/views/OrganisationsCatalogView.js rename to client-app/src/app/catalog/views/OrganisationsCatalogView.js diff --git a/client-app/javascript/app/catalog/views/PlatformsCatalogView.js b/client-app/src/app/catalog/views/PlatformsCatalogView.js similarity index 100% rename from client-app/javascript/app/catalog/views/PlatformsCatalogView.js rename to client-app/src/app/catalog/views/PlatformsCatalogView.js diff --git a/client-app/javascript/app/catalog/views/ProgramsCatalogView.js b/client-app/src/app/catalog/views/ProgramsCatalogView.js similarity index 100% rename from client-app/javascript/app/catalog/views/ProgramsCatalogView.js rename to client-app/src/app/catalog/views/ProgramsCatalogView.js diff --git a/client-app/javascript/app/catalog/views/ProjectsCatalogView.js b/client-app/src/app/catalog/views/ProjectsCatalogView.js similarity index 100% rename from client-app/javascript/app/catalog/views/ProjectsCatalogView.js rename to client-app/src/app/catalog/views/ProjectsCatalogView.js diff --git a/client-app/javascript/app/catalog/views/SpeciesCatalogView.js b/client-app/src/app/catalog/views/SpeciesCatalogView.js similarity index 100% rename from client-app/javascript/app/catalog/views/SpeciesCatalogView.js rename to client-app/src/app/catalog/views/SpeciesCatalogView.js diff --git a/client-app/javascript/app/components/CookieLoader.js b/client-app/src/app/components/CookieLoader.js similarity index 100% rename from client-app/javascript/app/components/CookieLoader.js rename to client-app/src/app/components/CookieLoader.js diff --git a/client-app/javascript/app/components/ReCaptcha.js b/client-app/src/app/components/ReCaptcha.js similarity index 100% rename from client-app/javascript/app/components/ReCaptcha.js rename to client-app/src/app/components/ReCaptcha.js diff --git a/client-app/javascript/app/components/steps/AccessSetStep.js b/client-app/src/app/components/steps/AccessSetStep.js similarity index 100% rename from client-app/javascript/app/components/steps/AccessSetStep.js rename to client-app/src/app/components/steps/AccessSetStep.js diff --git a/client-app/javascript/app/components/steps/ActivitySetStep.js b/client-app/src/app/components/steps/ActivitySetStep.js similarity index 100% rename from client-app/javascript/app/components/steps/ActivitySetStep.js rename to client-app/src/app/components/steps/ActivitySetStep.js diff --git a/client-app/javascript/app/components/steps/AddGeomSiteStep.js b/client-app/src/app/components/steps/AddGeomSiteStep.js similarity index 100% rename from client-app/javascript/app/components/steps/AddGeomSiteStep.js rename to client-app/src/app/components/steps/AddGeomSiteStep.js diff --git a/client-app/javascript/app/components/steps/AreaClassificationsSetStep.js b/client-app/src/app/components/steps/AreaClassificationsSetStep.js similarity index 100% rename from client-app/javascript/app/components/steps/AreaClassificationsSetStep.js rename to client-app/src/app/components/steps/AreaClassificationsSetStep.js diff --git a/client-app/javascript/app/components/steps/CalibrationSetStep.js b/client-app/src/app/components/steps/CalibrationSetStep.js similarity index 100% rename from client-app/javascript/app/components/steps/CalibrationSetStep.js rename to client-app/src/app/components/steps/CalibrationSetStep.js diff --git a/client-app/javascript/app/components/steps/CitationStep.js b/client-app/src/app/components/steps/CitationStep.js similarity index 100% rename from client-app/javascript/app/components/steps/CitationStep.js rename to client-app/src/app/components/steps/CitationStep.js diff --git a/client-app/javascript/app/components/steps/ClassificationsStep.js b/client-app/src/app/components/steps/ClassificationsStep.js similarity index 100% rename from client-app/javascript/app/components/steps/ClassificationsStep.js rename to client-app/src/app/components/steps/ClassificationsStep.js diff --git a/client-app/javascript/app/components/steps/ContactSetStep.js b/client-app/src/app/components/steps/ContactSetStep.js similarity index 100% rename from client-app/javascript/app/components/steps/ContactSetStep.js rename to client-app/src/app/components/steps/ContactSetStep.js diff --git a/client-app/javascript/app/components/steps/DataDefinitionSetStep.js b/client-app/src/app/components/steps/DataDefinitionSetStep.js similarity index 100% rename from client-app/javascript/app/components/steps/DataDefinitionSetStep.js rename to client-app/src/app/components/steps/DataDefinitionSetStep.js diff --git a/client-app/javascript/app/components/steps/DescribeSiteStep.js b/client-app/src/app/components/steps/DescribeSiteStep.js similarity index 100% rename from client-app/javascript/app/components/steps/DescribeSiteStep.js rename to client-app/src/app/components/steps/DescribeSiteStep.js diff --git a/client-app/javascript/app/components/steps/DocumentSetStep.js b/client-app/src/app/components/steps/DocumentSetStep.js similarity index 100% rename from client-app/javascript/app/components/steps/DocumentSetStep.js rename to client-app/src/app/components/steps/DocumentSetStep.js diff --git a/client-app/javascript/app/components/steps/DocumentStepFiltered.js b/client-app/src/app/components/steps/DocumentStepFiltered.js similarity index 100% rename from client-app/javascript/app/components/steps/DocumentStepFiltered.js rename to client-app/src/app/components/steps/DocumentStepFiltered.js diff --git a/client-app/javascript/app/components/steps/DownloadsSetStep.js b/client-app/src/app/components/steps/DownloadsSetStep.js similarity index 100% rename from client-app/javascript/app/components/steps/DownloadsSetStep.js rename to client-app/src/app/components/steps/DownloadsSetStep.js diff --git a/client-app/javascript/app/components/steps/EmbeddedContentSetStep.js b/client-app/src/app/components/steps/EmbeddedContentSetStep.js similarity index 100% rename from client-app/javascript/app/components/steps/EmbeddedContentSetStep.js rename to client-app/src/app/components/steps/EmbeddedContentSetStep.js diff --git a/client-app/javascript/app/components/steps/MainDataStep.js b/client-app/src/app/components/steps/MainDataStep.js similarity index 100% rename from client-app/javascript/app/components/steps/MainDataStep.js rename to client-app/src/app/components/steps/MainDataStep.js diff --git a/client-app/javascript/app/components/steps/MapSelectAreaStep.js b/client-app/src/app/components/steps/MapSelectAreaStep.js similarity index 100% rename from client-app/javascript/app/components/steps/MapSelectAreaStep.js rename to client-app/src/app/components/steps/MapSelectAreaStep.js diff --git a/client-app/javascript/app/components/steps/OrganisationSetStep.js b/client-app/src/app/components/steps/OrganisationSetStep.js similarity index 100% rename from client-app/javascript/app/components/steps/OrganisationSetStep.js rename to client-app/src/app/components/steps/OrganisationSetStep.js diff --git a/client-app/javascript/app/components/steps/PlatformSetStep.js b/client-app/src/app/components/steps/PlatformSetStep.js similarity index 100% rename from client-app/javascript/app/components/steps/PlatformSetStep.js rename to client-app/src/app/components/steps/PlatformSetStep.js diff --git a/client-app/javascript/app/components/steps/PreLoadMainDataStep.js b/client-app/src/app/components/steps/PreLoadMainDataStep.js similarity index 100% rename from client-app/javascript/app/components/steps/PreLoadMainDataStep.js rename to client-app/src/app/components/steps/PreLoadMainDataStep.js diff --git a/client-app/javascript/app/components/steps/ProtocolsSetStep.js b/client-app/src/app/components/steps/ProtocolsSetStep.js similarity index 100% rename from client-app/javascript/app/components/steps/ProtocolsSetStep.js rename to client-app/src/app/components/steps/ProtocolsSetStep.js diff --git a/client-app/javascript/app/components/steps/RecoverySetStep.js b/client-app/src/app/components/steps/RecoverySetStep.js similarity index 100% rename from client-app/javascript/app/components/steps/RecoverySetStep.js rename to client-app/src/app/components/steps/RecoverySetStep.js diff --git a/client-app/javascript/app/components/steps/RelationDataSetStep.js b/client-app/src/app/components/steps/RelationDataSetStep.js similarity index 100% rename from client-app/javascript/app/components/steps/RelationDataSetStep.js rename to client-app/src/app/components/steps/RelationDataSetStep.js diff --git a/client-app/javascript/app/components/steps/ResourceSetStep.js b/client-app/src/app/components/steps/ResourceSetStep.js similarity index 100% rename from client-app/javascript/app/components/steps/ResourceSetStep.js rename to client-app/src/app/components/steps/ResourceSetStep.js diff --git a/client-app/javascript/app/components/steps/SelectActivityCategoryStep.js b/client-app/src/app/components/steps/SelectActivityCategoryStep.js similarity index 100% rename from client-app/javascript/app/components/steps/SelectActivityCategoryStep.js rename to client-app/src/app/components/steps/SelectActivityCategoryStep.js diff --git a/client-app/javascript/app/components/steps/SelectLayerStep.js b/client-app/src/app/components/steps/SelectLayerStep.js similarity index 100% rename from client-app/javascript/app/components/steps/SelectLayerStep.js rename to client-app/src/app/components/steps/SelectLayerStep.js diff --git a/client-app/javascript/app/components/steps/SelectRegisterTypeStep.js b/client-app/src/app/components/steps/SelectRegisterTypeStep.js similarity index 100% rename from client-app/javascript/app/components/steps/SelectRegisterTypeStep.js rename to client-app/src/app/components/steps/SelectRegisterTypeStep.js diff --git a/client-app/javascript/app/components/steps/SpeciesMainDataStep.js b/client-app/src/app/components/steps/SpeciesMainDataStep.js similarity index 100% rename from client-app/javascript/app/components/steps/SpeciesMainDataStep.js rename to client-app/src/app/components/steps/SpeciesMainDataStep.js diff --git a/client-app/javascript/app/components/steps/SpecimenTagSetStep.js b/client-app/src/app/components/steps/SpecimenTagSetStep.js similarity index 100% rename from client-app/javascript/app/components/steps/SpecimenTagSetStep.js rename to client-app/src/app/components/steps/SpecimenTagSetStep.js diff --git a/client-app/javascript/app/components/steps/UnitSetStep.js b/client-app/src/app/components/steps/UnitSetStep.js similarity index 100% rename from client-app/javascript/app/components/steps/UnitSetStep.js rename to client-app/src/app/components/steps/UnitSetStep.js diff --git a/client-app/javascript/app/components/steps/_ClassificationsRelationData.js b/client-app/src/app/components/steps/_ClassificationsRelationData.js similarity index 100% rename from client-app/javascript/app/components/steps/_ClassificationsRelationData.js rename to client-app/src/app/components/steps/_ClassificationsRelationData.js diff --git a/client-app/javascript/app/components/steps/_DataListAndSaveRelationData.js b/client-app/src/app/components/steps/_DataListAndSaveRelationData.js similarity index 100% rename from client-app/javascript/app/components/steps/_DataListAndSaveRelationData.js rename to client-app/src/app/components/steps/_DataListAndSaveRelationData.js diff --git a/client-app/javascript/app/components/steps/_DateRelationData.js b/client-app/src/app/components/steps/_DateRelationData.js similarity index 100% rename from client-app/javascript/app/components/steps/_DateRelationData.js rename to client-app/src/app/components/steps/_DateRelationData.js diff --git a/client-app/javascript/app/components/steps/_MainData.js b/client-app/src/app/components/steps/_MainData.js similarity index 100% rename from client-app/javascript/app/components/steps/_MainData.js rename to client-app/src/app/components/steps/_MainData.js diff --git a/client-app/javascript/app/components/steps/_ParametersRelationData.js b/client-app/src/app/components/steps/_ParametersRelationData.js similarity index 100% rename from client-app/javascript/app/components/steps/_ParametersRelationData.js rename to client-app/src/app/components/steps/_ParametersRelationData.js diff --git a/client-app/javascript/app/components/steps/_RememberDeleteItems.js b/client-app/src/app/components/steps/_RememberDeleteItems.js similarity index 100% rename from client-app/javascript/app/components/steps/_RememberDeleteItems.js rename to client-app/src/app/components/steps/_RememberDeleteItems.js diff --git a/client-app/javascript/app/components/steps/_SelectOptionBox.js b/client-app/src/app/components/steps/_SelectOptionBox.js similarity index 100% rename from client-app/javascript/app/components/steps/_SelectOptionBox.js rename to client-app/src/app/components/steps/_SelectOptionBox.js diff --git a/client-app/javascript/app/components/viewCustomization/addGeomSite/views/Line.js b/client-app/src/app/components/viewCustomization/addGeomSite/views/Line.js similarity index 100% rename from client-app/javascript/app/components/viewCustomization/addGeomSite/views/Line.js rename to client-app/src/app/components/viewCustomization/addGeomSite/views/Line.js diff --git a/client-app/javascript/app/components/viewCustomization/addGeomSite/views/MultiPolygon.js b/client-app/src/app/components/viewCustomization/addGeomSite/views/MultiPolygon.js similarity index 100% rename from client-app/javascript/app/components/viewCustomization/addGeomSite/views/MultiPolygon.js rename to client-app/src/app/components/viewCustomization/addGeomSite/views/MultiPolygon.js diff --git a/client-app/javascript/app/components/viewCustomization/addGeomSite/views/Point.js b/client-app/src/app/components/viewCustomization/addGeomSite/views/Point.js similarity index 100% rename from client-app/javascript/app/components/viewCustomization/addGeomSite/views/Point.js rename to client-app/src/app/components/viewCustomization/addGeomSite/views/Point.js diff --git a/client-app/javascript/app/components/viewCustomization/addGeomSite/views/_BaseGeometryForm.js b/client-app/src/app/components/viewCustomization/addGeomSite/views/_BaseGeometryForm.js similarity index 100% rename from client-app/javascript/app/components/viewCustomization/addGeomSite/views/_BaseGeometryForm.js rename to client-app/src/app/components/viewCustomization/addGeomSite/views/_BaseGeometryForm.js diff --git a/client-app/javascript/app/components/viewCustomization/addGeomSite/views/templates/LineForm.html b/client-app/src/app/components/viewCustomization/addGeomSite/views/templates/LineForm.html similarity index 100% rename from client-app/javascript/app/components/viewCustomization/addGeomSite/views/templates/LineForm.html rename to client-app/src/app/components/viewCustomization/addGeomSite/views/templates/LineForm.html diff --git a/client-app/javascript/app/components/viewCustomization/addGeomSite/views/templates/PointForm.html b/client-app/src/app/components/viewCustomization/addGeomSite/views/templates/PointForm.html similarity index 100% rename from client-app/javascript/app/components/viewCustomization/addGeomSite/views/templates/PointForm.html rename to client-app/src/app/components/viewCustomization/addGeomSite/views/templates/PointForm.html diff --git a/client-app/javascript/app/components/viewCustomization/describeSite/views/SelectStationByActivity.js b/client-app/src/app/components/viewCustomization/describeSite/views/SelectStationByActivity.js similarity index 100% rename from client-app/javascript/app/components/viewCustomization/describeSite/views/SelectStationByActivity.js rename to client-app/src/app/components/viewCustomization/describeSite/views/SelectStationByActivity.js diff --git a/client-app/javascript/app/components/viewCustomization/describeSite/views/_AdditionalKeyGetter.js b/client-app/src/app/components/viewCustomization/describeSite/views/_AdditionalKeyGetter.js similarity index 100% rename from client-app/javascript/app/components/viewCustomization/describeSite/views/_AdditionalKeyGetter.js rename to client-app/src/app/components/viewCustomization/describeSite/views/_AdditionalKeyGetter.js diff --git a/client-app/javascript/app/components/viewCustomization/describeSite/views/templates/ARForm.html b/client-app/src/app/components/viewCustomization/describeSite/views/templates/ARForm.html similarity index 100% rename from client-app/javascript/app/components/viewCustomization/describeSite/views/templates/ARForm.html rename to client-app/src/app/components/viewCustomization/describeSite/views/templates/ARForm.html diff --git a/client-app/javascript/app/components/viewCustomization/describeSite/views/templates/DescribeSiteForm.html b/client-app/src/app/components/viewCustomization/describeSite/views/templates/DescribeSiteForm.html similarity index 100% rename from client-app/javascript/app/components/viewCustomization/describeSite/views/templates/DescribeSiteForm.html rename to client-app/src/app/components/viewCustomization/describeSite/views/templates/DescribeSiteForm.html diff --git a/client-app/javascript/app/components/viewCustomization/describeSite/views/templates/IFForm.html b/client-app/src/app/components/viewCustomization/describeSite/views/templates/IFForm.html similarity index 100% rename from client-app/javascript/app/components/viewCustomization/describeSite/views/templates/IFForm.html rename to client-app/src/app/components/viewCustomization/describeSite/views/templates/IFForm.html diff --git a/client-app/javascript/app/components/viewCustomization/loadFile/models/LoadFileModel.js b/client-app/src/app/components/viewCustomization/loadFile/models/LoadFileModel.js similarity index 100% rename from client-app/javascript/app/components/viewCustomization/loadFile/models/LoadFileModel.js rename to client-app/src/app/components/viewCustomization/loadFile/models/LoadFileModel.js diff --git a/client-app/javascript/app/components/viewCustomization/loadFile/views/templates/ARFileForm.html b/client-app/src/app/components/viewCustomization/loadFile/views/templates/ARFileForm.html similarity index 100% rename from client-app/javascript/app/components/viewCustomization/loadFile/views/templates/ARFileForm.html rename to client-app/src/app/components/viewCustomization/loadFile/views/templates/ARFileForm.html diff --git a/client-app/javascript/app/components/viewCustomization/loadFile/views/templates/LoadFileForm.html b/client-app/src/app/components/viewCustomization/loadFile/views/templates/LoadFileForm.html similarity index 100% rename from client-app/javascript/app/components/viewCustomization/loadFile/views/templates/LoadFileForm.html rename to client-app/src/app/components/viewCustomization/loadFile/views/templates/LoadFileForm.html diff --git a/client-app/javascript/app/components/viewCustomization/parameter/views/templates/FTForm.html b/client-app/src/app/components/viewCustomization/parameter/views/templates/FTForm.html similarity index 100% rename from client-app/javascript/app/components/viewCustomization/parameter/views/templates/FTForm.html rename to client-app/src/app/components/viewCustomization/parameter/views/templates/FTForm.html diff --git a/client-app/javascript/app/components/viewCustomization/parameter/views/templates/OCForm.html b/client-app/src/app/components/viewCustomization/parameter/views/templates/OCForm.html similarity index 100% rename from client-app/javascript/app/components/viewCustomization/parameter/views/templates/OCForm.html rename to client-app/src/app/components/viewCustomization/parameter/views/templates/OCForm.html diff --git a/client-app/javascript/app/components/viewCustomization/relationData/views/templates/AreaTypeForm.html b/client-app/src/app/components/viewCustomization/relationData/views/templates/AreaTypeForm.html similarity index 100% rename from client-app/javascript/app/components/viewCustomization/relationData/views/templates/AreaTypeForm.html rename to client-app/src/app/components/viewCustomization/relationData/views/templates/AreaTypeForm.html diff --git a/client-app/javascript/app/components/viewCustomization/relationData/views/templates/DateForm.html b/client-app/src/app/components/viewCustomization/relationData/views/templates/DateForm.html similarity index 100% rename from client-app/javascript/app/components/viewCustomization/relationData/views/templates/DateForm.html rename to client-app/src/app/components/viewCustomization/relationData/views/templates/DateForm.html diff --git a/client-app/javascript/app/components/viewCustomization/relationData/views/templates/DefaultForm.html b/client-app/src/app/components/viewCustomization/relationData/views/templates/DefaultForm.html similarity index 100% rename from client-app/javascript/app/components/viewCustomization/relationData/views/templates/DefaultForm.html rename to client-app/src/app/components/viewCustomization/relationData/views/templates/DefaultForm.html diff --git a/client-app/javascript/app/components/viewCustomization/relationData/views/templates/DeviceForm.html b/client-app/src/app/components/viewCustomization/relationData/views/templates/DeviceForm.html similarity index 100% rename from client-app/javascript/app/components/viewCustomization/relationData/views/templates/DeviceForm.html rename to client-app/src/app/components/viewCustomization/relationData/views/templates/DeviceForm.html diff --git a/client-app/javascript/app/components/viewCustomization/relationData/views/templates/PointGeometryForm.html b/client-app/src/app/components/viewCustomization/relationData/views/templates/PointGeometryForm.html similarity index 100% rename from client-app/javascript/app/components/viewCustomization/relationData/views/templates/PointGeometryForm.html rename to client-app/src/app/components/viewCustomization/relationData/views/templates/PointGeometryForm.html diff --git a/client-app/javascript/app/dataLoader/areas/views/AreaView.js b/client-app/src/app/dataLoader/areas/views/AreaView.js similarity index 100% rename from client-app/javascript/app/dataLoader/areas/views/AreaView.js rename to client-app/src/app/dataLoader/areas/views/AreaView.js diff --git a/client-app/javascript/app/dataLoader/areas/views/templates/AreaClassificationsForm.html b/client-app/src/app/dataLoader/areas/views/templates/AreaClassificationsForm.html similarity index 100% rename from client-app/javascript/app/dataLoader/areas/views/templates/AreaClassificationsForm.html rename to client-app/src/app/dataLoader/areas/views/templates/AreaClassificationsForm.html diff --git a/client-app/javascript/app/dataLoader/base/_GeographicBase.js b/client-app/src/app/dataLoader/base/_GeographicBase.js similarity index 100% rename from client-app/javascript/app/dataLoader/base/_GeographicBase.js rename to client-app/src/app/dataLoader/base/_GeographicBase.js diff --git a/client-app/javascript/app/dataLoader/citation/views/CitationView.js b/client-app/src/app/dataLoader/citation/views/CitationView.js similarity index 100% rename from client-app/javascript/app/dataLoader/citation/views/CitationView.js rename to client-app/src/app/dataLoader/citation/views/CitationView.js diff --git a/client-app/javascript/app/dataLoader/citation/views/templates/CitationForm.html b/client-app/src/app/dataLoader/citation/views/templates/CitationForm.html similarity index 100% rename from client-app/javascript/app/dataLoader/citation/views/templates/CitationForm.html rename to client-app/src/app/dataLoader/citation/views/templates/CitationForm.html diff --git a/client-app/javascript/app/dataLoader/infrastructure/views/InfrastructureAttributesView.js b/client-app/src/app/dataLoader/infrastructure/views/InfrastructureAttributesView.js similarity index 100% rename from client-app/javascript/app/dataLoader/infrastructure/views/InfrastructureAttributesView.js rename to client-app/src/app/dataLoader/infrastructure/views/InfrastructureAttributesView.js diff --git a/client-app/javascript/app/dataLoader/infrastructure/views/InfrastructureView.js b/client-app/src/app/dataLoader/infrastructure/views/InfrastructureView.js similarity index 100% rename from client-app/javascript/app/dataLoader/infrastructure/views/InfrastructureView.js rename to client-app/src/app/dataLoader/infrastructure/views/InfrastructureView.js diff --git a/client-app/javascript/app/dataLoader/infrastructure/views/templates/form/AttributesForm.html b/client-app/src/app/dataLoader/infrastructure/views/templates/form/AttributesForm.html similarity index 100% rename from client-app/javascript/app/dataLoader/infrastructure/views/templates/form/AttributesForm.html rename to client-app/src/app/dataLoader/infrastructure/views/templates/form/AttributesForm.html diff --git a/client-app/javascript/app/dataLoader/sightings/models/SightingsModel.js b/client-app/src/app/dataLoader/sightings/models/SightingsModel.js similarity index 100% rename from client-app/javascript/app/dataLoader/sightings/models/SightingsModel.js rename to client-app/src/app/dataLoader/sightings/models/SightingsModel.js diff --git a/client-app/javascript/app/dataLoader/sightings/views/SightingsView.js b/client-app/src/app/dataLoader/sightings/views/SightingsView.js similarity index 100% rename from client-app/javascript/app/dataLoader/sightings/views/SightingsView.js rename to client-app/src/app/dataLoader/sightings/views/SightingsView.js diff --git a/client-app/javascript/app/dataLoader/sightings/views/templates/SightingsForm.html b/client-app/src/app/dataLoader/sightings/views/templates/SightingsForm.html similarity index 100% rename from client-app/javascript/app/dataLoader/sightings/views/templates/SightingsForm.html rename to client-app/src/app/dataLoader/sightings/views/templates/SightingsForm.html diff --git a/client-app/javascript/app/dataLoader/surveyParameters/views/ObjectCollectingSeriesDataView.js b/client-app/src/app/dataLoader/surveyParameters/views/ObjectCollectingSeriesDataView.js similarity index 100% rename from client-app/javascript/app/dataLoader/surveyParameters/views/ObjectCollectingSeriesDataView.js rename to client-app/src/app/dataLoader/surveyParameters/views/ObjectCollectingSeriesDataView.js diff --git a/client-app/javascript/app/dataLoader/surveyParameters/views/ObjectCollectionView.js b/client-app/src/app/dataLoader/surveyParameters/views/ObjectCollectionView.js similarity index 100% rename from client-app/javascript/app/dataLoader/surveyParameters/views/ObjectCollectionView.js rename to client-app/src/app/dataLoader/surveyParameters/views/ObjectCollectionView.js diff --git a/client-app/javascript/app/dataLoader/surveyParameters/views/SurveyStationSeriesDataView.js b/client-app/src/app/dataLoader/surveyParameters/views/SurveyStationSeriesDataView.js similarity index 100% rename from client-app/javascript/app/dataLoader/surveyParameters/views/SurveyStationSeriesDataView.js rename to client-app/src/app/dataLoader/surveyParameters/views/SurveyStationSeriesDataView.js diff --git a/client-app/javascript/app/dataLoader/surveyParameters/views/SurveyStationView.js b/client-app/src/app/dataLoader/surveyParameters/views/SurveyStationView.js similarity index 100% rename from client-app/javascript/app/dataLoader/surveyParameters/views/SurveyStationView.js rename to client-app/src/app/dataLoader/surveyParameters/views/SurveyStationView.js diff --git a/client-app/javascript/app/dataLoader/surveyParameters/views/_DataLoadedByStationManagement.js b/client-app/src/app/dataLoader/surveyParameters/views/_DataLoadedByStationManagement.js similarity index 100% rename from client-app/javascript/app/dataLoader/surveyParameters/views/_DataLoadedByStationManagement.js rename to client-app/src/app/dataLoader/surveyParameters/views/_DataLoadedByStationManagement.js diff --git a/client-app/javascript/app/dataLoader/surveyParameters/views/_SeriesDataView.js b/client-app/src/app/dataLoader/surveyParameters/views/_SeriesDataView.js similarity index 100% rename from client-app/javascript/app/dataLoader/surveyParameters/views/_SeriesDataView.js rename to client-app/src/app/dataLoader/surveyParameters/views/_SeriesDataView.js diff --git a/client-app/javascript/app/dataLoader/surveyParameters/views/templates/ObjectCollectingForm.html b/client-app/src/app/dataLoader/surveyParameters/views/templates/ObjectCollectingForm.html similarity index 100% rename from client-app/javascript/app/dataLoader/surveyParameters/views/templates/ObjectCollectingForm.html rename to client-app/src/app/dataLoader/surveyParameters/views/templates/ObjectCollectingForm.html diff --git a/client-app/javascript/app/dataLoader/surveyParameters/views/templates/TimeSeriesForm.html b/client-app/src/app/dataLoader/surveyParameters/views/templates/TimeSeriesForm.html similarity index 100% rename from client-app/javascript/app/dataLoader/surveyParameters/views/templates/TimeSeriesForm.html rename to client-app/src/app/dataLoader/surveyParameters/views/templates/TimeSeriesForm.html diff --git a/client-app/javascript/app/dataLoader/tracking/views/TrackingDataView.js b/client-app/src/app/dataLoader/tracking/views/TrackingDataView.js similarity index 100% rename from client-app/javascript/app/dataLoader/tracking/views/TrackingDataView.js rename to client-app/src/app/dataLoader/tracking/views/TrackingDataView.js diff --git a/client-app/javascript/app/dataLoader/tracking/views/TrackingView.js b/client-app/src/app/dataLoader/tracking/views/TrackingView.js similarity index 100% rename from client-app/javascript/app/dataLoader/tracking/views/TrackingView.js rename to client-app/src/app/dataLoader/tracking/views/TrackingView.js diff --git a/client-app/javascript/app/dataLoader/tracking/views/templates/form/TrackingPointForm.html b/client-app/src/app/dataLoader/tracking/views/templates/form/TrackingPointForm.html similarity index 100% rename from client-app/javascript/app/dataLoader/tracking/views/templates/form/TrackingPointForm.html rename to client-app/src/app/dataLoader/tracking/views/templates/form/TrackingPointForm.html diff --git a/client-app/javascript/app/designs/base/_Browser.js b/client-app/src/app/designs/base/_Browser.js similarity index 100% rename from client-app/javascript/app/designs/base/_Browser.js rename to client-app/src/app/designs/base/_Browser.js diff --git a/client-app/javascript/app/designs/base/_Controller.js b/client-app/src/app/designs/base/_Controller.js similarity index 100% rename from client-app/javascript/app/designs/base/_Controller.js rename to client-app/src/app/designs/base/_Controller.js diff --git a/client-app/javascript/app/designs/base/_ControllerItfc.js b/client-app/src/app/designs/base/_ControllerItfc.js similarity index 100% rename from client-app/javascript/app/designs/base/_ControllerItfc.js rename to client-app/src/app/designs/base/_ControllerItfc.js diff --git a/client-app/javascript/app/designs/base/_Layout.js b/client-app/src/app/designs/base/_Layout.js similarity index 100% rename from client-app/javascript/app/designs/base/_Layout.js rename to client-app/src/app/designs/base/_Layout.js diff --git a/client-app/javascript/app/designs/base/_LayoutItfc.js b/client-app/src/app/designs/base/_LayoutItfc.js similarity index 100% rename from client-app/javascript/app/designs/base/_LayoutItfc.js rename to client-app/src/app/designs/base/_LayoutItfc.js diff --git a/client-app/javascript/app/designs/base/_Main.js b/client-app/src/app/designs/base/_Main.js similarity index 100% rename from client-app/javascript/app/designs/base/_Main.js rename to client-app/src/app/designs/base/_Main.js diff --git a/client-app/javascript/app/designs/base/_MainItfc.js b/client-app/src/app/designs/base/_MainItfc.js similarity index 100% rename from client-app/javascript/app/designs/base/_MainItfc.js rename to client-app/src/app/designs/base/_MainItfc.js diff --git a/client-app/javascript/app/designs/base/_ServiceOGC.js b/client-app/src/app/designs/base/_ServiceOGC.js similarity index 100% rename from client-app/javascript/app/designs/base/_ServiceOGC.js rename to client-app/src/app/designs/base/_ServiceOGC.js diff --git a/client-app/javascript/app/designs/chart/Controller.js b/client-app/src/app/designs/chart/Controller.js similarity index 100% rename from client-app/javascript/app/designs/chart/Controller.js rename to client-app/src/app/designs/chart/Controller.js diff --git a/client-app/javascript/app/designs/chart/layout/SideAndTopAndBottomContent.js b/client-app/src/app/designs/chart/layout/SideAndTopAndBottomContent.js similarity index 100% rename from client-app/javascript/app/designs/chart/layout/SideAndTopAndBottomContent.js rename to client-app/src/app/designs/chart/layout/SideAndTopAndBottomContent.js diff --git a/client-app/javascript/app/designs/chart/layout/TopAndBottomContent.js b/client-app/src/app/designs/chart/layout/TopAndBottomContent.js similarity index 100% rename from client-app/javascript/app/designs/chart/layout/TopAndBottomContent.js rename to client-app/src/app/designs/chart/layout/TopAndBottomContent.js diff --git a/client-app/javascript/app/designs/chart/layout/TopContent.js b/client-app/src/app/designs/chart/layout/TopContent.js similarity index 100% rename from client-app/javascript/app/designs/chart/layout/TopContent.js rename to client-app/src/app/designs/chart/layout/TopContent.js diff --git a/client-app/javascript/app/designs/chart/main/ChartsWithLegendAndToolbarsAndSlider.js b/client-app/src/app/designs/chart/main/ChartsWithLegendAndToolbarsAndSlider.js similarity index 100% rename from client-app/javascript/app/designs/chart/main/ChartsWithLegendAndToolbarsAndSlider.js rename to client-app/src/app/designs/chart/main/ChartsWithLegendAndToolbarsAndSlider.js diff --git a/client-app/javascript/app/designs/chart/main/ChartsWithToolbarsAndSlider.js b/client-app/src/app/designs/chart/main/ChartsWithToolbarsAndSlider.js similarity index 100% rename from client-app/javascript/app/designs/chart/main/ChartsWithToolbarsAndSlider.js rename to client-app/src/app/designs/chart/main/ChartsWithToolbarsAndSlider.js diff --git a/client-app/javascript/app/designs/chart/main/MultiPieChartWithToolbar.js b/client-app/src/app/designs/chart/main/MultiPieChartWithToolbar.js similarity index 100% rename from client-app/javascript/app/designs/chart/main/MultiPieChartWithToolbar.js rename to client-app/src/app/designs/chart/main/MultiPieChartWithToolbar.js diff --git a/client-app/javascript/app/designs/chart/main/MultiWindRoseChartWithToolbar.js b/client-app/src/app/designs/chart/main/MultiWindRoseChartWithToolbar.js similarity index 100% rename from client-app/javascript/app/designs/chart/main/MultiWindRoseChartWithToolbar.js rename to client-app/src/app/designs/chart/main/MultiWindRoseChartWithToolbar.js diff --git a/client-app/javascript/app/designs/chart/main/WindRoseChartWithToolbar.js b/client-app/src/app/designs/chart/main/WindRoseChartWithToolbar.js similarity index 100% rename from client-app/javascript/app/designs/chart/main/WindRoseChartWithToolbar.js rename to client-app/src/app/designs/chart/main/WindRoseChartWithToolbar.js diff --git a/client-app/javascript/app/designs/chart/main/_ChartsWithToolbarsAndSlider.js b/client-app/src/app/designs/chart/main/_ChartsWithToolbarsAndSlider.js similarity index 100% rename from client-app/javascript/app/designs/chart/main/_ChartsWithToolbarsAndSlider.js rename to client-app/src/app/designs/chart/main/_ChartsWithToolbarsAndSlider.js diff --git a/client-app/javascript/app/designs/chart/main/_ChartsWithToolbarsAndSliderItfc.js b/client-app/src/app/designs/chart/main/_ChartsWithToolbarsAndSliderItfc.js similarity index 100% rename from client-app/javascript/app/designs/chart/main/_ChartsWithToolbarsAndSliderItfc.js rename to client-app/src/app/designs/chart/main/_ChartsWithToolbarsAndSliderItfc.js diff --git a/client-app/javascript/app/designs/chart/main/_ProcessDataDefinitionAndGetTimeSeries.js b/client-app/src/app/designs/chart/main/_ProcessDataDefinitionAndGetTimeSeries.js similarity index 100% rename from client-app/javascript/app/designs/chart/main/_ProcessDataDefinitionAndGetTimeSeries.js rename to client-app/src/app/designs/chart/main/_ProcessDataDefinitionAndGetTimeSeries.js diff --git a/client-app/javascript/app/designs/details/Controller.js b/client-app/src/app/designs/details/Controller.js similarity index 100% rename from client-app/javascript/app/designs/details/Controller.js rename to client-app/src/app/designs/details/Controller.js diff --git a/client-app/javascript/app/designs/details/Layout.js b/client-app/src/app/designs/details/Layout.js similarity index 100% rename from client-app/javascript/app/designs/details/Layout.js rename to client-app/src/app/designs/details/Layout.js diff --git a/client-app/javascript/app/designs/details/_AddBasicTitle.js b/client-app/src/app/designs/details/_AddBasicTitle.js similarity index 100% rename from client-app/javascript/app/designs/details/_AddBasicTitle.js rename to client-app/src/app/designs/details/_AddBasicTitle.js diff --git a/client-app/javascript/app/designs/details/_AddTitle.js b/client-app/src/app/designs/details/_AddTitle.js similarity index 100% rename from client-app/javascript/app/designs/details/_AddTitle.js rename to client-app/src/app/designs/details/_AddTitle.js diff --git a/client-app/javascript/app/designs/details/_ControllerItfc.js b/client-app/src/app/designs/details/_ControllerItfc.js similarity index 100% rename from client-app/javascript/app/designs/details/_ControllerItfc.js rename to client-app/src/app/designs/details/_ControllerItfc.js diff --git a/client-app/javascript/app/designs/details/main/ActivityLayerMap.js b/client-app/src/app/designs/details/main/ActivityLayerMap.js similarity index 100% rename from client-app/javascript/app/designs/details/main/ActivityLayerMap.js rename to client-app/src/app/designs/details/main/ActivityLayerMap.js diff --git a/client-app/javascript/app/designs/details/main/ActivityMap.js b/client-app/src/app/designs/details/main/ActivityMap.js similarity index 100% rename from client-app/javascript/app/designs/details/main/ActivityMap.js rename to client-app/src/app/designs/details/main/ActivityMap.js diff --git a/client-app/javascript/app/designs/details/main/ActivityTrackingMap.js b/client-app/src/app/designs/details/main/ActivityTrackingMap.js similarity index 100% rename from client-app/javascript/app/designs/details/main/ActivityTrackingMap.js rename to client-app/src/app/designs/details/main/ActivityTrackingMap.js diff --git a/client-app/javascript/app/designs/details/main/Contact.js b/client-app/src/app/designs/details/main/Contact.js similarity index 100% rename from client-app/javascript/app/designs/details/main/Contact.js rename to client-app/src/app/designs/details/main/Contact.js diff --git a/client-app/javascript/app/designs/details/main/Document.js b/client-app/src/app/designs/details/main/Document.js similarity index 100% rename from client-app/javascript/app/designs/details/main/Document.js rename to client-app/src/app/designs/details/main/Document.js diff --git a/client-app/javascript/app/designs/details/main/DocumentPDF.js b/client-app/src/app/designs/details/main/DocumentPDF.js similarity index 100% rename from client-app/javascript/app/designs/details/main/DocumentPDF.js rename to client-app/src/app/designs/details/main/DocumentPDF.js diff --git a/client-app/javascript/app/designs/details/main/Organisation.js b/client-app/src/app/designs/details/main/Organisation.js similarity index 100% rename from client-app/javascript/app/designs/details/main/Organisation.js rename to client-app/src/app/designs/details/main/Organisation.js diff --git a/client-app/javascript/app/designs/details/main/Platform.js b/client-app/src/app/designs/details/main/Platform.js similarity index 100% rename from client-app/javascript/app/designs/details/main/Platform.js rename to client-app/src/app/designs/details/main/Platform.js diff --git a/client-app/javascript/app/designs/details/main/Program.js b/client-app/src/app/designs/details/main/Program.js similarity index 100% rename from client-app/javascript/app/designs/details/main/Program.js rename to client-app/src/app/designs/details/main/Program.js diff --git a/client-app/javascript/app/designs/details/main/Project.js b/client-app/src/app/designs/details/main/Project.js similarity index 100% rename from client-app/javascript/app/designs/details/main/Project.js rename to client-app/src/app/designs/details/main/Project.js diff --git a/client-app/javascript/app/designs/details/main/ServiceOGC.js b/client-app/src/app/designs/details/main/ServiceOGC.js similarity index 100% rename from client-app/javascript/app/designs/details/main/ServiceOGC.js rename to client-app/src/app/designs/details/main/ServiceOGC.js diff --git a/client-app/javascript/app/designs/details/main/Species.js b/client-app/src/app/designs/details/main/Species.js similarity index 100% rename from client-app/javascript/app/designs/details/main/Species.js rename to client-app/src/app/designs/details/main/Species.js diff --git a/client-app/javascript/app/designs/details/main/SpeciesLocation.js b/client-app/src/app/designs/details/main/SpeciesLocation.js similarity index 100% rename from client-app/javascript/app/designs/details/main/SpeciesLocation.js rename to client-app/src/app/designs/details/main/SpeciesLocation.js diff --git a/client-app/javascript/app/designs/details/main/Statistics.js b/client-app/src/app/designs/details/main/Statistics.js similarity index 100% rename from client-app/javascript/app/designs/details/main/Statistics.js rename to client-app/src/app/designs/details/main/Statistics.js diff --git a/client-app/javascript/app/designs/details/main/_ActivityBase.js b/client-app/src/app/designs/details/main/_ActivityBase.js similarity index 100% rename from client-app/javascript/app/designs/details/main/_ActivityBase.js rename to client-app/src/app/designs/details/main/_ActivityBase.js diff --git a/client-app/javascript/app/designs/details/main/_DetailsBase.js b/client-app/src/app/designs/details/main/_DetailsBase.js similarity index 100% rename from client-app/javascript/app/designs/details/main/_DetailsBase.js rename to client-app/src/app/designs/details/main/_DetailsBase.js diff --git a/client-app/javascript/app/designs/doubleList/Controller.js b/client-app/src/app/designs/doubleList/Controller.js similarity index 100% rename from client-app/javascript/app/designs/doubleList/Controller.js rename to client-app/src/app/designs/doubleList/Controller.js diff --git a/client-app/javascript/app/designs/doubleList/layout/Layout.js b/client-app/src/app/designs/doubleList/layout/Layout.js similarity index 100% rename from client-app/javascript/app/designs/doubleList/layout/Layout.js rename to client-app/src/app/designs/doubleList/layout/Layout.js diff --git a/client-app/javascript/app/designs/doubleList/layout/TopLeftContentAndDoubleList.js b/client-app/src/app/designs/doubleList/layout/TopLeftContentAndDoubleList.js similarity index 100% rename from client-app/javascript/app/designs/doubleList/layout/TopLeftContentAndDoubleList.js rename to client-app/src/app/designs/doubleList/layout/TopLeftContentAndDoubleList.js diff --git a/client-app/javascript/app/designs/doubleList/main/textSearchAndDoubleList.js b/client-app/src/app/designs/doubleList/main/textSearchAndDoubleList.js similarity index 100% rename from client-app/javascript/app/designs/doubleList/main/textSearchAndDoubleList.js rename to client-app/src/app/designs/doubleList/main/textSearchAndDoubleList.js diff --git a/client-app/javascript/app/designs/dynamicDualContent/Controller.js b/client-app/src/app/designs/dynamicDualContent/Controller.js similarity index 100% rename from client-app/javascript/app/designs/dynamicDualContent/Controller.js rename to client-app/src/app/designs/dynamicDualContent/Controller.js diff --git a/client-app/javascript/app/designs/dynamicDualContent/layout/FacetsInLeftSecondaryContent.js b/client-app/src/app/designs/dynamicDualContent/layout/FacetsInLeftSecondaryContent.js similarity index 100% rename from client-app/javascript/app/designs/dynamicDualContent/layout/FacetsInLeftSecondaryContent.js rename to client-app/src/app/designs/dynamicDualContent/layout/FacetsInLeftSecondaryContent.js diff --git a/client-app/javascript/app/designs/dynamicDualContent/layout/LeftSecondaryContent.js b/client-app/src/app/designs/dynamicDualContent/layout/LeftSecondaryContent.js similarity index 100% rename from client-app/javascript/app/designs/dynamicDualContent/layout/LeftSecondaryContent.js rename to client-app/src/app/designs/dynamicDualContent/layout/LeftSecondaryContent.js diff --git a/client-app/javascript/app/designs/dynamicDualContent/layout/TopSecondaryContent.js b/client-app/src/app/designs/dynamicDualContent/layout/TopSecondaryContent.js similarity index 100% rename from client-app/javascript/app/designs/dynamicDualContent/layout/TopSecondaryContent.js rename to client-app/src/app/designs/dynamicDualContent/layout/TopSecondaryContent.js diff --git a/client-app/javascript/app/designs/dynamicDualContent/layout/_Layout.js b/client-app/src/app/designs/dynamicDualContent/layout/_Layout.js similarity index 100% rename from client-app/javascript/app/designs/dynamicDualContent/layout/_Layout.js rename to client-app/src/app/designs/dynamicDualContent/layout/_Layout.js diff --git a/client-app/javascript/app/designs/dynamicDualContent/main/FacetsWithDynamicRightContent.js b/client-app/src/app/designs/dynamicDualContent/main/FacetsWithDynamicRightContent.js similarity index 100% rename from client-app/javascript/app/designs/dynamicDualContent/main/FacetsWithDynamicRightContent.js rename to client-app/src/app/designs/dynamicDualContent/main/FacetsWithDynamicRightContent.js diff --git a/client-app/javascript/app/designs/edition/Controller.js b/client-app/src/app/designs/edition/Controller.js similarity index 100% rename from client-app/javascript/app/designs/edition/Controller.js rename to client-app/src/app/designs/edition/Controller.js diff --git a/client-app/javascript/app/designs/edition/Layout.js b/client-app/src/app/designs/edition/Layout.js similarity index 100% rename from client-app/javascript/app/designs/edition/Layout.js rename to client-app/src/app/designs/edition/Layout.js diff --git a/client-app/javascript/app/designs/embeddedContent/Controller.js b/client-app/src/app/designs/embeddedContent/Controller.js similarity index 100% rename from client-app/javascript/app/designs/embeddedContent/Controller.js rename to client-app/src/app/designs/embeddedContent/Controller.js diff --git a/client-app/javascript/app/designs/embeddedContent/Layout.js b/client-app/src/app/designs/embeddedContent/Layout.js similarity index 100% rename from client-app/javascript/app/designs/embeddedContent/Layout.js rename to client-app/src/app/designs/embeddedContent/Layout.js diff --git a/client-app/javascript/app/designs/embeddedContentWithTopbar/Controller.js b/client-app/src/app/designs/embeddedContentWithTopbar/Controller.js similarity index 100% rename from client-app/javascript/app/designs/embeddedContentWithTopbar/Controller.js rename to client-app/src/app/designs/embeddedContentWithTopbar/Controller.js diff --git a/client-app/javascript/app/designs/embeddedContentWithTopbar/layout/TopAndCenterContent.js b/client-app/src/app/designs/embeddedContentWithTopbar/layout/TopAndCenterContent.js similarity index 100% rename from client-app/javascript/app/designs/embeddedContentWithTopbar/layout/TopAndCenterContent.js rename to client-app/src/app/designs/embeddedContentWithTopbar/layout/TopAndCenterContent.js diff --git a/client-app/javascript/app/designs/embeddedContentWithTopbar/main/EmbeddedContentSelectionInTopbar.js b/client-app/src/app/designs/embeddedContentWithTopbar/main/EmbeddedContentSelectionInTopbar.js similarity index 100% rename from client-app/javascript/app/designs/embeddedContentWithTopbar/main/EmbeddedContentSelectionInTopbar.js rename to client-app/src/app/designs/embeddedContentWithTopbar/main/EmbeddedContentSelectionInTopbar.js diff --git a/client-app/javascript/app/designs/externalTextSearchList/Controller.js b/client-app/src/app/designs/externalTextSearchList/Controller.js similarity index 100% rename from client-app/javascript/app/designs/externalTextSearchList/Controller.js rename to client-app/src/app/designs/externalTextSearchList/Controller.js diff --git a/client-app/javascript/app/designs/externalTextSearchList/Layout.js b/client-app/src/app/designs/externalTextSearchList/Layout.js similarity index 100% rename from client-app/javascript/app/designs/externalTextSearchList/Layout.js rename to client-app/src/app/designs/externalTextSearchList/Layout.js diff --git a/client-app/javascript/app/designs/externalTextSearchList/main/PlaceNames.js b/client-app/src/app/designs/externalTextSearchList/main/PlaceNames.js similarity index 100% rename from client-app/javascript/app/designs/externalTextSearchList/main/PlaceNames.js rename to client-app/src/app/designs/externalTextSearchList/main/PlaceNames.js diff --git a/client-app/javascript/app/designs/externalTextSearchList/main/Worms.js b/client-app/src/app/designs/externalTextSearchList/main/Worms.js similarity index 100% rename from client-app/javascript/app/designs/externalTextSearchList/main/Worms.js rename to client-app/src/app/designs/externalTextSearchList/main/Worms.js diff --git a/client-app/javascript/app/designs/formList/Controller.js b/client-app/src/app/designs/formList/Controller.js similarity index 100% rename from client-app/javascript/app/designs/formList/Controller.js rename to client-app/src/app/designs/formList/Controller.js diff --git a/client-app/javascript/app/designs/formList/_ControllerItfc.js b/client-app/src/app/designs/formList/_ControllerItfc.js similarity index 100% rename from client-app/javascript/app/designs/formList/_ControllerItfc.js rename to client-app/src/app/designs/formList/_ControllerItfc.js diff --git a/client-app/javascript/app/designs/formList/layout/Layout.js b/client-app/src/app/designs/formList/layout/Layout.js similarity index 100% rename from client-app/javascript/app/designs/formList/layout/Layout.js rename to client-app/src/app/designs/formList/layout/Layout.js diff --git a/client-app/javascript/app/designs/formList/layout/LayoutWithTopForm.js b/client-app/src/app/designs/formList/layout/LayoutWithTopForm.js similarity index 100% rename from client-app/javascript/app/designs/formList/layout/LayoutWithTopForm.js rename to client-app/src/app/designs/formList/layout/LayoutWithTopForm.js diff --git a/client-app/javascript/app/designs/formList/main/FormListByStep.js b/client-app/src/app/designs/formList/main/FormListByStep.js similarity index 100% rename from client-app/javascript/app/designs/formList/main/FormListByStep.js rename to client-app/src/app/designs/formList/main/FormListByStep.js diff --git a/client-app/javascript/app/designs/formList/main/_RequestAndParseData.js b/client-app/src/app/designs/formList/main/_RequestAndParseData.js similarity index 100% rename from client-app/javascript/app/designs/formList/main/_RequestAndParseData.js rename to client-app/src/app/designs/formList/main/_RequestAndParseData.js diff --git a/client-app/javascript/app/designs/list/Controller.js b/client-app/src/app/designs/list/Controller.js similarity index 100% rename from client-app/javascript/app/designs/list/Controller.js rename to client-app/src/app/designs/list/Controller.js diff --git a/client-app/javascript/app/designs/list/_AddFilter.js b/client-app/src/app/designs/list/_AddFilter.js similarity index 100% rename from client-app/javascript/app/designs/list/_AddFilter.js rename to client-app/src/app/designs/list/_AddFilter.js diff --git a/client-app/javascript/app/designs/list/layout/Layout.js b/client-app/src/app/designs/list/layout/Layout.js similarity index 100% rename from client-app/javascript/app/designs/list/layout/Layout.js rename to client-app/src/app/designs/list/layout/Layout.js diff --git a/client-app/javascript/app/designs/list/layout/ListWithTopContent.js b/client-app/src/app/designs/list/layout/ListWithTopContent.js similarity index 100% rename from client-app/javascript/app/designs/list/layout/ListWithTopContent.js rename to client-app/src/app/designs/list/layout/ListWithTopContent.js diff --git a/client-app/javascript/app/designs/list/layout/NoTitle.js b/client-app/src/app/designs/list/layout/NoTitle.js similarity index 100% rename from client-app/javascript/app/designs/list/layout/NoTitle.js rename to client-app/src/app/designs/list/layout/NoTitle.js diff --git a/client-app/javascript/app/designs/mapWithSideContent/Controller.js b/client-app/src/app/designs/mapWithSideContent/Controller.js similarity index 100% rename from client-app/javascript/app/designs/mapWithSideContent/Controller.js rename to client-app/src/app/designs/mapWithSideContent/Controller.js diff --git a/client-app/javascript/app/designs/mapWithSideContent/layout/MapAndContent.js b/client-app/src/app/designs/mapWithSideContent/layout/MapAndContent.js similarity index 100% rename from client-app/javascript/app/designs/mapWithSideContent/layout/MapAndContent.js rename to client-app/src/app/designs/mapWithSideContent/layout/MapAndContent.js diff --git a/client-app/javascript/app/designs/mapWithSideContent/layout/MapAndContentAndTopbar.js b/client-app/src/app/designs/mapWithSideContent/layout/MapAndContentAndTopbar.js similarity index 100% rename from client-app/javascript/app/designs/mapWithSideContent/layout/MapAndContentAndTopbar.js rename to client-app/src/app/designs/mapWithSideContent/layout/MapAndContentAndTopbar.js diff --git a/client-app/javascript/app/designs/mapWithSideContent/main/FilterAndGeographic.js b/client-app/src/app/designs/mapWithSideContent/main/FilterAndGeographic.js similarity index 100% rename from client-app/javascript/app/designs/mapWithSideContent/main/FilterAndGeographic.js rename to client-app/src/app/designs/mapWithSideContent/main/FilterAndGeographic.js diff --git a/client-app/javascript/app/designs/mapWithSideContent/main/Geographic.js b/client-app/src/app/designs/mapWithSideContent/main/Geographic.js similarity index 100% rename from client-app/javascript/app/designs/mapWithSideContent/main/Geographic.js rename to client-app/src/app/designs/mapWithSideContent/main/Geographic.js diff --git a/client-app/javascript/app/designs/mapWithSideContent/main/GeographicEditor.js b/client-app/src/app/designs/mapWithSideContent/main/GeographicEditor.js similarity index 100% rename from client-app/javascript/app/designs/mapWithSideContent/main/GeographicEditor.js rename to client-app/src/app/designs/mapWithSideContent/main/GeographicEditor.js diff --git a/client-app/javascript/app/designs/mapWithSideContent/main/Tracking.js b/client-app/src/app/designs/mapWithSideContent/main/Tracking.js similarity index 100% rename from client-app/javascript/app/designs/mapWithSideContent/main/Tracking.js rename to client-app/src/app/designs/mapWithSideContent/main/Tracking.js diff --git a/client-app/javascript/app/designs/mapWithSideContent/main/_TrackingByFilter.js b/client-app/src/app/designs/mapWithSideContent/main/_TrackingByFilter.js similarity index 100% rename from client-app/javascript/app/designs/mapWithSideContent/main/_TrackingByFilter.js rename to client-app/src/app/designs/mapWithSideContent/main/_TrackingByFilter.js diff --git a/client-app/javascript/app/designs/mapWithSideContent/main/_TrackingWithList.js b/client-app/src/app/designs/mapWithSideContent/main/_TrackingWithList.js similarity index 100% rename from client-app/javascript/app/designs/mapWithSideContent/main/_TrackingWithList.js rename to client-app/src/app/designs/mapWithSideContent/main/_TrackingWithList.js diff --git a/client-app/javascript/app/designs/mapWithSideContent/main/_TrackingWithListByFilter.js b/client-app/src/app/designs/mapWithSideContent/main/_TrackingWithListByFilter.js similarity index 100% rename from client-app/javascript/app/designs/mapWithSideContent/main/_TrackingWithListByFilter.js rename to client-app/src/app/designs/mapWithSideContent/main/_TrackingWithListByFilter.js diff --git a/client-app/javascript/app/designs/textSearchFacetsList/Controller.js b/client-app/src/app/designs/textSearchFacetsList/Controller.js similarity index 100% rename from client-app/javascript/app/designs/textSearchFacetsList/Controller.js rename to client-app/src/app/designs/textSearchFacetsList/Controller.js diff --git a/client-app/javascript/app/designs/textSearchFacetsList/Layout.js b/client-app/src/app/designs/textSearchFacetsList/Layout.js similarity index 100% rename from client-app/javascript/app/designs/textSearchFacetsList/Layout.js rename to client-app/src/app/designs/textSearchFacetsList/Layout.js diff --git a/client-app/javascript/app/designs/textSearchFacetsList/_AddFilter.js b/client-app/src/app/designs/textSearchFacetsList/_AddFilter.js similarity index 100% rename from client-app/javascript/app/designs/textSearchFacetsList/_AddFilter.js rename to client-app/src/app/designs/textSearchFacetsList/_AddFilter.js diff --git a/client-app/javascript/app/designs/textSearchFacetsList/main/Activity.js b/client-app/src/app/designs/textSearchFacetsList/main/Activity.js similarity index 100% rename from client-app/javascript/app/designs/textSearchFacetsList/main/Activity.js rename to client-app/src/app/designs/textSearchFacetsList/main/Activity.js diff --git a/client-app/javascript/app/designs/textSearchFacetsList/main/Administrative.js b/client-app/src/app/designs/textSearchFacetsList/main/Administrative.js similarity index 100% rename from client-app/javascript/app/designs/textSearchFacetsList/main/Administrative.js rename to client-app/src/app/designs/textSearchFacetsList/main/Administrative.js diff --git a/client-app/javascript/app/designs/textSearchFacetsList/main/Bibliography.js b/client-app/src/app/designs/textSearchFacetsList/main/Bibliography.js similarity index 100% rename from client-app/javascript/app/designs/textSearchFacetsList/main/Bibliography.js rename to client-app/src/app/designs/textSearchFacetsList/main/Bibliography.js diff --git a/client-app/javascript/app/designs/textSearchFacetsList/main/Domain.js b/client-app/src/app/designs/textSearchFacetsList/main/Domain.js similarity index 100% rename from client-app/javascript/app/designs/textSearchFacetsList/main/Domain.js rename to client-app/src/app/designs/textSearchFacetsList/main/Domain.js diff --git a/client-app/javascript/app/designs/textSearchFacetsList/main/Organisation.js b/client-app/src/app/designs/textSearchFacetsList/main/Organisation.js similarity index 100% rename from client-app/javascript/app/designs/textSearchFacetsList/main/Organisation.js rename to client-app/src/app/designs/textSearchFacetsList/main/Organisation.js diff --git a/client-app/javascript/app/designs/textSearchFacetsList/main/Platform.js b/client-app/src/app/designs/textSearchFacetsList/main/Platform.js similarity index 100% rename from client-app/javascript/app/designs/textSearchFacetsList/main/Platform.js rename to client-app/src/app/designs/textSearchFacetsList/main/Platform.js diff --git a/client-app/javascript/app/designs/textSearchFacetsList/main/Program.js b/client-app/src/app/designs/textSearchFacetsList/main/Program.js similarity index 100% rename from client-app/javascript/app/designs/textSearchFacetsList/main/Program.js rename to client-app/src/app/designs/textSearchFacetsList/main/Program.js diff --git a/client-app/javascript/app/designs/textSearchFacetsList/main/Project.js b/client-app/src/app/designs/textSearchFacetsList/main/Project.js similarity index 100% rename from client-app/javascript/app/designs/textSearchFacetsList/main/Project.js rename to client-app/src/app/designs/textSearchFacetsList/main/Project.js diff --git a/client-app/javascript/app/designs/textSearchFacetsList/main/ServiceOGC.js b/client-app/src/app/designs/textSearchFacetsList/main/ServiceOGC.js similarity index 100% rename from client-app/javascript/app/designs/textSearchFacetsList/main/ServiceOGC.js rename to client-app/src/app/designs/textSearchFacetsList/main/ServiceOGC.js diff --git a/client-app/javascript/app/designs/textSearchFacetsList/main/Species.js b/client-app/src/app/designs/textSearchFacetsList/main/Species.js similarity index 100% rename from client-app/javascript/app/designs/textSearchFacetsList/main/Species.js rename to client-app/src/app/designs/textSearchFacetsList/main/Species.js diff --git a/client-app/javascript/app/designs/textSearchFacetsList/main/Taxon.js b/client-app/src/app/designs/textSearchFacetsList/main/Taxon.js similarity index 100% rename from client-app/javascript/app/designs/textSearchFacetsList/main/Taxon.js rename to client-app/src/app/designs/textSearchFacetsList/main/Taxon.js diff --git a/client-app/javascript/app/designs/textSearchList/Controller.js b/client-app/src/app/designs/textSearchList/Controller.js similarity index 100% rename from client-app/javascript/app/designs/textSearchList/Controller.js rename to client-app/src/app/designs/textSearchList/Controller.js diff --git a/client-app/javascript/app/designs/textSearchList/_AddFilter.js b/client-app/src/app/designs/textSearchList/_AddFilter.js similarity index 100% rename from client-app/javascript/app/designs/textSearchList/_AddFilter.js rename to client-app/src/app/designs/textSearchList/_AddFilter.js diff --git a/client-app/javascript/app/designs/textSearchList/layout/BasicAndButtonsTopZone.js b/client-app/src/app/designs/textSearchList/layout/BasicAndButtonsTopZone.js similarity index 100% rename from client-app/javascript/app/designs/textSearchList/layout/BasicAndButtonsTopZone.js rename to client-app/src/app/designs/textSearchList/layout/BasicAndButtonsTopZone.js diff --git a/client-app/javascript/app/designs/textSearchList/layout/BasicTopZone.js b/client-app/src/app/designs/textSearchList/layout/BasicTopZone.js similarity index 100% rename from client-app/javascript/app/designs/textSearchList/layout/BasicTopZone.js rename to client-app/src/app/designs/textSearchList/layout/BasicTopZone.js diff --git a/client-app/javascript/app/designs/textSearchList/main/Domain.js b/client-app/src/app/designs/textSearchList/main/Domain.js similarity index 100% rename from client-app/javascript/app/designs/textSearchList/main/Domain.js rename to client-app/src/app/designs/textSearchList/main/Domain.js diff --git a/client-app/javascript/app/designs/textSearchList/main/Selection.js b/client-app/src/app/designs/textSearchList/main/Selection.js similarity index 100% rename from client-app/javascript/app/designs/textSearchList/main/Selection.js rename to client-app/src/app/designs/textSearchList/main/Selection.js diff --git a/client-app/javascript/app/designs/textSearchList/main/ServiceOGC.js b/client-app/src/app/designs/textSearchList/main/ServiceOGC.js similarity index 100% rename from client-app/javascript/app/designs/textSearchList/main/ServiceOGC.js rename to client-app/src/app/designs/textSearchList/main/ServiceOGC.js diff --git a/client-app/javascript/app/details/views/ActivityAreaMapBase.js b/client-app/src/app/details/views/ActivityAreaMapBase.js similarity index 100% rename from client-app/javascript/app/details/views/ActivityAreaMapBase.js rename to client-app/src/app/details/views/ActivityAreaMapBase.js diff --git a/client-app/javascript/app/details/views/ActivityCatalogDetailsView.js b/client-app/src/app/details/views/ActivityCatalogDetailsView.js similarity index 100% rename from client-app/javascript/app/details/views/ActivityCatalogDetailsView.js rename to client-app/src/app/details/views/ActivityCatalogDetailsView.js diff --git a/client-app/javascript/app/details/views/ActivityChart.js b/client-app/src/app/details/views/ActivityChart.js similarity index 100% rename from client-app/javascript/app/details/views/ActivityChart.js rename to client-app/src/app/details/views/ActivityChart.js diff --git a/client-app/javascript/app/details/views/ActivityCitationMapBase.js b/client-app/src/app/details/views/ActivityCitationMapBase.js similarity index 100% rename from client-app/javascript/app/details/views/ActivityCitationMapBase.js rename to client-app/src/app/details/views/ActivityCitationMapBase.js diff --git a/client-app/javascript/app/details/views/ActivityDetailsView.js b/client-app/src/app/details/views/ActivityDetailsView.js similarity index 100% rename from client-app/javascript/app/details/views/ActivityDetailsView.js rename to client-app/src/app/details/views/ActivityDetailsView.js diff --git a/client-app/javascript/app/details/views/ActivityFixedTimeseriesChart.js b/client-app/src/app/details/views/ActivityFixedTimeseriesChart.js similarity index 100% rename from client-app/javascript/app/details/views/ActivityFixedTimeseriesChart.js rename to client-app/src/app/details/views/ActivityFixedTimeseriesChart.js diff --git a/client-app/javascript/app/details/views/ActivityFixedTimeseriesMap.js b/client-app/src/app/details/views/ActivityFixedTimeseriesMap.js similarity index 100% rename from client-app/javascript/app/details/views/ActivityFixedTimeseriesMap.js rename to client-app/src/app/details/views/ActivityFixedTimeseriesMap.js diff --git a/client-app/javascript/app/details/views/ActivityInfrastructureMapBase.js b/client-app/src/app/details/views/ActivityInfrastructureMapBase.js similarity index 100% rename from client-app/javascript/app/details/views/ActivityInfrastructureMapBase.js rename to client-app/src/app/details/views/ActivityInfrastructureMapBase.js diff --git a/client-app/javascript/app/details/views/ActivityLayerMapBase.js b/client-app/src/app/details/views/ActivityLayerMapBase.js similarity index 100% rename from client-app/javascript/app/details/views/ActivityLayerMapBase.js rename to client-app/src/app/details/views/ActivityLayerMapBase.js diff --git a/client-app/javascript/app/details/views/BibliographyDetailsView.js b/client-app/src/app/details/views/BibliographyDetailsView.js similarity index 100% rename from client-app/javascript/app/details/views/BibliographyDetailsView.js rename to client-app/src/app/details/views/BibliographyDetailsView.js diff --git a/client-app/javascript/app/details/views/ContactDetailsView.js b/client-app/src/app/details/views/ContactDetailsView.js similarity index 100% rename from client-app/javascript/app/details/views/ContactDetailsView.js rename to client-app/src/app/details/views/ContactDetailsView.js diff --git a/client-app/javascript/app/details/views/DocumentDetailsView.js b/client-app/src/app/details/views/DocumentDetailsView.js similarity index 100% rename from client-app/javascript/app/details/views/DocumentDetailsView.js rename to client-app/src/app/details/views/DocumentDetailsView.js diff --git a/client-app/javascript/app/details/views/OrganisationCatalogDetailsView.js b/client-app/src/app/details/views/OrganisationCatalogDetailsView.js similarity index 100% rename from client-app/javascript/app/details/views/OrganisationCatalogDetailsView.js rename to client-app/src/app/details/views/OrganisationCatalogDetailsView.js diff --git a/client-app/javascript/app/details/views/OrganisationDetailsView.js b/client-app/src/app/details/views/OrganisationDetailsView.js similarity index 100% rename from client-app/javascript/app/details/views/OrganisationDetailsView.js rename to client-app/src/app/details/views/OrganisationDetailsView.js diff --git a/client-app/javascript/app/details/views/PlatformCatalogDetailsView.js b/client-app/src/app/details/views/PlatformCatalogDetailsView.js similarity index 100% rename from client-app/javascript/app/details/views/PlatformCatalogDetailsView.js rename to client-app/src/app/details/views/PlatformCatalogDetailsView.js diff --git a/client-app/javascript/app/details/views/PlatformDetailsView.js b/client-app/src/app/details/views/PlatformDetailsView.js similarity index 100% rename from client-app/javascript/app/details/views/PlatformDetailsView.js rename to client-app/src/app/details/views/PlatformDetailsView.js diff --git a/client-app/javascript/app/details/views/ProgramCatalogDetailsView.js b/client-app/src/app/details/views/ProgramCatalogDetailsView.js similarity index 100% rename from client-app/javascript/app/details/views/ProgramCatalogDetailsView.js rename to client-app/src/app/details/views/ProgramCatalogDetailsView.js diff --git a/client-app/javascript/app/details/views/ProgramDetailsView.js b/client-app/src/app/details/views/ProgramDetailsView.js similarity index 100% rename from client-app/javascript/app/details/views/ProgramDetailsView.js rename to client-app/src/app/details/views/ProgramDetailsView.js diff --git a/client-app/javascript/app/details/views/ProjectCatalogDetailsView.js b/client-app/src/app/details/views/ProjectCatalogDetailsView.js similarity index 100% rename from client-app/javascript/app/details/views/ProjectCatalogDetailsView.js rename to client-app/src/app/details/views/ProjectCatalogDetailsView.js diff --git a/client-app/javascript/app/details/views/ProjectDetailsView.js b/client-app/src/app/details/views/ProjectDetailsView.js similarity index 100% rename from client-app/javascript/app/details/views/ProjectDetailsView.js rename to client-app/src/app/details/views/ProjectDetailsView.js diff --git a/client-app/javascript/app/details/views/ServiceOGCCatalogDetailsView.js b/client-app/src/app/details/views/ServiceOGCCatalogDetailsView.js similarity index 100% rename from client-app/javascript/app/details/views/ServiceOGCCatalogDetailsView.js rename to client-app/src/app/details/views/ServiceOGCCatalogDetailsView.js diff --git a/client-app/javascript/app/details/views/ServiceOGCDetailsView.js b/client-app/src/app/details/views/ServiceOGCDetailsView.js similarity index 100% rename from client-app/javascript/app/details/views/ServiceOGCDetailsView.js rename to client-app/src/app/details/views/ServiceOGCDetailsView.js diff --git a/client-app/javascript/app/details/views/SpeciesCatalogDetailsView.js b/client-app/src/app/details/views/SpeciesCatalogDetailsView.js similarity index 100% rename from client-app/javascript/app/details/views/SpeciesCatalogDetailsView.js rename to client-app/src/app/details/views/SpeciesCatalogDetailsView.js diff --git a/client-app/javascript/app/details/views/SpeciesDetailsView.js b/client-app/src/app/details/views/SpeciesDetailsView.js similarity index 100% rename from client-app/javascript/app/details/views/SpeciesDetailsView.js rename to client-app/src/app/details/views/SpeciesDetailsView.js diff --git a/client-app/javascript/app/details/views/StatisticsDetailsView.js b/client-app/src/app/details/views/StatisticsDetailsView.js similarity index 100% rename from client-app/javascript/app/details/views/StatisticsDetailsView.js rename to client-app/src/app/details/views/StatisticsDetailsView.js diff --git a/client-app/javascript/app/details/views/_ActivityTimeSeriesDataManagement.js b/client-app/src/app/details/views/_ActivityTimeSeriesDataManagement.js similarity index 100% rename from client-app/javascript/app/details/views/_ActivityTimeSeriesDataManagement.js rename to client-app/src/app/details/views/_ActivityTimeSeriesDataManagement.js diff --git a/client-app/javascript/app/edition/views/ActivityEditionView.js b/client-app/src/app/edition/views/ActivityEditionView.js similarity index 100% rename from client-app/javascript/app/edition/views/ActivityEditionView.js rename to client-app/src/app/edition/views/ActivityEditionView.js diff --git a/client-app/javascript/app/edition/views/AnimalEditionView.js b/client-app/src/app/edition/views/AnimalEditionView.js similarity index 100% rename from client-app/javascript/app/edition/views/AnimalEditionView.js rename to client-app/src/app/edition/views/AnimalEditionView.js diff --git a/client-app/javascript/app/edition/views/ConditionEditionView.js b/client-app/src/app/edition/views/ConditionEditionView.js similarity index 100% rename from client-app/javascript/app/edition/views/ConditionEditionView.js rename to client-app/src/app/edition/views/ConditionEditionView.js diff --git a/client-app/javascript/app/edition/views/ContactEditionView.js b/client-app/src/app/edition/views/ContactEditionView.js similarity index 100% rename from client-app/javascript/app/edition/views/ContactEditionView.js rename to client-app/src/app/edition/views/ContactEditionView.js diff --git a/client-app/javascript/app/edition/views/DeviceEditionView.js b/client-app/src/app/edition/views/DeviceEditionView.js similarity index 100% rename from client-app/javascript/app/edition/views/DeviceEditionView.js rename to client-app/src/app/edition/views/DeviceEditionView.js diff --git a/client-app/javascript/app/edition/views/DocumentEditionView.js b/client-app/src/app/edition/views/DocumentEditionView.js similarity index 100% rename from client-app/javascript/app/edition/views/DocumentEditionView.js rename to client-app/src/app/edition/views/DocumentEditionView.js diff --git a/client-app/javascript/app/edition/views/LoadDataDocumentEditionView.js b/client-app/src/app/edition/views/LoadDataDocumentEditionView.js similarity index 100% rename from client-app/javascript/app/edition/views/LoadDataDocumentEditionView.js rename to client-app/src/app/edition/views/LoadDataDocumentEditionView.js diff --git a/client-app/javascript/app/edition/views/LoadDataToActivityEditionView.js b/client-app/src/app/edition/views/LoadDataToActivityEditionView.js similarity index 100% rename from client-app/javascript/app/edition/views/LoadDataToActivityEditionView.js rename to client-app/src/app/edition/views/LoadDataToActivityEditionView.js diff --git a/client-app/javascript/app/edition/views/MetricsDefinitionEditionView.js b/client-app/src/app/edition/views/MetricsDefinitionEditionView.js similarity index 100% rename from client-app/javascript/app/edition/views/MetricsDefinitionEditionView.js rename to client-app/src/app/edition/views/MetricsDefinitionEditionView.js diff --git a/client-app/javascript/app/edition/views/MisIdentificationEditionView.js b/client-app/src/app/edition/views/MisIdentificationEditionView.js similarity index 100% rename from client-app/javascript/app/edition/views/MisIdentificationEditionView.js rename to client-app/src/app/edition/views/MisIdentificationEditionView.js diff --git a/client-app/javascript/app/edition/views/OrganisationEditionView.js b/client-app/src/app/edition/views/OrganisationEditionView.js similarity index 100% rename from client-app/javascript/app/edition/views/OrganisationEditionView.js rename to client-app/src/app/edition/views/OrganisationEditionView.js diff --git a/client-app/javascript/app/edition/views/ParameterEditionView.js b/client-app/src/app/edition/views/ParameterEditionView.js similarity index 100% rename from client-app/javascript/app/edition/views/ParameterEditionView.js rename to client-app/src/app/edition/views/ParameterEditionView.js diff --git a/client-app/javascript/app/edition/views/PermissionsEditionView.js b/client-app/src/app/edition/views/PermissionsEditionView.js similarity index 100% rename from client-app/javascript/app/edition/views/PermissionsEditionView.js rename to client-app/src/app/edition/views/PermissionsEditionView.js diff --git a/client-app/javascript/app/edition/views/PlatformEditionView.js b/client-app/src/app/edition/views/PlatformEditionView.js similarity index 100% rename from client-app/javascript/app/edition/views/PlatformEditionView.js rename to client-app/src/app/edition/views/PlatformEditionView.js diff --git a/client-app/javascript/app/edition/views/ProgramEditionView.js b/client-app/src/app/edition/views/ProgramEditionView.js similarity index 100% rename from client-app/javascript/app/edition/views/ProgramEditionView.js rename to client-app/src/app/edition/views/ProgramEditionView.js diff --git a/client-app/javascript/app/edition/views/ProjectEditionView.js b/client-app/src/app/edition/views/ProjectEditionView.js similarity index 100% rename from client-app/javascript/app/edition/views/ProjectEditionView.js rename to client-app/src/app/edition/views/ProjectEditionView.js diff --git a/client-app/javascript/app/edition/views/ServiceOGCEditionView.js b/client-app/src/app/edition/views/ServiceOGCEditionView.js similarity index 100% rename from client-app/javascript/app/edition/views/ServiceOGCEditionView.js rename to client-app/src/app/edition/views/ServiceOGCEditionView.js diff --git a/client-app/javascript/app/edition/views/SpeciesEditionView.js b/client-app/src/app/edition/views/SpeciesEditionView.js similarity index 100% rename from client-app/javascript/app/edition/views/SpeciesEditionView.js rename to client-app/src/app/edition/views/SpeciesEditionView.js diff --git a/client-app/javascript/app/edition/views/UnitEditionView.js b/client-app/src/app/edition/views/UnitEditionView.js similarity index 100% rename from client-app/javascript/app/edition/views/UnitEditionView.js rename to client-app/src/app/edition/views/UnitEditionView.js diff --git a/client-app/javascript/app/edition/views/dataLoader/AddDataFT.js b/client-app/src/app/edition/views/dataLoader/AddDataFT.js similarity index 100% rename from client-app/javascript/app/edition/views/dataLoader/AddDataFT.js rename to client-app/src/app/edition/views/dataLoader/AddDataFT.js diff --git a/client-app/javascript/app/edition/views/dataLoader/AddDataIF.js b/client-app/src/app/edition/views/dataLoader/AddDataIF.js similarity index 100% rename from client-app/javascript/app/edition/views/dataLoader/AddDataIF.js rename to client-app/src/app/edition/views/dataLoader/AddDataIF.js diff --git a/client-app/javascript/app/edition/views/dataLoader/AddDataOC.js b/client-app/src/app/edition/views/dataLoader/AddDataOC.js similarity index 100% rename from client-app/javascript/app/edition/views/dataLoader/AddDataOC.js rename to client-app/src/app/edition/views/dataLoader/AddDataOC.js diff --git a/client-app/javascript/app/edition/views/dataLoader/EditDataAR.js b/client-app/src/app/edition/views/dataLoader/EditDataAR.js similarity index 100% rename from client-app/javascript/app/edition/views/dataLoader/EditDataAR.js rename to client-app/src/app/edition/views/dataLoader/EditDataAR.js diff --git a/client-app/javascript/app/edition/views/dataLoader/LoadDataAR.js b/client-app/src/app/edition/views/dataLoader/LoadDataAR.js similarity index 100% rename from client-app/javascript/app/edition/views/dataLoader/LoadDataAR.js rename to client-app/src/app/edition/views/dataLoader/LoadDataAR.js diff --git a/client-app/javascript/app/edition/views/dataLoader/LoadDataFT.js b/client-app/src/app/edition/views/dataLoader/LoadDataFT.js similarity index 100% rename from client-app/javascript/app/edition/views/dataLoader/LoadDataFT.js rename to client-app/src/app/edition/views/dataLoader/LoadDataFT.js diff --git a/client-app/javascript/app/edition/views/dataLoader/LoadDataOC.js b/client-app/src/app/edition/views/dataLoader/LoadDataOC.js similarity index 100% rename from client-app/javascript/app/edition/views/dataLoader/LoadDataOC.js rename to client-app/src/app/edition/views/dataLoader/LoadDataOC.js diff --git a/client-app/javascript/app/edition/views/dataLoader/LoadDataTR.js b/client-app/src/app/edition/views/dataLoader/LoadDataTR.js similarity index 100% rename from client-app/javascript/app/edition/views/dataLoader/LoadDataTR.js rename to client-app/src/app/edition/views/dataLoader/LoadDataTR.js diff --git a/client-app/javascript/app/edition/views/dataLoader/_BaseDataToActivityEdition.js b/client-app/src/app/edition/views/dataLoader/_BaseDataToActivityEdition.js similarity index 100% rename from client-app/javascript/app/edition/views/dataLoader/_BaseDataToActivityEdition.js rename to client-app/src/app/edition/views/dataLoader/_BaseDataToActivityEdition.js diff --git a/client-app/javascript/app/edition/views/dataLoader/_BaseDataToActivityEditionItfc.js b/client-app/src/app/edition/views/dataLoader/_BaseDataToActivityEditionItfc.js similarity index 100% rename from client-app/javascript/app/edition/views/dataLoader/_BaseDataToActivityEditionItfc.js rename to client-app/src/app/edition/views/dataLoader/_BaseDataToActivityEditionItfc.js diff --git a/client-app/javascript/app/edition/views/dataLoader/_BaseLoadDataToActivityEdition.js b/client-app/src/app/edition/views/dataLoader/_BaseLoadDataToActivityEdition.js similarity index 100% rename from client-app/javascript/app/edition/views/dataLoader/_BaseLoadDataToActivityEdition.js rename to client-app/src/app/edition/views/dataLoader/_BaseLoadDataToActivityEdition.js diff --git a/client-app/javascript/app/edition/views/dataLoader/_BaseLoadDataToActivityEditionItfc.js b/client-app/src/app/edition/views/dataLoader/_BaseLoadDataToActivityEditionItfc.js similarity index 100% rename from client-app/javascript/app/edition/views/dataLoader/_BaseLoadDataToActivityEditionItfc.js rename to client-app/src/app/edition/views/dataLoader/_BaseLoadDataToActivityEditionItfc.js diff --git a/client-app/javascript/app/home/views/HomeView.js b/client-app/src/app/home/views/HomeView.js similarity index 100% rename from client-app/javascript/app/home/views/HomeView.js rename to client-app/src/app/home/views/HomeView.js diff --git a/client-app/javascript/app/home/views/ProductWidget.js b/client-app/src/app/home/views/ProductWidget.js similarity index 100% rename from client-app/javascript/app/home/views/ProductWidget.js rename to client-app/src/app/home/views/ProductWidget.js diff --git a/client-app/javascript/app/home/views/SearchBarWidget.js b/client-app/src/app/home/views/SearchBarWidget.js similarity index 100% rename from client-app/javascript/app/home/views/SearchBarWidget.js rename to client-app/src/app/home/views/SearchBarWidget.js diff --git a/client-app/javascript/app/home/views/SearchFastFilterWidget.js b/client-app/src/app/home/views/SearchFastFilterWidget.js similarity index 100% rename from client-app/javascript/app/home/views/SearchFastFilterWidget.js rename to client-app/src/app/home/views/SearchFastFilterWidget.js diff --git a/client-app/javascript/app/home/views/SearchFilterWidget.js b/client-app/src/app/home/views/SearchFilterWidget.js similarity index 100% rename from client-app/javascript/app/home/views/SearchFilterWidget.js rename to client-app/src/app/home/views/SearchFilterWidget.js diff --git a/client-app/javascript/app/home/views/SearchResultsWidget.js b/client-app/src/app/home/views/SearchResultsWidget.js similarity index 100% rename from client-app/javascript/app/home/views/SearchResultsWidget.js rename to client-app/src/app/home/views/SearchResultsWidget.js diff --git a/client-app/javascript/app/home/views/SocialWidget.js b/client-app/src/app/home/views/SocialWidget.js similarity index 100% rename from client-app/javascript/app/home/views/SocialWidget.js rename to client-app/src/app/home/views/SocialWidget.js diff --git a/client-app/javascript/app/home/views/StatsWidget.js b/client-app/src/app/home/views/StatsWidget.js similarity index 100% rename from client-app/javascript/app/home/views/StatsWidget.js rename to client-app/src/app/home/views/StatsWidget.js diff --git a/client-app/javascript/app/home/views/_DashboardItem.js b/client-app/src/app/home/views/_DashboardItem.js similarity index 100% rename from client-app/javascript/app/home/views/_DashboardItem.js rename to client-app/src/app/home/views/_DashboardItem.js diff --git a/client-app/javascript/app/maintenance/domains/_HierarchicalDomain.js b/client-app/src/app/maintenance/domains/_HierarchicalDomain.js similarity index 100% rename from client-app/javascript/app/maintenance/domains/_HierarchicalDomain.js rename to client-app/src/app/maintenance/domains/_HierarchicalDomain.js diff --git a/client-app/javascript/app/maintenance/domains/admin/views/AccessibilityView.js b/client-app/src/app/maintenance/domains/admin/views/AccessibilityView.js similarity index 100% rename from client-app/javascript/app/maintenance/domains/admin/views/AccessibilityView.js rename to client-app/src/app/maintenance/domains/admin/views/AccessibilityView.js diff --git a/client-app/javascript/app/maintenance/domains/admin/views/ActivityFieldsView.js b/client-app/src/app/maintenance/domains/admin/views/ActivityFieldsView.js similarity index 100% rename from client-app/javascript/app/maintenance/domains/admin/views/ActivityFieldsView.js rename to client-app/src/app/maintenance/domains/admin/views/ActivityFieldsView.js diff --git a/client-app/javascript/app/maintenance/domains/admin/views/ActivityTypesView.js b/client-app/src/app/maintenance/domains/admin/views/ActivityTypesView.js similarity index 100% rename from client-app/javascript/app/maintenance/domains/admin/views/ActivityTypesView.js rename to client-app/src/app/maintenance/domains/admin/views/ActivityTypesView.js diff --git a/client-app/javascript/app/maintenance/domains/admin/views/ContactRolesView.js b/client-app/src/app/maintenance/domains/admin/views/ContactRolesView.js similarity index 100% rename from client-app/javascript/app/maintenance/domains/admin/views/ContactRolesView.js rename to client-app/src/app/maintenance/domains/admin/views/ContactRolesView.js diff --git a/client-app/javascript/app/maintenance/domains/admin/views/CountriesView.js b/client-app/src/app/maintenance/domains/admin/views/CountriesView.js similarity index 100% rename from client-app/javascript/app/maintenance/domains/admin/views/CountriesView.js rename to client-app/src/app/maintenance/domains/admin/views/CountriesView.js diff --git a/client-app/javascript/app/maintenance/domains/admin/views/DeviceTypesView.js b/client-app/src/app/maintenance/domains/admin/views/DeviceTypesView.js similarity index 100% rename from client-app/javascript/app/maintenance/domains/admin/views/DeviceTypesView.js rename to client-app/src/app/maintenance/domains/admin/views/DeviceTypesView.js diff --git a/client-app/javascript/app/maintenance/domains/admin/views/DocumentTypesView.js b/client-app/src/app/maintenance/domains/admin/views/DocumentTypesView.js similarity index 100% rename from client-app/javascript/app/maintenance/domains/admin/views/DocumentTypesView.js rename to client-app/src/app/maintenance/domains/admin/views/DocumentTypesView.js diff --git a/client-app/javascript/app/maintenance/domains/admin/views/OrganisationRolesView.js b/client-app/src/app/maintenance/domains/admin/views/OrganisationRolesView.js similarity index 100% rename from client-app/javascript/app/maintenance/domains/admin/views/OrganisationRolesView.js rename to client-app/src/app/maintenance/domains/admin/views/OrganisationRolesView.js diff --git a/client-app/javascript/app/maintenance/domains/admin/views/OrganisationTypesView.js b/client-app/src/app/maintenance/domains/admin/views/OrganisationTypesView.js similarity index 100% rename from client-app/javascript/app/maintenance/domains/admin/views/OrganisationTypesView.js rename to client-app/src/app/maintenance/domains/admin/views/OrganisationTypesView.js diff --git a/client-app/javascript/app/maintenance/domains/admin/views/PlatformTypesView.js b/client-app/src/app/maintenance/domains/admin/views/PlatformTypesView.js similarity index 100% rename from client-app/javascript/app/maintenance/domains/admin/views/PlatformTypesView.js rename to client-app/src/app/maintenance/domains/admin/views/PlatformTypesView.js diff --git a/client-app/javascript/app/maintenance/domains/admin/views/ProjectGroupsView.js b/client-app/src/app/maintenance/domains/admin/views/ProjectGroupsView.js similarity index 100% rename from client-app/javascript/app/maintenance/domains/admin/views/ProjectGroupsView.js rename to client-app/src/app/maintenance/domains/admin/views/ProjectGroupsView.js diff --git a/client-app/javascript/app/maintenance/domains/admin/views/ScopesView.js b/client-app/src/app/maintenance/domains/admin/views/ScopesView.js similarity index 100% rename from client-app/javascript/app/maintenance/domains/admin/views/ScopesView.js rename to client-app/src/app/maintenance/domains/admin/views/ScopesView.js diff --git a/client-app/javascript/app/maintenance/domains/admin/views/templates/forms/ActivityTypesForm.html b/client-app/src/app/maintenance/domains/admin/views/templates/forms/ActivityTypesForm.html similarity index 100% rename from client-app/javascript/app/maintenance/domains/admin/views/templates/forms/ActivityTypesForm.html rename to client-app/src/app/maintenance/domains/admin/views/templates/forms/ActivityTypesForm.html diff --git a/client-app/javascript/app/maintenance/domains/admin/views/templates/forms/CountriesForm.html b/client-app/src/app/maintenance/domains/admin/views/templates/forms/CountriesForm.html similarity index 100% rename from client-app/javascript/app/maintenance/domains/admin/views/templates/forms/CountriesForm.html rename to client-app/src/app/maintenance/domains/admin/views/templates/forms/CountriesForm.html diff --git a/client-app/javascript/app/maintenance/domains/geometry/views/AreaTypesView.js b/client-app/src/app/maintenance/domains/geometry/views/AreaTypesView.js similarity index 100% rename from client-app/javascript/app/maintenance/domains/geometry/views/AreaTypesView.js rename to client-app/src/app/maintenance/domains/geometry/views/AreaTypesView.js diff --git a/client-app/javascript/app/maintenance/domains/geometry/views/DestinyView.js b/client-app/src/app/maintenance/domains/geometry/views/DestinyView.js similarity index 100% rename from client-app/javascript/app/maintenance/domains/geometry/views/DestinyView.js rename to client-app/src/app/maintenance/domains/geometry/views/DestinyView.js diff --git a/client-app/javascript/app/maintenance/domains/geometry/views/EndingView.js b/client-app/src/app/maintenance/domains/geometry/views/EndingView.js similarity index 100% rename from client-app/javascript/app/maintenance/domains/geometry/views/EndingView.js rename to client-app/src/app/maintenance/domains/geometry/views/EndingView.js diff --git a/client-app/javascript/app/maintenance/domains/geometry/views/InspireThemesView.js b/client-app/src/app/maintenance/domains/geometry/views/InspireThemesView.js similarity index 100% rename from client-app/javascript/app/maintenance/domains/geometry/views/InspireThemesView.js rename to client-app/src/app/maintenance/domains/geometry/views/InspireThemesView.js diff --git a/client-app/javascript/app/maintenance/domains/geometry/views/LineTypesView.js b/client-app/src/app/maintenance/domains/geometry/views/LineTypesView.js similarity index 100% rename from client-app/javascript/app/maintenance/domains/geometry/views/LineTypesView.js rename to client-app/src/app/maintenance/domains/geometry/views/LineTypesView.js diff --git a/client-app/javascript/app/maintenance/domains/geometry/views/MeshTypesView.js b/client-app/src/app/maintenance/domains/geometry/views/MeshTypesView.js similarity index 100% rename from client-app/javascript/app/maintenance/domains/geometry/views/MeshTypesView.js rename to client-app/src/app/maintenance/domains/geometry/views/MeshTypesView.js diff --git a/client-app/javascript/app/maintenance/domains/geometry/views/RasterTypesView.js b/client-app/src/app/maintenance/domains/geometry/views/RasterTypesView.js similarity index 100% rename from client-app/javascript/app/maintenance/domains/geometry/views/RasterTypesView.js rename to client-app/src/app/maintenance/domains/geometry/views/RasterTypesView.js diff --git a/client-app/javascript/app/maintenance/domains/geometry/views/RecordingTypesView.js b/client-app/src/app/maintenance/domains/geometry/views/RecordingTypesView.js similarity index 100% rename from client-app/javascript/app/maintenance/domains/geometry/views/RecordingTypesView.js rename to client-app/src/app/maintenance/domains/geometry/views/RecordingTypesView.js diff --git a/client-app/javascript/app/maintenance/domains/geometry/views/ShorelineTypesView.js b/client-app/src/app/maintenance/domains/geometry/views/ShorelineTypesView.js similarity index 100% rename from client-app/javascript/app/maintenance/domains/geometry/views/ShorelineTypesView.js rename to client-app/src/app/maintenance/domains/geometry/views/ShorelineTypesView.js diff --git a/client-app/javascript/app/maintenance/domains/geometry/views/ThematicTypeView.js b/client-app/src/app/maintenance/domains/geometry/views/ThematicTypeView.js similarity index 100% rename from client-app/javascript/app/maintenance/domains/geometry/views/ThematicTypeView.js rename to client-app/src/app/maintenance/domains/geometry/views/ThematicTypeView.js diff --git a/client-app/javascript/app/maintenance/domains/geometry/views/ToponymTypesView.js b/client-app/src/app/maintenance/domains/geometry/views/ToponymTypesView.js similarity index 100% rename from client-app/javascript/app/maintenance/domains/geometry/views/ToponymTypesView.js rename to client-app/src/app/maintenance/domains/geometry/views/ToponymTypesView.js diff --git a/client-app/javascript/app/maintenance/domains/geometry/views/templates/forms/InspireThemesForm.html b/client-app/src/app/maintenance/domains/geometry/views/templates/forms/InspireThemesForm.html similarity index 100% rename from client-app/javascript/app/maintenance/domains/geometry/views/templates/forms/InspireThemesForm.html rename to client-app/src/app/maintenance/domains/geometry/views/templates/forms/InspireThemesForm.html diff --git a/client-app/javascript/app/maintenance/domains/geometry/views/templates/forms/LineTypesForm.html b/client-app/src/app/maintenance/domains/geometry/views/templates/forms/LineTypesForm.html similarity index 100% rename from client-app/javascript/app/maintenance/domains/geometry/views/templates/forms/LineTypesForm.html rename to client-app/src/app/maintenance/domains/geometry/views/templates/forms/LineTypesForm.html diff --git a/client-app/javascript/app/maintenance/domains/geometry/views/templates/forms/ThematicTypeForm.html b/client-app/src/app/maintenance/domains/geometry/views/templates/forms/ThematicTypeForm.html similarity index 100% rename from client-app/javascript/app/maintenance/domains/geometry/views/templates/forms/ThematicTypeForm.html rename to client-app/src/app/maintenance/domains/geometry/views/templates/forms/ThematicTypeForm.html diff --git a/client-app/javascript/app/maintenance/domains/observations/views/AttributeTypesView.js b/client-app/src/app/maintenance/domains/observations/views/AttributeTypesView.js similarity index 100% rename from client-app/javascript/app/maintenance/domains/observations/views/AttributeTypesView.js rename to client-app/src/app/maintenance/domains/observations/views/AttributeTypesView.js diff --git a/client-app/javascript/app/maintenance/domains/observations/views/CensingStatusView.js b/client-app/src/app/maintenance/domains/observations/views/CensingStatusView.js similarity index 100% rename from client-app/javascript/app/maintenance/domains/observations/views/CensingStatusView.js rename to client-app/src/app/maintenance/domains/observations/views/CensingStatusView.js diff --git a/client-app/javascript/app/maintenance/domains/observations/views/ConfidenceView.js b/client-app/src/app/maintenance/domains/observations/views/ConfidenceView.js similarity index 100% rename from client-app/javascript/app/maintenance/domains/observations/views/ConfidenceView.js rename to client-app/src/app/maintenance/domains/observations/views/ConfidenceView.js diff --git a/client-app/javascript/app/maintenance/domains/observations/views/EventGroupsView.js b/client-app/src/app/maintenance/domains/observations/views/EventGroupsView.js similarity index 100% rename from client-app/javascript/app/maintenance/domains/observations/views/EventGroupsView.js rename to client-app/src/app/maintenance/domains/observations/views/EventGroupsView.js diff --git a/client-app/javascript/app/maintenance/domains/observations/views/InfrastructureTypeView.js b/client-app/src/app/maintenance/domains/observations/views/InfrastructureTypeView.js similarity index 100% rename from client-app/javascript/app/maintenance/domains/observations/views/InfrastructureTypeView.js rename to client-app/src/app/maintenance/domains/observations/views/InfrastructureTypeView.js diff --git a/client-app/javascript/app/maintenance/domains/observations/views/MetricGroupsView.js b/client-app/src/app/maintenance/domains/observations/views/MetricGroupsView.js similarity index 100% rename from client-app/javascript/app/maintenance/domains/observations/views/MetricGroupsView.js rename to client-app/src/app/maintenance/domains/observations/views/MetricGroupsView.js diff --git a/client-app/javascript/app/maintenance/domains/observations/views/MetricsDefinitionsView.js b/client-app/src/app/maintenance/domains/observations/views/MetricsDefinitionsView.js similarity index 100% rename from client-app/javascript/app/maintenance/domains/observations/views/MetricsDefinitionsView.js rename to client-app/src/app/maintenance/domains/observations/views/MetricsDefinitionsView.js diff --git a/client-app/javascript/app/maintenance/domains/observations/views/ObjectTypesView.js b/client-app/src/app/maintenance/domains/observations/views/ObjectTypesView.js similarity index 100% rename from client-app/javascript/app/maintenance/domains/observations/views/ObjectTypesView.js rename to client-app/src/app/maintenance/domains/observations/views/ObjectTypesView.js diff --git a/client-app/javascript/app/maintenance/domains/observations/views/ObservationTypesView.js b/client-app/src/app/maintenance/domains/observations/views/ObservationTypesView.js similarity index 100% rename from client-app/javascript/app/maintenance/domains/observations/views/ObservationTypesView.js rename to client-app/src/app/maintenance/domains/observations/views/ObservationTypesView.js diff --git a/client-app/javascript/app/maintenance/domains/observations/views/ParameterTypesView.js b/client-app/src/app/maintenance/domains/observations/views/ParameterTypesView.js similarity index 100% rename from client-app/javascript/app/maintenance/domains/observations/views/ParameterTypesView.js rename to client-app/src/app/maintenance/domains/observations/views/ParameterTypesView.js diff --git a/client-app/javascript/app/maintenance/domains/observations/views/ParametersView.js b/client-app/src/app/maintenance/domains/observations/views/ParametersView.js similarity index 100% rename from client-app/javascript/app/maintenance/domains/observations/views/ParametersView.js rename to client-app/src/app/maintenance/domains/observations/views/ParametersView.js diff --git a/client-app/javascript/app/maintenance/domains/observations/views/SampleTypesView.js b/client-app/src/app/maintenance/domains/observations/views/SampleTypesView.js similarity index 100% rename from client-app/javascript/app/maintenance/domains/observations/views/SampleTypesView.js rename to client-app/src/app/maintenance/domains/observations/views/SampleTypesView.js diff --git a/client-app/javascript/app/maintenance/domains/observations/views/SeaConditionsView.js b/client-app/src/app/maintenance/domains/observations/views/SeaConditionsView.js similarity index 100% rename from client-app/javascript/app/maintenance/domains/observations/views/SeaConditionsView.js rename to client-app/src/app/maintenance/domains/observations/views/SeaConditionsView.js diff --git a/client-app/javascript/app/maintenance/domains/observations/views/UnitTypesView.js b/client-app/src/app/maintenance/domains/observations/views/UnitTypesView.js similarity index 100% rename from client-app/javascript/app/maintenance/domains/observations/views/UnitTypesView.js rename to client-app/src/app/maintenance/domains/observations/views/UnitTypesView.js diff --git a/client-app/javascript/app/maintenance/domains/observations/views/UnitsView.js b/client-app/src/app/maintenance/domains/observations/views/UnitsView.js similarity index 100% rename from client-app/javascript/app/maintenance/domains/observations/views/UnitsView.js rename to client-app/src/app/maintenance/domains/observations/views/UnitsView.js diff --git a/client-app/javascript/app/maintenance/domains/taxon/views/CanaryProtectionView.js b/client-app/src/app/maintenance/domains/taxon/views/CanaryProtectionView.js similarity index 100% rename from client-app/javascript/app/maintenance/domains/taxon/views/CanaryProtectionView.js rename to client-app/src/app/maintenance/domains/taxon/views/CanaryProtectionView.js diff --git a/client-app/javascript/app/maintenance/domains/taxon/views/EUProtectionView.js b/client-app/src/app/maintenance/domains/taxon/views/EUProtectionView.js similarity index 100% rename from client-app/javascript/app/maintenance/domains/taxon/views/EUProtectionView.js rename to client-app/src/app/maintenance/domains/taxon/views/EUProtectionView.js diff --git a/client-app/javascript/app/maintenance/domains/taxon/views/EcologyView.js b/client-app/src/app/maintenance/domains/taxon/views/EcologyView.js similarity index 100% rename from client-app/javascript/app/maintenance/domains/taxon/views/EcologyView.js rename to client-app/src/app/maintenance/domains/taxon/views/EcologyView.js diff --git a/client-app/javascript/app/maintenance/domains/taxon/views/EndemicityView.js b/client-app/src/app/maintenance/domains/taxon/views/EndemicityView.js similarity index 100% rename from client-app/javascript/app/maintenance/domains/taxon/views/EndemicityView.js rename to client-app/src/app/maintenance/domains/taxon/views/EndemicityView.js diff --git a/client-app/javascript/app/maintenance/domains/taxon/views/InterestView.js b/client-app/src/app/maintenance/domains/taxon/views/InterestView.js similarity index 100% rename from client-app/javascript/app/maintenance/domains/taxon/views/InterestView.js rename to client-app/src/app/maintenance/domains/taxon/views/InterestView.js diff --git a/client-app/javascript/app/maintenance/domains/taxon/views/LifeStagesView.js b/client-app/src/app/maintenance/domains/taxon/views/LifeStagesView.js similarity index 100% rename from client-app/javascript/app/maintenance/domains/taxon/views/LifeStagesView.js rename to client-app/src/app/maintenance/domains/taxon/views/LifeStagesView.js diff --git a/client-app/javascript/app/maintenance/domains/taxon/views/OriginView.js b/client-app/src/app/maintenance/domains/taxon/views/OriginView.js similarity index 100% rename from client-app/javascript/app/maintenance/domains/taxon/views/OriginView.js rename to client-app/src/app/maintenance/domains/taxon/views/OriginView.js diff --git a/client-app/javascript/app/maintenance/domains/taxon/views/PermanenceView.js b/client-app/src/app/maintenance/domains/taxon/views/PermanenceView.js similarity index 100% rename from client-app/javascript/app/maintenance/domains/taxon/views/PermanenceView.js rename to client-app/src/app/maintenance/domains/taxon/views/PermanenceView.js diff --git a/client-app/javascript/app/maintenance/domains/taxon/views/RankView.js b/client-app/src/app/maintenance/domains/taxon/views/RankView.js similarity index 100% rename from client-app/javascript/app/maintenance/domains/taxon/views/RankView.js rename to client-app/src/app/maintenance/domains/taxon/views/RankView.js diff --git a/client-app/javascript/app/maintenance/domains/taxon/views/SexView.js b/client-app/src/app/maintenance/domains/taxon/views/SexView.js similarity index 100% rename from client-app/javascript/app/maintenance/domains/taxon/views/SexView.js rename to client-app/src/app/maintenance/domains/taxon/views/SexView.js diff --git a/client-app/javascript/app/maintenance/domains/taxon/views/SpainProtectionView.js b/client-app/src/app/maintenance/domains/taxon/views/SpainProtectionView.js similarity index 100% rename from client-app/javascript/app/maintenance/domains/taxon/views/SpainProtectionView.js rename to client-app/src/app/maintenance/domains/taxon/views/SpainProtectionView.js diff --git a/client-app/javascript/app/maintenance/domains/taxon/views/StatusView.js b/client-app/src/app/maintenance/domains/taxon/views/StatusView.js similarity index 100% rename from client-app/javascript/app/maintenance/domains/taxon/views/StatusView.js rename to client-app/src/app/maintenance/domains/taxon/views/StatusView.js diff --git a/client-app/javascript/app/maintenance/domains/taxon/views/TrophicRegimeView.js b/client-app/src/app/maintenance/domains/taxon/views/TrophicRegimeView.js similarity index 100% rename from client-app/javascript/app/maintenance/domains/taxon/views/TrophicRegimeView.js rename to client-app/src/app/maintenance/domains/taxon/views/TrophicRegimeView.js diff --git a/client-app/javascript/app/maintenance/domains/templates/forms/DomainForm.html b/client-app/src/app/maintenance/domains/templates/forms/DomainForm.html similarity index 100% rename from client-app/javascript/app/maintenance/domains/templates/forms/DomainForm.html rename to client-app/src/app/maintenance/domains/templates/forms/DomainForm.html diff --git a/client-app/javascript/app/maintenance/domains/templates/forms/HierarchicalDomainForm.html b/client-app/src/app/maintenance/domains/templates/forms/HierarchicalDomainForm.html similarity index 100% rename from client-app/javascript/app/maintenance/domains/templates/forms/HierarchicalDomainForm.html rename to client-app/src/app/maintenance/domains/templates/forms/HierarchicalDomainForm.html diff --git a/client-app/javascript/app/maintenance/models/AccessModel.js b/client-app/src/app/maintenance/models/AccessModel.js similarity index 100% rename from client-app/javascript/app/maintenance/models/AccessModel.js rename to client-app/src/app/maintenance/models/AccessModel.js diff --git a/client-app/javascript/app/maintenance/models/PermissionsModel.js b/client-app/src/app/maintenance/models/PermissionsModel.js similarity index 100% rename from client-app/javascript/app/maintenance/models/PermissionsModel.js rename to client-app/src/app/maintenance/models/PermissionsModel.js diff --git a/client-app/javascript/app/maintenance/views/DomainView.js b/client-app/src/app/maintenance/views/DomainView.js similarity index 100% rename from client-app/javascript/app/maintenance/views/DomainView.js rename to client-app/src/app/maintenance/views/DomainView.js diff --git a/client-app/javascript/app/maintenance/views/PermissionsView.js b/client-app/src/app/maintenance/views/PermissionsView.js similarity index 100% rename from client-app/javascript/app/maintenance/views/PermissionsView.js rename to client-app/src/app/maintenance/views/PermissionsView.js diff --git a/client-app/javascript/app/maintenance/views/ServiceOGCView.js b/client-app/src/app/maintenance/views/ServiceOGCView.js similarity index 100% rename from client-app/javascript/app/maintenance/views/ServiceOGCView.js rename to client-app/src/app/maintenance/views/ServiceOGCView.js diff --git a/client-app/javascript/app/maintenance/views/templates/forms/AccessForm.html b/client-app/src/app/maintenance/views/templates/forms/AccessForm.html similarity index 100% rename from client-app/javascript/app/maintenance/views/templates/forms/AccessForm.html rename to client-app/src/app/maintenance/views/templates/forms/AccessForm.html diff --git a/client-app/javascript/app/maintenance/views/templates/forms/CategoryLayerForm.html b/client-app/src/app/maintenance/views/templates/forms/CategoryLayerForm.html similarity index 100% rename from client-app/javascript/app/maintenance/views/templates/forms/CategoryLayerForm.html rename to client-app/src/app/maintenance/views/templates/forms/CategoryLayerForm.html diff --git a/client-app/javascript/app/maintenance/views/templates/forms/DownloadsForm.html b/client-app/src/app/maintenance/views/templates/forms/DownloadsForm.html similarity index 100% rename from client-app/javascript/app/maintenance/views/templates/forms/DownloadsForm.html rename to client-app/src/app/maintenance/views/templates/forms/DownloadsForm.html diff --git a/client-app/javascript/app/maintenance/views/templates/forms/PermissionsForm.html b/client-app/src/app/maintenance/views/templates/forms/PermissionsForm.html similarity index 100% rename from client-app/javascript/app/maintenance/views/templates/forms/PermissionsForm.html rename to client-app/src/app/maintenance/views/templates/forms/PermissionsForm.html diff --git a/client-app/javascript/app/maintenance/views/templates/forms/ProtocolsForm.html b/client-app/src/app/maintenance/views/templates/forms/ProtocolsForm.html similarity index 100% rename from client-app/javascript/app/maintenance/views/templates/forms/ProtocolsForm.html rename to client-app/src/app/maintenance/views/templates/forms/ProtocolsForm.html diff --git a/client-app/javascript/app/maintenance/views/templates/forms/ServiceOGCForm.html b/client-app/src/app/maintenance/views/templates/forms/ServiceOGCForm.html similarity index 100% rename from client-app/javascript/app/maintenance/views/templates/forms/ServiceOGCForm.html rename to client-app/src/app/maintenance/views/templates/forms/ServiceOGCForm.html diff --git a/client-app/javascript/app/maintenance/views/templates/forms/ServiceOGCLayerSearchForm.html b/client-app/src/app/maintenance/views/templates/forms/ServiceOGCLayerSearchForm.html similarity index 100% rename from client-app/javascript/app/maintenance/views/templates/forms/ServiceOGCLayerSearchForm.html rename to client-app/src/app/maintenance/views/templates/forms/ServiceOGCLayerSearchForm.html diff --git a/client-app/javascript/app/nls/es/translation.js b/client-app/src/app/nls/es/translation.js similarity index 100% rename from client-app/javascript/app/nls/es/translation.js rename to client-app/src/app/nls/es/translation.js diff --git a/client-app/javascript/app/nls/translation.js b/client-app/src/app/nls/translation.js similarity index 100% rename from client-app/javascript/app/nls/translation.js rename to client-app/src/app/nls/translation.js diff --git a/client-app/javascript/app/products/views/OpenMapView.js b/client-app/src/app/products/views/OpenMapView.js similarity index 100% rename from client-app/javascript/app/products/views/OpenMapView.js rename to client-app/src/app/products/views/OpenMapView.js diff --git a/client-app/javascript/app/products/views/ServiceOGCCatalogView.js b/client-app/src/app/products/views/ServiceOGCCatalogView.js similarity index 100% rename from client-app/javascript/app/products/views/ServiceOGCCatalogView.js rename to client-app/src/app/products/views/ServiceOGCCatalogView.js diff --git a/client-app/javascript/app/redmicConfig.js b/client-app/src/app/redmicConfig.js similarity index 100% rename from client-app/javascript/app/redmicConfig.js rename to client-app/src/app/redmicConfig.js diff --git a/client-app/javascript/app/user/models/FeedbackModel.js b/client-app/src/app/user/models/FeedbackModel.js similarity index 100% rename from client-app/javascript/app/user/models/FeedbackModel.js rename to client-app/src/app/user/models/FeedbackModel.js diff --git a/client-app/javascript/app/user/models/PasswordModel.js b/client-app/src/app/user/models/PasswordModel.js similarity index 100% rename from client-app/javascript/app/user/models/PasswordModel.js rename to client-app/src/app/user/models/PasswordModel.js diff --git a/client-app/javascript/app/user/models/RegisterModel.js b/client-app/src/app/user/models/RegisterModel.js similarity index 100% rename from client-app/javascript/app/user/models/RegisterModel.js rename to client-app/src/app/user/models/RegisterModel.js diff --git a/client-app/javascript/app/user/models/UserEmailModel.js b/client-app/src/app/user/models/UserEmailModel.js similarity index 100% rename from client-app/javascript/app/user/models/UserEmailModel.js rename to client-app/src/app/user/models/UserEmailModel.js diff --git a/client-app/javascript/app/user/models/UserImageModel.js b/client-app/src/app/user/models/UserImageModel.js similarity index 100% rename from client-app/javascript/app/user/models/UserImageModel.js rename to client-app/src/app/user/models/UserImageModel.js diff --git a/client-app/javascript/app/user/models/UserNameModel.js b/client-app/src/app/user/models/UserNameModel.js similarity index 100% rename from client-app/javascript/app/user/models/UserNameModel.js rename to client-app/src/app/user/models/UserNameModel.js diff --git a/client-app/javascript/app/user/models/UserSectorModel.js b/client-app/src/app/user/models/UserSectorModel.js similarity index 100% rename from client-app/javascript/app/user/models/UserSectorModel.js rename to client-app/src/app/user/models/UserSectorModel.js diff --git a/client-app/javascript/app/user/views/ConfirmResettingView.js b/client-app/src/app/user/views/ConfirmResettingView.js similarity index 100% rename from client-app/javascript/app/user/views/ConfirmResettingView.js rename to client-app/src/app/user/views/ConfirmResettingView.js diff --git a/client-app/javascript/app/user/views/FeedbackView.js b/client-app/src/app/user/views/FeedbackView.js similarity index 100% rename from client-app/javascript/app/user/views/FeedbackView.js rename to client-app/src/app/user/views/FeedbackView.js diff --git a/client-app/javascript/app/user/views/InnerWhatIsRedmicView.js b/client-app/src/app/user/views/InnerWhatIsRedmicView.js similarity index 100% rename from client-app/javascript/app/user/views/InnerWhatIsRedmicView.js rename to client-app/src/app/user/views/InnerWhatIsRedmicView.js diff --git a/client-app/javascript/app/user/views/LoginView.js b/client-app/src/app/user/views/LoginView.js similarity index 100% rename from client-app/javascript/app/user/views/LoginView.js rename to client-app/src/app/user/views/LoginView.js diff --git a/client-app/javascript/app/user/views/RegisterView.js b/client-app/src/app/user/views/RegisterView.js similarity index 100% rename from client-app/javascript/app/user/views/RegisterView.js rename to client-app/src/app/user/views/RegisterView.js diff --git a/client-app/javascript/app/user/views/ResettingView.js b/client-app/src/app/user/views/ResettingView.js similarity index 100% rename from client-app/javascript/app/user/views/ResettingView.js rename to client-app/src/app/user/views/ResettingView.js diff --git a/client-app/javascript/app/user/views/TermsAndConditionsView.js b/client-app/src/app/user/views/TermsAndConditionsView.js similarity index 100% rename from client-app/javascript/app/user/views/TermsAndConditionsView.js rename to client-app/src/app/user/views/TermsAndConditionsView.js diff --git a/client-app/javascript/app/user/views/UserProfileView.js b/client-app/src/app/user/views/UserProfileView.js similarity index 100% rename from client-app/javascript/app/user/views/UserProfileView.js rename to client-app/src/app/user/views/UserProfileView.js diff --git a/client-app/javascript/app/user/views/WhatIsRedmicView.js b/client-app/src/app/user/views/WhatIsRedmicView.js similarity index 100% rename from client-app/javascript/app/user/views/WhatIsRedmicView.js rename to client-app/src/app/user/views/WhatIsRedmicView.js diff --git a/client-app/javascript/app/user/views/_ExternalUserBaseView.js b/client-app/src/app/user/views/_ExternalUserBaseView.js similarity index 100% rename from client-app/javascript/app/user/views/_ExternalUserBaseView.js rename to client-app/src/app/user/views/_ExternalUserBaseView.js diff --git a/client-app/javascript/app/user/views/templates/ConfirmResetting.html b/client-app/src/app/user/views/templates/ConfirmResetting.html similarity index 100% rename from client-app/javascript/app/user/views/templates/ConfirmResetting.html rename to client-app/src/app/user/views/templates/ConfirmResetting.html diff --git a/client-app/javascript/app/user/views/templates/ExternalUserBase.html b/client-app/src/app/user/views/templates/ExternalUserBase.html similarity index 100% rename from client-app/javascript/app/user/views/templates/ExternalUserBase.html rename to client-app/src/app/user/views/templates/ExternalUserBase.html diff --git a/client-app/javascript/app/user/views/templates/Feedback.html b/client-app/src/app/user/views/templates/Feedback.html similarity index 100% rename from client-app/javascript/app/user/views/templates/Feedback.html rename to client-app/src/app/user/views/templates/Feedback.html diff --git a/client-app/javascript/app/user/views/templates/Login.html b/client-app/src/app/user/views/templates/Login.html similarity index 100% rename from client-app/javascript/app/user/views/templates/Login.html rename to client-app/src/app/user/views/templates/Login.html diff --git a/client-app/javascript/app/user/views/templates/Register.html b/client-app/src/app/user/views/templates/Register.html similarity index 100% rename from client-app/javascript/app/user/views/templates/Register.html rename to client-app/src/app/user/views/templates/Register.html diff --git a/client-app/javascript/app/user/views/templates/Resetting.html b/client-app/src/app/user/views/templates/Resetting.html similarity index 100% rename from client-app/javascript/app/user/views/templates/Resetting.html rename to client-app/src/app/user/views/templates/Resetting.html diff --git a/client-app/javascript/app/user/views/templates/TermsAndConditions.html b/client-app/src/app/user/views/templates/TermsAndConditions.html similarity index 100% rename from client-app/javascript/app/user/views/templates/TermsAndConditions.html rename to client-app/src/app/user/views/templates/TermsAndConditions.html diff --git a/client-app/javascript/app/user/views/templates/WhatIsRedmic.html b/client-app/src/app/user/views/templates/WhatIsRedmic.html similarity index 100% rename from client-app/javascript/app/user/views/templates/WhatIsRedmic.html rename to client-app/src/app/user/views/templates/WhatIsRedmic.html diff --git a/client-app/javascript/app/user/views/templates/forms/ChangePasswordForm.html b/client-app/src/app/user/views/templates/forms/ChangePasswordForm.html similarity index 100% rename from client-app/javascript/app/user/views/templates/forms/ChangePasswordForm.html rename to client-app/src/app/user/views/templates/forms/ChangePasswordForm.html diff --git a/client-app/javascript/app/user/views/templates/forms/FeedbackForm.html b/client-app/src/app/user/views/templates/forms/FeedbackForm.html similarity index 100% rename from client-app/javascript/app/user/views/templates/forms/FeedbackForm.html rename to client-app/src/app/user/views/templates/forms/FeedbackForm.html diff --git a/client-app/javascript/app/user/views/templates/forms/RegisterForm.html b/client-app/src/app/user/views/templates/forms/RegisterForm.html similarity index 100% rename from client-app/javascript/app/user/views/templates/forms/RegisterForm.html rename to client-app/src/app/user/views/templates/forms/RegisterForm.html diff --git a/client-app/javascript/app/user/views/templates/forms/UserEmailForm.html b/client-app/src/app/user/views/templates/forms/UserEmailForm.html similarity index 100% rename from client-app/javascript/app/user/views/templates/forms/UserEmailForm.html rename to client-app/src/app/user/views/templates/forms/UserEmailForm.html diff --git a/client-app/javascript/app/user/views/templates/forms/UserImageForm.html b/client-app/src/app/user/views/templates/forms/UserImageForm.html similarity index 100% rename from client-app/javascript/app/user/views/templates/forms/UserImageForm.html rename to client-app/src/app/user/views/templates/forms/UserImageForm.html diff --git a/client-app/javascript/app/user/views/templates/forms/UserNameForm.html b/client-app/src/app/user/views/templates/forms/UserNameForm.html similarity index 100% rename from client-app/javascript/app/user/views/templates/forms/UserNameForm.html rename to client-app/src/app/user/views/templates/forms/UserNameForm.html diff --git a/client-app/javascript/app/user/views/templates/forms/UserSectorForm.html b/client-app/src/app/user/views/templates/forms/UserSectorForm.html similarity index 100% rename from client-app/javascript/app/user/views/templates/forms/UserSectorForm.html rename to client-app/src/app/user/views/templates/forms/UserSectorForm.html diff --git a/client-app/javascript/app/viewers/models/PointClusterCategorizeModel.js b/client-app/src/app/viewers/models/PointClusterCategorizeModel.js similarity index 100% rename from client-app/javascript/app/viewers/models/PointClusterCategorizeModel.js rename to client-app/src/app/viewers/models/PointClusterCategorizeModel.js diff --git a/client-app/javascript/app/viewers/models/PointClusterModel.js b/client-app/src/app/viewers/models/PointClusterModel.js similarity index 100% rename from client-app/javascript/app/viewers/models/PointClusterModel.js rename to client-app/src/app/viewers/models/PointClusterModel.js diff --git a/client-app/javascript/app/viewers/views/BibliographyView.js b/client-app/src/app/viewers/views/BibliographyView.js similarity index 100% rename from client-app/javascript/app/viewers/views/BibliographyView.js rename to client-app/src/app/viewers/views/BibliographyView.js diff --git a/client-app/javascript/app/viewers/views/ChartsView.js b/client-app/src/app/viewers/views/ChartsView.js similarity index 100% rename from client-app/javascript/app/viewers/views/ChartsView.js rename to client-app/src/app/viewers/views/ChartsView.js diff --git a/client-app/javascript/app/viewers/views/RealTimeDashboardView.js b/client-app/src/app/viewers/views/RealTimeDashboardView.js similarity index 100% rename from client-app/javascript/app/viewers/views/RealTimeDashboardView.js rename to client-app/src/app/viewers/views/RealTimeDashboardView.js diff --git a/client-app/javascript/app/viewers/views/RealTimeView.js b/client-app/src/app/viewers/views/RealTimeView.js similarity index 100% rename from client-app/javascript/app/viewers/views/RealTimeView.js rename to client-app/src/app/viewers/views/RealTimeView.js diff --git a/client-app/javascript/app/viewers/views/SpeciesDistributionView.js b/client-app/src/app/viewers/views/SpeciesDistributionView.js similarity index 100% rename from client-app/javascript/app/viewers/views/SpeciesDistributionView.js rename to client-app/src/app/viewers/views/SpeciesDistributionView.js diff --git a/client-app/javascript/app/viewers/views/StacBrowserView.js b/client-app/src/app/viewers/views/StacBrowserView.js similarity index 100% rename from client-app/javascript/app/viewers/views/StacBrowserView.js rename to client-app/src/app/viewers/views/StacBrowserView.js diff --git a/client-app/javascript/app/viewers/views/TrackingView.js b/client-app/src/app/viewers/views/TrackingView.js similarity index 100% rename from client-app/javascript/app/viewers/views/TrackingView.js rename to client-app/src/app/viewers/views/TrackingView.js diff --git a/client-app/javascript/app/viewers/views/TrashCharts.js b/client-app/src/app/viewers/views/TrashCharts.js similarity index 100% rename from client-app/javascript/app/viewers/views/TrashCharts.js rename to client-app/src/app/viewers/views/TrashCharts.js diff --git a/client-app/javascript/app/viewers/views/TrashCollectionView.js b/client-app/src/app/viewers/views/TrashCollectionView.js similarity index 100% rename from client-app/javascript/app/viewers/views/TrashCollectionView.js rename to client-app/src/app/viewers/views/TrashCollectionView.js diff --git a/client-app/javascript/app/viewers/views/TrashDetails.js b/client-app/src/app/viewers/views/TrashDetails.js similarity index 100% rename from client-app/javascript/app/viewers/views/TrashDetails.js rename to client-app/src/app/viewers/views/TrashDetails.js diff --git a/client-app/javascript/app/viewers/views/TrashInfo.js b/client-app/src/app/viewers/views/TrashInfo.js similarity index 100% rename from client-app/javascript/app/viewers/views/TrashInfo.js rename to client-app/src/app/viewers/views/TrashInfo.js diff --git a/client-app/javascript/app/viewers/views/_ObjectCollectionSeriesSelectionManagement.js b/client-app/src/app/viewers/views/_ObjectCollectionSeriesSelectionManagement.js similarity index 100% rename from client-app/javascript/app/viewers/views/_ObjectCollectionSeriesSelectionManagement.js rename to client-app/src/app/viewers/views/_ObjectCollectionSeriesSelectionManagement.js diff --git a/client-app/javascript/app/viewers/views/_SelectTimeInterval.js b/client-app/src/app/viewers/views/_SelectTimeInterval.js similarity index 100% rename from client-app/javascript/app/viewers/views/_SelectTimeInterval.js rename to client-app/src/app/viewers/views/_SelectTimeInterval.js diff --git a/client-app/javascript/app/viewers/views/_TimeSeriesDataManagement.js b/client-app/src/app/viewers/views/_TimeSeriesDataManagement.js similarity index 100% rename from client-app/javascript/app/viewers/views/_TimeSeriesDataManagement.js rename to client-app/src/app/viewers/views/_TimeSeriesDataManagement.js diff --git a/client-app/javascript/app/viewers/views/_TimeSeriesSelectionManagement.js b/client-app/src/app/viewers/views/_TimeSeriesSelectionManagement.js similarity index 100% rename from client-app/javascript/app/viewers/views/_TimeSeriesSelectionManagement.js rename to client-app/src/app/viewers/views/_TimeSeriesSelectionManagement.js diff --git a/client-app/javascript/app/viewers/views/templates/forms/PointClusterCategorizeForm.html b/client-app/src/app/viewers/views/templates/forms/PointClusterCategorizeForm.html similarity index 100% rename from client-app/javascript/app/viewers/views/templates/forms/PointClusterCategorizeForm.html rename to client-app/src/app/viewers/views/templates/forms/PointClusterCategorizeForm.html diff --git a/client-app/javascript/app/viewers/views/templates/forms/PointClusterForm.html b/client-app/src/app/viewers/views/templates/forms/PointClusterForm.html similarity index 100% rename from client-app/javascript/app/viewers/views/templates/forms/PointClusterForm.html rename to client-app/src/app/viewers/views/templates/forms/PointClusterForm.html diff --git a/client-app/javascript/app/viewers/views/templates/forms/SpeciesDistributionForm.html b/client-app/src/app/viewers/views/templates/forms/SpeciesDistributionForm.html similarity index 100% rename from client-app/javascript/app/viewers/views/templates/forms/SpeciesDistributionForm.html rename to client-app/src/app/viewers/views/templates/forms/SpeciesDistributionForm.html diff --git a/client-app/javascript/app/viewers/views/templates/forms/TrackingForm.html b/client-app/src/app/viewers/views/templates/forms/TrackingForm.html similarity index 100% rename from client-app/javascript/app/viewers/views/templates/forms/TrackingForm.html rename to client-app/src/app/viewers/views/templates/forms/TrackingForm.html diff --git a/client-app/javascript/app/views/404.js b/client-app/src/app/views/404.js similarity index 100% rename from client-app/javascript/app/views/404.js rename to client-app/src/app/views/404.js diff --git a/client-app/javascript/app/views/ActivateAccount.js b/client-app/src/app/views/ActivateAccount.js similarity index 100% rename from client-app/javascript/app/views/ActivateAccount.js rename to client-app/src/app/views/ActivateAccount.js diff --git a/client-app/javascript/app/views/NoSupportBrowser.js b/client-app/src/app/views/NoSupportBrowser.js similarity index 100% rename from client-app/javascript/app/views/NoSupportBrowser.js rename to client-app/src/app/views/NoSupportBrowser.js diff --git a/client-app/javascript/app/views/UnderConstructionView.js b/client-app/src/app/views/UnderConstructionView.js similarity index 100% rename from client-app/javascript/app/views/UnderConstructionView.js rename to client-app/src/app/views/UnderConstructionView.js diff --git a/client-app/javascript/app/views/nls/es/translation.js b/client-app/src/app/views/nls/es/translation.js similarity index 100% rename from client-app/javascript/app/views/nls/es/translation.js rename to client-app/src/app/views/nls/es/translation.js diff --git a/client-app/javascript/app/views/nls/translation.js b/client-app/src/app/views/nls/translation.js similarity index 100% rename from client-app/javascript/app/views/nls/translation.js rename to client-app/src/app/views/nls/translation.js diff --git a/client-app/javascript/app/views/templates/NoSupportBrowser.html b/client-app/src/app/views/templates/NoSupportBrowser.html similarity index 100% rename from client-app/javascript/app/views/templates/NoSupportBrowser.html rename to client-app/src/app/views/templates/NoSupportBrowser.html diff --git a/client-app/javascript/dojoConfig.js b/client-app/src/dojoConfig.js similarity index 95% rename from client-app/javascript/dojoConfig.js rename to client-app/src/dojoConfig.js index f0757382..619b7fdf 100644 --- a/client-app/javascript/dojoConfig.js +++ b/client-app/src/dojoConfig.js @@ -10,7 +10,7 @@ dojoConfig = { location: '../dojox' },{ name: 'app', - location: '../app' + location: '../../src/app' },{ name: 'put-selector', location: '../put-selector' @@ -19,10 +19,10 @@ dojoConfig = { location: '../alertify/build' },{ name: 'redmic', - location: '../redmic' + location: '../../src/redmic' },{ name: 'src', - location: '../src' + location: '../../src/src' },{ name: 'dropzone', location: '../dropzone/dist/min' @@ -64,7 +64,7 @@ dojoConfig = { location: '../proj4/dist' },{ name: 'RWidgets', - location: '../redmic/widgets' + location: '../../src/redmic/widgets' },{ name: 'handlebars', location: '../handlebars/dist' diff --git a/client-app/javascript/dojoConfigBuild.js b/client-app/src/dojoConfigBuild.js similarity index 100% rename from client-app/javascript/dojoConfigBuild.js rename to client-app/src/dojoConfigBuild.js diff --git a/client-app/javascript/redmic/base/CheckBrowser.js b/client-app/src/redmic/base/CheckBrowser.js similarity index 100% rename from client-app/javascript/redmic/base/CheckBrowser.js rename to client-app/src/redmic/base/CheckBrowser.js diff --git a/client-app/javascript/redmic/base/Credentials.js b/client-app/src/redmic/base/Credentials.js similarity index 100% rename from client-app/javascript/redmic/base/Credentials.js rename to client-app/src/redmic/base/Credentials.js diff --git a/client-app/javascript/redmic/base/GuestChecker.js b/client-app/src/redmic/base/GuestChecker.js similarity index 100% rename from client-app/javascript/redmic/base/GuestChecker.js rename to client-app/src/redmic/base/GuestChecker.js diff --git a/client-app/javascript/redmic/base/Mediator.js b/client-app/src/redmic/base/Mediator.js similarity index 100% rename from client-app/javascript/redmic/base/Mediator.js rename to client-app/src/redmic/base/Mediator.js diff --git a/client-app/javascript/redmic/base/RedmicLocalStorage.js b/client-app/src/redmic/base/RedmicLocalStorage.js similarity index 100% rename from client-app/javascript/redmic/base/RedmicLocalStorage.js rename to client-app/src/redmic/base/RedmicLocalStorage.js diff --git a/client-app/javascript/redmic/base/tv4.js b/client-app/src/redmic/base/tv4.js similarity index 100% rename from client-app/javascript/redmic/base/tv4.js rename to client-app/src/redmic/base/tv4.js diff --git a/client-app/javascript/redmic/dialog/LockDialogImpl.js b/client-app/src/redmic/dialog/LockDialogImpl.js similarity index 100% rename from client-app/javascript/redmic/dialog/LockDialogImpl.js rename to client-app/src/redmic/dialog/LockDialogImpl.js diff --git a/client-app/javascript/redmic/dialog/_DialogComplexItfc.js b/client-app/src/redmic/dialog/_DialogComplexItfc.js similarity index 100% rename from client-app/javascript/redmic/dialog/_DialogComplexItfc.js rename to client-app/src/redmic/dialog/_DialogComplexItfc.js diff --git a/client-app/javascript/redmic/form/FormContainer.js b/client-app/src/redmic/form/FormContainer.js similarity index 100% rename from client-app/javascript/redmic/form/FormContainer.js rename to client-app/src/redmic/form/FormContainer.js diff --git a/client-app/javascript/redmic/form/Select.js b/client-app/src/redmic/form/Select.js similarity index 100% rename from client-app/javascript/redmic/form/Select.js rename to client-app/src/redmic/form/Select.js diff --git a/client-app/javascript/redmic/form/UploadInput.js b/client-app/src/redmic/form/UploadInput.js similarity index 100% rename from client-app/javascript/redmic/form/UploadInput.js rename to client-app/src/redmic/form/UploadInput.js diff --git a/client-app/javascript/redmic/form/nls/UploadInput.js b/client-app/src/redmic/form/nls/UploadInput.js similarity index 100% rename from client-app/javascript/redmic/form/nls/UploadInput.js rename to client-app/src/redmic/form/nls/UploadInput.js diff --git a/client-app/javascript/redmic/form/nls/es/UploadInput.js b/client-app/src/redmic/form/nls/es/UploadInput.js similarity index 100% rename from client-app/javascript/redmic/form/nls/es/UploadInput.js rename to client-app/src/redmic/form/nls/es/UploadInput.js diff --git a/client-app/javascript/redmic/form/templates/Select.html b/client-app/src/redmic/form/templates/Select.html similarity index 100% rename from client-app/javascript/redmic/form/templates/Select.html rename to client-app/src/redmic/form/templates/Select.html diff --git a/client-app/javascript/redmic/form/templates/UploadInput.html b/client-app/src/redmic/form/templates/UploadInput.html similarity index 100% rename from client-app/javascript/redmic/form/templates/UploadInput.html rename to client-app/src/redmic/form/templates/UploadInput.html diff --git a/client-app/javascript/redmic/layout/DialogComplex.js b/client-app/src/redmic/layout/DialogComplex.js similarity index 100% rename from client-app/javascript/redmic/layout/DialogComplex.js rename to client-app/src/redmic/layout/DialogComplex.js diff --git a/client-app/javascript/redmic/layout/DialogSimple.js b/client-app/src/redmic/layout/DialogSimple.js similarity index 100% rename from client-app/javascript/redmic/layout/DialogSimple.js rename to client-app/src/redmic/layout/DialogSimple.js diff --git a/client-app/javascript/redmic/layout/_DialogBase.js b/client-app/src/redmic/layout/_DialogBase.js similarity index 100% rename from client-app/javascript/redmic/layout/_DialogBase.js rename to client-app/src/redmic/layout/_DialogBase.js diff --git a/client-app/javascript/redmic/modules/app/App.js b/client-app/src/redmic/modules/app/App.js similarity index 100% rename from client-app/javascript/redmic/modules/app/App.js rename to client-app/src/redmic/modules/app/App.js diff --git a/client-app/javascript/redmic/modules/app/ModuleStore.js b/client-app/src/redmic/modules/app/ModuleStore.js similarity index 100% rename from client-app/javascript/redmic/modules/app/ModuleStore.js rename to client-app/src/redmic/modules/app/ModuleStore.js diff --git a/client-app/javascript/redmic/modules/app/Router.js b/client-app/src/redmic/modules/app/Router.js similarity index 100% rename from client-app/javascript/redmic/modules/app/Router.js rename to client-app/src/redmic/modules/app/Router.js diff --git a/client-app/javascript/redmic/modules/app/_app.js b/client-app/src/redmic/modules/app/_app.js similarity index 100% rename from client-app/javascript/redmic/modules/app/_app.js rename to client-app/src/redmic/modules/app/_app.js diff --git a/client-app/javascript/redmic/modules/app/_appItfc.js b/client-app/src/redmic/modules/app/_appItfc.js similarity index 100% rename from client-app/javascript/redmic/modules/app/_appItfc.js rename to client-app/src/redmic/modules/app/_appItfc.js diff --git a/client-app/javascript/redmic/modules/app/innerApp.js b/client-app/src/redmic/modules/app/innerApp.js similarity index 100% rename from client-app/javascript/redmic/modules/app/innerApp.js rename to client-app/src/redmic/modules/app/innerApp.js diff --git a/client-app/javascript/redmic/modules/app/outerApp.js b/client-app/src/redmic/modules/app/outerApp.js similarity index 100% rename from client-app/javascript/redmic/modules/app/outerApp.js rename to client-app/src/redmic/modules/app/outerApp.js diff --git a/client-app/javascript/redmic/modules/atlas/Atlas.js b/client-app/src/redmic/modules/atlas/Atlas.js similarity index 100% rename from client-app/javascript/redmic/modules/atlas/Atlas.js rename to client-app/src/redmic/modules/atlas/Atlas.js diff --git a/client-app/javascript/redmic/modules/atlas/_AtlasLayersManagement.js b/client-app/src/redmic/modules/atlas/_AtlasLayersManagement.js similarity index 100% rename from client-app/javascript/redmic/modules/atlas/_AtlasLayersManagement.js rename to client-app/src/redmic/modules/atlas/_AtlasLayersManagement.js diff --git a/client-app/javascript/redmic/modules/atlas/_AtlasLegendManagement.js b/client-app/src/redmic/modules/atlas/_AtlasLegendManagement.js similarity index 100% rename from client-app/javascript/redmic/modules/atlas/_AtlasLegendManagement.js rename to client-app/src/redmic/modules/atlas/_AtlasLegendManagement.js diff --git a/client-app/javascript/redmic/modules/base/Analytics.js b/client-app/src/redmic/modules/base/Analytics.js similarity index 100% rename from client-app/javascript/redmic/modules/base/Analytics.js rename to client-app/src/redmic/modules/base/Analytics.js diff --git a/client-app/javascript/redmic/modules/base/Credentials.js b/client-app/src/redmic/modules/base/Credentials.js similarity index 100% rename from client-app/javascript/redmic/modules/base/Credentials.js rename to client-app/src/redmic/modules/base/Credentials.js diff --git a/client-app/javascript/redmic/modules/base/Loading.js b/client-app/src/redmic/modules/base/Loading.js similarity index 100% rename from client-app/javascript/redmic/modules/base/Loading.js rename to client-app/src/redmic/modules/base/Loading.js diff --git a/client-app/javascript/redmic/modules/base/Manager.js b/client-app/src/redmic/modules/base/Manager.js similarity index 100% rename from client-app/javascript/redmic/modules/base/Manager.js rename to client-app/src/redmic/modules/base/Manager.js diff --git a/client-app/javascript/redmic/modules/base/_AuthFirewall.js b/client-app/src/redmic/modules/base/_AuthFirewall.js similarity index 100% rename from client-app/javascript/redmic/modules/base/_AuthFirewall.js rename to client-app/src/redmic/modules/base/_AuthFirewall.js diff --git a/client-app/javascript/redmic/modules/base/_ChkCollection.js b/client-app/src/redmic/modules/base/_ChkCollection.js similarity index 100% rename from client-app/javascript/redmic/modules/base/_ChkCollection.js rename to client-app/src/redmic/modules/base/_ChkCollection.js diff --git a/client-app/javascript/redmic/modules/base/_CommunicationCenter.js b/client-app/src/redmic/modules/base/_CommunicationCenter.js similarity index 100% rename from client-app/javascript/redmic/modules/base/_CommunicationCenter.js rename to client-app/src/redmic/modules/base/_CommunicationCenter.js diff --git a/client-app/javascript/redmic/modules/base/_ExternalConfig.js b/client-app/src/redmic/modules/base/_ExternalConfig.js similarity index 100% rename from client-app/javascript/redmic/modules/base/_ExternalConfig.js rename to client-app/src/redmic/modules/base/_ExternalConfig.js diff --git a/client-app/javascript/redmic/modules/base/_Filter.js b/client-app/src/redmic/modules/base/_Filter.js similarity index 100% rename from client-app/javascript/redmic/modules/base/_Filter.js rename to client-app/src/redmic/modules/base/_Filter.js diff --git a/client-app/javascript/redmic/modules/base/_FilterItfc.js b/client-app/src/redmic/modules/base/_FilterItfc.js similarity index 100% rename from client-app/javascript/redmic/modules/base/_FilterItfc.js rename to client-app/src/redmic/modules/base/_FilterItfc.js diff --git a/client-app/javascript/redmic/modules/base/_Itfc.js b/client-app/src/redmic/modules/base/_Itfc.js similarity index 100% rename from client-app/javascript/redmic/modules/base/_Itfc.js rename to client-app/src/redmic/modules/base/_Itfc.js diff --git a/client-app/javascript/redmic/modules/base/_ListenQueryParams.js b/client-app/src/redmic/modules/base/_ListenQueryParams.js similarity index 100% rename from client-app/javascript/redmic/modules/base/_ListenQueryParams.js rename to client-app/src/redmic/modules/base/_ListenQueryParams.js diff --git a/client-app/javascript/redmic/modules/base/_ListenQueryParamsItfc.js b/client-app/src/redmic/modules/base/_ListenQueryParamsItfc.js similarity index 100% rename from client-app/javascript/redmic/modules/base/_ListenQueryParamsItfc.js rename to client-app/src/redmic/modules/base/_ListenQueryParamsItfc.js diff --git a/client-app/javascript/redmic/modules/base/_ListenWindowResize.js b/client-app/src/redmic/modules/base/_ListenWindowResize.js similarity index 100% rename from client-app/javascript/redmic/modules/base/_ListenWindowResize.js rename to client-app/src/redmic/modules/base/_ListenWindowResize.js diff --git a/client-app/javascript/redmic/modules/base/_ManageClickEvent.js b/client-app/src/redmic/modules/base/_ManageClickEvent.js similarity index 100% rename from client-app/javascript/redmic/modules/base/_ManageClickEvent.js rename to client-app/src/redmic/modules/base/_ManageClickEvent.js diff --git a/client-app/javascript/redmic/modules/base/_Module.js b/client-app/src/redmic/modules/base/_Module.js similarity index 100% rename from client-app/javascript/redmic/modules/base/_Module.js rename to client-app/src/redmic/modules/base/_Module.js diff --git a/client-app/javascript/redmic/modules/base/_ModuleItfc.js b/client-app/src/redmic/modules/base/_ModuleItfc.js similarity index 100% rename from client-app/javascript/redmic/modules/base/_ModuleItfc.js rename to client-app/src/redmic/modules/base/_ModuleItfc.js diff --git a/client-app/javascript/redmic/modules/base/_Persistence.js b/client-app/src/redmic/modules/base/_Persistence.js similarity index 100% rename from client-app/javascript/redmic/modules/base/_Persistence.js rename to client-app/src/redmic/modules/base/_Persistence.js diff --git a/client-app/javascript/redmic/modules/base/_PersistenceItfc.js b/client-app/src/redmic/modules/base/_PersistenceItfc.js similarity index 100% rename from client-app/javascript/redmic/modules/base/_PersistenceItfc.js rename to client-app/src/redmic/modules/base/_PersistenceItfc.js diff --git a/client-app/javascript/redmic/modules/base/_Selection.js b/client-app/src/redmic/modules/base/_Selection.js similarity index 100% rename from client-app/javascript/redmic/modules/base/_Selection.js rename to client-app/src/redmic/modules/base/_Selection.js diff --git a/client-app/javascript/redmic/modules/base/_SelectionBase.js b/client-app/src/redmic/modules/base/_SelectionBase.js similarity index 100% rename from client-app/javascript/redmic/modules/base/_SelectionBase.js rename to client-app/src/redmic/modules/base/_SelectionBase.js diff --git a/client-app/javascript/redmic/modules/base/_SelectionItfc.js b/client-app/src/redmic/modules/base/_SelectionItfc.js similarity index 100% rename from client-app/javascript/redmic/modules/base/_SelectionItfc.js rename to client-app/src/redmic/modules/base/_SelectionItfc.js diff --git a/client-app/javascript/redmic/modules/base/_Show.js b/client-app/src/redmic/modules/base/_Show.js similarity index 100% rename from client-app/javascript/redmic/modules/base/_Show.js rename to client-app/src/redmic/modules/base/_Show.js diff --git a/client-app/javascript/redmic/modules/base/_ShowInPopup.js b/client-app/src/redmic/modules/base/_ShowInPopup.js similarity index 100% rename from client-app/javascript/redmic/modules/base/_ShowInPopup.js rename to client-app/src/redmic/modules/base/_ShowInPopup.js diff --git a/client-app/javascript/redmic/modules/base/_ShowInTooltip.js b/client-app/src/redmic/modules/base/_ShowInTooltip.js similarity index 100% rename from client-app/javascript/redmic/modules/base/_ShowInTooltip.js rename to client-app/src/redmic/modules/base/_ShowInTooltip.js diff --git a/client-app/javascript/redmic/modules/base/_ShowItfc.js b/client-app/src/redmic/modules/base/_ShowItfc.js similarity index 100% rename from client-app/javascript/redmic/modules/base/_ShowItfc.js rename to client-app/src/redmic/modules/base/_ShowItfc.js diff --git a/client-app/javascript/redmic/modules/base/_ShowOnEvt.js b/client-app/src/redmic/modules/base/_ShowOnEvt.js similarity index 100% rename from client-app/javascript/redmic/modules/base/_ShowOnEvt.js rename to client-app/src/redmic/modules/base/_ShowOnEvt.js diff --git a/client-app/javascript/redmic/modules/base/_Store.js b/client-app/src/redmic/modules/base/_Store.js similarity index 100% rename from client-app/javascript/redmic/modules/base/_Store.js rename to client-app/src/redmic/modules/base/_Store.js diff --git a/client-app/javascript/redmic/modules/base/_StoreItfc.js b/client-app/src/redmic/modules/base/_StoreItfc.js similarity index 100% rename from client-app/javascript/redmic/modules/base/_StoreItfc.js rename to client-app/src/redmic/modules/base/_StoreItfc.js diff --git a/client-app/javascript/redmic/modules/base/_Window.js b/client-app/src/redmic/modules/base/_Window.js similarity index 100% rename from client-app/javascript/redmic/modules/base/_Window.js rename to client-app/src/redmic/modules/base/_Window.js diff --git a/client-app/javascript/redmic/modules/browser/Browser.js b/client-app/src/redmic/modules/browser/Browser.js similarity index 100% rename from client-app/javascript/redmic/modules/browser/Browser.js rename to client-app/src/redmic/modules/browser/Browser.js diff --git a/client-app/javascript/redmic/modules/browser/HierarchicalImpl.js b/client-app/src/redmic/modules/browser/HierarchicalImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/browser/HierarchicalImpl.js rename to client-app/src/redmic/modules/browser/HierarchicalImpl.js diff --git a/client-app/javascript/redmic/modules/browser/ListImpl.js b/client-app/src/redmic/modules/browser/ListImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/browser/ListImpl.js rename to client-app/src/redmic/modules/browser/ListImpl.js diff --git a/client-app/javascript/redmic/modules/browser/_BrowserItfc.js b/client-app/src/redmic/modules/browser/_BrowserItfc.js similarity index 100% rename from client-app/javascript/redmic/modules/browser/_BrowserItfc.js rename to client-app/src/redmic/modules/browser/_BrowserItfc.js diff --git a/client-app/javascript/redmic/modules/browser/_ButtonsInRow.js b/client-app/src/redmic/modules/browser/_ButtonsInRow.js similarity index 100% rename from client-app/javascript/redmic/modules/browser/_ButtonsInRow.js rename to client-app/src/redmic/modules/browser/_ButtonsInRow.js diff --git a/client-app/javascript/redmic/modules/browser/_DataTypeParser.js b/client-app/src/redmic/modules/browser/_DataTypeParser.js similarity index 100% rename from client-app/javascript/redmic/modules/browser/_DataTypeParser.js rename to client-app/src/redmic/modules/browser/_DataTypeParser.js diff --git a/client-app/javascript/redmic/modules/browser/_DragAndDrop.js b/client-app/src/redmic/modules/browser/_DragAndDrop.js similarity index 100% rename from client-app/javascript/redmic/modules/browser/_DragAndDrop.js rename to client-app/src/redmic/modules/browser/_DragAndDrop.js diff --git a/client-app/javascript/redmic/modules/browser/_EditionTable.js b/client-app/src/redmic/modules/browser/_EditionTable.js similarity index 100% rename from client-app/javascript/redmic/modules/browser/_EditionTable.js rename to client-app/src/redmic/modules/browser/_EditionTable.js diff --git a/client-app/javascript/redmic/modules/browser/_Framework.js b/client-app/src/redmic/modules/browser/_Framework.js similarity index 100% rename from client-app/javascript/redmic/modules/browser/_Framework.js rename to client-app/src/redmic/modules/browser/_Framework.js diff --git a/client-app/javascript/redmic/modules/browser/_GeoJsonParser.js b/client-app/src/redmic/modules/browser/_GeoJsonParser.js similarity index 100% rename from client-app/javascript/redmic/modules/browser/_GeoJsonParser.js rename to client-app/src/redmic/modules/browser/_GeoJsonParser.js diff --git a/client-app/javascript/redmic/modules/browser/_HierarchicalDragAndDrop.js b/client-app/src/redmic/modules/browser/_HierarchicalDragAndDrop.js similarity index 100% rename from client-app/javascript/redmic/modules/browser/_HierarchicalDragAndDrop.js rename to client-app/src/redmic/modules/browser/_HierarchicalDragAndDrop.js diff --git a/client-app/javascript/redmic/modules/browser/_HierarchicalLazyLoad.js b/client-app/src/redmic/modules/browser/_HierarchicalLazyLoad.js similarity index 100% rename from client-app/javascript/redmic/modules/browser/_HierarchicalLazyLoad.js rename to client-app/src/redmic/modules/browser/_HierarchicalLazyLoad.js diff --git a/client-app/javascript/redmic/modules/browser/_HierarchicalSelect.js b/client-app/src/redmic/modules/browser/_HierarchicalSelect.js similarity index 100% rename from client-app/javascript/redmic/modules/browser/_HierarchicalSelect.js rename to client-app/src/redmic/modules/browser/_HierarchicalSelect.js diff --git a/client-app/javascript/redmic/modules/browser/_HierarchicalTable.js b/client-app/src/redmic/modules/browser/_HierarchicalTable.js similarity index 100% rename from client-app/javascript/redmic/modules/browser/_HierarchicalTable.js rename to client-app/src/redmic/modules/browser/_HierarchicalTable.js diff --git a/client-app/javascript/redmic/modules/browser/_MultiTemplate.js b/client-app/src/redmic/modules/browser/_MultiTemplate.js similarity index 100% rename from client-app/javascript/redmic/modules/browser/_MultiTemplate.js rename to client-app/src/redmic/modules/browser/_MultiTemplate.js diff --git a/client-app/javascript/redmic/modules/browser/_NoDataTemplate.js b/client-app/src/redmic/modules/browser/_NoDataTemplate.js similarity index 100% rename from client-app/javascript/redmic/modules/browser/_NoDataTemplate.js rename to client-app/src/redmic/modules/browser/_NoDataTemplate.js diff --git a/client-app/javascript/redmic/modules/browser/_Select.js b/client-app/src/redmic/modules/browser/_Select.js similarity index 100% rename from client-app/javascript/redmic/modules/browser/_Select.js rename to client-app/src/redmic/modules/browser/_Select.js diff --git a/client-app/javascript/redmic/modules/browser/_Table.js b/client-app/src/redmic/modules/browser/_Table.js similarity index 100% rename from client-app/javascript/redmic/modules/browser/_Table.js rename to client-app/src/redmic/modules/browser/_Table.js diff --git a/client-app/javascript/redmic/modules/browser/bars/Order.js b/client-app/src/redmic/modules/browser/bars/Order.js similarity index 100% rename from client-app/javascript/redmic/modules/browser/bars/Order.js rename to client-app/src/redmic/modules/browser/bars/Order.js diff --git a/client-app/javascript/redmic/modules/browser/bars/Pagination.js b/client-app/src/redmic/modules/browser/bars/Pagination.js similarity index 100% rename from client-app/javascript/redmic/modules/browser/bars/Pagination.js rename to client-app/src/redmic/modules/browser/bars/Pagination.js diff --git a/client-app/javascript/redmic/modules/browser/bars/SelectionBox.js b/client-app/src/redmic/modules/browser/bars/SelectionBox.js similarity index 100% rename from client-app/javascript/redmic/modules/browser/bars/SelectionBox.js rename to client-app/src/redmic/modules/browser/bars/SelectionBox.js diff --git a/client-app/javascript/redmic/modules/browser/bars/Total.js b/client-app/src/redmic/modules/browser/bars/Total.js similarity index 100% rename from client-app/javascript/redmic/modules/browser/bars/Total.js rename to client-app/src/redmic/modules/browser/bars/Total.js diff --git a/client-app/javascript/redmic/modules/browser/bars/_SelectBox.js b/client-app/src/redmic/modules/browser/bars/_SelectBox.js similarity index 100% rename from client-app/javascript/redmic/modules/browser/bars/_SelectBox.js rename to client-app/src/redmic/modules/browser/bars/_SelectBox.js diff --git a/client-app/javascript/redmic/modules/browser/buttons/Buttons.js b/client-app/src/redmic/modules/browser/buttons/Buttons.js similarity index 100% rename from client-app/javascript/redmic/modules/browser/buttons/Buttons.js rename to client-app/src/redmic/modules/browser/buttons/Buttons.js diff --git a/client-app/javascript/redmic/modules/browser/buttons/_ButtonsItfc.js b/client-app/src/redmic/modules/browser/buttons/_ButtonsItfc.js similarity index 100% rename from client-app/javascript/redmic/modules/browser/buttons/_ButtonsItfc.js rename to client-app/src/redmic/modules/browser/buttons/_ButtonsItfc.js diff --git a/client-app/javascript/redmic/modules/browser/buttons/_GroupButtons.js b/client-app/src/redmic/modules/browser/buttons/_GroupButtons.js similarity index 100% rename from client-app/javascript/redmic/modules/browser/buttons/_GroupButtons.js rename to client-app/src/redmic/modules/browser/buttons/_GroupButtons.js diff --git a/client-app/javascript/redmic/modules/browser/row/Row.js b/client-app/src/redmic/modules/browser/row/Row.js similarity index 100% rename from client-app/javascript/redmic/modules/browser/row/Row.js rename to client-app/src/redmic/modules/browser/row/Row.js diff --git a/client-app/javascript/redmic/modules/browser/row/_Buttons.js b/client-app/src/redmic/modules/browser/row/_Buttons.js similarity index 100% rename from client-app/javascript/redmic/modules/browser/row/_Buttons.js rename to client-app/src/redmic/modules/browser/row/_Buttons.js diff --git a/client-app/javascript/redmic/modules/browser/row/_Hierarchical.js b/client-app/src/redmic/modules/browser/row/_Hierarchical.js similarity index 100% rename from client-app/javascript/redmic/modules/browser/row/_Hierarchical.js rename to client-app/src/redmic/modules/browser/row/_Hierarchical.js diff --git a/client-app/javascript/redmic/modules/browser/row/_HierarchicalSelect.js b/client-app/src/redmic/modules/browser/row/_HierarchicalSelect.js similarity index 100% rename from client-app/javascript/redmic/modules/browser/row/_HierarchicalSelect.js rename to client-app/src/redmic/modules/browser/row/_HierarchicalSelect.js diff --git a/client-app/javascript/redmic/modules/browser/row/_HierarchicalTable.js b/client-app/src/redmic/modules/browser/row/_HierarchicalTable.js similarity index 100% rename from client-app/javascript/redmic/modules/browser/row/_HierarchicalTable.js rename to client-app/src/redmic/modules/browser/row/_HierarchicalTable.js diff --git a/client-app/javascript/redmic/modules/browser/row/_RowItfc.js b/client-app/src/redmic/modules/browser/row/_RowItfc.js similarity index 100% rename from client-app/javascript/redmic/modules/browser/row/_RowItfc.js rename to client-app/src/redmic/modules/browser/row/_RowItfc.js diff --git a/client-app/javascript/redmic/modules/browser/row/_Select.js b/client-app/src/redmic/modules/browser/row/_Select.js similarity index 100% rename from client-app/javascript/redmic/modules/browser/row/_Select.js rename to client-app/src/redmic/modules/browser/row/_Select.js diff --git a/client-app/javascript/redmic/modules/browser/row/_Table.js b/client-app/src/redmic/modules/browser/row/_Table.js similarity index 100% rename from client-app/javascript/redmic/modules/browser/row/_Table.js rename to client-app/src/redmic/modules/browser/row/_Table.js diff --git a/client-app/javascript/redmic/modules/chart/ChartsContainer/ChartsContainer.js b/client-app/src/redmic/modules/chart/ChartsContainer/ChartsContainer.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/ChartsContainer/ChartsContainer.js rename to client-app/src/redmic/modules/chart/ChartsContainer/ChartsContainer.js diff --git a/client-app/javascript/redmic/modules/chart/ChartsContainer/InfoChartsContainerImpl.js b/client-app/src/redmic/modules/chart/ChartsContainer/InfoChartsContainerImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/ChartsContainer/InfoChartsContainerImpl.js rename to client-app/src/redmic/modules/chart/ChartsContainer/InfoChartsContainerImpl.js diff --git a/client-app/javascript/redmic/modules/chart/ChartsContainer/SliderChartsContainerImpl.js b/client-app/src/redmic/modules/chart/ChartsContainer/SliderChartsContainerImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/ChartsContainer/SliderChartsContainerImpl.js rename to client-app/src/redmic/modules/chart/ChartsContainer/SliderChartsContainerImpl.js diff --git a/client-app/javascript/redmic/modules/chart/ChartsContainer/_AngularAxisDrawing.js b/client-app/src/redmic/modules/chart/ChartsContainer/_AngularAxisDrawing.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/ChartsContainer/_AngularAxisDrawing.js rename to client-app/src/redmic/modules/chart/ChartsContainer/_AngularAxisDrawing.js diff --git a/client-app/javascript/redmic/modules/chart/ChartsContainer/_AngularAxisWithGridDrawing.js b/client-app/src/redmic/modules/chart/ChartsContainer/_AngularAxisWithGridDrawing.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/ChartsContainer/_AngularAxisWithGridDrawing.js rename to client-app/src/redmic/modules/chart/ChartsContainer/_AngularAxisWithGridDrawing.js diff --git a/client-app/javascript/redmic/modules/chart/ChartsContainer/_AxesDrawing.js b/client-app/src/redmic/modules/chart/ChartsContainer/_AxesDrawing.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/ChartsContainer/_AxesDrawing.js rename to client-app/src/redmic/modules/chart/ChartsContainer/_AxesDrawing.js diff --git a/client-app/javascript/redmic/modules/chart/ChartsContainer/_AxesDrawingItfc.js b/client-app/src/redmic/modules/chart/ChartsContainer/_AxesDrawingItfc.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/ChartsContainer/_AxesDrawingItfc.js rename to client-app/src/redmic/modules/chart/ChartsContainer/_AxesDrawingItfc.js diff --git a/client-app/javascript/redmic/modules/chart/ChartsContainer/_BreadcrumbsBar.js b/client-app/src/redmic/modules/chart/ChartsContainer/_BreadcrumbsBar.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/ChartsContainer/_BreadcrumbsBar.js rename to client-app/src/redmic/modules/chart/ChartsContainer/_BreadcrumbsBar.js diff --git a/client-app/javascript/redmic/modules/chart/ChartsContainer/_ChartsContainerItfc.js b/client-app/src/redmic/modules/chart/ChartsContainer/_ChartsContainerItfc.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/ChartsContainer/_ChartsContainerItfc.js rename to client-app/src/redmic/modules/chart/ChartsContainer/_ChartsContainerItfc.js diff --git a/client-app/javascript/redmic/modules/chart/ChartsContainer/_ColorSelection.js b/client-app/src/redmic/modules/chart/ChartsContainer/_ColorSelection.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/ChartsContainer/_ColorSelection.js rename to client-app/src/redmic/modules/chart/ChartsContainer/_ColorSelection.js diff --git a/client-app/javascript/redmic/modules/chart/ChartsContainer/_ColorSelectionItfc.js b/client-app/src/redmic/modules/chart/ChartsContainer/_ColorSelectionItfc.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/ChartsContainer/_ColorSelectionItfc.js rename to client-app/src/redmic/modules/chart/ChartsContainer/_ColorSelectionItfc.js diff --git a/client-app/javascript/redmic/modules/chart/ChartsContainer/_DomainHistoryNavigation.js b/client-app/src/redmic/modules/chart/ChartsContainer/_DomainHistoryNavigation.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/ChartsContainer/_DomainHistoryNavigation.js rename to client-app/src/redmic/modules/chart/ChartsContainer/_DomainHistoryNavigation.js diff --git a/client-app/javascript/redmic/modules/chart/ChartsContainer/_GroupedLegendBar.js b/client-app/src/redmic/modules/chart/ChartsContainer/_GroupedLegendBar.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/ChartsContainer/_GroupedLegendBar.js rename to client-app/src/redmic/modules/chart/ChartsContainer/_GroupedLegendBar.js diff --git a/client-app/javascript/redmic/modules/chart/ChartsContainer/_InfoOnEmptyData.js b/client-app/src/redmic/modules/chart/ChartsContainer/_InfoOnEmptyData.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/ChartsContainer/_InfoOnEmptyData.js rename to client-app/src/redmic/modules/chart/ChartsContainer/_InfoOnEmptyData.js diff --git a/client-app/javascript/redmic/modules/chart/ChartsContainer/_InfoOnLayerEvent.js b/client-app/src/redmic/modules/chart/ChartsContainer/_InfoOnLayerEvent.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/ChartsContainer/_InfoOnLayerEvent.js rename to client-app/src/redmic/modules/chart/ChartsContainer/_InfoOnLayerEvent.js diff --git a/client-app/javascript/redmic/modules/chart/ChartsContainer/_InfoOnLayerEventItfc.js b/client-app/src/redmic/modules/chart/ChartsContainer/_InfoOnLayerEventItfc.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/ChartsContainer/_InfoOnLayerEventItfc.js rename to client-app/src/redmic/modules/chart/ChartsContainer/_InfoOnLayerEventItfc.js diff --git a/client-app/javascript/redmic/modules/chart/ChartsContainer/_InfoOnMouseOver.js b/client-app/src/redmic/modules/chart/ChartsContainer/_InfoOnMouseOver.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/ChartsContainer/_InfoOnMouseOver.js rename to client-app/src/redmic/modules/chart/ChartsContainer/_InfoOnMouseOver.js diff --git a/client-app/javascript/redmic/modules/chart/ChartsContainer/_InfoOnZeroValueData.js b/client-app/src/redmic/modules/chart/ChartsContainer/_InfoOnZeroValueData.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/ChartsContainer/_InfoOnZeroValueData.js rename to client-app/src/redmic/modules/chart/ChartsContainer/_InfoOnZeroValueData.js diff --git a/client-app/javascript/redmic/modules/chart/ChartsContainer/_InfoTooltipManagement.js b/client-app/src/redmic/modules/chart/ChartsContainer/_InfoTooltipManagement.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/ChartsContainer/_InfoTooltipManagement.js rename to client-app/src/redmic/modules/chart/ChartsContainer/_InfoTooltipManagement.js diff --git a/client-app/javascript/redmic/modules/chart/ChartsContainer/_LayerColorSelection.js b/client-app/src/redmic/modules/chart/ChartsContainer/_LayerColorSelection.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/ChartsContainer/_LayerColorSelection.js rename to client-app/src/redmic/modules/chart/ChartsContainer/_LayerColorSelection.js diff --git a/client-app/javascript/redmic/modules/chart/ChartsContainer/_LegendBar.js b/client-app/src/redmic/modules/chart/ChartsContainer/_LegendBar.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/ChartsContainer/_LegendBar.js rename to client-app/src/redmic/modules/chart/ChartsContainer/_LegendBar.js diff --git a/client-app/javascript/redmic/modules/chart/ChartsContainer/_LegendBarCommons.js b/client-app/src/redmic/modules/chart/ChartsContainer/_LegendBarCommons.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/ChartsContainer/_LegendBarCommons.js rename to client-app/src/redmic/modules/chart/ChartsContainer/_LegendBarCommons.js diff --git a/client-app/javascript/redmic/modules/chart/ChartsContainer/_LegendBarCommonsItfc.js b/client-app/src/redmic/modules/chart/ChartsContainer/_LegendBarCommonsItfc.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/ChartsContainer/_LegendBarCommonsItfc.js rename to client-app/src/redmic/modules/chart/ChartsContainer/_LegendBarCommonsItfc.js diff --git a/client-app/javascript/redmic/modules/chart/ChartsContainer/_RadialAxisDrawing.js b/client-app/src/redmic/modules/chart/ChartsContainer/_RadialAxisDrawing.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/ChartsContainer/_RadialAxisDrawing.js rename to client-app/src/redmic/modules/chart/ChartsContainer/_RadialAxisDrawing.js diff --git a/client-app/javascript/redmic/modules/chart/ChartsContainer/_RadialAxisWithGridDrawing.js b/client-app/src/redmic/modules/chart/ChartsContainer/_RadialAxisWithGridDrawing.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/ChartsContainer/_RadialAxisWithGridDrawing.js rename to client-app/src/redmic/modules/chart/ChartsContainer/_RadialAxisWithGridDrawing.js diff --git a/client-app/javascript/redmic/modules/chart/ChartsContainer/_SummaryBox.js b/client-app/src/redmic/modules/chart/ChartsContainer/_SummaryBox.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/ChartsContainer/_SummaryBox.js rename to client-app/src/redmic/modules/chart/ChartsContainer/_SummaryBox.js diff --git a/client-app/javascript/redmic/modules/chart/ChartsContainer/_TemporalAxisDrawing.js b/client-app/src/redmic/modules/chart/ChartsContainer/_TemporalAxisDrawing.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/ChartsContainer/_TemporalAxisDrawing.js rename to client-app/src/redmic/modules/chart/ChartsContainer/_TemporalAxisDrawing.js diff --git a/client-app/javascript/redmic/modules/chart/ChartsContainer/_TemporalAxisWithGridDrawing.js b/client-app/src/redmic/modules/chart/ChartsContainer/_TemporalAxisWithGridDrawing.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/ChartsContainer/_TemporalAxisWithGridDrawing.js rename to client-app/src/redmic/modules/chart/ChartsContainer/_TemporalAxisWithGridDrawing.js diff --git a/client-app/javascript/redmic/modules/chart/ChartsContainer/_VerticalAxesDrawing.js b/client-app/src/redmic/modules/chart/ChartsContainer/_VerticalAxesDrawing.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/ChartsContainer/_VerticalAxesDrawing.js rename to client-app/src/redmic/modules/chart/ChartsContainer/_VerticalAxesDrawing.js diff --git a/client-app/javascript/redmic/modules/chart/ChartsContainer/_VerticalAxesWithGridDrawing.js b/client-app/src/redmic/modules/chart/ChartsContainer/_VerticalAxesWithGridDrawing.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/ChartsContainer/_VerticalAxesWithGridDrawing.js rename to client-app/src/redmic/modules/chart/ChartsContainer/_VerticalAxesWithGridDrawing.js diff --git a/client-app/javascript/redmic/modules/chart/ChartsContainer/_ZoomByDragging.js b/client-app/src/redmic/modules/chart/ChartsContainer/_ZoomByDragging.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/ChartsContainer/_ZoomByDragging.js rename to client-app/src/redmic/modules/chart/ChartsContainer/_ZoomByDragging.js diff --git a/client-app/javascript/redmic/modules/chart/SmartLegend/SmartLegend.js b/client-app/src/redmic/modules/chart/SmartLegend/SmartLegend.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/SmartLegend/SmartLegend.js rename to client-app/src/redmic/modules/chart/SmartLegend/SmartLegend.js diff --git a/client-app/javascript/redmic/modules/chart/SmartLegend/TimeSeriesSmartLegendImpl.js b/client-app/src/redmic/modules/chart/SmartLegend/TimeSeriesSmartLegendImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/SmartLegend/TimeSeriesSmartLegendImpl.js rename to client-app/src/redmic/modules/chart/SmartLegend/TimeSeriesSmartLegendImpl.js diff --git a/client-app/javascript/redmic/modules/chart/SmartLegend/_SmartLegendItfc.js b/client-app/src/redmic/modules/chart/SmartLegend/_SmartLegendItfc.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/SmartLegend/_SmartLegendItfc.js rename to client-app/src/redmic/modules/chart/SmartLegend/_SmartLegendItfc.js diff --git a/client-app/javascript/redmic/modules/chart/Toolbar/AggregationToolImpl.js b/client-app/src/redmic/modules/chart/Toolbar/AggregationToolImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/Toolbar/AggregationToolImpl.js rename to client-app/src/redmic/modules/chart/Toolbar/AggregationToolImpl.js diff --git a/client-app/javascript/redmic/modules/chart/Toolbar/DataSelectorImpl.js b/client-app/src/redmic/modules/chart/Toolbar/DataSelectorImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/Toolbar/DataSelectorImpl.js rename to client-app/src/redmic/modules/chart/Toolbar/DataSelectorImpl.js diff --git a/client-app/javascript/redmic/modules/chart/Toolbar/DateFilterImpl.js b/client-app/src/redmic/modules/chart/Toolbar/DateFilterImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/Toolbar/DateFilterImpl.js rename to client-app/src/redmic/modules/chart/Toolbar/DateFilterImpl.js diff --git a/client-app/javascript/redmic/modules/chart/Toolbar/GridManagementImpl.js b/client-app/src/redmic/modules/chart/Toolbar/GridManagementImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/Toolbar/GridManagementImpl.js rename to client-app/src/redmic/modules/chart/Toolbar/GridManagementImpl.js diff --git a/client-app/javascript/redmic/modules/chart/Toolbar/SliderSelectorImpl.js b/client-app/src/redmic/modules/chart/Toolbar/SliderSelectorImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/Toolbar/SliderSelectorImpl.js rename to client-app/src/redmic/modules/chart/Toolbar/SliderSelectorImpl.js diff --git a/client-app/javascript/redmic/modules/chart/Toolbar/Toolbar.js b/client-app/src/redmic/modules/chart/Toolbar/Toolbar.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/Toolbar/Toolbar.js rename to client-app/src/redmic/modules/chart/Toolbar/Toolbar.js diff --git a/client-app/javascript/redmic/modules/chart/Toolbar/_ToolbarItfc.js b/client-app/src/redmic/modules/chart/Toolbar/_ToolbarItfc.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/Toolbar/_ToolbarItfc.js rename to client-app/src/redmic/modules/chart/Toolbar/_ToolbarItfc.js diff --git a/client-app/javascript/redmic/modules/chart/layer/Axis/AngularAxisImpl.js b/client-app/src/redmic/modules/chart/layer/Axis/AngularAxisImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/layer/Axis/AngularAxisImpl.js rename to client-app/src/redmic/modules/chart/layer/Axis/AngularAxisImpl.js diff --git a/client-app/javascript/redmic/modules/chart/layer/Axis/AngularGridAxisImpl.js b/client-app/src/redmic/modules/chart/layer/Axis/AngularGridAxisImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/layer/Axis/AngularGridAxisImpl.js rename to client-app/src/redmic/modules/chart/layer/Axis/AngularGridAxisImpl.js diff --git a/client-app/javascript/redmic/modules/chart/layer/Axis/Axis.js b/client-app/src/redmic/modules/chart/layer/Axis/Axis.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/layer/Axis/Axis.js rename to client-app/src/redmic/modules/chart/layer/Axis/Axis.js diff --git a/client-app/javascript/redmic/modules/chart/layer/Axis/HorizontalGridAxisImpl.js b/client-app/src/redmic/modules/chart/layer/Axis/HorizontalGridAxisImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/layer/Axis/HorizontalGridAxisImpl.js rename to client-app/src/redmic/modules/chart/layer/Axis/HorizontalGridAxisImpl.js diff --git a/client-app/javascript/redmic/modules/chart/layer/Axis/RadialAxisImpl.js b/client-app/src/redmic/modules/chart/layer/Axis/RadialAxisImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/layer/Axis/RadialAxisImpl.js rename to client-app/src/redmic/modules/chart/layer/Axis/RadialAxisImpl.js diff --git a/client-app/javascript/redmic/modules/chart/layer/Axis/RadialGridAxisImpl.js b/client-app/src/redmic/modules/chart/layer/Axis/RadialGridAxisImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/layer/Axis/RadialGridAxisImpl.js rename to client-app/src/redmic/modules/chart/layer/Axis/RadialGridAxisImpl.js diff --git a/client-app/javascript/redmic/modules/chart/layer/Axis/TemporalAxisImpl.js b/client-app/src/redmic/modules/chart/layer/Axis/TemporalAxisImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/layer/Axis/TemporalAxisImpl.js rename to client-app/src/redmic/modules/chart/layer/Axis/TemporalAxisImpl.js diff --git a/client-app/javascript/redmic/modules/chart/layer/Axis/VerticalAxisImpl.js b/client-app/src/redmic/modules/chart/layer/Axis/VerticalAxisImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/layer/Axis/VerticalAxisImpl.js rename to client-app/src/redmic/modules/chart/layer/Axis/VerticalAxisImpl.js diff --git a/client-app/javascript/redmic/modules/chart/layer/Axis/VerticalGridAxisImpl.js b/client-app/src/redmic/modules/chart/layer/Axis/VerticalGridAxisImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/layer/Axis/VerticalGridAxisImpl.js rename to client-app/src/redmic/modules/chart/layer/Axis/VerticalGridAxisImpl.js diff --git a/client-app/javascript/redmic/modules/chart/layer/Axis/_AxisItfc.js b/client-app/src/redmic/modules/chart/layer/Axis/_AxisItfc.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/layer/Axis/_AxisItfc.js rename to client-app/src/redmic/modules/chart/layer/Axis/_AxisItfc.js diff --git a/client-app/javascript/redmic/modules/chart/layer/Axis/_HorizontalCommons.js b/client-app/src/redmic/modules/chart/layer/Axis/_HorizontalCommons.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/layer/Axis/_HorizontalCommons.js rename to client-app/src/redmic/modules/chart/layer/Axis/_HorizontalCommons.js diff --git a/client-app/javascript/redmic/modules/chart/layer/Axis/_VerticalCommons.js b/client-app/src/redmic/modules/chart/layer/Axis/_VerticalCommons.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/layer/Axis/_VerticalCommons.js rename to client-app/src/redmic/modules/chart/layer/Axis/_VerticalCommons.js diff --git a/client-app/javascript/redmic/modules/chart/layer/Axis/_VerticalCommonsItfc.js b/client-app/src/redmic/modules/chart/layer/Axis/_VerticalCommonsItfc.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/layer/Axis/_VerticalCommonsItfc.js rename to client-app/src/redmic/modules/chart/layer/Axis/_VerticalCommonsItfc.js diff --git a/client-app/javascript/redmic/modules/chart/layer/ChartLayer/ChartLayer.js b/client-app/src/redmic/modules/chart/layer/ChartLayer/ChartLayer.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/layer/ChartLayer/ChartLayer.js rename to client-app/src/redmic/modules/chart/layer/ChartLayer/ChartLayer.js diff --git a/client-app/javascript/redmic/modules/chart/layer/ChartLayer/LinearChartImpl.js b/client-app/src/redmic/modules/chart/layer/ChartLayer/LinearChartImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/layer/ChartLayer/LinearChartImpl.js rename to client-app/src/redmic/modules/chart/layer/ChartLayer/LinearChartImpl.js diff --git a/client-app/javascript/redmic/modules/chart/layer/ChartLayer/MultiPieChartImpl.js b/client-app/src/redmic/modules/chart/layer/ChartLayer/MultiPieChartImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/layer/ChartLayer/MultiPieChartImpl.js rename to client-app/src/redmic/modules/chart/layer/ChartLayer/MultiPieChartImpl.js diff --git a/client-app/javascript/redmic/modules/chart/layer/ChartLayer/PieChartImpl.js b/client-app/src/redmic/modules/chart/layer/ChartLayer/PieChartImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/layer/ChartLayer/PieChartImpl.js rename to client-app/src/redmic/modules/chart/layer/ChartLayer/PieChartImpl.js diff --git a/client-app/javascript/redmic/modules/chart/layer/ChartLayer/WindRoseChartImpl.js b/client-app/src/redmic/modules/chart/layer/ChartLayer/WindRoseChartImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/layer/ChartLayer/WindRoseChartImpl.js rename to client-app/src/redmic/modules/chart/layer/ChartLayer/WindRoseChartImpl.js diff --git a/client-app/javascript/redmic/modules/chart/layer/ChartLayer/_CategoryLayerCommons.js b/client-app/src/redmic/modules/chart/layer/ChartLayer/_CategoryLayerCommons.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/layer/ChartLayer/_CategoryLayerCommons.js rename to client-app/src/redmic/modules/chart/layer/ChartLayer/_CategoryLayerCommons.js diff --git a/client-app/javascript/redmic/modules/chart/layer/ChartLayer/_CategoryLayerCommonsItfc.js b/client-app/src/redmic/modules/chart/layer/ChartLayer/_CategoryLayerCommonsItfc.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/layer/ChartLayer/_CategoryLayerCommonsItfc.js rename to client-app/src/redmic/modules/chart/layer/ChartLayer/_CategoryLayerCommonsItfc.js diff --git a/client-app/javascript/redmic/modules/chart/layer/ChartLayer/_ChartHoleManagement.js b/client-app/src/redmic/modules/chart/layer/ChartLayer/_ChartHoleManagement.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/layer/ChartLayer/_ChartHoleManagement.js rename to client-app/src/redmic/modules/chart/layer/ChartLayer/_ChartHoleManagement.js diff --git a/client-app/javascript/redmic/modules/chart/layer/ChartLayer/_ChartLayerItfc.js b/client-app/src/redmic/modules/chart/layer/ChartLayer/_ChartLayerItfc.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/layer/ChartLayer/_ChartLayerItfc.js rename to client-app/src/redmic/modules/chart/layer/ChartLayer/_ChartLayerItfc.js diff --git a/client-app/javascript/redmic/modules/chart/layer/ChartLayer/_CircularLayerCommons.js b/client-app/src/redmic/modules/chart/layer/ChartLayer/_CircularLayerCommons.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/layer/ChartLayer/_CircularLayerCommons.js rename to client-app/src/redmic/modules/chart/layer/ChartLayer/_CircularLayerCommons.js diff --git a/client-app/javascript/redmic/modules/chart/layer/ChartLayer/_CircularLayerCommonsItfc.js b/client-app/src/redmic/modules/chart/layer/ChartLayer/_CircularLayerCommonsItfc.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/layer/ChartLayer/_CircularLayerCommonsItfc.js rename to client-app/src/redmic/modules/chart/layer/ChartLayer/_CircularLayerCommonsItfc.js diff --git a/client-app/javascript/redmic/modules/chart/layer/ChartLayer/_ColorHierarchyGeneration.js b/client-app/src/redmic/modules/chart/layer/ChartLayer/_ColorHierarchyGeneration.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/layer/ChartLayer/_ColorHierarchyGeneration.js rename to client-app/src/redmic/modules/chart/layer/ChartLayer/_ColorHierarchyGeneration.js diff --git a/client-app/javascript/redmic/modules/chart/layer/ChartLayer/_LevelNavigation.js b/client-app/src/redmic/modules/chart/layer/ChartLayer/_LevelNavigation.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/layer/ChartLayer/_LevelNavigation.js rename to client-app/src/redmic/modules/chart/layer/ChartLayer/_LevelNavigation.js diff --git a/client-app/javascript/redmic/modules/chart/layer/ChartLayer/_MultipleWindRose.js b/client-app/src/redmic/modules/chart/layer/ChartLayer/_MultipleWindRose.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/layer/ChartLayer/_MultipleWindRose.js rename to client-app/src/redmic/modules/chart/layer/ChartLayer/_MultipleWindRose.js diff --git a/client-app/javascript/redmic/modules/chart/layer/ChartLayer/_ObtainableValue.js b/client-app/src/redmic/modules/chart/layer/ChartLayer/_ObtainableValue.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/layer/ChartLayer/_ObtainableValue.js rename to client-app/src/redmic/modules/chart/layer/ChartLayer/_ObtainableValue.js diff --git a/client-app/javascript/redmic/modules/chart/layer/ChartLayer/_ObtainableValueItfc.js b/client-app/src/redmic/modules/chart/layer/ChartLayer/_ObtainableValueItfc.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/layer/ChartLayer/_ObtainableValueItfc.js rename to client-app/src/redmic/modules/chart/layer/ChartLayer/_ObtainableValueItfc.js diff --git a/client-app/javascript/redmic/modules/chart/layer/ChartLayer/_PieCommons.js b/client-app/src/redmic/modules/chart/layer/ChartLayer/_PieCommons.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/layer/ChartLayer/_PieCommons.js rename to client-app/src/redmic/modules/chart/layer/ChartLayer/_PieCommons.js diff --git a/client-app/javascript/redmic/modules/chart/layer/ChartLayer/_PutButtonInHole.js b/client-app/src/redmic/modules/chart/layer/ChartLayer/_PutButtonInHole.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/layer/ChartLayer/_PutButtonInHole.js rename to client-app/src/redmic/modules/chart/layer/ChartLayer/_PutButtonInHole.js diff --git a/client-app/javascript/redmic/modules/chart/layer/ChartLayer/_PutButtonInHoleItfc.js b/client-app/src/redmic/modules/chart/layer/ChartLayer/_PutButtonInHoleItfc.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/layer/ChartLayer/_PutButtonInHoleItfc.js rename to client-app/src/redmic/modules/chart/layer/ChartLayer/_PutButtonInHoleItfc.js diff --git a/client-app/javascript/redmic/modules/chart/layer/ChartLayer/_QueryableValue.js b/client-app/src/redmic/modules/chart/layer/ChartLayer/_QueryableValue.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/layer/ChartLayer/_QueryableValue.js rename to client-app/src/redmic/modules/chart/layer/ChartLayer/_QueryableValue.js diff --git a/client-app/javascript/redmic/modules/chart/layer/ChartLayer/_ShowInfoInHole.js b/client-app/src/redmic/modules/chart/layer/ChartLayer/_ShowInfoInHole.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/layer/ChartLayer/_ShowInfoInHole.js rename to client-app/src/redmic/modules/chart/layer/ChartLayer/_ShowInfoInHole.js diff --git a/client-app/javascript/redmic/modules/chart/layer/ChartLayer/_SimplePieCommons.js b/client-app/src/redmic/modules/chart/layer/ChartLayer/_SimplePieCommons.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/layer/ChartLayer/_SimplePieCommons.js rename to client-app/src/redmic/modules/chart/layer/ChartLayer/_SimplePieCommons.js diff --git a/client-app/javascript/redmic/modules/chart/layer/ChartLayer/_SimpleWindRose.js b/client-app/src/redmic/modules/chart/layer/ChartLayer/_SimpleWindRose.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/layer/ChartLayer/_SimpleWindRose.js rename to client-app/src/redmic/modules/chart/layer/ChartLayer/_SimpleWindRose.js diff --git a/client-app/javascript/redmic/modules/chart/layer/ChartLayer/_VariableRadiusByDepth.js b/client-app/src/redmic/modules/chart/layer/ChartLayer/_VariableRadiusByDepth.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/layer/ChartLayer/_VariableRadiusByDepth.js rename to client-app/src/redmic/modules/chart/layer/ChartLayer/_VariableRadiusByDepth.js diff --git a/client-app/javascript/redmic/modules/chart/layer/_LayerCommons.js b/client-app/src/redmic/modules/chart/layer/_LayerCommons.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/layer/_LayerCommons.js rename to client-app/src/redmic/modules/chart/layer/_LayerCommons.js diff --git a/client-app/javascript/redmic/modules/chart/layer/_LayerCommonsItfc.js b/client-app/src/redmic/modules/chart/layer/_LayerCommonsItfc.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/layer/_LayerCommonsItfc.js rename to client-app/src/redmic/modules/chart/layer/_LayerCommonsItfc.js diff --git a/client-app/javascript/redmic/modules/chart/layer/_PolarLayerCommons.js b/client-app/src/redmic/modules/chart/layer/_PolarLayerCommons.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/layer/_PolarLayerCommons.js rename to client-app/src/redmic/modules/chart/layer/_PolarLayerCommons.js diff --git a/client-app/javascript/redmic/modules/chart/layer/_PolarLayerCommonsItfc.js b/client-app/src/redmic/modules/chart/layer/_PolarLayerCommonsItfc.js similarity index 100% rename from client-app/javascript/redmic/modules/chart/layer/_PolarLayerCommonsItfc.js rename to client-app/src/redmic/modules/chart/layer/_PolarLayerCommonsItfc.js diff --git a/client-app/javascript/redmic/modules/components/ExternalConfig.js b/client-app/src/redmic/modules/components/ExternalConfig.js similarity index 100% rename from client-app/javascript/redmic/modules/components/ExternalConfig.js rename to client-app/src/redmic/modules/components/ExternalConfig.js diff --git a/client-app/javascript/redmic/modules/components/Keypad/IconKeypadImpl.js b/client-app/src/redmic/modules/components/Keypad/IconKeypadImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/components/Keypad/IconKeypadImpl.js rename to client-app/src/redmic/modules/components/Keypad/IconKeypadImpl.js diff --git a/client-app/javascript/redmic/modules/components/Keypad/Keypad.js b/client-app/src/redmic/modules/components/Keypad/Keypad.js similarity index 100% rename from client-app/javascript/redmic/modules/components/Keypad/Keypad.js rename to client-app/src/redmic/modules/components/Keypad/Keypad.js diff --git a/client-app/javascript/redmic/modules/components/Keypad/TrizoneKeypadImpl.js b/client-app/src/redmic/modules/components/Keypad/TrizoneKeypadImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/components/Keypad/TrizoneKeypadImpl.js rename to client-app/src/redmic/modules/components/Keypad/TrizoneKeypadImpl.js diff --git a/client-app/javascript/redmic/modules/components/Keypad/_KeypadItfc.js b/client-app/src/redmic/modules/components/Keypad/_KeypadItfc.js similarity index 100% rename from client-app/javascript/redmic/modules/components/Keypad/_KeypadItfc.js rename to client-app/src/redmic/modules/components/Keypad/_KeypadItfc.js diff --git a/client-app/javascript/redmic/modules/components/PDFViewer/PDFViewer.js b/client-app/src/redmic/modules/components/PDFViewer/PDFViewer.js similarity index 100% rename from client-app/javascript/redmic/modules/components/PDFViewer/PDFViewer.js rename to client-app/src/redmic/modules/components/PDFViewer/PDFViewer.js diff --git a/client-app/javascript/redmic/modules/components/ProgressSlider/ProgressSlider.js b/client-app/src/redmic/modules/components/ProgressSlider/ProgressSlider.js similarity index 100% rename from client-app/javascript/redmic/modules/components/ProgressSlider/ProgressSlider.js rename to client-app/src/redmic/modules/components/ProgressSlider/ProgressSlider.js diff --git a/client-app/javascript/redmic/modules/components/ProgressSlider/StepAndRateEditor.js b/client-app/src/redmic/modules/components/ProgressSlider/StepAndRateEditor.js similarity index 100% rename from client-app/javascript/redmic/modules/components/ProgressSlider/StepAndRateEditor.js rename to client-app/src/redmic/modules/components/ProgressSlider/StepAndRateEditor.js diff --git a/client-app/javascript/redmic/modules/components/Sidebar/MainSidebarImpl.js b/client-app/src/redmic/modules/components/Sidebar/MainSidebarImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/components/Sidebar/MainSidebarImpl.js rename to client-app/src/redmic/modules/components/Sidebar/MainSidebarImpl.js diff --git a/client-app/javascript/redmic/modules/components/Sidebar/Sidebar.js b/client-app/src/redmic/modules/components/Sidebar/Sidebar.js similarity index 100% rename from client-app/javascript/redmic/modules/components/Sidebar/Sidebar.js rename to client-app/src/redmic/modules/components/Sidebar/Sidebar.js diff --git a/client-app/javascript/redmic/modules/components/Sidebar/_Secondary.js b/client-app/src/redmic/modules/components/Sidebar/_Secondary.js similarity index 100% rename from client-app/javascript/redmic/modules/components/Sidebar/_Secondary.js rename to client-app/src/redmic/modules/components/Sidebar/_Secondary.js diff --git a/client-app/javascript/redmic/modules/components/Topbar.js b/client-app/src/redmic/modules/components/Topbar.js similarity index 100% rename from client-app/javascript/redmic/modules/components/Topbar.js rename to client-app/src/redmic/modules/components/Topbar.js diff --git a/client-app/javascript/redmic/modules/filter/Filter.js b/client-app/src/redmic/modules/filter/Filter.js similarity index 100% rename from client-app/javascript/redmic/modules/filter/Filter.js rename to client-app/src/redmic/modules/filter/Filter.js diff --git a/client-app/javascript/redmic/modules/form/Form.js b/client-app/src/redmic/modules/form/Form.js similarity index 100% rename from client-app/javascript/redmic/modules/form/Form.js rename to client-app/src/redmic/modules/form/Form.js diff --git a/client-app/javascript/redmic/modules/form/FormContainerImpl.js b/client-app/src/redmic/modules/form/FormContainerImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/form/FormContainerImpl.js rename to client-app/src/redmic/modules/form/FormContainerImpl.js diff --git a/client-app/javascript/redmic/modules/form/_BaseCreateKeypad.js b/client-app/src/redmic/modules/form/_BaseCreateKeypad.js similarity index 100% rename from client-app/javascript/redmic/modules/form/_BaseCreateKeypad.js rename to client-app/src/redmic/modules/form/_BaseCreateKeypad.js diff --git a/client-app/javascript/redmic/modules/form/_CreateInternalKeypad.js b/client-app/src/redmic/modules/form/_CreateInternalKeypad.js similarity index 100% rename from client-app/javascript/redmic/modules/form/_CreateInternalKeypad.js rename to client-app/src/redmic/modules/form/_CreateInternalKeypad.js diff --git a/client-app/javascript/redmic/modules/form/_CreateKeypad.js b/client-app/src/redmic/modules/form/_CreateKeypad.js similarity index 100% rename from client-app/javascript/redmic/modules/form/_CreateKeypad.js rename to client-app/src/redmic/modules/form/_CreateKeypad.js diff --git a/client-app/javascript/redmic/modules/form/_FormItfc.js b/client-app/src/redmic/modules/form/_FormItfc.js similarity index 100% rename from client-app/javascript/redmic/modules/form/_FormItfc.js rename to client-app/src/redmic/modules/form/_FormItfc.js diff --git a/client-app/javascript/redmic/modules/form/_ListenModelHasChanged.js b/client-app/src/redmic/modules/form/_ListenModelHasChanged.js similarity index 100% rename from client-app/javascript/redmic/modules/form/_ListenModelHasChanged.js rename to client-app/src/redmic/modules/form/_ListenModelHasChanged.js diff --git a/client-app/javascript/redmic/modules/form/_PublicateChanges.js b/client-app/src/redmic/modules/form/_PublicateChanges.js similarity index 100% rename from client-app/javascript/redmic/modules/form/_PublicateChanges.js rename to client-app/src/redmic/modules/form/_PublicateChanges.js diff --git a/client-app/javascript/redmic/modules/form/_ShowInDialog.js b/client-app/src/redmic/modules/form/_ShowInDialog.js similarity index 100% rename from client-app/javascript/redmic/modules/form/_ShowInDialog.js rename to client-app/src/redmic/modules/form/_ShowInDialog.js diff --git a/client-app/javascript/redmic/modules/form/_ShowInTableList.js b/client-app/src/redmic/modules/form/_ShowInTableList.js similarity index 100% rename from client-app/javascript/redmic/modules/form/_ShowInTableList.js rename to client-app/src/redmic/modules/form/_ShowInTableList.js diff --git a/client-app/javascript/redmic/modules/form/input/AnnotationImpl.js b/client-app/src/redmic/modules/form/input/AnnotationImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/form/input/AnnotationImpl.js rename to client-app/src/redmic/modules/form/input/AnnotationImpl.js diff --git a/client-app/javascript/redmic/modules/form/input/ButtonImpl.js b/client-app/src/redmic/modules/form/input/ButtonImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/form/input/ButtonImpl.js rename to client-app/src/redmic/modules/form/input/ButtonImpl.js diff --git a/client-app/javascript/redmic/modules/form/input/CheckBoxGroupImpl.js b/client-app/src/redmic/modules/form/input/CheckBoxGroupImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/form/input/CheckBoxGroupImpl.js rename to client-app/src/redmic/modules/form/input/CheckBoxGroupImpl.js diff --git a/client-app/javascript/redmic/modules/form/input/CheckBoxImpl.js b/client-app/src/redmic/modules/form/input/CheckBoxImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/form/input/CheckBoxImpl.js rename to client-app/src/redmic/modules/form/input/CheckBoxImpl.js diff --git a/client-app/javascript/redmic/modules/form/input/ColorImpl.js b/client-app/src/redmic/modules/form/input/ColorImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/form/input/ColorImpl.js rename to client-app/src/redmic/modules/form/input/ColorImpl.js diff --git a/client-app/javascript/redmic/modules/form/input/ColorPickerImpl.js b/client-app/src/redmic/modules/form/input/ColorPickerImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/form/input/ColorPickerImpl.js rename to client-app/src/redmic/modules/form/input/ColorPickerImpl.js diff --git a/client-app/javascript/redmic/modules/form/input/ColorPickerTextBoxImpl.js b/client-app/src/redmic/modules/form/input/ColorPickerTextBoxImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/form/input/ColorPickerTextBoxImpl.js rename to client-app/src/redmic/modules/form/input/ColorPickerTextBoxImpl.js diff --git a/client-app/javascript/redmic/modules/form/input/ColorsRampImpl.js b/client-app/src/redmic/modules/form/input/ColorsRampImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/form/input/ColorsRampImpl.js rename to client-app/src/redmic/modules/form/input/ColorsRampImpl.js diff --git a/client-app/javascript/redmic/modules/form/input/DateRangeComplexImpl.js b/client-app/src/redmic/modules/form/input/DateRangeComplexImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/form/input/DateRangeComplexImpl.js rename to client-app/src/redmic/modules/form/input/DateRangeComplexImpl.js diff --git a/client-app/javascript/redmic/modules/form/input/DateRangeImpl.js b/client-app/src/redmic/modules/form/input/DateRangeImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/form/input/DateRangeImpl.js rename to client-app/src/redmic/modules/form/input/DateRangeImpl.js diff --git a/client-app/javascript/redmic/modules/form/input/DateRangeTextBoxImpl.js b/client-app/src/redmic/modules/form/input/DateRangeTextBoxImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/form/input/DateRangeTextBoxImpl.js rename to client-app/src/redmic/modules/form/input/DateRangeTextBoxImpl.js diff --git a/client-app/javascript/redmic/modules/form/input/DateTextBoxImpl.js b/client-app/src/redmic/modules/form/input/DateTextBoxImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/form/input/DateTextBoxImpl.js rename to client-app/src/redmic/modules/form/input/DateTextBoxImpl.js diff --git a/client-app/javascript/redmic/modules/form/input/DateTimeImpl.js b/client-app/src/redmic/modules/form/input/DateTimeImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/form/input/DateTimeImpl.js rename to client-app/src/redmic/modules/form/input/DateTimeImpl.js diff --git a/client-app/javascript/redmic/modules/form/input/DateTimeTextBoxImpl.js b/client-app/src/redmic/modules/form/input/DateTimeTextBoxImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/form/input/DateTimeTextBoxImpl.js rename to client-app/src/redmic/modules/form/input/DateTimeTextBoxImpl.js diff --git a/client-app/javascript/redmic/modules/form/input/FilteringSelectImpl.js b/client-app/src/redmic/modules/form/input/FilteringSelectImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/form/input/FilteringSelectImpl.js rename to client-app/src/redmic/modules/form/input/FilteringSelectImpl.js diff --git a/client-app/javascript/redmic/modules/form/input/GeographicCoordinatesComponentImpl.js b/client-app/src/redmic/modules/form/input/GeographicCoordinatesComponentImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/form/input/GeographicCoordinatesComponentImpl.js rename to client-app/src/redmic/modules/form/input/GeographicCoordinatesComponentImpl.js diff --git a/client-app/javascript/redmic/modules/form/input/GeometryImpl.js b/client-app/src/redmic/modules/form/input/GeometryImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/form/input/GeometryImpl.js rename to client-app/src/redmic/modules/form/input/GeometryImpl.js diff --git a/client-app/javascript/redmic/modules/form/input/Input.js b/client-app/src/redmic/modules/form/input/Input.js similarity index 100% rename from client-app/javascript/redmic/modules/form/input/Input.js rename to client-app/src/redmic/modules/form/input/Input.js diff --git a/client-app/javascript/redmic/modules/form/input/KeywordsImpl.js b/client-app/src/redmic/modules/form/input/KeywordsImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/form/input/KeywordsImpl.js rename to client-app/src/redmic/modules/form/input/KeywordsImpl.js diff --git a/client-app/javascript/redmic/modules/form/input/MapSearchImpl.js b/client-app/src/redmic/modules/form/input/MapSearchImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/form/input/MapSearchImpl.js rename to client-app/src/redmic/modules/form/input/MapSearchImpl.js diff --git a/client-app/javascript/redmic/modules/form/input/MultiSelectImpl.js b/client-app/src/redmic/modules/form/input/MultiSelectImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/form/input/MultiSelectImpl.js rename to client-app/src/redmic/modules/form/input/MultiSelectImpl.js diff --git a/client-app/javascript/redmic/modules/form/input/NumberSpinnerImpl.js b/client-app/src/redmic/modules/form/input/NumberSpinnerImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/form/input/NumberSpinnerImpl.js rename to client-app/src/redmic/modules/form/input/NumberSpinnerImpl.js diff --git a/client-app/javascript/redmic/modules/form/input/NumberTextBoxImpl.js b/client-app/src/redmic/modules/form/input/NumberTextBoxImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/form/input/NumberTextBoxImpl.js rename to client-app/src/redmic/modules/form/input/NumberTextBoxImpl.js diff --git a/client-app/javascript/redmic/modules/form/input/PointImpl.js b/client-app/src/redmic/modules/form/input/PointImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/form/input/PointImpl.js rename to client-app/src/redmic/modules/form/input/PointImpl.js diff --git a/client-app/javascript/redmic/modules/form/input/RadioButtonGroupImpl.js b/client-app/src/redmic/modules/form/input/RadioButtonGroupImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/form/input/RadioButtonGroupImpl.js rename to client-app/src/redmic/modules/form/input/RadioButtonGroupImpl.js diff --git a/client-app/javascript/redmic/modules/form/input/RadioButtonImpl.js b/client-app/src/redmic/modules/form/input/RadioButtonImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/form/input/RadioButtonImpl.js rename to client-app/src/redmic/modules/form/input/RadioButtonImpl.js diff --git a/client-app/javascript/redmic/modules/form/input/RangeImpl.js b/client-app/src/redmic/modules/form/input/RangeImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/form/input/RangeImpl.js rename to client-app/src/redmic/modules/form/input/RangeImpl.js diff --git a/client-app/javascript/redmic/modules/form/input/RangeSliderImpl.js b/client-app/src/redmic/modules/form/input/RangeSliderImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/form/input/RangeSliderImpl.js rename to client-app/src/redmic/modules/form/input/RangeSliderImpl.js diff --git a/client-app/javascript/redmic/modules/form/input/SelectImpl.js b/client-app/src/redmic/modules/form/input/SelectImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/form/input/SelectImpl.js rename to client-app/src/redmic/modules/form/input/SelectImpl.js diff --git a/client-app/javascript/redmic/modules/form/input/SelectOnListPopupImpl.js b/client-app/src/redmic/modules/form/input/SelectOnListPopupImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/form/input/SelectOnListPopupImpl.js rename to client-app/src/redmic/modules/form/input/SelectOnListPopupImpl.js diff --git a/client-app/javascript/redmic/modules/form/input/SliderImpl.js b/client-app/src/redmic/modules/form/input/SliderImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/form/input/SliderImpl.js rename to client-app/src/redmic/modules/form/input/SliderImpl.js diff --git a/client-app/javascript/redmic/modules/form/input/TextAreaImpl.js b/client-app/src/redmic/modules/form/input/TextAreaImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/form/input/TextAreaImpl.js rename to client-app/src/redmic/modules/form/input/TextAreaImpl.js diff --git a/client-app/javascript/redmic/modules/form/input/TextBoxImpl.js b/client-app/src/redmic/modules/form/input/TextBoxImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/form/input/TextBoxImpl.js rename to client-app/src/redmic/modules/form/input/TextBoxImpl.js diff --git a/client-app/javascript/redmic/modules/form/input/UploadFileImpl.js b/client-app/src/redmic/modules/form/input/UploadFileImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/form/input/UploadFileImpl.js rename to client-app/src/redmic/modules/form/input/UploadFileImpl.js diff --git a/client-app/javascript/redmic/modules/form/input/ValueAndUnitSelectorImpl.js b/client-app/src/redmic/modules/form/input/ValueAndUnitSelectorImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/form/input/ValueAndUnitSelectorImpl.js rename to client-app/src/redmic/modules/form/input/ValueAndUnitSelectorImpl.js diff --git a/client-app/javascript/redmic/modules/form/input/_BaseDateTime.js b/client-app/src/redmic/modules/form/input/_BaseDateTime.js similarity index 100% rename from client-app/javascript/redmic/modules/form/input/_BaseDateTime.js rename to client-app/src/redmic/modules/form/input/_BaseDateTime.js diff --git a/client-app/javascript/redmic/modules/form/input/_BaseMultiSelectImpl.js b/client-app/src/redmic/modules/form/input/_BaseMultiSelectImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/form/input/_BaseMultiSelectImpl.js rename to client-app/src/redmic/modules/form/input/_BaseMultiSelectImpl.js diff --git a/client-app/javascript/redmic/modules/form/input/_BaseRange.js b/client-app/src/redmic/modules/form/input/_BaseRange.js similarity index 100% rename from client-app/javascript/redmic/modules/form/input/_BaseRange.js rename to client-app/src/redmic/modules/form/input/_BaseRange.js diff --git a/client-app/javascript/redmic/modules/form/input/_BaseTextBoxWidthExpandTooltipImpl.js b/client-app/src/redmic/modules/form/input/_BaseTextBoxWidthExpandTooltipImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/form/input/_BaseTextBoxWidthExpandTooltipImpl.js rename to client-app/src/redmic/modules/form/input/_BaseTextBoxWidthExpandTooltipImpl.js diff --git a/client-app/javascript/redmic/modules/form/input/_BaseWidthExpandTooltipImpl.js b/client-app/src/redmic/modules/form/input/_BaseWidthExpandTooltipImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/form/input/_BaseWidthExpandTooltipImpl.js rename to client-app/src/redmic/modules/form/input/_BaseWidthExpandTooltipImpl.js diff --git a/client-app/javascript/redmic/modules/form/input/_DeleteOnClear.js b/client-app/src/redmic/modules/form/input/_DeleteOnClear.js similarity index 100% rename from client-app/javascript/redmic/modules/form/input/_DeleteOnClear.js rename to client-app/src/redmic/modules/form/input/_DeleteOnClear.js diff --git a/client-app/javascript/redmic/modules/form/input/_Dependence.js b/client-app/src/redmic/modules/form/input/_Dependence.js similarity index 100% rename from client-app/javascript/redmic/modules/form/input/_Dependence.js rename to client-app/src/redmic/modules/form/input/_Dependence.js diff --git a/client-app/javascript/redmic/modules/form/input/_DisableInput.js b/client-app/src/redmic/modules/form/input/_DisableInput.js similarity index 100% rename from client-app/javascript/redmic/modules/form/input/_DisableInput.js rename to client-app/src/redmic/modules/form/input/_DisableInput.js diff --git a/client-app/javascript/redmic/modules/form/input/_IgnoreNonexistentProperty.js b/client-app/src/redmic/modules/form/input/_IgnoreNonexistentProperty.js similarity index 100% rename from client-app/javascript/redmic/modules/form/input/_IgnoreNonexistentProperty.js rename to client-app/src/redmic/modules/form/input/_IgnoreNonexistentProperty.js diff --git a/client-app/javascript/redmic/modules/form/input/_InputItfc.js b/client-app/src/redmic/modules/form/input/_InputItfc.js similarity index 100% rename from client-app/javascript/redmic/modules/form/input/_InputItfc.js rename to client-app/src/redmic/modules/form/input/_InputItfc.js diff --git a/client-app/javascript/redmic/modules/form/input/_NodesCreation.js b/client-app/src/redmic/modules/form/input/_NodesCreation.js similarity index 100% rename from client-app/javascript/redmic/modules/form/input/_NodesCreation.js rename to client-app/src/redmic/modules/form/input/_NodesCreation.js diff --git a/client-app/javascript/redmic/modules/form/input/_SelectOnPopupImpl.js b/client-app/src/redmic/modules/form/input/_SelectOnPopupImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/form/input/_SelectOnPopupImpl.js rename to client-app/src/redmic/modules/form/input/_SelectOnPopupImpl.js diff --git a/client-app/javascript/redmic/modules/gateway/AddItemGatewayImpl.js b/client-app/src/redmic/modules/gateway/AddItemGatewayImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/gateway/AddItemGatewayImpl.js rename to client-app/src/redmic/modules/gateway/AddItemGatewayImpl.js diff --git a/client-app/javascript/redmic/modules/gateway/Gateway.js b/client-app/src/redmic/modules/gateway/Gateway.js similarity index 100% rename from client-app/javascript/redmic/modules/gateway/Gateway.js rename to client-app/src/redmic/modules/gateway/Gateway.js diff --git a/client-app/javascript/redmic/modules/gateway/LocalSelectorGatewayImpl.js b/client-app/src/redmic/modules/gateway/LocalSelectorGatewayImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/gateway/LocalSelectorGatewayImpl.js rename to client-app/src/redmic/modules/gateway/LocalSelectorGatewayImpl.js diff --git a/client-app/javascript/redmic/modules/gateway/MapCenteringGatewayImpl.js b/client-app/src/redmic/modules/gateway/MapCenteringGatewayImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/gateway/MapCenteringGatewayImpl.js rename to client-app/src/redmic/modules/gateway/MapCenteringGatewayImpl.js diff --git a/client-app/javascript/redmic/modules/gateway/_GatewayItfc.js b/client-app/src/redmic/modules/gateway/_GatewayItfc.js similarity index 100% rename from client-app/javascript/redmic/modules/gateway/_GatewayItfc.js rename to client-app/src/redmic/modules/gateway/_GatewayItfc.js diff --git a/client-app/javascript/redmic/modules/layout/TabsDisplayer.js b/client-app/src/redmic/modules/layout/TabsDisplayer.js similarity index 100% rename from client-app/javascript/redmic/modules/layout/TabsDisplayer.js rename to client-app/src/redmic/modules/layout/TabsDisplayer.js diff --git a/client-app/javascript/redmic/modules/layout/dataDisplayer/DataDisplayer.js b/client-app/src/redmic/modules/layout/dataDisplayer/DataDisplayer.js similarity index 100% rename from client-app/javascript/redmic/modules/layout/dataDisplayer/DataDisplayer.js rename to client-app/src/redmic/modules/layout/dataDisplayer/DataDisplayer.js diff --git a/client-app/javascript/redmic/modules/layout/genericDisplayer/GenericDisplayer.js b/client-app/src/redmic/modules/layout/genericDisplayer/GenericDisplayer.js similarity index 100% rename from client-app/javascript/redmic/modules/layout/genericDisplayer/GenericDisplayer.js rename to client-app/src/redmic/modules/layout/genericDisplayer/GenericDisplayer.js diff --git a/client-app/javascript/redmic/modules/layout/genericDisplayer/GenericWithTopbarDisplayerImpl.js b/client-app/src/redmic/modules/layout/genericDisplayer/GenericWithTopbarDisplayerImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/layout/genericDisplayer/GenericWithTopbarDisplayerImpl.js rename to client-app/src/redmic/modules/layout/genericDisplayer/GenericWithTopbarDisplayerImpl.js diff --git a/client-app/javascript/redmic/modules/layout/listMenu/ListMenu.js b/client-app/src/redmic/modules/layout/listMenu/ListMenu.js similarity index 100% rename from client-app/javascript/redmic/modules/layout/listMenu/ListMenu.js rename to client-app/src/redmic/modules/layout/listMenu/ListMenu.js diff --git a/client-app/javascript/redmic/modules/layout/nestedContent/NestedBrowsersImpl.js b/client-app/src/redmic/modules/layout/nestedContent/NestedBrowsersImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/layout/nestedContent/NestedBrowsersImpl.js rename to client-app/src/redmic/modules/layout/nestedContent/NestedBrowsersImpl.js diff --git a/client-app/javascript/redmic/modules/layout/nestedContent/NestedContent.js b/client-app/src/redmic/modules/layout/nestedContent/NestedContent.js similarity index 100% rename from client-app/javascript/redmic/modules/layout/nestedContent/NestedContent.js rename to client-app/src/redmic/modules/layout/nestedContent/NestedContent.js diff --git a/client-app/javascript/redmic/modules/layout/templateDisplayer/TemplateDisplayer.js b/client-app/src/redmic/modules/layout/templateDisplayer/TemplateDisplayer.js similarity index 100% rename from client-app/javascript/redmic/modules/layout/templateDisplayer/TemplateDisplayer.js rename to client-app/src/redmic/modules/layout/templateDisplayer/TemplateDisplayer.js diff --git a/client-app/javascript/redmic/modules/layout/wizard/Wizard.js b/client-app/src/redmic/modules/layout/wizard/Wizard.js similarity index 100% rename from client-app/javascript/redmic/modules/layout/wizard/Wizard.js rename to client-app/src/redmic/modules/layout/wizard/Wizard.js diff --git a/client-app/javascript/redmic/modules/layout/wizard/_CompleteBySelection.js b/client-app/src/redmic/modules/layout/wizard/_CompleteBySelection.js similarity index 100% rename from client-app/javascript/redmic/modules/layout/wizard/_CompleteBySelection.js rename to client-app/src/redmic/modules/layout/wizard/_CompleteBySelection.js diff --git a/client-app/javascript/redmic/modules/layout/wizard/_StepBreadcrumbs.js b/client-app/src/redmic/modules/layout/wizard/_StepBreadcrumbs.js similarity index 100% rename from client-app/javascript/redmic/modules/layout/wizard/_StepBreadcrumbs.js rename to client-app/src/redmic/modules/layout/wizard/_StepBreadcrumbs.js diff --git a/client-app/javascript/redmic/modules/layout/wizard/_StepNavigation.js b/client-app/src/redmic/modules/layout/wizard/_StepNavigation.js similarity index 100% rename from client-app/javascript/redmic/modules/layout/wizard/_StepNavigation.js rename to client-app/src/redmic/modules/layout/wizard/_StepNavigation.js diff --git a/client-app/javascript/redmic/modules/layout/wizard/_WizardStep.js b/client-app/src/redmic/modules/layout/wizard/_WizardStep.js similarity index 100% rename from client-app/javascript/redmic/modules/layout/wizard/_WizardStep.js rename to client-app/src/redmic/modules/layout/wizard/_WizardStep.js diff --git a/client-app/javascript/redmic/modules/layout/wizard/_WizardStepItfc.js b/client-app/src/redmic/modules/layout/wizard/_WizardStepItfc.js similarity index 100% rename from client-app/javascript/redmic/modules/layout/wizard/_WizardStepItfc.js rename to client-app/src/redmic/modules/layout/wizard/_WizardStepItfc.js diff --git a/client-app/javascript/redmic/modules/map/LeafletImpl.js b/client-app/src/redmic/modules/map/LeafletImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/map/LeafletImpl.js rename to client-app/src/redmic/modules/map/LeafletImpl.js diff --git a/client-app/javascript/redmic/modules/map/Map.js b/client-app/src/redmic/modules/map/Map.js similarity index 100% rename from client-app/javascript/redmic/modules/map/Map.js rename to client-app/src/redmic/modules/map/Map.js diff --git a/client-app/javascript/redmic/modules/map/MapButton.js b/client-app/src/redmic/modules/map/MapButton.js similarity index 100% rename from client-app/javascript/redmic/modules/map/MapButton.js rename to client-app/src/redmic/modules/map/MapButton.js diff --git a/client-app/javascript/redmic/modules/map/StaticLayersDefinition.js b/client-app/src/redmic/modules/map/StaticLayersDefinition.js similarity index 100% rename from client-app/javascript/redmic/modules/map/StaticLayersDefinition.js rename to client-app/src/redmic/modules/map/StaticLayersDefinition.js diff --git a/client-app/javascript/redmic/modules/map/_ImportWkt.js b/client-app/src/redmic/modules/map/_ImportWkt.js similarity index 100% rename from client-app/javascript/redmic/modules/map/_ImportWkt.js rename to client-app/src/redmic/modules/map/_ImportWkt.js diff --git a/client-app/javascript/redmic/modules/map/_LeafletDraw.js b/client-app/src/redmic/modules/map/_LeafletDraw.js similarity index 100% rename from client-app/javascript/redmic/modules/map/_LeafletDraw.js rename to client-app/src/redmic/modules/map/_LeafletDraw.js diff --git a/client-app/javascript/redmic/modules/map/_LeafletImplItfc.js b/client-app/src/redmic/modules/map/_LeafletImplItfc.js similarity index 100% rename from client-app/javascript/redmic/modules/map/_LeafletImplItfc.js rename to client-app/src/redmic/modules/map/_LeafletImplItfc.js diff --git a/client-app/javascript/redmic/modules/map/_LeafletWidgetsManagement.js b/client-app/src/redmic/modules/map/_LeafletWidgetsManagement.js similarity index 100% rename from client-app/javascript/redmic/modules/map/_LeafletWidgetsManagement.js rename to client-app/src/redmic/modules/map/_LeafletWidgetsManagement.js diff --git a/client-app/javascript/redmic/modules/map/_ListenContainers.js b/client-app/src/redmic/modules/map/_ListenContainers.js similarity index 100% rename from client-app/javascript/redmic/modules/map/_ListenContainers.js rename to client-app/src/redmic/modules/map/_ListenContainers.js diff --git a/client-app/javascript/redmic/modules/map/_MapItfc.js b/client-app/src/redmic/modules/map/_MapItfc.js similarity index 100% rename from client-app/javascript/redmic/modules/map/_MapItfc.js rename to client-app/src/redmic/modules/map/_MapItfc.js diff --git a/client-app/javascript/redmic/modules/map/_OverlayLayersManagement.js b/client-app/src/redmic/modules/map/_OverlayLayersManagement.js similarity index 100% rename from client-app/javascript/redmic/modules/map/_OverlayLayersManagement.js rename to client-app/src/redmic/modules/map/_OverlayLayersManagement.js diff --git a/client-app/javascript/redmic/modules/map/_PlaceNamesButton.js b/client-app/src/redmic/modules/map/_PlaceNamesButton.js similarity index 100% rename from client-app/javascript/redmic/modules/map/_PlaceNamesButton.js rename to client-app/src/redmic/modules/map/_PlaceNamesButton.js diff --git a/client-app/javascript/redmic/modules/map/_StaticLayersManagement.js b/client-app/src/redmic/modules/map/_StaticLayersManagement.js similarity index 100% rename from client-app/javascript/redmic/modules/map/_StaticLayersManagement.js rename to client-app/src/redmic/modules/map/_StaticLayersManagement.js diff --git a/client-app/javascript/redmic/modules/map/layer/DrawingLayerImpl.js b/client-app/src/redmic/modules/map/layer/DrawingLayerImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/map/layer/DrawingLayerImpl.js rename to client-app/src/redmic/modules/map/layer/DrawingLayerImpl.js diff --git a/client-app/javascript/redmic/modules/map/layer/GeoJsonLayerImpl.js b/client-app/src/redmic/modules/map/layer/GeoJsonLayerImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/map/layer/GeoJsonLayerImpl.js rename to client-app/src/redmic/modules/map/layer/GeoJsonLayerImpl.js diff --git a/client-app/javascript/redmic/modules/map/layer/GridLayerImpl.js b/client-app/src/redmic/modules/map/layer/GridLayerImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/map/layer/GridLayerImpl.js rename to client-app/src/redmic/modules/map/layer/GridLayerImpl.js diff --git a/client-app/javascript/redmic/modules/map/layer/MapLayer.js b/client-app/src/redmic/modules/map/layer/MapLayer.js similarity index 100% rename from client-app/javascript/redmic/modules/map/layer/MapLayer.js rename to client-app/src/redmic/modules/map/layer/MapLayer.js diff --git a/client-app/javascript/redmic/modules/map/layer/PruneClusterLayerImpl.js b/client-app/src/redmic/modules/map/layer/PruneClusterLayerImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/map/layer/PruneClusterLayerImpl.js rename to client-app/src/redmic/modules/map/layer/PruneClusterLayerImpl.js diff --git a/client-app/javascript/redmic/modules/map/layer/TrackingLayerImpl.js b/client-app/src/redmic/modules/map/layer/TrackingLayerImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/map/layer/TrackingLayerImpl.js rename to client-app/src/redmic/modules/map/layer/TrackingLayerImpl.js diff --git a/client-app/javascript/redmic/modules/map/layer/TrackingLine.js b/client-app/src/redmic/modules/map/layer/TrackingLine.js similarity index 100% rename from client-app/javascript/redmic/modules/map/layer/TrackingLine.js rename to client-app/src/redmic/modules/map/layer/TrackingLine.js diff --git a/client-app/javascript/redmic/modules/map/layer/WmsLayerImpl.js b/client-app/src/redmic/modules/map/layer/WmsLayerImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/map/layer/WmsLayerImpl.js rename to client-app/src/redmic/modules/map/layer/WmsLayerImpl.js diff --git a/client-app/javascript/redmic/modules/map/layer/_AddFilter.js b/client-app/src/redmic/modules/map/layer/_AddFilter.js similarity index 100% rename from client-app/javascript/redmic/modules/map/layer/_AddFilter.js rename to client-app/src/redmic/modules/map/layer/_AddFilter.js diff --git a/client-app/javascript/redmic/modules/map/layer/_AnimateMarker.js b/client-app/src/redmic/modules/map/layer/_AnimateMarker.js similarity index 100% rename from client-app/javascript/redmic/modules/map/layer/_AnimateMarker.js rename to client-app/src/redmic/modules/map/layer/_AnimateMarker.js diff --git a/client-app/javascript/redmic/modules/map/layer/_D3Expansion.js b/client-app/src/redmic/modules/map/layer/_D3Expansion.js similarity index 100% rename from client-app/javascript/redmic/modules/map/layer/_D3Expansion.js rename to client-app/src/redmic/modules/map/layer/_D3Expansion.js diff --git a/client-app/javascript/redmic/modules/map/layer/_Editable.js b/client-app/src/redmic/modules/map/layer/_Editable.js similarity index 100% rename from client-app/javascript/redmic/modules/map/layer/_Editable.js rename to client-app/src/redmic/modules/map/layer/_Editable.js diff --git a/client-app/javascript/redmic/modules/map/layer/_GeoJsonLayerItfc.js b/client-app/src/redmic/modules/map/layer/_GeoJsonLayerItfc.js similarity index 100% rename from client-app/javascript/redmic/modules/map/layer/_GeoJsonLayerItfc.js rename to client-app/src/redmic/modules/map/layer/_GeoJsonLayerItfc.js diff --git a/client-app/javascript/redmic/modules/map/layer/_Highlightable.js b/client-app/src/redmic/modules/map/layer/_Highlightable.js similarity index 100% rename from client-app/javascript/redmic/modules/map/layer/_Highlightable.js rename to client-app/src/redmic/modules/map/layer/_Highlightable.js diff --git a/client-app/javascript/redmic/modules/map/layer/_LayerProtocols.js b/client-app/src/redmic/modules/map/layer/_LayerProtocols.js similarity index 100% rename from client-app/javascript/redmic/modules/map/layer/_LayerProtocols.js rename to client-app/src/redmic/modules/map/layer/_LayerProtocols.js diff --git a/client-app/javascript/redmic/modules/map/layer/_ListenBounds.js b/client-app/src/redmic/modules/map/layer/_ListenBounds.js similarity index 100% rename from client-app/javascript/redmic/modules/map/layer/_ListenBounds.js rename to client-app/src/redmic/modules/map/layer/_ListenBounds.js diff --git a/client-app/javascript/redmic/modules/map/layer/_ListenZoom.js b/client-app/src/redmic/modules/map/layer/_ListenZoom.js similarity index 100% rename from client-app/javascript/redmic/modules/map/layer/_ListenZoom.js rename to client-app/src/redmic/modules/map/layer/_ListenZoom.js diff --git a/client-app/javascript/redmic/modules/map/layer/_MapLayerItfc.js b/client-app/src/redmic/modules/map/layer/_MapLayerItfc.js similarity index 100% rename from client-app/javascript/redmic/modules/map/layer/_MapLayerItfc.js rename to client-app/src/redmic/modules/map/layer/_MapLayerItfc.js diff --git a/client-app/javascript/redmic/modules/map/layer/_PruneClusterLayerItfc.js b/client-app/src/redmic/modules/map/layer/_PruneClusterLayerItfc.js similarity index 100% rename from client-app/javascript/redmic/modules/map/layer/_PruneClusterLayerItfc.js rename to client-app/src/redmic/modules/map/layer/_PruneClusterLayerItfc.js diff --git a/client-app/javascript/redmic/modules/map/layer/_PublishInfo.js b/client-app/src/redmic/modules/map/layer/_PublishInfo.js similarity index 100% rename from client-app/javascript/redmic/modules/map/layer/_PublishInfo.js rename to client-app/src/redmic/modules/map/layer/_PublishInfo.js diff --git a/client-app/javascript/redmic/modules/map/layer/_PublishInfoItfc.js b/client-app/src/redmic/modules/map/layer/_PublishInfoItfc.js similarity index 100% rename from client-app/javascript/redmic/modules/map/layer/_PublishInfoItfc.js rename to client-app/src/redmic/modules/map/layer/_PublishInfoItfc.js diff --git a/client-app/javascript/redmic/modules/map/layer/_RadiusCommons.js b/client-app/src/redmic/modules/map/layer/_RadiusCommons.js similarity index 100% rename from client-app/javascript/redmic/modules/map/layer/_RadiusCommons.js rename to client-app/src/redmic/modules/map/layer/_RadiusCommons.js diff --git a/client-app/javascript/redmic/modules/map/layer/_RadiusOnClick.js b/client-app/src/redmic/modules/map/layer/_RadiusOnClick.js similarity index 100% rename from client-app/javascript/redmic/modules/map/layer/_RadiusOnClick.js rename to client-app/src/redmic/modules/map/layer/_RadiusOnClick.js diff --git a/client-app/javascript/redmic/modules/map/layer/_RadiusOnSelect.js b/client-app/src/redmic/modules/map/layer/_RadiusOnSelect.js similarity index 100% rename from client-app/javascript/redmic/modules/map/layer/_RadiusOnSelect.js rename to client-app/src/redmic/modules/map/layer/_RadiusOnSelect.js diff --git a/client-app/javascript/redmic/modules/map/layer/_SelectOnClick.js b/client-app/src/redmic/modules/map/layer/_SelectOnClick.js similarity index 100% rename from client-app/javascript/redmic/modules/map/layer/_SelectOnClick.js rename to client-app/src/redmic/modules/map/layer/_SelectOnClick.js diff --git a/client-app/javascript/redmic/modules/map/layer/_Selectable.js b/client-app/src/redmic/modules/map/layer/_Selectable.js similarity index 100% rename from client-app/javascript/redmic/modules/map/layer/_Selectable.js rename to client-app/src/redmic/modules/map/layer/_Selectable.js diff --git a/client-app/javascript/redmic/modules/map/layer/_SelectableItfc.js b/client-app/src/redmic/modules/map/layer/_SelectableItfc.js similarity index 100% rename from client-app/javascript/redmic/modules/map/layer/_SelectableItfc.js rename to client-app/src/redmic/modules/map/layer/_SelectableItfc.js diff --git a/client-app/javascript/redmic/modules/map/layer/_TrackingDataManagement.js b/client-app/src/redmic/modules/map/layer/_TrackingDataManagement.js similarity index 100% rename from client-app/javascript/redmic/modules/map/layer/_TrackingDataManagement.js rename to client-app/src/redmic/modules/map/layer/_TrackingDataManagement.js diff --git a/client-app/javascript/redmic/modules/map/layer/_TrackingMarkersManagement.js b/client-app/src/redmic/modules/map/layer/_TrackingMarkersManagement.js similarity index 100% rename from client-app/javascript/redmic/modules/map/layer/_TrackingMarkersManagement.js rename to client-app/src/redmic/modules/map/layer/_TrackingMarkersManagement.js diff --git a/client-app/javascript/redmic/modules/mapQuery/QueryOnMap.js b/client-app/src/redmic/modules/mapQuery/QueryOnMap.js similarity index 100% rename from client-app/javascript/redmic/modules/mapQuery/QueryOnMap.js rename to client-app/src/redmic/modules/mapQuery/QueryOnMap.js diff --git a/client-app/javascript/redmic/modules/mapQuery/_ContentManagement.js b/client-app/src/redmic/modules/mapQuery/_ContentManagement.js similarity index 100% rename from client-app/javascript/redmic/modules/mapQuery/_ContentManagement.js rename to client-app/src/redmic/modules/mapQuery/_ContentManagement.js diff --git a/client-app/javascript/redmic/modules/mapQuery/_ResultsBrowser.js b/client-app/src/redmic/modules/mapQuery/_ResultsBrowser.js similarity index 100% rename from client-app/javascript/redmic/modules/mapQuery/_ResultsBrowser.js rename to client-app/src/redmic/modules/mapQuery/_ResultsBrowser.js diff --git a/client-app/javascript/redmic/modules/metaTags/MetaTags.js b/client-app/src/redmic/modules/metaTags/MetaTags.js similarity index 100% rename from client-app/javascript/redmic/modules/metaTags/MetaTags.js rename to client-app/src/redmic/modules/metaTags/MetaTags.js diff --git a/client-app/javascript/redmic/modules/metaTags/metaTagsContent.js b/client-app/src/redmic/modules/metaTags/metaTagsContent.js similarity index 100% rename from client-app/javascript/redmic/modules/metaTags/metaTagsContent.js rename to client-app/src/redmic/modules/metaTags/metaTagsContent.js diff --git a/client-app/javascript/redmic/modules/model/Model.js b/client-app/src/redmic/modules/model/Model.js similarity index 100% rename from client-app/javascript/redmic/modules/model/Model.js rename to client-app/src/redmic/modules/model/Model.js diff --git a/client-app/javascript/redmic/modules/model/ModelImpl.js b/client-app/src/redmic/modules/model/ModelImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/model/ModelImpl.js rename to client-app/src/redmic/modules/model/ModelImpl.js diff --git a/client-app/javascript/redmic/modules/model/_ModelItfc.js b/client-app/src/redmic/modules/model/_ModelItfc.js similarity index 100% rename from client-app/javascript/redmic/modules/model/_ModelItfc.js rename to client-app/src/redmic/modules/model/_ModelItfc.js diff --git a/client-app/javascript/redmic/modules/notification/Alert.js b/client-app/src/redmic/modules/notification/Alert.js similarity index 100% rename from client-app/javascript/redmic/modules/notification/Alert.js rename to client-app/src/redmic/modules/notification/Alert.js diff --git a/client-app/javascript/redmic/modules/notification/CommunicationCenter.js b/client-app/src/redmic/modules/notification/CommunicationCenter.js similarity index 100% rename from client-app/javascript/redmic/modules/notification/CommunicationCenter.js rename to client-app/src/redmic/modules/notification/CommunicationCenter.js diff --git a/client-app/javascript/redmic/modules/notification/Notification.js b/client-app/src/redmic/modules/notification/Notification.js similarity index 100% rename from client-app/javascript/redmic/modules/notification/Notification.js rename to client-app/src/redmic/modules/notification/Notification.js diff --git a/client-app/javascript/redmic/modules/notification/NotificationSidebar.js b/client-app/src/redmic/modules/notification/NotificationSidebar.js similarity index 100% rename from client-app/javascript/redmic/modules/notification/NotificationSidebar.js rename to client-app/src/redmic/modules/notification/NotificationSidebar.js diff --git a/client-app/javascript/redmic/modules/notification/TaskNotification.js b/client-app/src/redmic/modules/notification/TaskNotification.js similarity index 100% rename from client-app/javascript/redmic/modules/notification/TaskNotification.js rename to client-app/src/redmic/modules/notification/TaskNotification.js diff --git a/client-app/javascript/redmic/modules/search/CompositeImpl.js b/client-app/src/redmic/modules/search/CompositeImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/search/CompositeImpl.js rename to client-app/src/redmic/modules/search/CompositeImpl.js diff --git a/client-app/javascript/redmic/modules/search/DateRangeImpl.js b/client-app/src/redmic/modules/search/DateRangeImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/search/DateRangeImpl.js rename to client-app/src/redmic/modules/search/DateRangeImpl.js diff --git a/client-app/javascript/redmic/modules/search/FacetsImpl.js b/client-app/src/redmic/modules/search/FacetsImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/search/FacetsImpl.js rename to client-app/src/redmic/modules/search/FacetsImpl.js diff --git a/client-app/javascript/redmic/modules/search/GeographicImpl.js b/client-app/src/redmic/modules/search/GeographicImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/search/GeographicImpl.js rename to client-app/src/redmic/modules/search/GeographicImpl.js diff --git a/client-app/javascript/redmic/modules/search/MultiSelectImpl.js b/client-app/src/redmic/modules/search/MultiSelectImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/search/MultiSelectImpl.js rename to client-app/src/redmic/modules/search/MultiSelectImpl.js diff --git a/client-app/javascript/redmic/modules/search/RangeImpl.js b/client-app/src/redmic/modules/search/RangeImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/search/RangeImpl.js rename to client-app/src/redmic/modules/search/RangeImpl.js diff --git a/client-app/javascript/redmic/modules/search/Search.js b/client-app/src/redmic/modules/search/Search.js similarity index 100% rename from client-app/javascript/redmic/modules/search/Search.js rename to client-app/src/redmic/modules/search/Search.js diff --git a/client-app/javascript/redmic/modules/search/TextImpl.js b/client-app/src/redmic/modules/search/TextImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/search/TextImpl.js rename to client-app/src/redmic/modules/search/TextImpl.js diff --git a/client-app/javascript/redmic/modules/search/_HideFormByAction.js b/client-app/src/redmic/modules/search/_HideFormByAction.js similarity index 100% rename from client-app/javascript/redmic/modules/search/_HideFormByAction.js rename to client-app/src/redmic/modules/search/_HideFormByAction.js diff --git a/client-app/javascript/redmic/modules/search/_SearchItfc.js b/client-app/src/redmic/modules/search/_SearchItfc.js similarity index 100% rename from client-app/javascript/redmic/modules/search/_SearchItfc.js rename to client-app/src/redmic/modules/search/_SearchItfc.js diff --git a/client-app/javascript/redmic/modules/selection/SelectionBox.js b/client-app/src/redmic/modules/selection/SelectionBox.js similarity index 100% rename from client-app/javascript/redmic/modules/selection/SelectionBox.js rename to client-app/src/redmic/modules/selection/SelectionBox.js diff --git a/client-app/javascript/redmic/modules/selection/SelectionManager.js b/client-app/src/redmic/modules/selection/SelectionManager.js similarity index 100% rename from client-app/javascript/redmic/modules/selection/SelectionManager.js rename to client-app/src/redmic/modules/selection/SelectionManager.js diff --git a/client-app/javascript/redmic/modules/selection/Selector.js b/client-app/src/redmic/modules/selection/Selector.js similarity index 100% rename from client-app/javascript/redmic/modules/selection/Selector.js rename to client-app/src/redmic/modules/selection/Selector.js diff --git a/client-app/javascript/redmic/modules/selection/_SelectorItfc.js b/client-app/src/redmic/modules/selection/_SelectorItfc.js similarity index 100% rename from client-app/javascript/redmic/modules/selection/_SelectorItfc.js rename to client-app/src/redmic/modules/selection/_SelectorItfc.js diff --git a/client-app/javascript/redmic/modules/selection/_SelectorPersistence.js b/client-app/src/redmic/modules/selection/_SelectorPersistence.js similarity index 100% rename from client-app/javascript/redmic/modules/selection/_SelectorPersistence.js rename to client-app/src/redmic/modules/selection/_SelectorPersistence.js diff --git a/client-app/javascript/redmic/modules/socket/Socket.js b/client-app/src/redmic/modules/socket/Socket.js similarity index 100% rename from client-app/javascript/redmic/modules/socket/Socket.js rename to client-app/src/redmic/modules/socket/Socket.js diff --git a/client-app/javascript/redmic/modules/socket/Task.js b/client-app/src/redmic/modules/socket/Task.js similarity index 100% rename from client-app/javascript/redmic/modules/socket/Task.js rename to client-app/src/redmic/modules/socket/Task.js diff --git a/client-app/javascript/redmic/modules/socket/_IngestData.js b/client-app/src/redmic/modules/socket/_IngestData.js similarity index 100% rename from client-app/javascript/redmic/modules/socket/_IngestData.js rename to client-app/src/redmic/modules/socket/_IngestData.js diff --git a/client-app/javascript/redmic/modules/socket/_Report.js b/client-app/src/redmic/modules/socket/_Report.js similarity index 100% rename from client-app/javascript/redmic/modules/socket/_Report.js rename to client-app/src/redmic/modules/socket/_Report.js diff --git a/client-app/javascript/redmic/modules/socket/_Worms.js b/client-app/src/redmic/modules/socket/_Worms.js similarity index 100% rename from client-app/javascript/redmic/modules/socket/_Worms.js rename to client-app/src/redmic/modules/socket/_Worms.js diff --git a/client-app/javascript/redmic/modules/store/RequestJoiner/AtlasDataImpl.js b/client-app/src/redmic/modules/store/RequestJoiner/AtlasDataImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/store/RequestJoiner/AtlasDataImpl.js rename to client-app/src/redmic/modules/store/RequestJoiner/AtlasDataImpl.js diff --git a/client-app/javascript/redmic/modules/store/RequestJoiner/RequestJoiner.js b/client-app/src/redmic/modules/store/RequestJoiner/RequestJoiner.js similarity index 100% rename from client-app/javascript/redmic/modules/store/RequestJoiner/RequestJoiner.js rename to client-app/src/redmic/modules/store/RequestJoiner/RequestJoiner.js diff --git a/client-app/javascript/redmic/modules/store/RequestJoiner/_RequestJoinerItfc.js b/client-app/src/redmic/modules/store/RequestJoiner/_RequestJoinerItfc.js similarity index 100% rename from client-app/javascript/redmic/modules/store/RequestJoiner/_RequestJoinerItfc.js rename to client-app/src/redmic/modules/store/RequestJoiner/_RequestJoinerItfc.js diff --git a/client-app/javascript/redmic/modules/store/RestManager.js b/client-app/src/redmic/modules/store/RestManager.js similarity index 100% rename from client-app/javascript/redmic/modules/store/RestManager.js rename to client-app/src/redmic/modules/store/RestManager.js diff --git a/client-app/javascript/redmic/modules/store/RestManagerImpl.js b/client-app/src/redmic/modules/store/RestManagerImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/store/RestManagerImpl.js rename to client-app/src/redmic/modules/store/RestManagerImpl.js diff --git a/client-app/javascript/redmic/modules/store/_RestManagerItfc.js b/client-app/src/redmic/modules/store/_RestManagerItfc.js similarity index 100% rename from client-app/javascript/redmic/modules/store/_RestManagerItfc.js rename to client-app/src/redmic/modules/store/_RestManagerItfc.js diff --git a/client-app/javascript/redmic/modules/tree/CbtreeImpl.js b/client-app/src/redmic/modules/tree/CbtreeImpl.js similarity index 100% rename from client-app/javascript/redmic/modules/tree/CbtreeImpl.js rename to client-app/src/redmic/modules/tree/CbtreeImpl.js diff --git a/client-app/javascript/redmic/modules/tree/Tree.js b/client-app/src/redmic/modules/tree/Tree.js similarity index 100% rename from client-app/javascript/redmic/modules/tree/Tree.js rename to client-app/src/redmic/modules/tree/Tree.js diff --git a/client-app/javascript/redmic/modules/tree/_HierarchicalFilter.js b/client-app/src/redmic/modules/tree/_HierarchicalFilter.js similarity index 100% rename from client-app/javascript/redmic/modules/tree/_HierarchicalFilter.js rename to client-app/src/redmic/modules/tree/_HierarchicalFilter.js diff --git a/client-app/javascript/redmic/modules/tree/_LazyLoad.js b/client-app/src/redmic/modules/tree/_LazyLoad.js similarity index 100% rename from client-app/javascript/redmic/modules/tree/_LazyLoad.js rename to client-app/src/redmic/modules/tree/_LazyLoad.js diff --git a/client-app/javascript/redmic/modules/tree/_LeafSelection.js b/client-app/src/redmic/modules/tree/_LeafSelection.js similarity index 100% rename from client-app/javascript/redmic/modules/tree/_LeafSelection.js rename to client-app/src/redmic/modules/tree/_LeafSelection.js diff --git a/client-app/javascript/redmic/modules/tree/_SelectionBox.js b/client-app/src/redmic/modules/tree/_SelectionBox.js similarity index 100% rename from client-app/javascript/redmic/modules/tree/_SelectionBox.js rename to client-app/src/redmic/modules/tree/_SelectionBox.js diff --git a/client-app/javascript/redmic/modules/tree/_TreeItfc.js b/client-app/src/redmic/modules/tree/_TreeItfc.js similarity index 100% rename from client-app/javascript/redmic/modules/tree/_TreeItfc.js rename to client-app/src/redmic/modules/tree/_TreeItfc.js diff --git a/client-app/javascript/redmic/modules/user/FullscreenToggle.js b/client-app/src/redmic/modules/user/FullscreenToggle.js similarity index 100% rename from client-app/javascript/redmic/modules/user/FullscreenToggle.js rename to client-app/src/redmic/modules/user/FullscreenToggle.js diff --git a/client-app/javascript/redmic/modules/user/LanguageSelector.js b/client-app/src/redmic/modules/user/LanguageSelector.js similarity index 100% rename from client-app/javascript/redmic/modules/user/LanguageSelector.js rename to client-app/src/redmic/modules/user/LanguageSelector.js diff --git a/client-app/javascript/redmic/modules/user/UserArea.js b/client-app/src/redmic/modules/user/UserArea.js similarity index 100% rename from client-app/javascript/redmic/modules/user/UserArea.js rename to client-app/src/redmic/modules/user/UserArea.js diff --git a/client-app/javascript/redmic/validation/stringFormats.js b/client-app/src/redmic/validation/stringFormats.js similarity index 100% rename from client-app/javascript/redmic/validation/stringFormats.js rename to client-app/src/redmic/validation/stringFormats.js diff --git a/client-app/javascript/redmic/view/effects/Animation.js b/client-app/src/redmic/view/effects/Animation.js similarity index 100% rename from client-app/javascript/redmic/view/effects/Animation.js rename to client-app/src/redmic/view/effects/Animation.js diff --git a/client-app/javascript/redmic/widgets/Button.js b/client-app/src/redmic/widgets/Button.js similarity index 100% rename from client-app/javascript/redmic/widgets/Button.js rename to client-app/src/redmic/widgets/Button.js diff --git a/client-app/javascript/redmic/widgets/ComboButton.js b/client-app/src/redmic/widgets/ComboButton.js similarity index 100% rename from client-app/javascript/redmic/widgets/ComboButton.js rename to client-app/src/redmic/widgets/ComboButton.js diff --git a/client-app/javascript/redmic/widgets/Converter.js b/client-app/src/redmic/widgets/Converter.js similarity index 100% rename from client-app/javascript/redmic/widgets/Converter.js rename to client-app/src/redmic/widgets/Converter.js diff --git a/client-app/javascript/redmic/widgets/DatePicker.js b/client-app/src/redmic/widgets/DatePicker.js similarity index 100% rename from client-app/javascript/redmic/widgets/DatePicker.js rename to client-app/src/redmic/widgets/DatePicker.js diff --git a/client-app/javascript/redmic/widgets/Facet.js b/client-app/src/redmic/widgets/Facet.js similarity index 100% rename from client-app/javascript/redmic/widgets/Facet.js rename to client-app/src/redmic/widgets/Facet.js diff --git a/client-app/javascript/redmic/widgets/FilteringSelect.js b/client-app/src/redmic/widgets/FilteringSelect.js similarity index 100% rename from client-app/javascript/redmic/widgets/FilteringSelect.js rename to client-app/src/redmic/widgets/FilteringSelect.js diff --git a/client-app/javascript/redmic/widgets/KeywordsInput.js b/client-app/src/redmic/widgets/KeywordsInput.js similarity index 100% rename from client-app/javascript/redmic/widgets/KeywordsInput.js rename to client-app/src/redmic/widgets/KeywordsInput.js diff --git a/client-app/javascript/redmic/widgets/Map.js b/client-app/src/redmic/widgets/Map.js similarity index 100% rename from client-app/javascript/redmic/widgets/Map.js rename to client-app/src/redmic/widgets/Map.js diff --git a/client-app/javascript/redmic/widgets/ProgressSlider.js b/client-app/src/redmic/widgets/ProgressSlider.js similarity index 100% rename from client-app/javascript/redmic/widgets/ProgressSlider.js rename to client-app/src/redmic/widgets/ProgressSlider.js diff --git a/client-app/javascript/redmic/widgets/README.md b/client-app/src/redmic/widgets/README.md similarity index 100% rename from client-app/javascript/redmic/widgets/README.md rename to client-app/src/redmic/widgets/README.md diff --git a/client-app/javascript/redmic/widgets/RangeSlider.js b/client-app/src/redmic/widgets/RangeSlider.js similarity index 100% rename from client-app/javascript/redmic/widgets/RangeSlider.js rename to client-app/src/redmic/widgets/RangeSlider.js diff --git a/client-app/javascript/redmic/widgets/RedmicUtilities.js b/client-app/src/redmic/widgets/RedmicUtilities.js similarity index 100% rename from client-app/javascript/redmic/widgets/RedmicUtilities.js rename to client-app/src/redmic/widgets/RedmicUtilities.js diff --git a/client-app/javascript/redmic/widgets/Slider.js b/client-app/src/redmic/widgets/Slider.js similarity index 100% rename from client-app/javascript/redmic/widgets/Slider.js rename to client-app/src/redmic/widgets/Slider.js diff --git a/client-app/javascript/redmic/widgets/Switch.js b/client-app/src/redmic/widgets/Switch.js similarity index 100% rename from client-app/javascript/redmic/widgets/Switch.js rename to client-app/src/redmic/widgets/Switch.js diff --git a/client-app/javascript/redmic/widgets/TemplateWidget.js b/client-app/src/redmic/widgets/TemplateWidget.js similarity index 100% rename from client-app/javascript/redmic/widgets/TemplateWidget.js rename to client-app/src/redmic/widgets/TemplateWidget.js diff --git a/client-app/javascript/redmic/widgets/TextSearch.js b/client-app/src/redmic/widgets/TextSearch.js similarity index 100% rename from client-app/javascript/redmic/widgets/TextSearch.js rename to client-app/src/redmic/widgets/TextSearch.js diff --git a/client-app/javascript/redmic/widgets/TimeSelect.js b/client-app/src/redmic/widgets/TimeSelect.js similarity index 100% rename from client-app/javascript/redmic/widgets/TimeSelect.js rename to client-app/src/redmic/widgets/TimeSelect.js diff --git a/client-app/javascript/redmic/widgets/ToggleButton.js b/client-app/src/redmic/widgets/ToggleButton.js similarity index 100% rename from client-app/javascript/redmic/widgets/ToggleButton.js rename to client-app/src/redmic/widgets/ToggleButton.js diff --git a/client-app/javascript/redmic/widgets/Utilities.js b/client-app/src/redmic/widgets/Utilities.js similarity index 100% rename from client-app/javascript/redmic/widgets/Utilities.js rename to client-app/src/redmic/widgets/Utilities.js diff --git a/client-app/javascript/redmic/widgets/ValueAndUnitSelector.js b/client-app/src/redmic/widgets/ValueAndUnitSelector.js similarity index 100% rename from client-app/javascript/redmic/widgets/ValueAndUnitSelector.js rename to client-app/src/redmic/widgets/ValueAndUnitSelector.js diff --git a/client-app/javascript/redmic/widgets/extensions/_ShowValue.js b/client-app/src/redmic/widgets/extensions/_ShowValue.js similarity index 100% rename from client-app/javascript/redmic/widgets/extensions/_ShowValue.js rename to client-app/src/redmic/widgets/extensions/_ShowValue.js diff --git a/client-app/javascript/src/view/detail/_WidgetDefinition.js b/client-app/src/src/view/detail/_WidgetDefinition.js similarity index 100% rename from client-app/javascript/src/view/detail/_WidgetDefinition.js rename to client-app/src/src/view/detail/_WidgetDefinition.js diff --git a/client-app/javascript/src/view/detail/activity/ActivityDetail.js b/client-app/src/src/view/detail/activity/ActivityDetail.js similarity index 100% rename from client-app/javascript/src/view/detail/activity/ActivityDetail.js rename to client-app/src/src/view/detail/activity/ActivityDetail.js diff --git a/client-app/javascript/src/view/detail/activity/_ActivityLayoutWidget.js b/client-app/src/src/view/detail/activity/_ActivityLayoutWidget.js similarity index 100% rename from client-app/javascript/src/view/detail/activity/_ActivityLayoutWidget.js rename to client-app/src/src/view/detail/activity/_ActivityLayoutWidget.js -- GitLab From 2d52a001ec798b37929d3bfd0ba07a357043f1f0 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Mon, 22 Jul 2024 12:48:05 +0100 Subject: [PATCH 017/249] Corrige ruta hacia tests --- Gruntfile.js | 1 + grunt/config/jshint.js | 9 +++++---- grunt/config/test.js | 6 +++--- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index acd50b46..3da4f2be 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -14,6 +14,7 @@ module.exports = function(grunt) { rootPath: __dirname, srcPath: 'client-app/src', depsPath: 'client-app/deps', + testPath: 'client-app/tests', distPath: 'dist', destDir: 'javascript' }, diff --git a/grunt/config/jshint.js b/grunt/config/jshint.js index 91866983..134f18e3 100644 --- a/grunt/config/jshint.js +++ b/grunt/config/jshint.js @@ -1,6 +1,7 @@ module.exports = function(grunt) { - var srcPath = grunt.config('redmicConfig.srcPath'); + var srcPath = grunt.config('redmicConfig.srcPath'), + testPath = grunt.config('redmicConfig.testPath'); grunt.config('jshint', { src: { @@ -16,13 +17,13 @@ module.exports = function(grunt) { ] } }, - tests: { + test: { options: { esversion: 6, - ignores: ['tests/sockTest/*.js'] + ignores: [testPath + '/sockTest/*.js'] }, files: { - src: ['tests/**/*.js'] + src: [testPath + '/**/*.js'] } }, options: { diff --git a/grunt/config/test.js b/grunt/config/test.js index b44039e5..5a0c79a6 100644 --- a/grunt/config/test.js +++ b/grunt/config/test.js @@ -11,7 +11,7 @@ module.exports = function(grunt) { rootPath = grunt.config('redmicConfig.rootPath'), srcPath = grunt.config('redmicConfig.srcPath'), - testsPath = 'client-app/tests', + testPath = grunt.config('redmicConfig.testPath'), outputPath = 'test_reports', ownServerHost = grunt.option('ownServerHost') || '', @@ -39,7 +39,7 @@ module.exports = function(grunt) { configPath = path.join(rootPath, outputPath, configDirName), reportersOutputPath = path.join(rootPath, outputPath, currOutputDirName), - absoluteTestsPath = path.join(rootPath, testsPath), + absoluteTestsPath = path.join(rootPath, testPath), userDataDir = outputPath + '/' + configDirName; grunt.file['delete'](configPath); @@ -93,7 +93,7 @@ module.exports = function(grunt) { testParams = { srcPath: srcPath, - testsPath: testsPath, + testsPath: testPath, ownServerPort: ownServerPort, ownSocketPort: ownSocketPort, ownTunnelPort: ownTunnelPort, -- GitLab From 8687a67284bd6bac4a9b36bdfbaa278154fdd594 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Tue, 23 Jul 2024 08:38:08 +0100 Subject: [PATCH 018/249] Corrige proceso de compilado y relacionados MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adapta a las nuevas rutas la configuración de compilado y otros procesos relacionados. --- client-app/app.profile.js | 82 ++++++++++++++++++------------------- grunt/config/copy.js | 26 +++++++----- grunt/task/buildApp.js | 4 +- server-app/views/layout.pug | 8 ++-- 4 files changed, 63 insertions(+), 57 deletions(-) diff --git a/client-app/app.profile.js b/client-app/app.profile.js index 601cdb37..a26273c3 100644 --- a/client-app/app.profile.js +++ b/client-app/app.profile.js @@ -25,9 +25,9 @@ var declarativeTagger = function(filename) { }; var profileObj = { - basePath: './src', - releaseDir: '../../dist', - releaseName: 'src', + basePath: '.', + releaseDir: '../dist', + releaseName: 'javascript', action: 'release', layerOptimize: 'closure', optimize: 'closure', @@ -85,16 +85,16 @@ var profileObj = { packages: [{ name: 'dijit', - location: 'dijit' + location: 'deps/dijit' },{ name: 'dojo', - location: 'dojo' + location: 'deps/dojo' },{ name: 'dojox', - location: 'dojox' + location: 'deps/dojox' },{ name: 'cbtree', - location: 'cbtree', + location: 'deps/cbtree', resourceTags: { amd: amdTagger, ignore: ignoreTagger.bind(null, [ @@ -119,112 +119,112 @@ var profileObj = { } },{ name: 'put-selector', - location: 'put-selector' + location: 'deps/put-selector' },{ name: 'wicket', - location: 'wicket', + location: 'deps/wicket', resourceTags: { amd: amdTagger, ignore: ignoreTagger.bind(null, ['wicket/wicket.min', 'wicket/wicket-leaflet.min']) } },{ name: 'app', - location: 'app', + location: 'src/app', resourceTags: { amd: amdTagger } },{ name: 'RWidgets', - location: 'redmic/widgets', + location: 'src/redmic/widgets', resourceTags: { amd: amdTagger } },{ name: 'redmic', - location: 'redmic', + location: 'src/redmic', resourceTags: { amd: amdTagger } },{ name: 'src', - location: 'src', + location: 'src/src', resourceTags: { amd: amdTagger } },{ name: 'mediatorjs', - location: 'mediatorjs', + location: 'deps/mediatorjs', resourceTags: { amd: amdTagger, ignore: ignoreTagger.bind(null, 'mediatorjs/mediator.min') } },{ name: 'moment', - location: 'moment/min', + location: 'deps/moment/min', resourceTags: { amd: amdTagger, ignore: ignoreTagger.bind(null, 'moment/moment.min') } },{ name: 'deepmerge', - location: 'deepmerge/dist', + location: 'deps/deepmerge/dist', resourceTags: { amd: amdTagger, ignore: ignoreTagger.bind(null, 'deepmerge/umd') } },{ name: 'leaflet', - location: 'leaflet/dist', + location: 'deps/leaflet/dist', resourceTags: { amd: amdTagger, ignore: ignoreTagger.bind(null, 'leaflet/leaflet') } },{ name: 'leaflet-nontiledlayer', - location: 'leaflet-nontiledlayer/dist', + location: 'deps/leaflet-nontiledlayer/dist', resourceTags: { amd: amdTagger } },{ name: 'awesome-markers', - location: 'leaflet-awesome-markers/dist', + location: 'deps/leaflet-awesome-markers/dist', resourceTags: { ignore: ignoreTagger.bind(null, 'awesome-markers/leaflet.awesome-markers.min') } },{ name: 'L-coordinates', - location: 'leaflet-coordinates/dist', + location: 'deps/leaflet-coordinates/dist', resourceTags: { ignore: ignoreTagger.bind(null, 'L-coordinates/Leaflet.Coordinates-0.1.5.min') } },{ name: 'L-draw', - location: 'leaflet-draw/dist', + location: 'deps/leaflet-draw/dist', resourceTags: { ignore: ignoreTagger.bind(null, 'L-draw/leaflet.draw') } },{ name: 'L-miniMap', - location: 'leaflet-minimap/dist', + location: 'deps/leaflet-minimap/dist', resourceTags: { amd: amdTagger, ignore: ignoreTagger.bind(null, 'L-miniMap/Control.MiniMap.min') } },{ name: 'L-navBar', - location: 'leaflet-navbar/src', + location: 'deps/leaflet-navbar/src', resourceTags: { ignore: ignoreTagger.bind(null, 'L-navBar/Leaflet.NavBar') } },{ name: 'L-areaselect', - location: 'leaflet-areaselect/src', + location: 'deps/leaflet-areaselect/src', resourceTags: { ignore: ignoreTagger.bind(null, 'L-areaselect/leaflet-areaselect') } },{ name: 'leaflet-measure', - location: 'leaflet-measure/dist', + location: 'deps/leaflet-measure/dist', resourceTags: { amd: amdTagger, ignore: ignoreTagger.bind(null, [ @@ -234,110 +234,110 @@ var profileObj = { } },{ name: 'pruneCluster', - location: 'pruneCluster/dist', + location: 'deps/pruneCluster/dist', resourceTags: { amd: amdTagger, ignore: ignoreTagger.bind(null, 'pruneCluster/PruneCluster.amd.min') } },{ name: 'sockjs', - location: 'sockjs/dist', + location: 'deps/sockjs/dist', resourceTags: { amd: amdTagger, ignore: ignoreTagger.bind(null, 'sockjs/sockjs.min') } },{ name: 'stomp-websocket', - location: 'stomp-websocket/lib', + location: 'deps/stomp-websocket/lib', resourceTags: { ignore: ignoreTagger.bind(null, 'stomp-websocket/stomp.min') } },{ name: 'alertify', - location: 'alertify/build', + location: 'deps/alertify/build', resourceTags: { amd: amdTagger, ignore: ignoreTagger.bind(null, 'alertify/alertify.min') } },{ name: 'templates', - location: 'templates/dist', + location: 'deps/templates/dist', resourceTags: { amd: amdTagger } },{ name: 'd3', - location: 'd3/dist', + location: 'deps/d3/dist', resourceTags: { amd: amdTagger, ignore: ignoreTagger.bind(null, 'd3/d3.min') } },{ name: 'd3Tip', - location: 'd3-v6-tip/build', + location: 'deps/d3-v6-tip/build', resourceTags: { amd: amdTagger, ignore: ignoreTagger.bind(null, 'd3Tip/d3-v6-tip.min') } },{ name: 'uuid', - location: 'uuid/dist/umd', + location: 'deps/uuid/dist/umd', resourceTags: { amd: amdTagger, ignore: ignoreTagger.bind(null, 'uuid/uuidv4.min') } },{ name: 'proj4', - location: 'proj4/dist', + location: 'deps/proj4/dist', resourceTags: { amd: amdTagger, ignore: ignoreTagger.bind(null, 'proj4/proj4') } },{ name: 'dropzone', - location: 'dropzone/dist/min', + location: 'deps/dropzone/dist/min', resourceTags: { amd: amdTagger, ignore: ignoreTagger.bind(null, 'dropzone/dropzone-amd-module.min') } },{ name: 'tv4', - location: 'tv4', + location: 'deps/tv4', resourceTags: { amd: amdTagger, ignore: ignoreTagger.bind(null, 'tv4/tv4') } },{ name: 'colorjs', - location: 'color-js', + location: 'deps/color-js', resourceTags: { copyOnly: copyOnlyTagger, ignore: ignoreTagger.bind(null, 'colorjs/color') } },{ name: 'json-schema-ref-parser', - location: 'json-schema-ref-parser/dist', + location: 'deps/json-schema-ref-parser/dist', resourceTags: { copyOnly: copyOnlyTagger, ignore: ignoreTagger.bind(null, 'json-schema-ref-parser/ref-parser.min') } },{ name: 'packery', - location: 'packery/dist', + location: 'deps/packery/dist', resourceTags: { copyOnly: copyOnlyTagger, ignore: ignoreTagger.bind(null, 'packery/packery.pkgd.min') } },{ name: 'draggabilly', - location: 'draggabilly/dist', + location: 'deps/draggabilly/dist', resourceTags: { copyOnly: copyOnlyTagger, ignore: ignoreTagger.bind(null, 'draggabilly/draggabilly.pkgd.min') } },{ name: 'handlebars', - location: 'handlebars/dist', + location: 'deps/handlebars/dist', resourceTags: { amd: amdTagger, ignore: ignoreTagger.bind(null, 'handlebars/handlebars.runtime.min') diff --git a/grunt/config/copy.js b/grunt/config/copy.js index 87ad826c..87d8fd1e 100644 --- a/grunt/config/copy.js +++ b/grunt/config/copy.js @@ -1,7 +1,11 @@ module.exports = function(grunt) { - var srcPath = grunt.config('redmicConfig.srcPath'), + var path = require('path'), + + srcPath = grunt.config('redmicConfig.srcPath'), + depsPath = grunt.config('redmicConfig.depsPath'), distPath = grunt.config('redmicConfig.distPath'), + destDir = grunt.config('redmicConfig.destDir'), publicPath = srcPath.split('/')[0], resourcesPath = 'resources/**', @@ -10,13 +14,13 @@ module.exports = function(grunt) { stylesDistPath = stylesPath + '/dist', distStylesSubPath = distPath + '/stylesheets', - leafletPath = '/deps/leaflet/', - srcLeafletPath = publicPath + leafletPath, - distLeafletPath = distPath + leafletPath, + leafletPath = 'leaflet', + srcLeafletPath = path.join(depsPath, leafletPath), + distLeafletPath = path.join(distPath, destDir, leafletPath), - pdfjsPath = '/deps/pdfjs/', - srcPdfjsPath = publicPath + pdfjsPath, - distPdfjsPath = distPath + pdfjsPath, + pdfjsPath = 'pdfjs', + srcPdfjsPath = path.join(depsPath, pdfjsPath), + distPdfjsPath = path.join(distPath, destDir, pdfjsPath), pdfjsWebName = 'web', pdfjsBuildName = 'build'; @@ -47,14 +51,14 @@ module.exports = function(grunt) { }, pdfjs: { files: [{ - cwd: srcPdfjsPath + pdfjsWebName, + cwd: path.join(srcPdfjsPath, pdfjsWebName), src: ['v*[^.map]', 'pdf.viewer.js', 'images/*', 'locale/es-ES/*', 'locale/en-GB/*'], - dest: distPdfjsPath + pdfjsWebName, + dest: path.join(distPdfjsPath, pdfjsWebName), expand: true },{ - cwd: srcPdfjsPath + pdfjsBuildName, + cwd: path.join(srcPdfjsPath, pdfjsBuildName), src: 'pdf.worker.js', - dest: distPdfjsPath + pdfjsBuildName, + dest: path.join(distPdfjsPath, pdfjsBuildName), expand: true }] } diff --git a/grunt/task/buildApp.js b/grunt/task/buildApp.js index 2fe3ca46..5d11c693 100644 --- a/grunt/task/buildApp.js +++ b/grunt/task/buildApp.js @@ -7,7 +7,7 @@ module.exports = function(grunt) { var path = require('path'), rootPath = grunt.config('redmicConfig.rootPath'), - srcPath = grunt.config('redmicConfig.srcPath'), + depsPath = grunt.config('redmicConfig.depsPath'), distPath = grunt.config('redmicConfig.distPath'), destDir = grunt.config('redmicConfig.destDir'), resourcesToClean = grunt.config('redmicConfig.resourcesToCleanInBuiltApp'), @@ -21,7 +21,7 @@ module.exports = function(grunt) { command: function() { var profile = pkg.dojoBuild, - scriptPath = path.join(srcPath, 'dojo/dojo.js'), + scriptPath = path.join(depsPath, 'dojo/dojo.js'), releaseDir = path.join(rootPath, distPath), nodeParams = ' --optimize_for_size --max_old_space_size=3000 --gc_interval=100 ', buildParams = ' load=build --profile "' + profile + '" --releaseDir "' + releaseDir + '"'; diff --git a/server-app/views/layout.pug b/server-app/views/layout.pug index 26c43ed0..54b950ee 100644 --- a/server-app/views/layout.pug +++ b/server-app/views/layout.pug @@ -29,7 +29,9 @@ html altLocale1 = esLocale; } - const basePath = '/' + (env.useBuilt ? 'dist' : 'client-app'); + const basePath = '/' + (env.useBuilt ? 'dist' : 'client-app'), + dojoConfigPath = basePath + '/' + (env.useBuilt ? 'javascript' : 'src') + '/dojoConfig.js', + dojoJsPath = basePath + '/' + (env.useBuilt ? 'javascript' : 'deps') + '/dojo/dojo.js'; meta(name = 'og:locale' content = locale) meta(name = 'og:locale:alternate' content = altLocale1) @@ -38,8 +40,8 @@ html meta(name = 'twitter:card' content = 'summary') meta(name = 'twitter:site' content = '@redmic_project') - script(src = basePath + '/src/dojoConfig.js') - script(src = basePath + '/deps/dojo/dojo.js' data-dojo-config = 'locale:"' + env.lang + '"') + script(src = dojoConfigPath) + script(src = dojoJsPath data-dojo-config = 'locale:"' + env.lang + '"') link(rel='shortcut icon', href=basePath + '/resources/images/favicon.ico') -- GitLab From db641413a98d753c61f76c0e91f3e5d9417de9a6 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Tue, 23 Jul 2024 09:51:17 +0100 Subject: [PATCH 019/249] =?UTF-8?q?Mueve=20redmicConfig=20a=20ra=C3=ADz=20?= =?UTF-8?q?del=20c=C3=B3digo=20de=20la=20app?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client-app/src/{app => }/redmicConfig.js | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename client-app/src/{app => }/redmicConfig.js (100%) diff --git a/client-app/src/app/redmicConfig.js b/client-app/src/redmicConfig.js similarity index 100% rename from client-app/src/app/redmicConfig.js rename to client-app/src/redmicConfig.js -- GitLab From bab60044bf7335f3e911c443af812b2e5f926212 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Tue, 23 Jul 2024 09:55:47 +0100 Subject: [PATCH 020/249] Limpia directorio src de compilado --- client-app/src/dojoConfig.js | 24 ++++++++++++------------ client-app/src/dojoConfigBuild.js | 6 +++--- grunt/config/cleanBuiltApp.js | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/client-app/src/dojoConfig.js b/client-app/src/dojoConfig.js index 619b7fdf..227b99c4 100644 --- a/client-app/src/dojoConfig.js +++ b/client-app/src/dojoConfig.js @@ -1,5 +1,17 @@ dojoConfig = { packages: [{ + name: 'src', + location: '../../src' + },{ + name: 'app', + location: '../../src/app' + },{ + name: 'redmic', + location: '../../src/redmic' + },{ + name: 'RWidgets', + location: '../../src/redmic/widgets' + },{ name: 'dojo', location: '../dojo' },{ @@ -8,21 +20,12 @@ dojoConfig = { },{ name: 'dojox', location: '../dojox' - },{ - name: 'app', - location: '../../src/app' },{ name: 'put-selector', location: '../put-selector' },{ name: 'alertify', location: '../alertify/build' - },{ - name: 'redmic', - location: '../../src/redmic' - },{ - name: 'src', - location: '../../src/src' },{ name: 'dropzone', location: '../dropzone/dist/min' @@ -62,9 +65,6 @@ dojoConfig = { },{ name: 'proj4', location: '../proj4/dist' - },{ - name: 'RWidgets', - location: '../../src/redmic/widgets' },{ name: 'handlebars', location: '../handlebars/dist' diff --git a/client-app/src/dojoConfigBuild.js b/client-app/src/dojoConfigBuild.js index 086b1c66..6e9e96b0 100644 --- a/client-app/src/dojoConfigBuild.js +++ b/client-app/src/dojoConfigBuild.js @@ -3,14 +3,14 @@ dojoConfig = { extraLocale: ['en'], packages: [{ + name: 'app', + location: '../app' + },{ name: 'dojo', location: '../dojo' },{ name: 'dojox', location: '../dojox' - },{ - name: 'app', - location: '../app' },{ name: 'json-schema-ref-parser', location: '../json-schema-ref-parser' diff --git a/grunt/config/cleanBuiltApp.js b/grunt/config/cleanBuiltApp.js index 7345ab7c..044227d7 100644 --- a/grunt/config/cleanBuiltApp.js +++ b/grunt/config/cleanBuiltApp.js @@ -4,7 +4,7 @@ module.exports = function(grunt) { 'alertify', 'awesome-markers', 'cbtree', 'd3Tip', 'dijit', 'dojo', 'dojox', 'deepmerge', 'dropzone', 'handlebars', 'L-areaselect', 'L-coordinates', 'L-draw', 'L-miniMap', 'L-navBar', 'leaflet', 'leaflet-nontiledlayer', 'mediatorjs', 'moment', 'uuid', 'proj4', 'pruneCluster', 'put-selector', - 'redmic', 'RWidgets', 'sockjs', 'stomp-websocket', 'templates', 'tv4', 'wicket' + 'redmic', 'RWidgets', 'sockjs', 'stomp-websocket', 'src', 'templates', 'tv4', 'wicket' ]; var recursiveDirectoriesToDelete = [ -- GitLab From 7c0cf9f49f65c0fbaf338ed86a96e4834ef41cf6 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Tue, 23 Jul 2024 09:56:07 +0100 Subject: [PATCH 021/249] Reubica nuevos recursos en directorios acordes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Para comenzar a reorganizar los recursos internos de la aplicación, se sigue un criterio más acorde al contexto al que pertenecen. Por ejemplo, para la definición de la vista de detalle de actividad, se decide que estará en 'src/catalog/detail/activity/', ya que a nivel de navegación dentro de la app, el usuario entra por la ruta de catálogos, luego va a ver en detalle un registro concreto y por último se contextualiza dentro de los datos de una entidad llamada actividad. También se puede entender como una jerarquización de contenidos basándose en la URL por la que se llega a consumirlos desde la app (aunque la correspondencia de nombres no siempre sea exacta). --- client-app/src/app/designs/details/main/Program.js | 2 +- client-app/src/app/designs/details/main/Project.js | 2 +- client-app/src/app/designs/details/main/_DetailsBase.js | 2 +- .../src/{src/view => catalog}/detail/_WidgetDefinition.js | 0 .../src/{src/view => catalog}/detail/activity/ActivityDetail.js | 0 .../view => catalog}/detail/activity/_ActivityLayoutWidget.js | 2 +- 6 files changed, 4 insertions(+), 4 deletions(-) rename client-app/src/{src/view => catalog}/detail/_WidgetDefinition.js (100%) rename client-app/src/{src/view => catalog}/detail/activity/ActivityDetail.js (100%) rename client-app/src/{src/view => catalog}/detail/activity/_ActivityLayoutWidget.js (99%) diff --git a/client-app/src/app/designs/details/main/Program.js b/client-app/src/app/designs/details/main/Program.js index ed92d537..96f77a0c 100644 --- a/client-app/src/app/designs/details/main/Program.js +++ b/client-app/src/app/designs/details/main/Program.js @@ -4,7 +4,7 @@ define([ , "dojo/_base/lang" , "templates/ProjectInfo" , "templates/ProjectList" - , 'src/view/detail/_WidgetDefinition' + , 'src/catalog/detail/_WidgetDefinition' , "./_ActivityBase" ], function( redmicConfig diff --git a/client-app/src/app/designs/details/main/Project.js b/client-app/src/app/designs/details/main/Project.js index afa6c329..90771883 100644 --- a/client-app/src/app/designs/details/main/Project.js +++ b/client-app/src/app/designs/details/main/Project.js @@ -4,7 +4,7 @@ define([ , "dojo/_base/lang" , "templates/ActivityList" , "templates/ProjectInfo" - , 'src/view/detail/_WidgetDefinition' + , 'src/catalog/detail/_WidgetDefinition' , "./_ActivityBase" ], function( redmicConfig diff --git a/client-app/src/app/designs/details/main/_DetailsBase.js b/client-app/src/app/designs/details/main/_DetailsBase.js index 6c3a9870..e7637ec7 100644 --- a/client-app/src/app/designs/details/main/_DetailsBase.js +++ b/client-app/src/app/designs/details/main/_DetailsBase.js @@ -5,7 +5,7 @@ define([ , "app/designs/details/_AddTitle" , "dojo/_base/declare" , "dojo/_base/lang" - , 'src/view/detail/_WidgetDefinition' + , 'src/catalog/detail/_WidgetDefinition' , "templates/ActivityList" ], function( _Main diff --git a/client-app/src/src/view/detail/_WidgetDefinition.js b/client-app/src/catalog/detail/_WidgetDefinition.js similarity index 100% rename from client-app/src/src/view/detail/_WidgetDefinition.js rename to client-app/src/catalog/detail/_WidgetDefinition.js diff --git a/client-app/src/src/view/detail/activity/ActivityDetail.js b/client-app/src/catalog/detail/activity/ActivityDetail.js similarity index 100% rename from client-app/src/src/view/detail/activity/ActivityDetail.js rename to client-app/src/catalog/detail/activity/ActivityDetail.js diff --git a/client-app/src/src/view/detail/activity/_ActivityLayoutWidget.js b/client-app/src/catalog/detail/activity/_ActivityLayoutWidget.js similarity index 99% rename from client-app/src/src/view/detail/activity/_ActivityLayoutWidget.js rename to client-app/src/catalog/detail/activity/_ActivityLayoutWidget.js index a463fd6e..a7f122b0 100644 --- a/client-app/src/src/view/detail/activity/_ActivityLayoutWidget.js +++ b/client-app/src/catalog/detail/activity/_ActivityLayoutWidget.js @@ -1,6 +1,6 @@ define([ 'dojo/_base/declare' - , 'src/view/detail/_WidgetDefinition' + , 'src/catalog/detail/_WidgetDefinition' ], function( declare , _WidgetDefinition -- GitLab From a35d355b3307258b7e13b54764849ded8fb138d2 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Tue, 23 Jul 2024 10:05:09 +0100 Subject: [PATCH 022/249] =?UTF-8?q?Apunta=20a=20nueva=20ubicaci=C3=B3n=20d?= =?UTF-8?q?e=20redmicConfig?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../administrative/taxonomy/views/MisIdentificationView.js | 2 +- .../src/app/administrative/taxonomy/views/SpeciesView.js | 2 +- client-app/src/app/administrative/views/ActivityView.js | 2 +- client-app/src/app/administrative/views/AnimalView.js | 2 +- client-app/src/app/administrative/views/ContactView.js | 2 +- client-app/src/app/administrative/views/DeviceView.js | 2 +- client-app/src/app/administrative/views/DocumentView.js | 2 +- client-app/src/app/administrative/views/OrganisationView.js | 2 +- client-app/src/app/administrative/views/PlatformView.js | 2 +- client-app/src/app/administrative/views/ProgramView.js | 2 +- client-app/src/app/administrative/views/ProjectView.js | 2 +- client-app/src/app/base/views/extensions/_ActivityClosed.js | 2 +- client-app/src/app/base/views/extensions/_EditionLayerView.js | 2 +- client-app/src/app/base/views/extensions/_GetActivityData.js | 2 +- .../_ListenActivityDataAndAccessByActivityCategory.js | 2 +- client-app/src/app/catalog/views/ActivitiesCatalogView.js | 2 +- client-app/src/app/catalog/views/OrganisationsCatalogView.js | 2 +- client-app/src/app/catalog/views/ProgramsCatalogView.js | 2 +- client-app/src/app/catalog/views/ProjectsCatalogView.js | 2 +- client-app/src/app/catalog/views/SpeciesCatalogView.js | 4 ++-- client-app/src/app/components/CookieLoader.js | 2 +- client-app/src/app/components/ReCaptcha.js | 2 +- client-app/src/app/components/steps/AccessSetStep.js | 2 +- client-app/src/app/components/steps/ActivitySetStep.js | 2 +- .../src/app/components/steps/AreaClassificationsSetStep.js | 2 +- client-app/src/app/components/steps/CalibrationSetStep.js | 2 +- client-app/src/app/components/steps/CitationStep.js | 2 +- client-app/src/app/components/steps/ClassificationsStep.js | 2 +- client-app/src/app/components/steps/ContactSetStep.js | 2 +- client-app/src/app/components/steps/DataDefinitionSetStep.js | 2 +- client-app/src/app/components/steps/DescribeSiteStep.js | 2 +- client-app/src/app/components/steps/DocumentSetStep.js | 2 +- client-app/src/app/components/steps/DocumentStepFiltered.js | 2 +- client-app/src/app/components/steps/OrganisationSetStep.js | 2 +- client-app/src/app/components/steps/PlatformSetStep.js | 2 +- client-app/src/app/components/steps/RecoverySetStep.js | 2 +- client-app/src/app/components/steps/RelationDataSetStep.js | 2 +- client-app/src/app/components/steps/SelectLayerStep.js | 2 +- client-app/src/app/components/steps/SpeciesMainDataStep.js | 2 +- client-app/src/app/components/steps/SpecimenTagSetStep.js | 2 +- client-app/src/app/components/steps/UnitSetStep.js | 2 +- .../src/app/components/steps/_ClassificationsRelationData.js | 4 ++-- .../describeSite/views/SelectStationByActivity.js | 2 +- .../viewCustomization/loadFile/models/LoadFileModel.js | 2 +- client-app/src/app/dataLoader/areas/views/AreaView.js | 2 +- client-app/src/app/dataLoader/citation/views/CitationView.js | 2 +- .../infrastructure/views/InfrastructureAttributesView.js | 4 ++-- .../app/dataLoader/infrastructure/views/InfrastructureView.js | 2 +- .../src/app/dataLoader/sightings/models/SightingsModel.js | 2 +- .../src/app/dataLoader/sightings/views/SightingsView.js | 2 +- .../surveyParameters/views/ObjectCollectingSeriesDataView.js | 2 +- .../dataLoader/surveyParameters/views/ObjectCollectionView.js | 2 +- .../surveyParameters/views/SurveyStationSeriesDataView.js | 2 +- .../dataLoader/surveyParameters/views/SurveyStationView.js | 2 +- .../app/dataLoader/surveyParameters/views/_SeriesDataView.js | 2 +- .../src/app/dataLoader/tracking/views/TrackingDataView.js | 2 +- client-app/src/app/dataLoader/tracking/views/TrackingView.js | 2 +- .../app/designs/chart/main/MultiWindRoseChartWithToolbar.js | 2 +- .../chart/main/_ProcessDataDefinitionAndGetTimeSeries.js | 2 +- .../src/app/designs/details/main/ActivityTrackingMap.js | 2 +- client-app/src/app/designs/details/main/Contact.js | 2 +- client-app/src/app/designs/details/main/Document.js | 2 +- client-app/src/app/designs/details/main/DocumentPDF.js | 2 +- client-app/src/app/designs/details/main/Organisation.js | 2 +- client-app/src/app/designs/details/main/Platform.js | 2 +- client-app/src/app/designs/details/main/Program.js | 2 +- client-app/src/app/designs/details/main/Project.js | 2 +- client-app/src/app/designs/details/main/ServiceOGC.js | 2 +- client-app/src/app/designs/details/main/Species.js | 2 +- client-app/src/app/designs/details/main/SpeciesLocation.js | 2 +- client-app/src/app/designs/details/main/Statistics.js | 2 +- .../src/app/designs/externalTextSearchList/main/PlaceNames.js | 2 +- .../src/app/designs/externalTextSearchList/main/Worms.js | 2 +- .../src/app/designs/mapWithSideContent/main/Tracking.js | 2 +- .../app/designs/mapWithSideContent/main/_TrackingWithList.js | 2 +- client-app/src/app/designs/textSearchFacetsList/Controller.js | 2 +- .../src/app/designs/textSearchFacetsList/main/Activity.js | 2 +- .../app/designs/textSearchFacetsList/main/Administrative.js | 2 +- .../src/app/designs/textSearchFacetsList/main/Bibliography.js | 2 +- .../src/app/designs/textSearchFacetsList/main/Domain.js | 2 +- .../src/app/designs/textSearchFacetsList/main/Organisation.js | 2 +- .../src/app/designs/textSearchFacetsList/main/Platform.js | 2 +- .../src/app/designs/textSearchFacetsList/main/Program.js | 2 +- .../src/app/designs/textSearchFacetsList/main/Project.js | 2 +- .../src/app/designs/textSearchFacetsList/main/ServiceOGC.js | 2 +- .../src/app/designs/textSearchFacetsList/main/Species.js | 2 +- client-app/src/app/designs/textSearchFacetsList/main/Taxon.js | 2 +- client-app/src/app/designs/textSearchList/Controller.js | 2 +- client-app/src/app/designs/textSearchList/main/Domain.js | 2 +- client-app/src/app/details/views/ActivityAreaMapBase.js | 2 +- .../src/app/details/views/ActivityCatalogDetailsView.js | 2 +- client-app/src/app/details/views/ActivityCitationMapBase.js | 4 ++-- client-app/src/app/details/views/ActivityDetailsView.js | 2 +- .../src/app/details/views/ActivityFixedTimeseriesChart.js | 2 +- .../src/app/details/views/ActivityFixedTimeseriesMap.js | 2 +- .../src/app/details/views/ActivityInfrastructureMapBase.js | 2 +- client-app/src/app/details/views/ActivityLayerMapBase.js | 2 +- client-app/src/app/details/views/BibliographyDetailsView.js | 2 +- client-app/src/app/details/views/ContactDetailsView.js | 4 ++-- client-app/src/app/details/views/DocumentDetailsView.js | 2 +- .../src/app/details/views/OrganisationCatalogDetailsView.js | 4 ++-- client-app/src/app/details/views/OrganisationDetailsView.js | 4 ++-- .../src/app/details/views/PlatformCatalogDetailsView.js | 4 ++-- client-app/src/app/details/views/PlatformDetailsView.js | 4 ++-- client-app/src/app/details/views/ProgramCatalogDetailsView.js | 4 ++-- client-app/src/app/details/views/ProgramDetailsView.js | 4 ++-- client-app/src/app/details/views/ProjectCatalogDetailsView.js | 4 ++-- client-app/src/app/details/views/ProjectDetailsView.js | 4 ++-- .../src/app/details/views/ServiceOGCCatalogDetailsView.js | 4 ++-- client-app/src/app/details/views/ServiceOGCDetailsView.js | 4 ++-- client-app/src/app/details/views/SpeciesCatalogDetailsView.js | 2 +- client-app/src/app/details/views/SpeciesDetailsView.js | 2 +- client-app/src/app/details/views/StatisticsDetailsView.js | 4 ++-- client-app/src/app/edition/views/ActivityEditionView.js | 2 +- client-app/src/app/edition/views/AnimalEditionView.js | 4 ++-- client-app/src/app/edition/views/ConditionEditionView.js | 2 +- client-app/src/app/edition/views/ContactEditionView.js | 2 +- client-app/src/app/edition/views/DeviceEditionView.js | 2 +- client-app/src/app/edition/views/DocumentEditionView.js | 2 +- .../src/app/edition/views/LoadDataToActivityEditionView.js | 2 +- .../src/app/edition/views/MetricsDefinitionEditionView.js | 4 ++-- .../src/app/edition/views/MisIdentificationEditionView.js | 2 +- client-app/src/app/edition/views/OrganisationEditionView.js | 2 +- client-app/src/app/edition/views/ParameterEditionView.js | 2 +- client-app/src/app/edition/views/PermissionsEditionView.js | 2 +- client-app/src/app/edition/views/PlatformEditionView.js | 2 +- client-app/src/app/edition/views/ProgramEditionView.js | 2 +- client-app/src/app/edition/views/ProjectEditionView.js | 2 +- client-app/src/app/edition/views/ServiceOGCEditionView.js | 2 +- client-app/src/app/edition/views/SpeciesEditionView.js | 2 +- client-app/src/app/edition/views/UnitEditionView.js | 2 +- client-app/src/app/edition/views/dataLoader/AddDataFT.js | 2 +- client-app/src/app/edition/views/dataLoader/AddDataIF.js | 4 ++-- client-app/src/app/edition/views/dataLoader/AddDataOC.js | 2 +- client-app/src/app/edition/views/dataLoader/EditDataAR.js | 2 +- client-app/src/app/edition/views/dataLoader/LoadDataOC.js | 2 +- client-app/src/app/edition/views/dataLoader/LoadDataTR.js | 2 +- .../edition/views/dataLoader/_BaseDataToActivityEdition.js | 4 ++-- client-app/src/app/home/views/HomeView.js | 2 +- client-app/src/app/home/views/SearchBarWidget.js | 2 +- client-app/src/app/home/views/SearchFastFilterWidget.js | 2 +- client-app/src/app/home/views/SearchResultsWidget.js | 2 +- client-app/src/app/home/views/StatsWidget.js | 2 +- .../app/maintenance/domains/admin/views/ActivityTypesView.js | 2 +- .../domains/observations/views/MetricsDefinitionsView.js | 2 +- .../maintenance/domains/observations/views/ParametersView.js | 2 +- .../app/maintenance/domains/observations/views/UnitsView.js | 2 +- client-app/src/app/maintenance/models/AccessModel.js | 4 ++-- client-app/src/app/maintenance/models/PermissionsModel.js | 4 ++-- client-app/src/app/maintenance/views/DomainView.js | 4 ++-- client-app/src/app/maintenance/views/PermissionsView.js | 2 +- client-app/src/app/products/views/OpenMapView.js | 2 +- client-app/src/app/user/models/FeedbackModel.js | 4 ++-- client-app/src/app/user/models/PasswordModel.js | 4 ++-- client-app/src/app/user/models/RegisterModel.js | 4 ++-- client-app/src/app/user/models/UserEmailModel.js | 4 ++-- client-app/src/app/user/models/UserImageModel.js | 4 ++-- client-app/src/app/user/models/UserNameModel.js | 2 +- client-app/src/app/user/models/UserSectorModel.js | 4 ++-- client-app/src/app/user/views/ConfirmResettingView.js | 2 +- client-app/src/app/user/views/FeedbackView.js | 2 +- client-app/src/app/user/views/LoginView.js | 2 +- client-app/src/app/user/views/RegisterView.js | 2 +- client-app/src/app/user/views/ResettingView.js | 2 +- client-app/src/app/user/views/UserProfileView.js | 2 +- client-app/src/app/user/views/_ExternalUserBaseView.js | 2 +- .../src/app/viewers/models/PointClusterCategorizeModel.js | 4 ++-- client-app/src/app/viewers/models/PointClusterModel.js | 4 ++-- client-app/src/app/viewers/views/BibliographyView.js | 2 +- client-app/src/app/viewers/views/ChartsView.js | 2 +- client-app/src/app/viewers/views/RealTimeDashboardView.js | 2 +- client-app/src/app/viewers/views/RealTimeView.js | 2 +- client-app/src/app/viewers/views/SpeciesDistributionView.js | 2 +- client-app/src/app/viewers/views/TrackingView.js | 2 +- client-app/src/app/viewers/views/TrashCharts.js | 2 +- client-app/src/app/viewers/views/TrashCollectionView.js | 2 +- client-app/src/app/viewers/views/TrashDetails.js | 2 +- client-app/src/app/viewers/views/_TimeSeriesDataManagement.js | 2 +- client-app/src/app/views/ActivateAccount.js | 2 +- client-app/src/catalog/detail/_WidgetDefinition.js | 2 +- client-app/src/catalog/detail/activity/ActivityDetail.js | 2 +- client-app/src/redmic/form/FormContainer.js | 2 +- client-app/src/redmic/form/UploadInput.js | 2 +- client-app/src/redmic/modules/app/App.js | 2 +- client-app/src/redmic/modules/app/ModuleStore.js | 2 +- client-app/src/redmic/modules/atlas/Atlas.js | 2 +- client-app/src/redmic/modules/base/Credentials.js | 2 +- client-app/src/redmic/modules/base/Manager.js | 2 +- client-app/src/redmic/modules/base/_Itfc.js | 2 +- client-app/src/redmic/modules/components/ExternalConfig.js | 2 +- client-app/src/redmic/modules/form/input/GeometryImpl.js | 2 +- client-app/src/redmic/modules/form/input/Input.js | 2 +- client-app/src/redmic/modules/form/input/SelectImpl.js | 2 +- .../src/redmic/modules/form/input/_BaseMultiSelectImpl.js | 2 +- .../src/redmic/modules/form/input/_SelectOnPopupImpl.js | 2 +- client-app/src/redmic/modules/layout/wizard/_WizardStep.js | 2 +- client-app/src/redmic/modules/model/Model.js | 2 +- client-app/src/redmic/modules/model/ModelImpl.js | 2 +- client-app/src/redmic/modules/selection/Selector.js | 2 +- client-app/src/redmic/modules/socket/Socket.js | 2 +- client-app/src/redmic/modules/socket/_IngestData.js | 2 +- client-app/src/redmic/modules/socket/_Report.js | 2 +- client-app/src/redmic/modules/socket/_Worms.js | 2 +- .../src/redmic/modules/store/RequestJoiner/AtlasDataImpl.js | 2 +- client-app/src/redmic/modules/store/RestManager.js | 2 +- client-app/src/redmic/modules/store/RestManagerImpl.js | 2 +- client-app/src/redmic/modules/user/LanguageSelector.js | 2 +- client-app/src/redmic/modules/user/UserArea.js | 2 +- 208 files changed, 239 insertions(+), 239 deletions(-) diff --git a/client-app/src/app/administrative/taxonomy/views/MisIdentificationView.js b/client-app/src/app/administrative/taxonomy/views/MisIdentificationView.js index 8758c8a7..a5bb30a0 100644 --- a/client-app/src/app/administrative/taxonomy/views/MisIdentificationView.js +++ b/client-app/src/app/administrative/taxonomy/views/MisIdentificationView.js @@ -4,7 +4,7 @@ define([ , "app/designs/base/_Main" , "app/designs/textSearchList/Controller" , "app/designs/textSearchList/layout/BasicAndButtonsTopZone" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "redmic/modules/browser/_Select" diff --git a/client-app/src/app/administrative/taxonomy/views/SpeciesView.js b/client-app/src/app/administrative/taxonomy/views/SpeciesView.js index 8ef88cd8..91ae5b20 100644 --- a/client-app/src/app/administrative/taxonomy/views/SpeciesView.js +++ b/client-app/src/app/administrative/taxonomy/views/SpeciesView.js @@ -2,7 +2,7 @@ define([ 'alertify/alertify.min' , "app/designs/textSearchFacetsList/main/Species" , "app/base/views/extensions/_EditionWizardView" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "RWidgets/Button" diff --git a/client-app/src/app/administrative/views/ActivityView.js b/client-app/src/app/administrative/views/ActivityView.js index a4f5bdd6..254fb6b8 100644 --- a/client-app/src/app/administrative/views/ActivityView.js +++ b/client-app/src/app/administrative/views/ActivityView.js @@ -1,7 +1,7 @@ define([ "app/designs/textSearchFacetsList/main/Activity" , "app/base/views/extensions/_EditionWizardView" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" diff --git a/client-app/src/app/administrative/views/AnimalView.js b/client-app/src/app/administrative/views/AnimalView.js index e9f9840e..b0854a97 100644 --- a/client-app/src/app/administrative/views/AnimalView.js +++ b/client-app/src/app/administrative/views/AnimalView.js @@ -1,7 +1,7 @@ define([ "app/designs/textSearchFacetsList/main/Administrative" , "app/base/views/extensions/_EditionWizardView" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "templates/AnimalList" diff --git a/client-app/src/app/administrative/views/ContactView.js b/client-app/src/app/administrative/views/ContactView.js index 15eb9646..8e785197 100644 --- a/client-app/src/app/administrative/views/ContactView.js +++ b/client-app/src/app/administrative/views/ContactView.js @@ -1,7 +1,7 @@ define([ "app/designs/textSearchFacetsList/main/Administrative" , "app/base/views/extensions/_EditionWizardView" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "templates/ContactList" diff --git a/client-app/src/app/administrative/views/DeviceView.js b/client-app/src/app/administrative/views/DeviceView.js index a8036d03..f538d2a1 100644 --- a/client-app/src/app/administrative/views/DeviceView.js +++ b/client-app/src/app/administrative/views/DeviceView.js @@ -1,7 +1,7 @@ define([ 'app/designs/textSearchFacetsList/main/Administrative' , 'app/base/views/extensions/_EditionWizardView' - , 'app/redmicConfig' + , 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' , 'templates/DeviceList' diff --git a/client-app/src/app/administrative/views/DocumentView.js b/client-app/src/app/administrative/views/DocumentView.js index 6b7ebb22..824e82d2 100644 --- a/client-app/src/app/administrative/views/DocumentView.js +++ b/client-app/src/app/administrative/views/DocumentView.js @@ -1,7 +1,7 @@ define([ 'app/base/views/extensions/_EditionWizardView' , 'app/designs/textSearchFacetsList/main/Bibliography' - , 'app/redmicConfig' + , 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' , 'RWidgets/Button' diff --git a/client-app/src/app/administrative/views/OrganisationView.js b/client-app/src/app/administrative/views/OrganisationView.js index cf52d70c..bb1e3b4c 100644 --- a/client-app/src/app/administrative/views/OrganisationView.js +++ b/client-app/src/app/administrative/views/OrganisationView.js @@ -1,7 +1,7 @@ define([ "app/designs/textSearchFacetsList/main/Organisation" , "app/base/views/extensions/_EditionWizardView" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" ], function( diff --git a/client-app/src/app/administrative/views/PlatformView.js b/client-app/src/app/administrative/views/PlatformView.js index f62e9861..46fe0910 100644 --- a/client-app/src/app/administrative/views/PlatformView.js +++ b/client-app/src/app/administrative/views/PlatformView.js @@ -1,7 +1,7 @@ define([ "app/designs/textSearchFacetsList/main/Platform" , "app/base/views/extensions/_EditionWizardView" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" ], function( diff --git a/client-app/src/app/administrative/views/ProgramView.js b/client-app/src/app/administrative/views/ProgramView.js index 8cf3aebc..c65454f4 100644 --- a/client-app/src/app/administrative/views/ProgramView.js +++ b/client-app/src/app/administrative/views/ProgramView.js @@ -1,7 +1,7 @@ define([ "app/designs/textSearchFacetsList/main/Program" , "app/base/views/extensions/_EditionWizardView" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" ], function( diff --git a/client-app/src/app/administrative/views/ProjectView.js b/client-app/src/app/administrative/views/ProjectView.js index ca6c4148..54a2f805 100644 --- a/client-app/src/app/administrative/views/ProjectView.js +++ b/client-app/src/app/administrative/views/ProjectView.js @@ -1,7 +1,7 @@ define([ "app/designs/textSearchFacetsList/main/Project" , "app/base/views/extensions/_EditionWizardView" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" diff --git a/client-app/src/app/base/views/extensions/_ActivityClosed.js b/client-app/src/app/base/views/extensions/_ActivityClosed.js index 507156f9..f59ef78f 100644 --- a/client-app/src/app/base/views/extensions/_ActivityClosed.js +++ b/client-app/src/app/base/views/extensions/_ActivityClosed.js @@ -1,6 +1,6 @@ define([ 'alertify/alertify.min' - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" diff --git a/client-app/src/app/base/views/extensions/_EditionLayerView.js b/client-app/src/app/base/views/extensions/_EditionLayerView.js index f74a05a6..8c365b48 100644 --- a/client-app/src/app/base/views/extensions/_EditionLayerView.js +++ b/client-app/src/app/base/views/extensions/_EditionLayerView.js @@ -1,7 +1,7 @@ define([ "app/base/views/extensions/_EditionWizardView" , "app/base/views/extensions/_FormInDialogView" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" diff --git a/client-app/src/app/base/views/extensions/_GetActivityData.js b/client-app/src/app/base/views/extensions/_GetActivityData.js index b05d0e23..ad63fc86 100644 --- a/client-app/src/app/base/views/extensions/_GetActivityData.js +++ b/client-app/src/app/base/views/extensions/_GetActivityData.js @@ -1,5 +1,5 @@ define([ - "app/redmicConfig" + 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" diff --git a/client-app/src/app/base/views/extensions/_ListenActivityDataAndAccessByActivityCategory.js b/client-app/src/app/base/views/extensions/_ListenActivityDataAndAccessByActivityCategory.js index 184865d0..d24ef062 100644 --- a/client-app/src/app/base/views/extensions/_ListenActivityDataAndAccessByActivityCategory.js +++ b/client-app/src/app/base/views/extensions/_ListenActivityDataAndAccessByActivityCategory.js @@ -1,5 +1,5 @@ define([ - "app/redmicConfig" + 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" diff --git a/client-app/src/app/catalog/views/ActivitiesCatalogView.js b/client-app/src/app/catalog/views/ActivitiesCatalogView.js index 4f3e6336..988c446d 100644 --- a/client-app/src/app/catalog/views/ActivitiesCatalogView.js +++ b/client-app/src/app/catalog/views/ActivitiesCatalogView.js @@ -1,6 +1,6 @@ define([ "app/designs/textSearchFacetsList/main/Activity" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" ], function ( diff --git a/client-app/src/app/catalog/views/OrganisationsCatalogView.js b/client-app/src/app/catalog/views/OrganisationsCatalogView.js index 7f2b551f..e95fcf77 100644 --- a/client-app/src/app/catalog/views/OrganisationsCatalogView.js +++ b/client-app/src/app/catalog/views/OrganisationsCatalogView.js @@ -1,6 +1,6 @@ define([ "app/designs/textSearchFacetsList/main/Organisation" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" ], function ( diff --git a/client-app/src/app/catalog/views/ProgramsCatalogView.js b/client-app/src/app/catalog/views/ProgramsCatalogView.js index 65c585bd..ae25ff3d 100644 --- a/client-app/src/app/catalog/views/ProgramsCatalogView.js +++ b/client-app/src/app/catalog/views/ProgramsCatalogView.js @@ -1,6 +1,6 @@ define([ "app/designs/textSearchFacetsList/main/Program" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" ], function ( diff --git a/client-app/src/app/catalog/views/ProjectsCatalogView.js b/client-app/src/app/catalog/views/ProjectsCatalogView.js index 6a3e51f8..2a5f154c 100644 --- a/client-app/src/app/catalog/views/ProjectsCatalogView.js +++ b/client-app/src/app/catalog/views/ProjectsCatalogView.js @@ -1,6 +1,6 @@ define([ "app/designs/textSearchFacetsList/main/Project" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" ], function ( diff --git a/client-app/src/app/catalog/views/SpeciesCatalogView.js b/client-app/src/app/catalog/views/SpeciesCatalogView.js index 4ce4eb01..8d8f4eef 100644 --- a/client-app/src/app/catalog/views/SpeciesCatalogView.js +++ b/client-app/src/app/catalog/views/SpeciesCatalogView.js @@ -1,6 +1,6 @@ define([ "app/designs/textSearchFacetsList/main/Species" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" ], function ( @@ -43,4 +43,4 @@ define([ }, this.browserConfig || {}]); } }); -}); \ No newline at end of file +}); diff --git a/client-app/src/app/components/CookieLoader.js b/client-app/src/app/components/CookieLoader.js index b2312f0b..bc5c13ca 100644 --- a/client-app/src/app/components/CookieLoader.js +++ b/client-app/src/app/components/CookieLoader.js @@ -1,6 +1,6 @@ define([ 'alertify/alertify.min' - , 'app/redmicConfig' + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/i18n!app/nls/translation" diff --git a/client-app/src/app/components/ReCaptcha.js b/client-app/src/app/components/ReCaptcha.js index b36a0fef..a1f658bf 100644 --- a/client-app/src/app/components/ReCaptcha.js +++ b/client-app/src/app/components/ReCaptcha.js @@ -1,5 +1,5 @@ define([ - 'app/redmicConfig' + 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' ], function( diff --git a/client-app/src/app/components/steps/AccessSetStep.js b/client-app/src/app/components/steps/AccessSetStep.js index 47b6d15e..b3f28ee9 100644 --- a/client-app/src/app/components/steps/AccessSetStep.js +++ b/client-app/src/app/components/steps/AccessSetStep.js @@ -2,7 +2,7 @@ define([ "app/maintenance/models/AccessModel" , "app/designs/formList/layout/Layout" , "app/designs/formList/main/FormListByStep" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/Deferred" diff --git a/client-app/src/app/components/steps/ActivitySetStep.js b/client-app/src/app/components/steps/ActivitySetStep.js index db6560a7..16d65b0a 100644 --- a/client-app/src/app/components/steps/ActivitySetStep.js +++ b/client-app/src/app/components/steps/ActivitySetStep.js @@ -1,6 +1,6 @@ define([ 'app/designs/doubleList/main/textSearchAndDoubleList' - , 'app/redmicConfig' + , 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' , 'templates/ActivityList' diff --git a/client-app/src/app/components/steps/AreaClassificationsSetStep.js b/client-app/src/app/components/steps/AreaClassificationsSetStep.js index 2d65693f..1075ecd3 100644 --- a/client-app/src/app/components/steps/AreaClassificationsSetStep.js +++ b/client-app/src/app/components/steps/AreaClassificationsSetStep.js @@ -3,7 +3,7 @@ define([ , "app/components/steps/_RememberDeleteItems" ,"app/designs/formList/layout/Layout" , "app/designs/formList/main/FormListByStep" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/Deferred" diff --git a/client-app/src/app/components/steps/CalibrationSetStep.js b/client-app/src/app/components/steps/CalibrationSetStep.js index 511ee587..e5db8e9d 100644 --- a/client-app/src/app/components/steps/CalibrationSetStep.js +++ b/client-app/src/app/components/steps/CalibrationSetStep.js @@ -3,7 +3,7 @@ define([ , "app/components/steps/_RememberDeleteItems" , "app/designs/formList/layout/Layout" , "app/designs/formList/main/FormListByStep" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/Deferred" diff --git a/client-app/src/app/components/steps/CitationStep.js b/client-app/src/app/components/steps/CitationStep.js index 19a90e63..ce260cec 100644 --- a/client-app/src/app/components/steps/CitationStep.js +++ b/client-app/src/app/components/steps/CitationStep.js @@ -1,6 +1,6 @@ define([ "app/designs/mapWithSideContent/main/Geographic" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "templates/SpeciesDistributionPopup" diff --git a/client-app/src/app/components/steps/ClassificationsStep.js b/client-app/src/app/components/steps/ClassificationsStep.js index a13a6751..8f43caa7 100644 --- a/client-app/src/app/components/steps/ClassificationsStep.js +++ b/client-app/src/app/components/steps/ClassificationsStep.js @@ -2,7 +2,7 @@ define([ "app/designs/list/_AddFilter" , "app/designs/list/Controller" , "app/designs/list/layout/Layout" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "redmic/modules/browser/_Select" diff --git a/client-app/src/app/components/steps/ContactSetStep.js b/client-app/src/app/components/steps/ContactSetStep.js index afd5fc33..61b52e18 100644 --- a/client-app/src/app/components/steps/ContactSetStep.js +++ b/client-app/src/app/components/steps/ContactSetStep.js @@ -3,7 +3,7 @@ define([ , "app/components/steps/_RememberDeleteItems" ,"app/designs/formList/layout/Layout" , "app/designs/formList/main/FormListByStep" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/Deferred" diff --git a/client-app/src/app/components/steps/DataDefinitionSetStep.js b/client-app/src/app/components/steps/DataDefinitionSetStep.js index c7975529..31903639 100644 --- a/client-app/src/app/components/steps/DataDefinitionSetStep.js +++ b/client-app/src/app/components/steps/DataDefinitionSetStep.js @@ -4,7 +4,7 @@ define([ , "app/designs/formList/main/FormListByStep" , "app/designs/formList/layout/Layout" , "app/edition/views/ParameterEditionView" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "redmic/modules/base/_ShowInPopup" diff --git a/client-app/src/app/components/steps/DescribeSiteStep.js b/client-app/src/app/components/steps/DescribeSiteStep.js index 06ba129f..78ff147d 100644 --- a/client-app/src/app/components/steps/DescribeSiteStep.js +++ b/client-app/src/app/components/steps/DescribeSiteStep.js @@ -3,7 +3,7 @@ define([ , "app/components/steps/_MainData" , "app/components/viewCustomization/describeSite/views/_AdditionalKeyGetter" , "app/components/viewCustomization/describeSite/views/SelectStationByActivity" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "redmic/modules/base/_ShowInPopup" diff --git a/client-app/src/app/components/steps/DocumentSetStep.js b/client-app/src/app/components/steps/DocumentSetStep.js index 3a3a9967..8a238dcd 100644 --- a/client-app/src/app/components/steps/DocumentSetStep.js +++ b/client-app/src/app/components/steps/DocumentSetStep.js @@ -1,6 +1,6 @@ define([ "app/designs/doubleList/main/textSearchAndDoubleList" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "templates/DocumentList" diff --git a/client-app/src/app/components/steps/DocumentStepFiltered.js b/client-app/src/app/components/steps/DocumentStepFiltered.js index 783bde1f..6efe3f3b 100644 --- a/client-app/src/app/components/steps/DocumentStepFiltered.js +++ b/client-app/src/app/components/steps/DocumentStepFiltered.js @@ -3,7 +3,7 @@ define([ , "app/designs/doubleList/layout/TopLeftContentAndDoubleList" , "app/designs/doubleList/Controller" , "RWidgets/Utilities" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "templates/DocumentList" diff --git a/client-app/src/app/components/steps/OrganisationSetStep.js b/client-app/src/app/components/steps/OrganisationSetStep.js index 5b89efb1..efbd4587 100644 --- a/client-app/src/app/components/steps/OrganisationSetStep.js +++ b/client-app/src/app/components/steps/OrganisationSetStep.js @@ -3,7 +3,7 @@ define([ , "app/components/steps/_RememberDeleteItems" ,"app/designs/formList/layout/Layout" , "app/designs/formList/main/FormListByStep" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/Deferred" diff --git a/client-app/src/app/components/steps/PlatformSetStep.js b/client-app/src/app/components/steps/PlatformSetStep.js index 97733bc6..e4e7ccad 100644 --- a/client-app/src/app/components/steps/PlatformSetStep.js +++ b/client-app/src/app/components/steps/PlatformSetStep.js @@ -3,7 +3,7 @@ define([ , "app/components/steps/_RememberDeleteItems" ,"app/designs/formList/layout/Layout" , "app/designs/formList/main/FormListByStep" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/Deferred" diff --git a/client-app/src/app/components/steps/RecoverySetStep.js b/client-app/src/app/components/steps/RecoverySetStep.js index d45b4828..d3f045db 100644 --- a/client-app/src/app/components/steps/RecoverySetStep.js +++ b/client-app/src/app/components/steps/RecoverySetStep.js @@ -3,7 +3,7 @@ define([ , "app/components/steps/_RememberDeleteItems" , "app/designs/formList/layout/Layout" , "app/designs/formList/main/FormListByStep" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/Deferred" diff --git a/client-app/src/app/components/steps/RelationDataSetStep.js b/client-app/src/app/components/steps/RelationDataSetStep.js index e5d55296..319fd3f3 100644 --- a/client-app/src/app/components/steps/RelationDataSetStep.js +++ b/client-app/src/app/components/steps/RelationDataSetStep.js @@ -2,7 +2,7 @@ define([ "app/base/views/extensions/_AddSelectInput" , "app/designs/formList/layout/LayoutWithTopForm" , "app/designs/formList/Controller" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , 'moment/moment.min' diff --git a/client-app/src/app/components/steps/SelectLayerStep.js b/client-app/src/app/components/steps/SelectLayerStep.js index 5a73d44c..b5bb2243 100644 --- a/client-app/src/app/components/steps/SelectLayerStep.js +++ b/client-app/src/app/components/steps/SelectLayerStep.js @@ -3,7 +3,7 @@ define([ , "app/base/views/extensions/_LocalSelectionView" , "app/designs/list/layout/ListWithTopContent" , "app/designs/list/Controller" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "redmic/modules/base/_Store" diff --git a/client-app/src/app/components/steps/SpeciesMainDataStep.js b/client-app/src/app/components/steps/SpeciesMainDataStep.js index aef4a534..ccd6bd0c 100644 --- a/client-app/src/app/components/steps/SpeciesMainDataStep.js +++ b/client-app/src/app/components/steps/SpeciesMainDataStep.js @@ -1,7 +1,7 @@ define([ "app/components/steps/MainDataStep" , "app/designs/externalTextSearchList/main/Worms" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" diff --git a/client-app/src/app/components/steps/SpecimenTagSetStep.js b/client-app/src/app/components/steps/SpecimenTagSetStep.js index 6d4a9299..c68d5e12 100644 --- a/client-app/src/app/components/steps/SpecimenTagSetStep.js +++ b/client-app/src/app/components/steps/SpecimenTagSetStep.js @@ -3,7 +3,7 @@ define([ , "app/components/steps/_RememberDeleteItems" , "app/designs/formList/layout/Layout" , "app/designs/formList/main/FormListByStep" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/Deferred" diff --git a/client-app/src/app/components/steps/UnitSetStep.js b/client-app/src/app/components/steps/UnitSetStep.js index ed5dcde1..3151fffc 100644 --- a/client-app/src/app/components/steps/UnitSetStep.js +++ b/client-app/src/app/components/steps/UnitSetStep.js @@ -1,6 +1,6 @@ define([ "app/designs/doubleList/main/textSearchAndDoubleList" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "templates/UnitList" diff --git a/client-app/src/app/components/steps/_ClassificationsRelationData.js b/client-app/src/app/components/steps/_ClassificationsRelationData.js index 583e35cd..c554cef7 100644 --- a/client-app/src/app/components/steps/_ClassificationsRelationData.js +++ b/client-app/src/app/components/steps/_ClassificationsRelationData.js @@ -1,6 +1,6 @@ define([ "app/designs/formList/main/_RequestAndParseData" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "RWidgets/Utilities" @@ -331,4 +331,4 @@ define([ return idsReturn; } }); -}); \ No newline at end of file +}); diff --git a/client-app/src/app/components/viewCustomization/describeSite/views/SelectStationByActivity.js b/client-app/src/app/components/viewCustomization/describeSite/views/SelectStationByActivity.js index 2f412827..f34a8666 100644 --- a/client-app/src/app/components/viewCustomization/describeSite/views/SelectStationByActivity.js +++ b/client-app/src/app/components/viewCustomization/describeSite/views/SelectStationByActivity.js @@ -1,7 +1,7 @@ define([ "app/base/views/extensions/_LocalSelectionView" , "app/designs/mapWithSideContent/main/FilterAndGeographic" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "templates/SurveyStationList" diff --git a/client-app/src/app/components/viewCustomization/loadFile/models/LoadFileModel.js b/client-app/src/app/components/viewCustomization/loadFile/models/LoadFileModel.js index c3999ac0..ef0fb0dd 100644 --- a/client-app/src/app/components/viewCustomization/loadFile/models/LoadFileModel.js +++ b/client-app/src/app/components/viewCustomization/loadFile/models/LoadFileModel.js @@ -1,5 +1,5 @@ define([ - "app/redmicConfig" + 'src/redmicConfig' ], function ( redmicConfig ){ diff --git a/client-app/src/app/dataLoader/areas/views/AreaView.js b/client-app/src/app/dataLoader/areas/views/AreaView.js index 7e9da1a7..ccc4e004 100644 --- a/client-app/src/app/dataLoader/areas/views/AreaView.js +++ b/client-app/src/app/dataLoader/areas/views/AreaView.js @@ -1,6 +1,6 @@ define([ "app/dataLoader/base/_GeographicBase" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" diff --git a/client-app/src/app/dataLoader/citation/views/CitationView.js b/client-app/src/app/dataLoader/citation/views/CitationView.js index 20ab123c..8d1b4c4a 100644 --- a/client-app/src/app/dataLoader/citation/views/CitationView.js +++ b/client-app/src/app/dataLoader/citation/views/CitationView.js @@ -1,7 +1,7 @@ define([ "app/base/views/extensions/_ActivityClosed" , "app/designs/mapWithSideContent/main/GeographicEditor" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/Deferred" diff --git a/client-app/src/app/dataLoader/infrastructure/views/InfrastructureAttributesView.js b/client-app/src/app/dataLoader/infrastructure/views/InfrastructureAttributesView.js index 890ec422..b1cbfe97 100644 --- a/client-app/src/app/dataLoader/infrastructure/views/InfrastructureAttributesView.js +++ b/client-app/src/app/dataLoader/infrastructure/views/InfrastructureAttributesView.js @@ -4,7 +4,7 @@ define([ , 'app/designs/base/_Main' , 'app/designs/textSearchList/Controller' , 'app/designs/textSearchList/layout/BasicAndButtonsTopZone' - , 'app/redmicConfig' + , 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' , 'templates/InfrastructureAttributesList' @@ -121,4 +121,4 @@ define([ this._updateTitle(lang.replace(this.title, properties)); } }); -}); \ No newline at end of file +}); diff --git a/client-app/src/app/dataLoader/infrastructure/views/InfrastructureView.js b/client-app/src/app/dataLoader/infrastructure/views/InfrastructureView.js index 15015a63..8f8edaaa 100644 --- a/client-app/src/app/dataLoader/infrastructure/views/InfrastructureView.js +++ b/client-app/src/app/dataLoader/infrastructure/views/InfrastructureView.js @@ -1,6 +1,6 @@ define([ "app/dataLoader/base/_GeographicBase" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" diff --git a/client-app/src/app/dataLoader/sightings/models/SightingsModel.js b/client-app/src/app/dataLoader/sightings/models/SightingsModel.js index fa91dbdf..7c0cab6f 100644 --- a/client-app/src/app/dataLoader/sightings/models/SightingsModel.js +++ b/client-app/src/app/dataLoader/sightings/models/SightingsModel.js @@ -1,5 +1,5 @@ define([ - "app/redmicConfig" + 'src/redmicConfig' ], function ( redmicConfig ){ diff --git a/client-app/src/app/dataLoader/sightings/views/SightingsView.js b/client-app/src/app/dataLoader/sightings/views/SightingsView.js index e364b8bc..4083afe1 100644 --- a/client-app/src/app/dataLoader/sightings/views/SightingsView.js +++ b/client-app/src/app/dataLoader/sightings/views/SightingsView.js @@ -1,7 +1,7 @@ define([ "app/dataLoader/sightings/models/SightingsModel" , "app/designs/mapWithSideContent/main/GeographicEditor" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" ], diff --git a/client-app/src/app/dataLoader/surveyParameters/views/ObjectCollectingSeriesDataView.js b/client-app/src/app/dataLoader/surveyParameters/views/ObjectCollectingSeriesDataView.js index 8379ec79..514924e1 100644 --- a/client-app/src/app/dataLoader/surveyParameters/views/ObjectCollectingSeriesDataView.js +++ b/client-app/src/app/dataLoader/surveyParameters/views/ObjectCollectingSeriesDataView.js @@ -1,6 +1,6 @@ define([ "app/dataLoader/surveyParameters/views/_SeriesDataView" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , 'moment/moment.min' diff --git a/client-app/src/app/dataLoader/surveyParameters/views/ObjectCollectionView.js b/client-app/src/app/dataLoader/surveyParameters/views/ObjectCollectionView.js index 4dc1917d..7b20b3ce 100644 --- a/client-app/src/app/dataLoader/surveyParameters/views/ObjectCollectionView.js +++ b/client-app/src/app/dataLoader/surveyParameters/views/ObjectCollectionView.js @@ -1,6 +1,6 @@ define([ "app/dataLoader/surveyParameters/views/_DataLoadedByStationManagement" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "templates/ObjectCollectionList" diff --git a/client-app/src/app/dataLoader/surveyParameters/views/SurveyStationSeriesDataView.js b/client-app/src/app/dataLoader/surveyParameters/views/SurveyStationSeriesDataView.js index 9b93844d..96b93d4f 100644 --- a/client-app/src/app/dataLoader/surveyParameters/views/SurveyStationSeriesDataView.js +++ b/client-app/src/app/dataLoader/surveyParameters/views/SurveyStationSeriesDataView.js @@ -1,6 +1,6 @@ define([ "app/dataLoader/surveyParameters/views/_SeriesDataView" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , 'moment/moment.min' diff --git a/client-app/src/app/dataLoader/surveyParameters/views/SurveyStationView.js b/client-app/src/app/dataLoader/surveyParameters/views/SurveyStationView.js index ac7aa0e5..66c69d9e 100644 --- a/client-app/src/app/dataLoader/surveyParameters/views/SurveyStationView.js +++ b/client-app/src/app/dataLoader/surveyParameters/views/SurveyStationView.js @@ -1,6 +1,6 @@ define([ "app/dataLoader/surveyParameters/views/_DataLoadedByStationManagement" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "templates/SurveyStationList" diff --git a/client-app/src/app/dataLoader/surveyParameters/views/_SeriesDataView.js b/client-app/src/app/dataLoader/surveyParameters/views/_SeriesDataView.js index 8342ce35..0ac1765b 100644 --- a/client-app/src/app/dataLoader/surveyParameters/views/_SeriesDataView.js +++ b/client-app/src/app/dataLoader/surveyParameters/views/_SeriesDataView.js @@ -9,7 +9,7 @@ define([ , "app/designs/list/Controller" , "app/designs/list/layout/Layout" , "app/details/views/_ActivityTimeSeriesDataManagement" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" diff --git a/client-app/src/app/dataLoader/tracking/views/TrackingDataView.js b/client-app/src/app/dataLoader/tracking/views/TrackingDataView.js index 5baf424f..bb956381 100644 --- a/client-app/src/app/dataLoader/tracking/views/TrackingDataView.js +++ b/client-app/src/app/dataLoader/tracking/views/TrackingDataView.js @@ -3,7 +3,7 @@ define([ , "app/designs/list/_AddFilter" , "app/designs/list/Controller" , "app/designs/list/layout/Layout" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , 'moment/moment.min' diff --git a/client-app/src/app/dataLoader/tracking/views/TrackingView.js b/client-app/src/app/dataLoader/tracking/views/TrackingView.js index 341b8af0..81a0117a 100644 --- a/client-app/src/app/dataLoader/tracking/views/TrackingView.js +++ b/client-app/src/app/dataLoader/tracking/views/TrackingView.js @@ -4,7 +4,7 @@ define([ , "app/base/views/extensions/_ListenActivityDataAndAccessByActivityCategory" , "app/designs/mapWithSideContent/main/Tracking" , "app/designs/mapWithSideContent/main/_TrackingWithListByFilter" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "put-selector/put" diff --git a/client-app/src/app/designs/chart/main/MultiWindRoseChartWithToolbar.js b/client-app/src/app/designs/chart/main/MultiWindRoseChartWithToolbar.js index 29dd7587..cf62a4ee 100644 --- a/client-app/src/app/designs/chart/main/MultiWindRoseChartWithToolbar.js +++ b/client-app/src/app/designs/chart/main/MultiWindRoseChartWithToolbar.js @@ -2,7 +2,7 @@ define([ 'app/designs/base/_Main' , 'app/designs/chart/Controller' , 'app/designs/chart/layout/TopContent' - , 'app/redmicConfig' + , 'src/redmicConfig' , 'd3/d3.min' , 'dojo/_base/declare' , 'dojo/_base/lang' diff --git a/client-app/src/app/designs/chart/main/_ProcessDataDefinitionAndGetTimeSeries.js b/client-app/src/app/designs/chart/main/_ProcessDataDefinitionAndGetTimeSeries.js index dc0cb3e1..d504d1b3 100644 --- a/client-app/src/app/designs/chart/main/_ProcessDataDefinitionAndGetTimeSeries.js +++ b/client-app/src/app/designs/chart/main/_ProcessDataDefinitionAndGetTimeSeries.js @@ -1,5 +1,5 @@ define([ - "app/redmicConfig" + 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" diff --git a/client-app/src/app/designs/details/main/ActivityTrackingMap.js b/client-app/src/app/designs/details/main/ActivityTrackingMap.js index e014645e..32094d7d 100644 --- a/client-app/src/app/designs/details/main/ActivityTrackingMap.js +++ b/client-app/src/app/designs/details/main/ActivityTrackingMap.js @@ -5,7 +5,7 @@ define([ , "app/designs/details/Layout" , "app/designs/mapWithSideContent/main/Tracking" , "app/designs/mapWithSideContent/main/_TrackingWithListByFilter" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" ], function( diff --git a/client-app/src/app/designs/details/main/Contact.js b/client-app/src/app/designs/details/main/Contact.js index d22af63f..e8db7591 100644 --- a/client-app/src/app/designs/details/main/Contact.js +++ b/client-app/src/app/designs/details/main/Contact.js @@ -1,5 +1,5 @@ define([ - "app/redmicConfig" + 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "templates/ContactInfo" diff --git a/client-app/src/app/designs/details/main/Document.js b/client-app/src/app/designs/details/main/Document.js index 8fc50595..14d04024 100644 --- a/client-app/src/app/designs/details/main/Document.js +++ b/client-app/src/app/designs/details/main/Document.js @@ -1,5 +1,5 @@ define([ - 'app/redmicConfig' + 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' , 'redmic/base/Credentials' diff --git a/client-app/src/app/designs/details/main/DocumentPDF.js b/client-app/src/app/designs/details/main/DocumentPDF.js index 46793740..fa41c02e 100644 --- a/client-app/src/app/designs/details/main/DocumentPDF.js +++ b/client-app/src/app/designs/details/main/DocumentPDF.js @@ -2,7 +2,7 @@ define([ 'app/designs/base/_Main' , 'app/designs/details/Controller' , 'app/designs/details/Layout' - , 'app/redmicConfig' + , 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' , 'redmic/modules/components/PDFViewer/PDFViewer' diff --git a/client-app/src/app/designs/details/main/Organisation.js b/client-app/src/app/designs/details/main/Organisation.js index 4291139d..ca95a84f 100644 --- a/client-app/src/app/designs/details/main/Organisation.js +++ b/client-app/src/app/designs/details/main/Organisation.js @@ -1,5 +1,5 @@ define([ - "app/redmicConfig" + 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "templates/OrganisationInfo" diff --git a/client-app/src/app/designs/details/main/Platform.js b/client-app/src/app/designs/details/main/Platform.js index 294f1cc6..fe69703a 100644 --- a/client-app/src/app/designs/details/main/Platform.js +++ b/client-app/src/app/designs/details/main/Platform.js @@ -1,5 +1,5 @@ define([ - "app/redmicConfig" + 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "redmic/modules/browser/_Framework" diff --git a/client-app/src/app/designs/details/main/Program.js b/client-app/src/app/designs/details/main/Program.js index 96f77a0c..559d0522 100644 --- a/client-app/src/app/designs/details/main/Program.js +++ b/client-app/src/app/designs/details/main/Program.js @@ -1,5 +1,5 @@ define([ - "app/redmicConfig" + 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "templates/ProjectInfo" diff --git a/client-app/src/app/designs/details/main/Project.js b/client-app/src/app/designs/details/main/Project.js index 90771883..f696c6a8 100644 --- a/client-app/src/app/designs/details/main/Project.js +++ b/client-app/src/app/designs/details/main/Project.js @@ -1,5 +1,5 @@ define([ - "app/redmicConfig" + 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "templates/ActivityList" diff --git a/client-app/src/app/designs/details/main/ServiceOGC.js b/client-app/src/app/designs/details/main/ServiceOGC.js index d3adcdd9..b254ef2f 100644 --- a/client-app/src/app/designs/details/main/ServiceOGC.js +++ b/client-app/src/app/designs/details/main/ServiceOGC.js @@ -1,6 +1,6 @@ define([ "app/designs/base/_Main" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , 'redmic/modules/layout/templateDisplayer/TemplateDisplayer' diff --git a/client-app/src/app/designs/details/main/Species.js b/client-app/src/app/designs/details/main/Species.js index 8f2963a8..c1521fcc 100644 --- a/client-app/src/app/designs/details/main/Species.js +++ b/client-app/src/app/designs/details/main/Species.js @@ -1,5 +1,5 @@ define([ - "app/redmicConfig" + 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "redmic/modules/browser/_ButtonsInRow" diff --git a/client-app/src/app/designs/details/main/SpeciesLocation.js b/client-app/src/app/designs/details/main/SpeciesLocation.js index b87ae440..5fd6b122 100644 --- a/client-app/src/app/designs/details/main/SpeciesLocation.js +++ b/client-app/src/app/designs/details/main/SpeciesLocation.js @@ -3,7 +3,7 @@ define([ , "app/designs/base/_Main" , "app/designs/details/Controller" , "app/designs/details/Layout" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/Deferred" diff --git a/client-app/src/app/designs/details/main/Statistics.js b/client-app/src/app/designs/details/main/Statistics.js index df448c8b..e7c455f8 100644 --- a/client-app/src/app/designs/details/main/Statistics.js +++ b/client-app/src/app/designs/details/main/Statistics.js @@ -3,7 +3,7 @@ define([ , "app/designs/details/Controller" , "app/designs/details/Layout" , "app/designs/details/_AddTitle" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "redmic/modules/browser/_ButtonsInRow" diff --git a/client-app/src/app/designs/externalTextSearchList/main/PlaceNames.js b/client-app/src/app/designs/externalTextSearchList/main/PlaceNames.js index 6ee2cd59..a8ed895d 100644 --- a/client-app/src/app/designs/externalTextSearchList/main/PlaceNames.js +++ b/client-app/src/app/designs/externalTextSearchList/main/PlaceNames.js @@ -2,7 +2,7 @@ define([ "app/designs/base/_Main" , "app/designs/externalTextSearchList/Controller" , "app/designs/externalTextSearchList/Layout" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "put-selector/put" diff --git a/client-app/src/app/designs/externalTextSearchList/main/Worms.js b/client-app/src/app/designs/externalTextSearchList/main/Worms.js index 0af996ff..ae85f1fb 100644 --- a/client-app/src/app/designs/externalTextSearchList/main/Worms.js +++ b/client-app/src/app/designs/externalTextSearchList/main/Worms.js @@ -2,7 +2,7 @@ define([ "app/designs/base/_Main" , "app/designs/externalTextSearchList/Controller" , "app/designs/externalTextSearchList/Layout" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" diff --git a/client-app/src/app/designs/mapWithSideContent/main/Tracking.js b/client-app/src/app/designs/mapWithSideContent/main/Tracking.js index cc4e9d97..c1a3f69d 100644 --- a/client-app/src/app/designs/mapWithSideContent/main/Tracking.js +++ b/client-app/src/app/designs/mapWithSideContent/main/Tracking.js @@ -3,7 +3,7 @@ define([ , "app/designs/base/_Main" , "app/designs/mapWithSideContent/Controller" , "app/designs/mapWithSideContent/layout/MapAndContentAndTopbar" - , "app/redmicConfig" + , 'src/redmicConfig' , 'd3/d3.min' , "dojo/_base/declare" , "dojo/_base/lang" diff --git a/client-app/src/app/designs/mapWithSideContent/main/_TrackingWithList.js b/client-app/src/app/designs/mapWithSideContent/main/_TrackingWithList.js index 544a8531..413e0288 100644 --- a/client-app/src/app/designs/mapWithSideContent/main/_TrackingWithList.js +++ b/client-app/src/app/designs/mapWithSideContent/main/_TrackingWithList.js @@ -1,5 +1,5 @@ define([ - "app/redmicConfig" + 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" diff --git a/client-app/src/app/designs/textSearchFacetsList/Controller.js b/client-app/src/app/designs/textSearchFacetsList/Controller.js index b959be0a..1b5f01f3 100644 --- a/client-app/src/app/designs/textSearchFacetsList/Controller.js +++ b/client-app/src/app/designs/textSearchFacetsList/Controller.js @@ -2,7 +2,7 @@ define([ "app/base/views/extensions/_OnShownAndRefresh" , "app/designs/base/_Browser" , "app/designs/base/_Controller" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "redmic/modules/base/_Store" diff --git a/client-app/src/app/designs/textSearchFacetsList/main/Activity.js b/client-app/src/app/designs/textSearchFacetsList/main/Activity.js index ffc9c1db..7fd242c4 100644 --- a/client-app/src/app/designs/textSearchFacetsList/main/Activity.js +++ b/client-app/src/app/designs/textSearchFacetsList/main/Activity.js @@ -3,7 +3,7 @@ define([ , 'app/base/views/extensions/_AddCompositeSearchInTooltipFromTextSearch' , "app/designs/textSearchFacetsList/Controller" , "app/designs/textSearchFacetsList/Layout" - , 'app/redmicConfig' + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "templates/ActivityList" diff --git a/client-app/src/app/designs/textSearchFacetsList/main/Administrative.js b/client-app/src/app/designs/textSearchFacetsList/main/Administrative.js index 0e8bd37a..62327275 100644 --- a/client-app/src/app/designs/textSearchFacetsList/main/Administrative.js +++ b/client-app/src/app/designs/textSearchFacetsList/main/Administrative.js @@ -2,7 +2,7 @@ define([ "app/designs/base/_Main" , "app/designs/textSearchFacetsList/Controller" , "app/designs/textSearchFacetsList/Layout" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "redmic/modules/browser/_Select" diff --git a/client-app/src/app/designs/textSearchFacetsList/main/Bibliography.js b/client-app/src/app/designs/textSearchFacetsList/main/Bibliography.js index 51ccdbf4..593b3581 100644 --- a/client-app/src/app/designs/textSearchFacetsList/main/Bibliography.js +++ b/client-app/src/app/designs/textSearchFacetsList/main/Bibliography.js @@ -2,7 +2,7 @@ define([ 'app/designs/base/_Main' , 'app/designs/textSearchFacetsList/Controller' , 'app/designs/textSearchFacetsList/Layout' - , 'app/redmicConfig' + , 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' , 'redmic/modules/browser/_Select' diff --git a/client-app/src/app/designs/textSearchFacetsList/main/Domain.js b/client-app/src/app/designs/textSearchFacetsList/main/Domain.js index 0f0717d8..37a79a2d 100644 --- a/client-app/src/app/designs/textSearchFacetsList/main/Domain.js +++ b/client-app/src/app/designs/textSearchFacetsList/main/Domain.js @@ -2,7 +2,7 @@ define([ "app/designs/base/_Main" , "app/designs/textSearchFacetsList/Controller" , "app/designs/textSearchFacetsList/Layout" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "redmic/modules/browser/bars/Order" diff --git a/client-app/src/app/designs/textSearchFacetsList/main/Organisation.js b/client-app/src/app/designs/textSearchFacetsList/main/Organisation.js index c7e49607..ca8d8f30 100644 --- a/client-app/src/app/designs/textSearchFacetsList/main/Organisation.js +++ b/client-app/src/app/designs/textSearchFacetsList/main/Organisation.js @@ -2,7 +2,7 @@ define([ "app/designs/base/_Main" , "app/designs/textSearchFacetsList/Controller" , "app/designs/textSearchFacetsList/Layout" - , 'app/redmicConfig' + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "templates/OrganisationList" diff --git a/client-app/src/app/designs/textSearchFacetsList/main/Platform.js b/client-app/src/app/designs/textSearchFacetsList/main/Platform.js index 68cd20bd..e8b0c258 100644 --- a/client-app/src/app/designs/textSearchFacetsList/main/Platform.js +++ b/client-app/src/app/designs/textSearchFacetsList/main/Platform.js @@ -2,7 +2,7 @@ define([ "app/designs/base/_Main" , "app/designs/textSearchFacetsList/Controller" , "app/designs/textSearchFacetsList/Layout" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "templates/PlatformList" diff --git a/client-app/src/app/designs/textSearchFacetsList/main/Program.js b/client-app/src/app/designs/textSearchFacetsList/main/Program.js index 17900e66..d4eb75ba 100644 --- a/client-app/src/app/designs/textSearchFacetsList/main/Program.js +++ b/client-app/src/app/designs/textSearchFacetsList/main/Program.js @@ -2,7 +2,7 @@ define([ "app/designs/base/_Main" , "app/designs/textSearchFacetsList/Controller" , "app/designs/textSearchFacetsList/Layout" - , 'app/redmicConfig' + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "templates/ProgramList" diff --git a/client-app/src/app/designs/textSearchFacetsList/main/Project.js b/client-app/src/app/designs/textSearchFacetsList/main/Project.js index 80988830..cc11b0d9 100644 --- a/client-app/src/app/designs/textSearchFacetsList/main/Project.js +++ b/client-app/src/app/designs/textSearchFacetsList/main/Project.js @@ -2,7 +2,7 @@ define([ "app/designs/base/_Main" , "app/designs/textSearchFacetsList/Controller" , "app/designs/textSearchFacetsList/Layout" - , 'app/redmicConfig' + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "templates/ProjectList" diff --git a/client-app/src/app/designs/textSearchFacetsList/main/ServiceOGC.js b/client-app/src/app/designs/textSearchFacetsList/main/ServiceOGC.js index 97462599..34e581d7 100644 --- a/client-app/src/app/designs/textSearchFacetsList/main/ServiceOGC.js +++ b/client-app/src/app/designs/textSearchFacetsList/main/ServiceOGC.js @@ -4,7 +4,7 @@ define([ , 'app/base/views/extensions/_AddCompositeSearchInTooltipFromTextSearch' , "app/designs/textSearchFacetsList/Controller" , "app/designs/textSearchFacetsList/Layout" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "redmic/modules/browser/HierarchicalImpl" diff --git a/client-app/src/app/designs/textSearchFacetsList/main/Species.js b/client-app/src/app/designs/textSearchFacetsList/main/Species.js index a166bf27..0dddc358 100644 --- a/client-app/src/app/designs/textSearchFacetsList/main/Species.js +++ b/client-app/src/app/designs/textSearchFacetsList/main/Species.js @@ -2,7 +2,7 @@ define([ "app/designs/base/_Main" , "app/designs/textSearchFacetsList/Controller" , "app/designs/textSearchFacetsList/Layout" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "templates/SpeciesList" diff --git a/client-app/src/app/designs/textSearchFacetsList/main/Taxon.js b/client-app/src/app/designs/textSearchFacetsList/main/Taxon.js index e6468e77..a9399a08 100644 --- a/client-app/src/app/designs/textSearchFacetsList/main/Taxon.js +++ b/client-app/src/app/designs/textSearchFacetsList/main/Taxon.js @@ -4,7 +4,7 @@ define([ , "app/designs/textSearchFacetsList/Layout" , "app/base/views/extensions/_EditionView" , "app/base/views/extensions/_FormInDialogView" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "templates/SpeciesList" diff --git a/client-app/src/app/designs/textSearchList/Controller.js b/client-app/src/app/designs/textSearchList/Controller.js index bd32c278..f65f06f7 100644 --- a/client-app/src/app/designs/textSearchList/Controller.js +++ b/client-app/src/app/designs/textSearchList/Controller.js @@ -1,7 +1,7 @@ define([ "app/designs/base/_Browser" , "app/designs/base/_Controller" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "redmic/modules/browser/bars/Pagination" diff --git a/client-app/src/app/designs/textSearchList/main/Domain.js b/client-app/src/app/designs/textSearchList/main/Domain.js index ab92be29..f4ab72f2 100644 --- a/client-app/src/app/designs/textSearchList/main/Domain.js +++ b/client-app/src/app/designs/textSearchList/main/Domain.js @@ -5,7 +5,7 @@ define([ , 'app/designs/base/_Main' , 'app/designs/textSearchList/Controller' , 'app/designs/textSearchList/layout/BasicAndButtonsTopZone' - , 'app/redmicConfig' + , 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' , "redmic/modules/browser/bars/Order" diff --git a/client-app/src/app/details/views/ActivityAreaMapBase.js b/client-app/src/app/details/views/ActivityAreaMapBase.js index 71a2c3da..c406eefc 100644 --- a/client-app/src/app/details/views/ActivityAreaMapBase.js +++ b/client-app/src/app/details/views/ActivityAreaMapBase.js @@ -1,6 +1,6 @@ define([ "app/designs/details/main/ActivityMap" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" diff --git a/client-app/src/app/details/views/ActivityCatalogDetailsView.js b/client-app/src/app/details/views/ActivityCatalogDetailsView.js index 2daa1668..9ce71351 100644 --- a/client-app/src/app/details/views/ActivityCatalogDetailsView.js +++ b/client-app/src/app/details/views/ActivityCatalogDetailsView.js @@ -1,5 +1,5 @@ define([ - 'app/redmicConfig' + 'src/redmicConfig' , 'dojo/_base/declare' , 'src/view/detail/activity/ActivityDetail' ], function( diff --git a/client-app/src/app/details/views/ActivityCitationMapBase.js b/client-app/src/app/details/views/ActivityCitationMapBase.js index 3dbd2a03..14ed3c18 100644 --- a/client-app/src/app/details/views/ActivityCitationMapBase.js +++ b/client-app/src/app/details/views/ActivityCitationMapBase.js @@ -1,6 +1,6 @@ define([ "app/designs/details/main/ActivityMap" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "templates/SpeciesDistributionPopup" @@ -27,4 +27,4 @@ define([ lang.mixin(this, this.config, args); } }); -}); \ No newline at end of file +}); diff --git a/client-app/src/app/details/views/ActivityDetailsView.js b/client-app/src/app/details/views/ActivityDetailsView.js index 12f3e3f1..6c138f96 100644 --- a/client-app/src/app/details/views/ActivityDetailsView.js +++ b/client-app/src/app/details/views/ActivityDetailsView.js @@ -1,5 +1,5 @@ define([ - 'app/redmicConfig' + 'src/redmicConfig' , 'dojo/_base/declare' , 'src/view/detail/activity/ActivityDetail' ], function( diff --git a/client-app/src/app/details/views/ActivityFixedTimeseriesChart.js b/client-app/src/app/details/views/ActivityFixedTimeseriesChart.js index 88da64fe..b70da099 100644 --- a/client-app/src/app/details/views/ActivityFixedTimeseriesChart.js +++ b/client-app/src/app/details/views/ActivityFixedTimeseriesChart.js @@ -1,6 +1,6 @@ define([ 'app/details/views/ActivityChart' - , 'app/redmicConfig' + , 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' ], function( diff --git a/client-app/src/app/details/views/ActivityFixedTimeseriesMap.js b/client-app/src/app/details/views/ActivityFixedTimeseriesMap.js index 6ab87503..b0d778a8 100644 --- a/client-app/src/app/details/views/ActivityFixedTimeseriesMap.js +++ b/client-app/src/app/details/views/ActivityFixedTimeseriesMap.js @@ -1,6 +1,6 @@ define([ 'app/designs/details/main/ActivityMap' - , 'app/redmicConfig' + , 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/aspect' diff --git a/client-app/src/app/details/views/ActivityInfrastructureMapBase.js b/client-app/src/app/details/views/ActivityInfrastructureMapBase.js index 3cdb4d9f..a278fd1b 100644 --- a/client-app/src/app/details/views/ActivityInfrastructureMapBase.js +++ b/client-app/src/app/details/views/ActivityInfrastructureMapBase.js @@ -1,6 +1,6 @@ define([ "app/designs/details/main/ActivityMap" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" diff --git a/client-app/src/app/details/views/ActivityLayerMapBase.js b/client-app/src/app/details/views/ActivityLayerMapBase.js index 560f80a4..4c817390 100644 --- a/client-app/src/app/details/views/ActivityLayerMapBase.js +++ b/client-app/src/app/details/views/ActivityLayerMapBase.js @@ -1,6 +1,6 @@ define([ 'app/designs/details/main/ActivityLayerMap' - , 'app/redmicConfig' + , 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' , 'redmic/modules/atlas/_AtlasLayersManagement' diff --git a/client-app/src/app/details/views/BibliographyDetailsView.js b/client-app/src/app/details/views/BibliographyDetailsView.js index 70b4b8ed..e2d3594f 100644 --- a/client-app/src/app/details/views/BibliographyDetailsView.js +++ b/client-app/src/app/details/views/BibliographyDetailsView.js @@ -1,6 +1,6 @@ define([ "app/designs/details/main/Document" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" ], function( Document diff --git a/client-app/src/app/details/views/ContactDetailsView.js b/client-app/src/app/details/views/ContactDetailsView.js index 361c4da1..6fc59f63 100644 --- a/client-app/src/app/details/views/ContactDetailsView.js +++ b/client-app/src/app/details/views/ContactDetailsView.js @@ -1,6 +1,6 @@ define([ "app/designs/details/main/Contact" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" ], function( @@ -28,4 +28,4 @@ define([ this.pathParent = redmicConfig.viewPaths.contact; } }); -}); \ No newline at end of file +}); diff --git a/client-app/src/app/details/views/DocumentDetailsView.js b/client-app/src/app/details/views/DocumentDetailsView.js index 2d58a9c0..2d057420 100644 --- a/client-app/src/app/details/views/DocumentDetailsView.js +++ b/client-app/src/app/details/views/DocumentDetailsView.js @@ -1,6 +1,6 @@ define([ "app/designs/details/main/Document" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" ], function( Document diff --git a/client-app/src/app/details/views/OrganisationCatalogDetailsView.js b/client-app/src/app/details/views/OrganisationCatalogDetailsView.js index ed13fa48..5189897b 100644 --- a/client-app/src/app/details/views/OrganisationCatalogDetailsView.js +++ b/client-app/src/app/details/views/OrganisationCatalogDetailsView.js @@ -1,6 +1,6 @@ define([ "app/designs/details/main/Organisation" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" ], function( Organisation @@ -20,4 +20,4 @@ define([ this.pathParent = redmicConfig.viewPaths.organisationCatalog; } }); -}); \ No newline at end of file +}); diff --git a/client-app/src/app/details/views/OrganisationDetailsView.js b/client-app/src/app/details/views/OrganisationDetailsView.js index 885602f0..6c8bdfcf 100644 --- a/client-app/src/app/details/views/OrganisationDetailsView.js +++ b/client-app/src/app/details/views/OrganisationDetailsView.js @@ -1,6 +1,6 @@ define([ "app/designs/details/main/Organisation" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" ], function( Organisation @@ -26,4 +26,4 @@ define([ this.pathParent = redmicConfig.viewPaths.organisation; } }); -}); \ No newline at end of file +}); diff --git a/client-app/src/app/details/views/PlatformCatalogDetailsView.js b/client-app/src/app/details/views/PlatformCatalogDetailsView.js index 035ab031..a0c59ea2 100644 --- a/client-app/src/app/details/views/PlatformCatalogDetailsView.js +++ b/client-app/src/app/details/views/PlatformCatalogDetailsView.js @@ -1,6 +1,6 @@ define([ "app/designs/details/main/Platform" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" ], function( Platform @@ -20,4 +20,4 @@ define([ this.pathParent = redmicConfig.viewPaths.platformCatalog; } }); -}); \ No newline at end of file +}); diff --git a/client-app/src/app/details/views/PlatformDetailsView.js b/client-app/src/app/details/views/PlatformDetailsView.js index ff73a2b9..2931cc64 100644 --- a/client-app/src/app/details/views/PlatformDetailsView.js +++ b/client-app/src/app/details/views/PlatformDetailsView.js @@ -1,6 +1,6 @@ define([ "app/designs/details/main/Platform" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" ], function( Platform @@ -26,4 +26,4 @@ define([ this.pathParent = redmicConfig.viewPaths.platform; } }); -}); \ No newline at end of file +}); diff --git a/client-app/src/app/details/views/ProgramCatalogDetailsView.js b/client-app/src/app/details/views/ProgramCatalogDetailsView.js index 5a597aa7..df21b401 100644 --- a/client-app/src/app/details/views/ProgramCatalogDetailsView.js +++ b/client-app/src/app/details/views/ProgramCatalogDetailsView.js @@ -1,6 +1,6 @@ define([ "app/designs/details/main/Program" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" ], function( Program @@ -23,4 +23,4 @@ define([ this.pathParent = redmicConfig.viewPaths.programCatalog; } }); -}); \ No newline at end of file +}); diff --git a/client-app/src/app/details/views/ProgramDetailsView.js b/client-app/src/app/details/views/ProgramDetailsView.js index f129e608..700cfd47 100644 --- a/client-app/src/app/details/views/ProgramDetailsView.js +++ b/client-app/src/app/details/views/ProgramDetailsView.js @@ -1,6 +1,6 @@ define([ "app/designs/details/main/Program" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" ], function( Program @@ -29,4 +29,4 @@ define([ this.pathParent = redmicConfig.viewPaths.program; } }); -}); \ No newline at end of file +}); diff --git a/client-app/src/app/details/views/ProjectCatalogDetailsView.js b/client-app/src/app/details/views/ProjectCatalogDetailsView.js index 8b29909b..b1575274 100644 --- a/client-app/src/app/details/views/ProjectCatalogDetailsView.js +++ b/client-app/src/app/details/views/ProjectCatalogDetailsView.js @@ -1,6 +1,6 @@ define([ "app/designs/details/main/Project" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" ], function( Project @@ -23,4 +23,4 @@ define([ this.pathParent = redmicConfig.viewPaths.project; } }); -}); \ No newline at end of file +}); diff --git a/client-app/src/app/details/views/ProjectDetailsView.js b/client-app/src/app/details/views/ProjectDetailsView.js index 5e2a7aa0..98bded1c 100644 --- a/client-app/src/app/details/views/ProjectDetailsView.js +++ b/client-app/src/app/details/views/ProjectDetailsView.js @@ -1,6 +1,6 @@ define([ "app/designs/details/main/Project" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" ], function( Project @@ -29,4 +29,4 @@ define([ this.pathParent = redmicConfig.viewPaths.projectCatalog; } }); -}); \ No newline at end of file +}); diff --git a/client-app/src/app/details/views/ServiceOGCCatalogDetailsView.js b/client-app/src/app/details/views/ServiceOGCCatalogDetailsView.js index a01454a1..be246c08 100644 --- a/client-app/src/app/details/views/ServiceOGCCatalogDetailsView.js +++ b/client-app/src/app/details/views/ServiceOGCCatalogDetailsView.js @@ -1,6 +1,6 @@ define([ "app/designs/details/main/ServiceOGC" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" ], function( ServiceOGC @@ -22,4 +22,4 @@ define([ this.pathParent = redmicConfig.viewPaths.serviceOGCCatalog; } }); -}); \ No newline at end of file +}); diff --git a/client-app/src/app/details/views/ServiceOGCDetailsView.js b/client-app/src/app/details/views/ServiceOGCDetailsView.js index c2e69b65..1e2b3ca2 100644 --- a/client-app/src/app/details/views/ServiceOGCDetailsView.js +++ b/client-app/src/app/details/views/ServiceOGCDetailsView.js @@ -1,6 +1,6 @@ define([ "app/designs/details/main/ServiceOGC" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" ], function( ServiceOGC @@ -28,4 +28,4 @@ define([ this.activeTitleParent = true; } }); -}); \ No newline at end of file +}); diff --git a/client-app/src/app/details/views/SpeciesCatalogDetailsView.js b/client-app/src/app/details/views/SpeciesCatalogDetailsView.js index bdabae4a..6c0ec39c 100644 --- a/client-app/src/app/details/views/SpeciesCatalogDetailsView.js +++ b/client-app/src/app/details/views/SpeciesCatalogDetailsView.js @@ -1,6 +1,6 @@ define([ 'app/designs/details/main/Species' - , 'app/redmicConfig' + , 'src/redmicConfig' , 'dojo/_base/declare' ], function( Species diff --git a/client-app/src/app/details/views/SpeciesDetailsView.js b/client-app/src/app/details/views/SpeciesDetailsView.js index 819565e9..0f409b5f 100644 --- a/client-app/src/app/details/views/SpeciesDetailsView.js +++ b/client-app/src/app/details/views/SpeciesDetailsView.js @@ -1,6 +1,6 @@ define([ 'app/designs/details/main/Species' - , 'app/redmicConfig' + , 'src/redmicConfig' , 'dojo/_base/declare' ], function( Species diff --git a/client-app/src/app/details/views/StatisticsDetailsView.js b/client-app/src/app/details/views/StatisticsDetailsView.js index 5e013b0b..3fe78e92 100644 --- a/client-app/src/app/details/views/StatisticsDetailsView.js +++ b/client-app/src/app/details/views/StatisticsDetailsView.js @@ -1,6 +1,6 @@ define([ "app/designs/details/main/Statistics" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" ], function( Statistics @@ -15,4 +15,4 @@ define([ } }); -}); \ No newline at end of file +}); diff --git a/client-app/src/app/edition/views/ActivityEditionView.js b/client-app/src/app/edition/views/ActivityEditionView.js index 1baf4950..ad24ff60 100644 --- a/client-app/src/app/edition/views/ActivityEditionView.js +++ b/client-app/src/app/edition/views/ActivityEditionView.js @@ -9,7 +9,7 @@ define([ , "app/components/steps/ResourceSetStep" , "app/designs/edition/Controller" , "app/designs/edition/Layout" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "redmic/modules/layout/wizard/_CompleteBySelection" diff --git a/client-app/src/app/edition/views/AnimalEditionView.js b/client-app/src/app/edition/views/AnimalEditionView.js index 893a8c99..a3450a0b 100644 --- a/client-app/src/app/edition/views/AnimalEditionView.js +++ b/client-app/src/app/edition/views/AnimalEditionView.js @@ -4,7 +4,7 @@ define([ , "app/components/steps/SpecimenTagSetStep" , "app/designs/edition/Controller" , "app/designs/edition/Layout" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" ], function( @@ -67,4 +67,4 @@ define([ }, this.editorConfig || {}]); } }); -}); \ No newline at end of file +}); diff --git a/client-app/src/app/edition/views/ConditionEditionView.js b/client-app/src/app/edition/views/ConditionEditionView.js index 486739b6..3acba284 100644 --- a/client-app/src/app/edition/views/ConditionEditionView.js +++ b/client-app/src/app/edition/views/ConditionEditionView.js @@ -3,7 +3,7 @@ define([ , "app/components/steps/MainDataStep" , "app/designs/edition/Controller" , "app/designs/edition/Layout" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "redmic/modules/layout/wizard/_CompleteBySelection" diff --git a/client-app/src/app/edition/views/ContactEditionView.js b/client-app/src/app/edition/views/ContactEditionView.js index 91248856..efdd8e7d 100644 --- a/client-app/src/app/edition/views/ContactEditionView.js +++ b/client-app/src/app/edition/views/ContactEditionView.js @@ -2,7 +2,7 @@ define([ "app/components/steps/MainDataStep" , "app/designs/edition/Controller" , "app/designs/edition/Layout" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" ], function( diff --git a/client-app/src/app/edition/views/DeviceEditionView.js b/client-app/src/app/edition/views/DeviceEditionView.js index 68a87b78..83d9ecc3 100644 --- a/client-app/src/app/edition/views/DeviceEditionView.js +++ b/client-app/src/app/edition/views/DeviceEditionView.js @@ -4,7 +4,7 @@ define([ , "app/components/steps/MainDataStep" , "app/designs/edition/Controller" , "app/designs/edition/Layout" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "redmic/modules/layout/wizard/_CompleteBySelection" diff --git a/client-app/src/app/edition/views/DocumentEditionView.js b/client-app/src/app/edition/views/DocumentEditionView.js index 93565172..3676e5fa 100644 --- a/client-app/src/app/edition/views/DocumentEditionView.js +++ b/client-app/src/app/edition/views/DocumentEditionView.js @@ -2,7 +2,7 @@ define([ "app/components/steps/MainDataStep" , "app/designs/edition/Controller" , "app/designs/edition/Layout" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" ], function( diff --git a/client-app/src/app/edition/views/LoadDataToActivityEditionView.js b/client-app/src/app/edition/views/LoadDataToActivityEditionView.js index a8f53be4..53d8fb77 100644 --- a/client-app/src/app/edition/views/LoadDataToActivityEditionView.js +++ b/client-app/src/app/edition/views/LoadDataToActivityEditionView.js @@ -10,7 +10,7 @@ define([ , "app/edition/views/dataLoader/LoadDataFT" , "app/edition/views/dataLoader/LoadDataOC" , "app/edition/views/dataLoader/LoadDataTR" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/Deferred" diff --git a/client-app/src/app/edition/views/MetricsDefinitionEditionView.js b/client-app/src/app/edition/views/MetricsDefinitionEditionView.js index 0f8cde78..11d12f13 100644 --- a/client-app/src/app/edition/views/MetricsDefinitionEditionView.js +++ b/client-app/src/app/edition/views/MetricsDefinitionEditionView.js @@ -4,7 +4,7 @@ define([ , "app/components/steps/MainDataStep" , "app/designs/edition/Controller" , "app/designs/edition/Layout" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "redmic/modules/layout/wizard/_CompleteBySelection" @@ -71,4 +71,4 @@ define([ } }); -}); \ No newline at end of file +}); diff --git a/client-app/src/app/edition/views/MisIdentificationEditionView.js b/client-app/src/app/edition/views/MisIdentificationEditionView.js index c74706cd..85e2f57e 100644 --- a/client-app/src/app/edition/views/MisIdentificationEditionView.js +++ b/client-app/src/app/edition/views/MisIdentificationEditionView.js @@ -6,7 +6,7 @@ define([ , "app/components/steps/DocumentStepFiltered" , "app/designs/edition/Controller" , "app/designs/edition/Layout" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "redmic/modules/layout/wizard/_CompleteBySelection" diff --git a/client-app/src/app/edition/views/OrganisationEditionView.js b/client-app/src/app/edition/views/OrganisationEditionView.js index 06c0b936..ddbbf154 100644 --- a/client-app/src/app/edition/views/OrganisationEditionView.js +++ b/client-app/src/app/edition/views/OrganisationEditionView.js @@ -2,7 +2,7 @@ define([ "app/components/steps/MainDataStep" , "app/designs/edition/Controller" , "app/designs/edition/Layout" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" ], function( diff --git a/client-app/src/app/edition/views/ParameterEditionView.js b/client-app/src/app/edition/views/ParameterEditionView.js index 0c13197a..72b53e9d 100644 --- a/client-app/src/app/edition/views/ParameterEditionView.js +++ b/client-app/src/app/edition/views/ParameterEditionView.js @@ -4,7 +4,7 @@ define([ , "app/components/steps/UnitSetStep" , "app/designs/edition/Controller" , "app/designs/edition/Layout" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "redmic/modules/layout/wizard/_CompleteBySelection" diff --git a/client-app/src/app/edition/views/PermissionsEditionView.js b/client-app/src/app/edition/views/PermissionsEditionView.js index 9b57eb03..27ce8a4f 100644 --- a/client-app/src/app/edition/views/PermissionsEditionView.js +++ b/client-app/src/app/edition/views/PermissionsEditionView.js @@ -4,7 +4,7 @@ define([ , "app/designs/edition/Controller" , "app/designs/edition/Layout" , "app/maintenance/models/PermissionsModel" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" ], function( diff --git a/client-app/src/app/edition/views/PlatformEditionView.js b/client-app/src/app/edition/views/PlatformEditionView.js index ca3db7d7..32bfcb20 100644 --- a/client-app/src/app/edition/views/PlatformEditionView.js +++ b/client-app/src/app/edition/views/PlatformEditionView.js @@ -3,7 +3,7 @@ define([ , "app/components/steps/MainDataStep" , "app/designs/edition/Controller" , "app/designs/edition/Layout" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" ], function( diff --git a/client-app/src/app/edition/views/ProgramEditionView.js b/client-app/src/app/edition/views/ProgramEditionView.js index d3fa9e71..0044cd5e 100644 --- a/client-app/src/app/edition/views/ProgramEditionView.js +++ b/client-app/src/app/edition/views/ProgramEditionView.js @@ -6,7 +6,7 @@ define([ //, "app/components/steps/PlatformSetStep" , "app/designs/edition/Controller" , "app/designs/edition/Layout" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" ], function( diff --git a/client-app/src/app/edition/views/ProjectEditionView.js b/client-app/src/app/edition/views/ProjectEditionView.js index dd6ae9c6..864f2b20 100644 --- a/client-app/src/app/edition/views/ProjectEditionView.js +++ b/client-app/src/app/edition/views/ProjectEditionView.js @@ -6,7 +6,7 @@ define([ //, "app/components/steps/PlatformSetStep" , "app/designs/edition/Controller" , "app/designs/edition/Layout" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" ], function( diff --git a/client-app/src/app/edition/views/ServiceOGCEditionView.js b/client-app/src/app/edition/views/ServiceOGCEditionView.js index d0309a22..b9ba2390 100644 --- a/client-app/src/app/edition/views/ServiceOGCEditionView.js +++ b/client-app/src/app/edition/views/ServiceOGCEditionView.js @@ -8,7 +8,7 @@ define([ , "app/components/steps/SelectLayerStep" , "app/designs/edition/Controller" , "app/designs/edition/Layout" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" ], function( diff --git a/client-app/src/app/edition/views/SpeciesEditionView.js b/client-app/src/app/edition/views/SpeciesEditionView.js index 60329c53..f4183e0f 100644 --- a/client-app/src/app/edition/views/SpeciesEditionView.js +++ b/client-app/src/app/edition/views/SpeciesEditionView.js @@ -3,7 +3,7 @@ define([ , "app/components/steps/SpeciesMainDataStep" , "app/designs/edition/Controller" , "app/designs/edition/Layout" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" ], function( diff --git a/client-app/src/app/edition/views/UnitEditionView.js b/client-app/src/app/edition/views/UnitEditionView.js index cfee36ca..95e15f3d 100644 --- a/client-app/src/app/edition/views/UnitEditionView.js +++ b/client-app/src/app/edition/views/UnitEditionView.js @@ -3,7 +3,7 @@ define([ , "app/maintenance/domains/observations/views/UnitTypesView" , "app/designs/edition/Controller" , "app/designs/edition/Layout" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "redmic/modules/layout/wizard/_CompleteBySelection" diff --git a/client-app/src/app/edition/views/dataLoader/AddDataFT.js b/client-app/src/app/edition/views/dataLoader/AddDataFT.js index 0b57ed48..6febf05a 100644 --- a/client-app/src/app/edition/views/dataLoader/AddDataFT.js +++ b/client-app/src/app/edition/views/dataLoader/AddDataFT.js @@ -5,7 +5,7 @@ define([ , "app/components/viewCustomization/addGeomSite/views/Point" , "app/designs/edition/Controller" , "app/designs/edition/Layout" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" ], function( diff --git a/client-app/src/app/edition/views/dataLoader/AddDataIF.js b/client-app/src/app/edition/views/dataLoader/AddDataIF.js index 9179cd97..f048a007 100644 --- a/client-app/src/app/edition/views/dataLoader/AddDataIF.js +++ b/client-app/src/app/edition/views/dataLoader/AddDataIF.js @@ -4,7 +4,7 @@ define([ , "app/components/viewCustomization/addGeomSite/views/Point" , "app/designs/edition/Controller" , "app/designs/edition/Layout" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" ], function( @@ -61,4 +61,4 @@ define([ }, this.editorConfig || {}]); } }); -}); \ No newline at end of file +}); diff --git a/client-app/src/app/edition/views/dataLoader/AddDataOC.js b/client-app/src/app/edition/views/dataLoader/AddDataOC.js index 66f15a7f..23dff4a9 100644 --- a/client-app/src/app/edition/views/dataLoader/AddDataOC.js +++ b/client-app/src/app/edition/views/dataLoader/AddDataOC.js @@ -5,7 +5,7 @@ define([ , "app/components/viewCustomization/addGeomSite/views/Line" , "app/designs/edition/Controller" , "app/designs/edition/Layout" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" ], function( diff --git a/client-app/src/app/edition/views/dataLoader/EditDataAR.js b/client-app/src/app/edition/views/dataLoader/EditDataAR.js index 2518c565..8f1457e8 100644 --- a/client-app/src/app/edition/views/dataLoader/EditDataAR.js +++ b/client-app/src/app/edition/views/dataLoader/EditDataAR.js @@ -3,7 +3,7 @@ define([ , "app/components/steps/MainDataStep" , "app/designs/edition/Controller" , "app/designs/edition/Layout" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" ], function( diff --git a/client-app/src/app/edition/views/dataLoader/LoadDataOC.js b/client-app/src/app/edition/views/dataLoader/LoadDataOC.js index eaf06a20..5b71db49 100644 --- a/client-app/src/app/edition/views/dataLoader/LoadDataOC.js +++ b/client-app/src/app/edition/views/dataLoader/LoadDataOC.js @@ -11,7 +11,7 @@ define([ , "app/designs/list/Controller" , "app/designs/list/layout/Layout" , "app/edition/views/dataLoader/_BaseLoadDataToActivityEdition" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "redmic/modules/browser/_Select" diff --git a/client-app/src/app/edition/views/dataLoader/LoadDataTR.js b/client-app/src/app/edition/views/dataLoader/LoadDataTR.js index 7348a8db..f9315849 100644 --- a/client-app/src/app/edition/views/dataLoader/LoadDataTR.js +++ b/client-app/src/app/edition/views/dataLoader/LoadDataTR.js @@ -7,7 +7,7 @@ define([ , "app/designs/list/Controller" , "app/designs/list/layout/Layout" , "app/edition/views/dataLoader/_BaseLoadDataToActivityEdition" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "redmic/modules/browser/_Select" diff --git a/client-app/src/app/edition/views/dataLoader/_BaseDataToActivityEdition.js b/client-app/src/app/edition/views/dataLoader/_BaseDataToActivityEdition.js index 3f06d8ab..705c581b 100644 --- a/client-app/src/app/edition/views/dataLoader/_BaseDataToActivityEdition.js +++ b/client-app/src/app/edition/views/dataLoader/_BaseDataToActivityEdition.js @@ -1,7 +1,7 @@ define([ "app/designs/edition/Controller" , "app/designs/edition/Layout" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" @@ -162,4 +162,4 @@ define([ }); } }); -}); \ No newline at end of file +}); diff --git a/client-app/src/app/home/views/HomeView.js b/client-app/src/app/home/views/HomeView.js index 4289f9d9..8ade6f42 100644 --- a/client-app/src/app/home/views/HomeView.js +++ b/client-app/src/app/home/views/HomeView.js @@ -8,7 +8,7 @@ define([ , 'app/home/views/SearchResultsWidget' , 'app/home/views/SocialWidget' , 'app/home/views/StatsWidget' - , 'app/redmicConfig' + , 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' , 'redmic/base/Credentials' diff --git a/client-app/src/app/home/views/SearchBarWidget.js b/client-app/src/app/home/views/SearchBarWidget.js index e22d2277..611d2e1c 100644 --- a/client-app/src/app/home/views/SearchBarWidget.js +++ b/client-app/src/app/home/views/SearchBarWidget.js @@ -1,5 +1,5 @@ define([ - 'app/redmicConfig' + 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' , 'redmic/modules/base/_Filter' diff --git a/client-app/src/app/home/views/SearchFastFilterWidget.js b/client-app/src/app/home/views/SearchFastFilterWidget.js index 3288bb27..80488a0f 100644 --- a/client-app/src/app/home/views/SearchFastFilterWidget.js +++ b/client-app/src/app/home/views/SearchFastFilterWidget.js @@ -1,5 +1,5 @@ define([ - 'app/redmicConfig' + 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' , 'redmic/modules/base/_Module' diff --git a/client-app/src/app/home/views/SearchResultsWidget.js b/client-app/src/app/home/views/SearchResultsWidget.js index f387ef80..3237b1b8 100644 --- a/client-app/src/app/home/views/SearchResultsWidget.js +++ b/client-app/src/app/home/views/SearchResultsWidget.js @@ -1,5 +1,5 @@ define([ - 'app/redmicConfig' + 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' , 'redmic/modules/base/_Filter' diff --git a/client-app/src/app/home/views/StatsWidget.js b/client-app/src/app/home/views/StatsWidget.js index 7b04f57a..b76c6562 100644 --- a/client-app/src/app/home/views/StatsWidget.js +++ b/client-app/src/app/home/views/StatsWidget.js @@ -1,5 +1,5 @@ define([ - 'app/redmicConfig' + 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' , 'redmic/modules/base/_Module' diff --git a/client-app/src/app/maintenance/domains/admin/views/ActivityTypesView.js b/client-app/src/app/maintenance/domains/admin/views/ActivityTypesView.js index 1bb82a85..aeb99691 100644 --- a/client-app/src/app/maintenance/domains/admin/views/ActivityTypesView.js +++ b/client-app/src/app/maintenance/domains/admin/views/ActivityTypesView.js @@ -2,7 +2,7 @@ define([ "app/base/views/extensions/_EditionView" , "app/base/views/extensions/_FormInDialogView" , "app/designs/textSearchFacetsList/main/Domain" - , 'app/redmicConfig' + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "templates/ActivityTypeList" diff --git a/client-app/src/app/maintenance/domains/observations/views/MetricsDefinitionsView.js b/client-app/src/app/maintenance/domains/observations/views/MetricsDefinitionsView.js index b7ed2fde..a26dbfea 100644 --- a/client-app/src/app/maintenance/domains/observations/views/MetricsDefinitionsView.js +++ b/client-app/src/app/maintenance/domains/observations/views/MetricsDefinitionsView.js @@ -1,7 +1,7 @@ define([ "app/designs/textSearchFacetsList/main/Domain" , "app/base/views/extensions/_EditionWizardView" - , 'app/redmicConfig' + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "templates/ConditionList" diff --git a/client-app/src/app/maintenance/domains/observations/views/ParametersView.js b/client-app/src/app/maintenance/domains/observations/views/ParametersView.js index d4bc5873..991042f2 100644 --- a/client-app/src/app/maintenance/domains/observations/views/ParametersView.js +++ b/client-app/src/app/maintenance/domains/observations/views/ParametersView.js @@ -1,7 +1,7 @@ define([ "app/designs/textSearchFacetsList/main/Domain" , "app/base/views/extensions/_EditionWizardView" - , 'app/redmicConfig' + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "templates/ParameterList" diff --git a/client-app/src/app/maintenance/domains/observations/views/UnitsView.js b/client-app/src/app/maintenance/domains/observations/views/UnitsView.js index b9d1fd94..204ad91a 100644 --- a/client-app/src/app/maintenance/domains/observations/views/UnitsView.js +++ b/client-app/src/app/maintenance/domains/observations/views/UnitsView.js @@ -1,7 +1,7 @@ define([ "app/designs/textSearchFacetsList/main/Domain" , "app/base/views/extensions/_EditionWizardView" - , 'app/redmicConfig' + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "templates/UnitList" diff --git a/client-app/src/app/maintenance/models/AccessModel.js b/client-app/src/app/maintenance/models/AccessModel.js index b00b619b..0ce0d86c 100644 --- a/client-app/src/app/maintenance/models/AccessModel.js +++ b/client-app/src/app/maintenance/models/AccessModel.js @@ -1,5 +1,5 @@ define([ - "app/redmicConfig" + 'src/redmicConfig' ], function ( redmicConfig ){ @@ -22,4 +22,4 @@ define([ } } }; -}); \ No newline at end of file +}); diff --git a/client-app/src/app/maintenance/models/PermissionsModel.js b/client-app/src/app/maintenance/models/PermissionsModel.js index f6d063ee..5d0d4dfa 100644 --- a/client-app/src/app/maintenance/models/PermissionsModel.js +++ b/client-app/src/app/maintenance/models/PermissionsModel.js @@ -1,5 +1,5 @@ define([ - "app/redmicConfig" + 'src/redmicConfig' ], function ( redmicConfig ){ @@ -49,4 +49,4 @@ define([ } } }; -}); \ No newline at end of file +}); diff --git a/client-app/src/app/maintenance/views/DomainView.js b/client-app/src/app/maintenance/views/DomainView.js index 06530d19..0bd3d740 100644 --- a/client-app/src/app/maintenance/views/DomainView.js +++ b/client-app/src/app/maintenance/views/DomainView.js @@ -1,7 +1,7 @@ define([ "app/designs/details/Controller" , "app/designs/details/Layout" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "app/base/views/_ViewListBase" @@ -108,4 +108,4 @@ define([ } }); -}); \ No newline at end of file +}); diff --git a/client-app/src/app/maintenance/views/PermissionsView.js b/client-app/src/app/maintenance/views/PermissionsView.js index bc40a64a..229ecf8e 100644 --- a/client-app/src/app/maintenance/views/PermissionsView.js +++ b/client-app/src/app/maintenance/views/PermissionsView.js @@ -2,7 +2,7 @@ define([ "app/base/views/extensions/_EditionWizardView" , "app/designs/list/Controller" , "app/designs/list/layout/Layout" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "redmic/modules/base/_Store" diff --git a/client-app/src/app/products/views/OpenMapView.js b/client-app/src/app/products/views/OpenMapView.js index b4d78c49..eda5a6fb 100644 --- a/client-app/src/app/products/views/OpenMapView.js +++ b/client-app/src/app/products/views/OpenMapView.js @@ -1,7 +1,7 @@ define([ "app/designs/mapWithSideContent/Controller" , "app/designs/mapWithSideContent/layout/MapAndContent" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , 'put-selector/put' diff --git a/client-app/src/app/user/models/FeedbackModel.js b/client-app/src/app/user/models/FeedbackModel.js index 2e2cb985..fd1a96c1 100644 --- a/client-app/src/app/user/models/FeedbackModel.js +++ b/client-app/src/app/user/models/FeedbackModel.js @@ -1,5 +1,5 @@ define([ - "app/redmicConfig" + 'src/redmicConfig' ], function ( redmicConfig ){ @@ -34,4 +34,4 @@ define([ } } }; -}); \ No newline at end of file +}); diff --git a/client-app/src/app/user/models/PasswordModel.js b/client-app/src/app/user/models/PasswordModel.js index 73bb44c4..5f825eb5 100644 --- a/client-app/src/app/user/models/PasswordModel.js +++ b/client-app/src/app/user/models/PasswordModel.js @@ -1,5 +1,5 @@ define([ - "app/redmicConfig" + 'src/redmicConfig' ], function ( redmicConfig ){ @@ -25,4 +25,4 @@ define([ } } }; -}); \ No newline at end of file +}); diff --git a/client-app/src/app/user/models/RegisterModel.js b/client-app/src/app/user/models/RegisterModel.js index 85bdc00a..385b3614 100644 --- a/client-app/src/app/user/models/RegisterModel.js +++ b/client-app/src/app/user/models/RegisterModel.js @@ -1,5 +1,5 @@ define([ - "app/redmicConfig" + 'src/redmicConfig' ], function ( redmicConfig ){ @@ -39,4 +39,4 @@ define([ } } }; -}); \ No newline at end of file +}); diff --git a/client-app/src/app/user/models/UserEmailModel.js b/client-app/src/app/user/models/UserEmailModel.js index fd8c0a84..c35ae7fc 100644 --- a/client-app/src/app/user/models/UserEmailModel.js +++ b/client-app/src/app/user/models/UserEmailModel.js @@ -1,5 +1,5 @@ define([ - "app/redmicConfig" + 'src/redmicConfig' ], function ( redmicConfig ){ @@ -19,4 +19,4 @@ define([ } } }; -}); \ No newline at end of file +}); diff --git a/client-app/src/app/user/models/UserImageModel.js b/client-app/src/app/user/models/UserImageModel.js index 8f6d9cbd..7f1b6c6a 100644 --- a/client-app/src/app/user/models/UserImageModel.js +++ b/client-app/src/app/user/models/UserImageModel.js @@ -1,5 +1,5 @@ define([ - "app/redmicConfig" + 'src/redmicConfig' ], function ( redmicConfig ){ @@ -19,4 +19,4 @@ define([ } } }; -}); \ No newline at end of file +}); diff --git a/client-app/src/app/user/models/UserNameModel.js b/client-app/src/app/user/models/UserNameModel.js index f5371452..6cbf05ba 100644 --- a/client-app/src/app/user/models/UserNameModel.js +++ b/client-app/src/app/user/models/UserNameModel.js @@ -1,5 +1,5 @@ define([ - "app/redmicConfig" + 'src/redmicConfig' ], function ( redmicConfig ){ diff --git a/client-app/src/app/user/models/UserSectorModel.js b/client-app/src/app/user/models/UserSectorModel.js index 25ac2d24..12460e8d 100644 --- a/client-app/src/app/user/models/UserSectorModel.js +++ b/client-app/src/app/user/models/UserSectorModel.js @@ -1,5 +1,5 @@ define([ - "app/redmicConfig" + 'src/redmicConfig' ], function ( redmicConfig ){ @@ -19,4 +19,4 @@ define([ } } }; -}); \ No newline at end of file +}); diff --git a/client-app/src/app/user/views/ConfirmResettingView.js b/client-app/src/app/user/views/ConfirmResettingView.js index 2cb168b2..aa189334 100644 --- a/client-app/src/app/user/views/ConfirmResettingView.js +++ b/client-app/src/app/user/views/ConfirmResettingView.js @@ -1,7 +1,7 @@ define([ 'alertify/alertify.min' , "app/user/views/_ExternalUserBaseView" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/text!./templates/ConfirmResetting.html" diff --git a/client-app/src/app/user/views/FeedbackView.js b/client-app/src/app/user/views/FeedbackView.js index f18ba3bf..3d49ecdc 100644 --- a/client-app/src/app/user/views/FeedbackView.js +++ b/client-app/src/app/user/views/FeedbackView.js @@ -3,7 +3,7 @@ define([ , 'app/components/ReCaptcha' , "app/user/models/FeedbackModel" , "app/user/views/_ExternalUserBaseView" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/query" diff --git a/client-app/src/app/user/views/LoginView.js b/client-app/src/app/user/views/LoginView.js index 5401b62f..6772456b 100644 --- a/client-app/src/app/user/views/LoginView.js +++ b/client-app/src/app/user/views/LoginView.js @@ -1,7 +1,7 @@ define([ 'alertify/alertify.min' , "app/user/views/_ExternalUserBaseView" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/text!./templates/Login.html" diff --git a/client-app/src/app/user/views/RegisterView.js b/client-app/src/app/user/views/RegisterView.js index 2f46ac8f..a785d957 100644 --- a/client-app/src/app/user/views/RegisterView.js +++ b/client-app/src/app/user/views/RegisterView.js @@ -3,7 +3,7 @@ define([ , 'app/components/ReCaptcha' , "app/user/models/RegisterModel" , "app/user/views/_ExternalUserBaseView" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/query" diff --git a/client-app/src/app/user/views/ResettingView.js b/client-app/src/app/user/views/ResettingView.js index d28fc39e..26045a60 100644 --- a/client-app/src/app/user/views/ResettingView.js +++ b/client-app/src/app/user/views/ResettingView.js @@ -1,7 +1,7 @@ define([ 'alertify/alertify.min' , "app/user/views/_ExternalUserBaseView" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/text!./templates/Resetting.html" diff --git a/client-app/src/app/user/views/UserProfileView.js b/client-app/src/app/user/views/UserProfileView.js index aeb62ac3..93dd2ba4 100644 --- a/client-app/src/app/user/views/UserProfileView.js +++ b/client-app/src/app/user/views/UserProfileView.js @@ -1,7 +1,7 @@ define([ "app/designs/details/Controller" , "app/designs/details/Layout" - , "app/redmicConfig" + , 'src/redmicConfig' , "app/user/models/PasswordModel" , "app/user/models/UserImageModel" , "app/user/models/UserNameModel" diff --git a/client-app/src/app/user/views/_ExternalUserBaseView.js b/client-app/src/app/user/views/_ExternalUserBaseView.js index f72a357b..74f78f8d 100644 --- a/client-app/src/app/user/views/_ExternalUserBaseView.js +++ b/client-app/src/app/user/views/_ExternalUserBaseView.js @@ -1,5 +1,5 @@ define([ - 'app/redmicConfig' + 'src/redmicConfig' , 'dijit/_TemplatedMixin' , 'dijit/_WidgetBase' , 'dijit/_WidgetsInTemplateMixin' diff --git a/client-app/src/app/viewers/models/PointClusterCategorizeModel.js b/client-app/src/app/viewers/models/PointClusterCategorizeModel.js index a802fba2..5a087430 100644 --- a/client-app/src/app/viewers/models/PointClusterCategorizeModel.js +++ b/client-app/src/app/viewers/models/PointClusterCategorizeModel.js @@ -1,5 +1,5 @@ define([ - "app/redmicConfig" + 'src/redmicConfig' ], function ( redmicConfig ){ @@ -76,4 +76,4 @@ define([ } } }; -}); \ No newline at end of file +}); diff --git a/client-app/src/app/viewers/models/PointClusterModel.js b/client-app/src/app/viewers/models/PointClusterModel.js index d47c34f3..ffd97281 100644 --- a/client-app/src/app/viewers/models/PointClusterModel.js +++ b/client-app/src/app/viewers/models/PointClusterModel.js @@ -1,5 +1,5 @@ define([ - "app/redmicConfig" + 'src/redmicConfig' ], function ( redmicConfig ){ @@ -41,4 +41,4 @@ define([ } } }; -}); \ No newline at end of file +}); diff --git a/client-app/src/app/viewers/views/BibliographyView.js b/client-app/src/app/viewers/views/BibliographyView.js index 0649e874..8165af75 100644 --- a/client-app/src/app/viewers/views/BibliographyView.js +++ b/client-app/src/app/viewers/views/BibliographyView.js @@ -1,6 +1,6 @@ define([ 'app/designs/textSearchFacetsList/main/Bibliography' - , 'app/redmicConfig' + , 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' ], function ( diff --git a/client-app/src/app/viewers/views/ChartsView.js b/client-app/src/app/viewers/views/ChartsView.js index ec3d821a..28aa82cc 100644 --- a/client-app/src/app/viewers/views/ChartsView.js +++ b/client-app/src/app/viewers/views/ChartsView.js @@ -8,7 +8,7 @@ define([ , "app/designs/list/layout/Layout" , 'app/viewers/views/_TimeSeriesDataManagement' , "app/viewers/views/_TimeSeriesSelectionManagement" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "redmic/modules/base/_ShowInPopup" diff --git a/client-app/src/app/viewers/views/RealTimeDashboardView.js b/client-app/src/app/viewers/views/RealTimeDashboardView.js index 919f3ac0..8315b8c9 100644 --- a/client-app/src/app/viewers/views/RealTimeDashboardView.js +++ b/client-app/src/app/viewers/views/RealTimeDashboardView.js @@ -4,7 +4,7 @@ define([ , "app/designs/details/Controller" , "app/designs/details/Layout" , "app/designs/details/_AddBasicTitle" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/Deferred" diff --git a/client-app/src/app/viewers/views/RealTimeView.js b/client-app/src/app/viewers/views/RealTimeView.js index 45b801e1..b782d032 100644 --- a/client-app/src/app/viewers/views/RealTimeView.js +++ b/client-app/src/app/viewers/views/RealTimeView.js @@ -1,7 +1,7 @@ define([ 'app/designs/mapWithSideContent/Controller' , 'app/designs/mapWithSideContent/layout/MapAndContent' - , 'app/redmicConfig' + , 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' , 'redmic/modules/atlas/Atlas' diff --git a/client-app/src/app/viewers/views/SpeciesDistributionView.js b/client-app/src/app/viewers/views/SpeciesDistributionView.js index b9dada5b..34d01647 100644 --- a/client-app/src/app/viewers/views/SpeciesDistributionView.js +++ b/client-app/src/app/viewers/views/SpeciesDistributionView.js @@ -2,7 +2,7 @@ define([ 'alertify/alertify.min' , "app/designs/mapWithSideContent/Controller" , "app/designs/mapWithSideContent/layout/MapAndContent" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" diff --git a/client-app/src/app/viewers/views/TrackingView.js b/client-app/src/app/viewers/views/TrackingView.js index 568b6fbd..10c9829f 100644 --- a/client-app/src/app/viewers/views/TrackingView.js +++ b/client-app/src/app/viewers/views/TrackingView.js @@ -2,7 +2,7 @@ define([ "app/designs/mapWithSideContent/main/Tracking" , "app/designs/mapWithSideContent/main/_TrackingByFilter" , "app/designs/mapWithSideContent/main/_TrackingWithList" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" diff --git a/client-app/src/app/viewers/views/TrashCharts.js b/client-app/src/app/viewers/views/TrashCharts.js index 6514e097..c32a4e4d 100644 --- a/client-app/src/app/viewers/views/TrashCharts.js +++ b/client-app/src/app/viewers/views/TrashCharts.js @@ -4,7 +4,7 @@ define([ , "app/designs/chart/main/MultiPieChartWithToolbar" , "app/designs/details/Controller" , "app/designs/details/Layout" - , "app/redmicConfig" + , 'src/redmicConfig' , "app/viewers/views/_ObjectCollectionSeriesSelectionManagement" , "dojo/_base/declare" , "dojo/_base/lang" diff --git a/client-app/src/app/viewers/views/TrashCollectionView.js b/client-app/src/app/viewers/views/TrashCollectionView.js index dbddb248..626f673d 100644 --- a/client-app/src/app/viewers/views/TrashCollectionView.js +++ b/client-app/src/app/viewers/views/TrashCollectionView.js @@ -2,7 +2,7 @@ define([ 'app/base/views/extensions/_AddCompositeSearchInTooltipFromTextSearch' , "app/designs/mapWithSideContent/Controller" , "app/designs/mapWithSideContent/layout/MapAndContent" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "redmic/modules/atlas/Atlas" diff --git a/client-app/src/app/viewers/views/TrashDetails.js b/client-app/src/app/viewers/views/TrashDetails.js index 82e0d5fe..2f31a9fa 100644 --- a/client-app/src/app/viewers/views/TrashDetails.js +++ b/client-app/src/app/viewers/views/TrashDetails.js @@ -5,7 +5,7 @@ define([ , "app/viewers/views/TrashCharts" , "app/viewers/views/TrashInfo" , "app/viewers/views/_SelectTimeInterval" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/Deferred" diff --git a/client-app/src/app/viewers/views/_TimeSeriesDataManagement.js b/client-app/src/app/viewers/views/_TimeSeriesDataManagement.js index 0daaf778..7bd2d695 100644 --- a/client-app/src/app/viewers/views/_TimeSeriesDataManagement.js +++ b/client-app/src/app/viewers/views/_TimeSeriesDataManagement.js @@ -1,5 +1,5 @@ define([ - 'app/redmicConfig' + 'src/redmicConfig' , 'app/details/views/_ActivityTimeSeriesDataManagement' , "dojo/_base/declare" , "dojo/_base/lang" diff --git a/client-app/src/app/views/ActivateAccount.js b/client-app/src/app/views/ActivateAccount.js index 7d4b8f6a..87bf7258 100644 --- a/client-app/src/app/views/ActivateAccount.js +++ b/client-app/src/app/views/ActivateAccount.js @@ -1,5 +1,5 @@ define([ - 'app/redmicConfig' + 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/request' diff --git a/client-app/src/catalog/detail/_WidgetDefinition.js b/client-app/src/catalog/detail/_WidgetDefinition.js index 2f624121..6a2a92cf 100644 --- a/client-app/src/catalog/detail/_WidgetDefinition.js +++ b/client-app/src/catalog/detail/_WidgetDefinition.js @@ -1,5 +1,5 @@ define([ - 'app/redmicConfig' + 'src/redmicConfig' , 'app/designs/details/main/ActivityTrackingMap' , 'app/details/views/ActivityAreaMapBase' , 'app/details/views/ActivityCitationMapBase' diff --git a/client-app/src/catalog/detail/activity/ActivityDetail.js b/client-app/src/catalog/detail/activity/ActivityDetail.js index 7513039d..3dde0eba 100644 --- a/client-app/src/catalog/detail/activity/ActivityDetail.js +++ b/client-app/src/catalog/detail/activity/ActivityDetail.js @@ -1,5 +1,5 @@ define([ - 'app/redmicConfig' + 'src/redmicConfig' , 'app/designs/details/main/_ActivityBase' , 'dojo/_base/declare' , 'dojo/_base/lang' diff --git a/client-app/src/redmic/form/FormContainer.js b/client-app/src/redmic/form/FormContainer.js index ff45c452..05ae5f4e 100644 --- a/client-app/src/redmic/form/FormContainer.js +++ b/client-app/src/redmic/form/FormContainer.js @@ -1,5 +1,5 @@ define([ - 'app/redmicConfig' + 'src/redmicConfig' , 'dijit/_TemplatedMixin' , 'dijit/_WidgetBase' , 'dojo/_base/declare' diff --git a/client-app/src/redmic/form/UploadInput.js b/client-app/src/redmic/form/UploadInput.js index 94d2224c..4dc197c1 100644 --- a/client-app/src/redmic/form/UploadInput.js +++ b/client-app/src/redmic/form/UploadInput.js @@ -1,6 +1,6 @@ define([ 'alertify/alertify.min' - , 'app/redmicConfig' + , 'src/redmicConfig' , 'dijit/_TemplatedMixin' , 'dijit/_WidgetBase' , 'dojo/_base/declare' diff --git a/client-app/src/redmic/modules/app/App.js b/client-app/src/redmic/modules/app/App.js index f0a365a8..775a72de 100644 --- a/client-app/src/redmic/modules/app/App.js +++ b/client-app/src/redmic/modules/app/App.js @@ -1,6 +1,6 @@ define([ 'app/components/CookieLoader' - , 'app/redmicConfig' + , 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/dom' diff --git a/client-app/src/redmic/modules/app/ModuleStore.js b/client-app/src/redmic/modules/app/ModuleStore.js index 7f16b4d1..8abc7b63 100644 --- a/client-app/src/redmic/modules/app/ModuleStore.js +++ b/client-app/src/redmic/modules/app/ModuleStore.js @@ -1,6 +1,6 @@ define([ "app/base/views/_View" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/Deferred" diff --git a/client-app/src/redmic/modules/atlas/Atlas.js b/client-app/src/redmic/modules/atlas/Atlas.js index 46528277..d2bb73f3 100644 --- a/client-app/src/redmic/modules/atlas/Atlas.js +++ b/client-app/src/redmic/modules/atlas/Atlas.js @@ -3,7 +3,7 @@ define([ ,'app/designs/list/Controller' , 'app/designs/list/layout/Layout' , 'app/designs/textSearchList/main/ServiceOGC' - , 'app/redmicConfig' + , 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/Deferred' diff --git a/client-app/src/redmic/modules/base/Credentials.js b/client-app/src/redmic/modules/base/Credentials.js index 87851ce5..bdfc40b0 100644 --- a/client-app/src/redmic/modules/base/Credentials.js +++ b/client-app/src/redmic/modules/base/Credentials.js @@ -1,5 +1,5 @@ define([ - 'app/redmicConfig' + 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' , 'redmic/modules/base/_Module' diff --git a/client-app/src/redmic/modules/base/Manager.js b/client-app/src/redmic/modules/base/Manager.js index 9d849af6..1b17c0c4 100644 --- a/client-app/src/redmic/modules/base/Manager.js +++ b/client-app/src/redmic/modules/base/Manager.js @@ -1,5 +1,5 @@ define([ - 'app/redmicConfig' + 'src/redmicConfig' , 'dijit/form/Button' , 'dojo/_base/declare' , 'dojo/_base/lang' diff --git a/client-app/src/redmic/modules/base/_Itfc.js b/client-app/src/redmic/modules/base/_Itfc.js index 38d64e77..e6dab16a 100644 --- a/client-app/src/redmic/modules/base/_Itfc.js +++ b/client-app/src/redmic/modules/base/_Itfc.js @@ -1,5 +1,5 @@ define([ - 'app/redmicConfig' + 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' ], function( diff --git a/client-app/src/redmic/modules/components/ExternalConfig.js b/client-app/src/redmic/modules/components/ExternalConfig.js index 85198cac..bf72bb84 100644 --- a/client-app/src/redmic/modules/components/ExternalConfig.js +++ b/client-app/src/redmic/modules/components/ExternalConfig.js @@ -1,5 +1,5 @@ define([ - 'app/redmicConfig' + 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' , 'redmic/modules/base/_Module' diff --git a/client-app/src/redmic/modules/form/input/GeometryImpl.js b/client-app/src/redmic/modules/form/input/GeometryImpl.js index e5890eb2..0de46db6 100644 --- a/client-app/src/redmic/modules/form/input/GeometryImpl.js +++ b/client-app/src/redmic/modules/form/input/GeometryImpl.js @@ -1,5 +1,5 @@ define([ - 'app/redmicConfig' + 'src/redmicConfig' , 'dijit/form/Textarea' , 'dojo/_base/declare' , 'dojo/_base/lang' diff --git a/client-app/src/redmic/modules/form/input/Input.js b/client-app/src/redmic/modules/form/input/Input.js index 1609514d..6fbb0a19 100644 --- a/client-app/src/redmic/modules/form/input/Input.js +++ b/client-app/src/redmic/modules/form/input/Input.js @@ -1,5 +1,5 @@ define([ - 'app/redmicConfig' + 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" diff --git a/client-app/src/redmic/modules/form/input/SelectImpl.js b/client-app/src/redmic/modules/form/input/SelectImpl.js index ec378c27..532e6c7a 100644 --- a/client-app/src/redmic/modules/form/input/SelectImpl.js +++ b/client-app/src/redmic/modules/form/input/SelectImpl.js @@ -1,5 +1,5 @@ define([ - "app/redmicConfig" + 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" diff --git a/client-app/src/redmic/modules/form/input/_BaseMultiSelectImpl.js b/client-app/src/redmic/modules/form/input/_BaseMultiSelectImpl.js index c401c159..10d43841 100644 --- a/client-app/src/redmic/modules/form/input/_BaseMultiSelectImpl.js +++ b/client-app/src/redmic/modules/form/input/_BaseMultiSelectImpl.js @@ -1,5 +1,5 @@ define([ - "app/redmicConfig" + 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" diff --git a/client-app/src/redmic/modules/form/input/_SelectOnPopupImpl.js b/client-app/src/redmic/modules/form/input/_SelectOnPopupImpl.js index f270ad1e..a15e68b0 100644 --- a/client-app/src/redmic/modules/form/input/_SelectOnPopupImpl.js +++ b/client-app/src/redmic/modules/form/input/_SelectOnPopupImpl.js @@ -1,5 +1,5 @@ define([ - "app/redmicConfig" + 'src/redmicConfig' , "dijit/form/ValidationTextBox" , "dojo/_base/declare" , "dojo/_base/lang" diff --git a/client-app/src/redmic/modules/layout/wizard/_WizardStep.js b/client-app/src/redmic/modules/layout/wizard/_WizardStep.js index 47201496..6f18c3a6 100644 --- a/client-app/src/redmic/modules/layout/wizard/_WizardStep.js +++ b/client-app/src/redmic/modules/layout/wizard/_WizardStep.js @@ -1,5 +1,5 @@ define([ - "app/redmicConfig" + 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" diff --git a/client-app/src/redmic/modules/model/Model.js b/client-app/src/redmic/modules/model/Model.js index 0a59a328..6c60966b 100644 --- a/client-app/src/redmic/modules/model/Model.js +++ b/client-app/src/redmic/modules/model/Model.js @@ -1,5 +1,5 @@ define([ - 'app/redmicConfig' + 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' , 'redmic/modules/base/_Module' diff --git a/client-app/src/redmic/modules/model/ModelImpl.js b/client-app/src/redmic/modules/model/ModelImpl.js index 0ef31c42..458ab43a 100644 --- a/client-app/src/redmic/modules/model/ModelImpl.js +++ b/client-app/src/redmic/modules/model/ModelImpl.js @@ -1,6 +1,6 @@ define([ "app/base/models/_Model" - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/Deferred" diff --git a/client-app/src/redmic/modules/selection/Selector.js b/client-app/src/redmic/modules/selection/Selector.js index d4bc964b..8d1e2b82 100644 --- a/client-app/src/redmic/modules/selection/Selector.js +++ b/client-app/src/redmic/modules/selection/Selector.js @@ -1,5 +1,5 @@ define([ - 'app/redmicConfig' + 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/Deferred' diff --git a/client-app/src/redmic/modules/socket/Socket.js b/client-app/src/redmic/modules/socket/Socket.js index b29ca8c6..d7eb5dda 100644 --- a/client-app/src/redmic/modules/socket/Socket.js +++ b/client-app/src/redmic/modules/socket/Socket.js @@ -1,5 +1,5 @@ define([ - 'app/redmicConfig' + 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "redmic/modules/base/_Module" diff --git a/client-app/src/redmic/modules/socket/_IngestData.js b/client-app/src/redmic/modules/socket/_IngestData.js index c585f89f..47be6bcb 100644 --- a/client-app/src/redmic/modules/socket/_IngestData.js +++ b/client-app/src/redmic/modules/socket/_IngestData.js @@ -1,5 +1,5 @@ define([ - "app/redmicConfig" + 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" diff --git a/client-app/src/redmic/modules/socket/_Report.js b/client-app/src/redmic/modules/socket/_Report.js index 95036648..7032ed10 100644 --- a/client-app/src/redmic/modules/socket/_Report.js +++ b/client-app/src/redmic/modules/socket/_Report.js @@ -1,6 +1,6 @@ define([ 'alertify/alertify.min' - , "app/redmicConfig" + , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" diff --git a/client-app/src/redmic/modules/socket/_Worms.js b/client-app/src/redmic/modules/socket/_Worms.js index 33b0c4eb..8376c329 100644 --- a/client-app/src/redmic/modules/socket/_Worms.js +++ b/client-app/src/redmic/modules/socket/_Worms.js @@ -1,5 +1,5 @@ define([ - "app/redmicConfig" + 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" diff --git a/client-app/src/redmic/modules/store/RequestJoiner/AtlasDataImpl.js b/client-app/src/redmic/modules/store/RequestJoiner/AtlasDataImpl.js index e52af90f..e70d9c25 100644 --- a/client-app/src/redmic/modules/store/RequestJoiner/AtlasDataImpl.js +++ b/client-app/src/redmic/modules/store/RequestJoiner/AtlasDataImpl.js @@ -1,5 +1,5 @@ define([ - 'app/redmicConfig' + 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/Deferred' diff --git a/client-app/src/redmic/modules/store/RestManager.js b/client-app/src/redmic/modules/store/RestManager.js index a939f1bd..949b4282 100644 --- a/client-app/src/redmic/modules/store/RestManager.js +++ b/client-app/src/redmic/modules/store/RestManager.js @@ -1,5 +1,5 @@ define([ - 'app/redmicConfig' + 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' , 'redmic/modules/base/_Module' diff --git a/client-app/src/redmic/modules/store/RestManagerImpl.js b/client-app/src/redmic/modules/store/RestManagerImpl.js index a684a8f0..b42ea8a1 100644 --- a/client-app/src/redmic/modules/store/RestManagerImpl.js +++ b/client-app/src/redmic/modules/store/RestManagerImpl.js @@ -1,5 +1,5 @@ define([ - 'app/redmicConfig' + 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/request' diff --git a/client-app/src/redmic/modules/user/LanguageSelector.js b/client-app/src/redmic/modules/user/LanguageSelector.js index fe80bf07..e649d1bc 100644 --- a/client-app/src/redmic/modules/user/LanguageSelector.js +++ b/client-app/src/redmic/modules/user/LanguageSelector.js @@ -1,5 +1,5 @@ define([ - 'app/redmicConfig' + 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/kernel' , 'dojo/_base/lang' diff --git a/client-app/src/redmic/modules/user/UserArea.js b/client-app/src/redmic/modules/user/UserArea.js index 89eedfc6..c7e524a6 100644 --- a/client-app/src/redmic/modules/user/UserArea.js +++ b/client-app/src/redmic/modules/user/UserArea.js @@ -1,5 +1,5 @@ define([ - 'app/redmicConfig' + 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' , 'put-selector/put' -- GitLab From 0412d4cccf8f6afa4a21f27fc82cef84dc1a64b5 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Tue, 23 Jul 2024 11:34:40 +0100 Subject: [PATCH 023/249] =?UTF-8?q?Actualiza=20subm=C3=B3dulo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client-app/deps/templates | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client-app/deps/templates b/client-app/deps/templates index 6ea2133c..b2279857 160000 --- a/client-app/deps/templates +++ b/client-app/deps/templates @@ -1 +1 @@ -Subproject commit 6ea2133c3bc8458d58ef6cc22aa0e23458296d38 +Subproject commit b22798571a7b98e744b0bfa6e03a3c4048be6541 -- GitLab From 15efd81d5769ee70c8e7069c5fd42cfaeed1a22c Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Tue, 23 Jul 2024 11:35:06 +0100 Subject: [PATCH 024/249] Mueve recursos desde src/app hacia src/oldapp MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Para dejar espacio libre al core de la aplicación en src/app (módulo App), se reubica el contenido antiguo de src/app. Actualiza referencias en dojoConfig. --- client-app/app.profile.js | 4 ++-- client-app/src/catalog/detail/activity/ActivityDetail.js | 2 +- client-app/src/dojoConfig.js | 2 +- .../administrative/taxonomy/views/ClassView.js | 0 .../administrative/taxonomy/views/FamilyView.js | 0 .../administrative/taxonomy/views/GenusView.js | 0 .../administrative/taxonomy/views/KingdomView.js | 0 .../administrative/taxonomy/views/MisIdentificationView.js | 0 .../administrative/taxonomy/views/OrderView.js | 0 .../administrative/taxonomy/views/PhylumView.js | 0 .../administrative/taxonomy/views/SpeciesView.js | 0 .../administrative/taxonomy/views/SubphylumView.js | 0 .../administrative/taxonomy/views/TaxonomyView.js | 0 .../administrative/taxonomy/views/_AddCompositeTaxon.js | 0 .../taxonomy/views/templates/forms/KingdomForm.html | 0 .../taxonomy/views/templates/forms/MisIdentificationForm.html | 0 .../taxonomy/views/templates/forms/PeculiarityForm.html | 0 .../taxonomy/views/templates/forms/RecoveryForm.html | 0 .../taxonomy/views/templates/forms/SpeciesForm.html | 0 .../taxonomy/views/templates/forms/SpecimenTagForm.html | 0 .../taxonomy/views/templates/forms/TaxonForm.html | 0 .../src/{app => oldapp}/administrative/views/ActivityView.js | 0 .../src/{app => oldapp}/administrative/views/AnimalView.js | 0 .../src/{app => oldapp}/administrative/views/ContactView.js | 0 .../src/{app => oldapp}/administrative/views/DeviceView.js | 0 .../src/{app => oldapp}/administrative/views/DocumentView.js | 0 .../{app => oldapp}/administrative/views/OrganisationView.js | 0 .../src/{app => oldapp}/administrative/views/PlatformView.js | 0 .../src/{app => oldapp}/administrative/views/ProgramView.js | 0 .../src/{app => oldapp}/administrative/views/ProjectView.js | 0 .../views/templates/forms/ActivityContactForm.html | 0 .../views/templates/forms/ActivityEmbeddedContentForm.html | 0 .../administrative/views/templates/forms/ActivityForm.html | 0 .../views/templates/forms/ActivityOrganisationForm.html | 0 .../views/templates/forms/ActivityPlatformForm.html | 0 .../views/templates/forms/ActivityResourceForm.html | 0 .../administrative/views/templates/forms/AnimalForm.html | 0 .../administrative/views/templates/forms/CalibrationForm.html | 0 .../administrative/views/templates/forms/ConditionForm.html | 0 .../administrative/views/templates/forms/ContactForm.html | 0 .../administrative/views/templates/forms/DeviceForm.html | 0 .../administrative/views/templates/forms/DocumentForm.html | 0 .../views/templates/forms/MetricsDefinitionForm.html | 0 .../views/templates/forms/OrganisationForm.html | 0 .../administrative/views/templates/forms/ParameterForm.html | 0 .../administrative/views/templates/forms/PlatformForm.html | 0 .../administrative/views/templates/forms/ProgramForm.html | 0 .../administrative/views/templates/forms/ProjectForm.html | 0 .../administrative/views/templates/forms/UnitForm.html | 0 client-app/src/{app => oldapp}/base/models/_Model.js | 0 client-app/src/{app => oldapp}/base/models/attr/ArrayAttr.js | 0 client-app/src/{app => oldapp}/base/models/attr/Attr.js | 0 client-app/src/{app => oldapp}/base/models/attr/ObjAttr.js | 0 .../src/{app => oldapp}/base/models/attr/RelationAttr.js | 0 client-app/src/{app => oldapp}/base/models/attr/_Attr.js | 0 .../src/{app => oldapp}/base/models/attr/_ComplexAttr.js | 0 .../{app => oldapp}/base/views/EditorLayerWithVariableForm.js | 0 client-app/src/{app => oldapp}/base/views/Module.js | 0 .../src/{app => oldapp}/base/views/_ListenRequestError.js | 0 client-app/src/{app => oldapp}/base/views/_LoadingWidget.js | 0 client-app/src/{app => oldapp}/base/views/_SettingsHandler.js | 0 client-app/src/{app => oldapp}/base/views/_View.js | 0 client-app/src/{app => oldapp}/base/views/_ViewHandle.js | 0 client-app/src/{app => oldapp}/base/views/_ViewListBase.js | 0 .../{app => oldapp}/base/views/extensions/_ActivityClosed.js | 0 .../base/views/extensions/_AddAtlasCategory.js | 0 .../extensions/_AddCompositeSearchInTooltipFromTextSearch.js | 0 .../src/{app => oldapp}/base/views/extensions/_AddForm.js | 0 .../src/{app => oldapp}/base/views/extensions/_AddFormItfc.js | 0 .../{app => oldapp}/base/views/extensions/_AddSelectInput.js | 0 .../base/views/extensions/_AddSelectInputItfc.js | 0 .../base/views/extensions/_AddSelectionHandlerKeypad.js | 0 .../base/views/extensions/_AddTextSearchInput.js | 0 .../base/views/extensions/_AddTextSearchInputItfc.js | 0 .../views/extensions/_CompositeInTooltipFromIconKeypad.js | 0 .../base/views/extensions/_CompositeSearchInTooltip.js | 0 .../src/{app => oldapp}/base/views/extensions/_Edition.js | 0 .../{app => oldapp}/base/views/extensions/_EditionCommons.js | 0 .../{app => oldapp}/base/views/extensions/_EditionFormList.js | 0 .../base/views/extensions/_EditionLayerView.js | 0 .../src/{app => oldapp}/base/views/extensions/_EditionView.js | 0 .../base/views/extensions/_EditionWizardView.js | 0 .../base/views/extensions/_FormInDialogView.js | 0 .../{app => oldapp}/base/views/extensions/_GetActivityData.js | 0 .../base/views/extensions/_GetActivityDataItfc.js | 0 .../base/views/extensions/_InterceptCloseUpView.js | 0 .../_ListenActivityDataAndAccessByActivityCategory.js | 0 .../base/views/extensions/_LocalSelectionView.js | 0 .../base/views/extensions/_LocalSelectionViewItfc.js | 0 .../base/views/extensions/_OnShownAndRefresh.js | 0 .../{app => oldapp}/base/views/extensions/_ProcessInterval.js | 0 .../base/views/extensions/_SelectInDoubleList.js | 0 .../{app => oldapp}/catalog/views/ActivitiesCatalogView.js | 0 .../{app => oldapp}/catalog/views/OrganisationsCatalogView.js | 0 .../src/{app => oldapp}/catalog/views/PlatformsCatalogView.js | 0 .../src/{app => oldapp}/catalog/views/ProgramsCatalogView.js | 0 .../src/{app => oldapp}/catalog/views/ProjectsCatalogView.js | 0 .../src/{app => oldapp}/catalog/views/SpeciesCatalogView.js | 0 client-app/src/{app => oldapp}/components/CookieLoader.js | 0 client-app/src/{app => oldapp}/components/ReCaptcha.js | 0 .../src/{app => oldapp}/components/steps/AccessSetStep.js | 0 .../src/{app => oldapp}/components/steps/ActivitySetStep.js | 0 .../src/{app => oldapp}/components/steps/AddGeomSiteStep.js | 0 .../components/steps/AreaClassificationsSetStep.js | 0 .../{app => oldapp}/components/steps/CalibrationSetStep.js | 0 .../src/{app => oldapp}/components/steps/CitationStep.js | 0 .../{app => oldapp}/components/steps/ClassificationsStep.js | 0 .../src/{app => oldapp}/components/steps/ContactSetStep.js | 0 .../{app => oldapp}/components/steps/DataDefinitionSetStep.js | 0 .../src/{app => oldapp}/components/steps/DescribeSiteStep.js | 0 .../src/{app => oldapp}/components/steps/DocumentSetStep.js | 0 .../{app => oldapp}/components/steps/DocumentStepFiltered.js | 0 .../src/{app => oldapp}/components/steps/DownloadsSetStep.js | 0 .../components/steps/EmbeddedContentSetStep.js | 0 .../src/{app => oldapp}/components/steps/MainDataStep.js | 0 .../src/{app => oldapp}/components/steps/MapSelectAreaStep.js | 0 .../{app => oldapp}/components/steps/OrganisationSetStep.js | 0 .../src/{app => oldapp}/components/steps/PlatformSetStep.js | 0 .../{app => oldapp}/components/steps/PreLoadMainDataStep.js | 0 .../src/{app => oldapp}/components/steps/ProtocolsSetStep.js | 0 .../src/{app => oldapp}/components/steps/RecoverySetStep.js | 0 .../{app => oldapp}/components/steps/RelationDataSetStep.js | 0 .../src/{app => oldapp}/components/steps/ResourceSetStep.js | 0 .../components/steps/SelectActivityCategoryStep.js | 0 .../src/{app => oldapp}/components/steps/SelectLayerStep.js | 0 .../components/steps/SelectRegisterTypeStep.js | 0 .../{app => oldapp}/components/steps/SpeciesMainDataStep.js | 0 .../{app => oldapp}/components/steps/SpecimenTagSetStep.js | 0 .../src/{app => oldapp}/components/steps/UnitSetStep.js | 0 .../components/steps/_ClassificationsRelationData.js | 0 .../components/steps/_DataListAndSaveRelationData.js | 0 .../src/{app => oldapp}/components/steps/_DateRelationData.js | 0 client-app/src/{app => oldapp}/components/steps/_MainData.js | 0 .../components/steps/_ParametersRelationData.js | 0 .../{app => oldapp}/components/steps/_RememberDeleteItems.js | 0 .../src/{app => oldapp}/components/steps/_SelectOptionBox.js | 0 .../components/viewCustomization/addGeomSite/views/Line.js | 0 .../viewCustomization/addGeomSite/views/MultiPolygon.js | 0 .../components/viewCustomization/addGeomSite/views/Point.js | 0 .../viewCustomization/addGeomSite/views/_BaseGeometryForm.js | 0 .../addGeomSite/views/templates/LineForm.html | 0 .../addGeomSite/views/templates/PointForm.html | 0 .../describeSite/views/SelectStationByActivity.js | 0 .../describeSite/views/_AdditionalKeyGetter.js | 0 .../describeSite/views/templates/ARForm.html | 0 .../describeSite/views/templates/DescribeSiteForm.html | 0 .../describeSite/views/templates/IFForm.html | 0 .../viewCustomization/loadFile/models/LoadFileModel.js | 0 .../loadFile/views/templates/ARFileForm.html | 0 .../loadFile/views/templates/LoadFileForm.html | 0 .../viewCustomization/parameter/views/templates/FTForm.html | 0 .../viewCustomization/parameter/views/templates/OCForm.html | 0 .../relationData/views/templates/AreaTypeForm.html | 0 .../relationData/views/templates/DateForm.html | 0 .../relationData/views/templates/DefaultForm.html | 0 .../relationData/views/templates/DeviceForm.html | 0 .../relationData/views/templates/PointGeometryForm.html | 0 .../src/{app => oldapp}/dataLoader/areas/views/AreaView.js | 0 .../areas/views/templates/AreaClassificationsForm.html | 0 .../src/{app => oldapp}/dataLoader/base/_GeographicBase.js | 0 .../{app => oldapp}/dataLoader/citation/views/CitationView.js | 0 .../dataLoader/citation/views/templates/CitationForm.html | 0 .../infrastructure/views/InfrastructureAttributesView.js | 0 .../dataLoader/infrastructure/views/InfrastructureView.js | 0 .../infrastructure/views/templates/form/AttributesForm.html | 0 .../dataLoader/sightings/models/SightingsModel.js | 0 .../dataLoader/sightings/views/SightingsView.js | 0 .../dataLoader/sightings/views/templates/SightingsForm.html | 0 .../surveyParameters/views/ObjectCollectingSeriesDataView.js | 0 .../dataLoader/surveyParameters/views/ObjectCollectionView.js | 0 .../surveyParameters/views/SurveyStationSeriesDataView.js | 0 .../dataLoader/surveyParameters/views/SurveyStationView.js | 0 .../surveyParameters/views/_DataLoadedByStationManagement.js | 0 .../dataLoader/surveyParameters/views/_SeriesDataView.js | 0 .../views/templates/ObjectCollectingForm.html | 0 .../surveyParameters/views/templates/TimeSeriesForm.html | 0 .../dataLoader/tracking/views/TrackingDataView.js | 0 .../{app => oldapp}/dataLoader/tracking/views/TrackingView.js | 0 .../tracking/views/templates/form/TrackingPointForm.html | 0 client-app/src/{app => oldapp}/designs/base/_Browser.js | 0 client-app/src/{app => oldapp}/designs/base/_Controller.js | 0 .../src/{app => oldapp}/designs/base/_ControllerItfc.js | 0 client-app/src/{app => oldapp}/designs/base/_Layout.js | 0 client-app/src/{app => oldapp}/designs/base/_LayoutItfc.js | 0 client-app/src/{app => oldapp}/designs/base/_Main.js | 0 client-app/src/{app => oldapp}/designs/base/_MainItfc.js | 0 client-app/src/{app => oldapp}/designs/base/_ServiceOGC.js | 0 client-app/src/{app => oldapp}/designs/chart/Controller.js | 0 .../designs/chart/layout/SideAndTopAndBottomContent.js | 0 .../designs/chart/layout/TopAndBottomContent.js | 0 .../src/{app => oldapp}/designs/chart/layout/TopContent.js | 0 .../chart/main/ChartsWithLegendAndToolbarsAndSlider.js | 0 .../designs/chart/main/ChartsWithToolbarsAndSlider.js | 0 .../designs/chart/main/MultiPieChartWithToolbar.js | 0 .../designs/chart/main/MultiWindRoseChartWithToolbar.js | 0 .../designs/chart/main/WindRoseChartWithToolbar.js | 0 .../designs/chart/main/_ChartsWithToolbarsAndSlider.js | 0 .../designs/chart/main/_ChartsWithToolbarsAndSliderItfc.js | 0 .../chart/main/_ProcessDataDefinitionAndGetTimeSeries.js | 0 client-app/src/{app => oldapp}/designs/details/Controller.js | 0 client-app/src/{app => oldapp}/designs/details/Layout.js | 0 .../src/{app => oldapp}/designs/details/_AddBasicTitle.js | 0 client-app/src/{app => oldapp}/designs/details/_AddTitle.js | 0 .../src/{app => oldapp}/designs/details/_ControllerItfc.js | 0 .../{app => oldapp}/designs/details/main/ActivityLayerMap.js | 0 .../src/{app => oldapp}/designs/details/main/ActivityMap.js | 0 .../designs/details/main/ActivityTrackingMap.js | 0 .../src/{app => oldapp}/designs/details/main/Contact.js | 0 .../src/{app => oldapp}/designs/details/main/Document.js | 0 .../src/{app => oldapp}/designs/details/main/DocumentPDF.js | 0 .../src/{app => oldapp}/designs/details/main/Organisation.js | 0 .../src/{app => oldapp}/designs/details/main/Platform.js | 0 .../src/{app => oldapp}/designs/details/main/Program.js | 0 .../src/{app => oldapp}/designs/details/main/Project.js | 0 .../src/{app => oldapp}/designs/details/main/ServiceOGC.js | 0 .../src/{app => oldapp}/designs/details/main/Species.js | 0 .../{app => oldapp}/designs/details/main/SpeciesLocation.js | 0 .../src/{app => oldapp}/designs/details/main/Statistics.js | 0 .../src/{app => oldapp}/designs/details/main/_ActivityBase.js | 0 .../src/{app => oldapp}/designs/details/main/_DetailsBase.js | 0 .../src/{app => oldapp}/designs/doubleList/Controller.js | 0 .../src/{app => oldapp}/designs/doubleList/layout/Layout.js | 0 .../designs/doubleList/layout/TopLeftContentAndDoubleList.js | 0 .../designs/doubleList/main/textSearchAndDoubleList.js | 0 .../{app => oldapp}/designs/dynamicDualContent/Controller.js | 0 .../dynamicDualContent/layout/FacetsInLeftSecondaryContent.js | 0 .../designs/dynamicDualContent/layout/LeftSecondaryContent.js | 0 .../designs/dynamicDualContent/layout/TopSecondaryContent.js | 0 .../designs/dynamicDualContent/layout/_Layout.js | 0 .../dynamicDualContent/main/FacetsWithDynamicRightContent.js | 0 client-app/src/{app => oldapp}/designs/edition/Controller.js | 0 client-app/src/{app => oldapp}/designs/edition/Layout.js | 0 .../src/{app => oldapp}/designs/embeddedContent/Controller.js | 0 .../src/{app => oldapp}/designs/embeddedContent/Layout.js | 0 .../designs/embeddedContentWithTopbar/Controller.js | 0 .../embeddedContentWithTopbar/layout/TopAndCenterContent.js | 0 .../main/EmbeddedContentSelectionInTopbar.js | 0 .../designs/externalTextSearchList/Controller.js | 0 .../{app => oldapp}/designs/externalTextSearchList/Layout.js | 0 .../designs/externalTextSearchList/main/PlaceNames.js | 0 .../designs/externalTextSearchList/main/Worms.js | 0 client-app/src/{app => oldapp}/designs/formList/Controller.js | 0 .../src/{app => oldapp}/designs/formList/_ControllerItfc.js | 0 .../src/{app => oldapp}/designs/formList/layout/Layout.js | 0 .../designs/formList/layout/LayoutWithTopForm.js | 0 .../{app => oldapp}/designs/formList/main/FormListByStep.js | 0 .../designs/formList/main/_RequestAndParseData.js | 0 client-app/src/{app => oldapp}/designs/list/Controller.js | 0 client-app/src/{app => oldapp}/designs/list/_AddFilter.js | 0 client-app/src/{app => oldapp}/designs/list/layout/Layout.js | 0 .../{app => oldapp}/designs/list/layout/ListWithTopContent.js | 0 client-app/src/{app => oldapp}/designs/list/layout/NoTitle.js | 0 .../{app => oldapp}/designs/mapWithSideContent/Controller.js | 0 .../designs/mapWithSideContent/layout/MapAndContent.js | 0 .../mapWithSideContent/layout/MapAndContentAndTopbar.js | 0 .../designs/mapWithSideContent/main/FilterAndGeographic.js | 0 .../designs/mapWithSideContent/main/Geographic.js | 0 .../designs/mapWithSideContent/main/GeographicEditor.js | 0 .../designs/mapWithSideContent/main/Tracking.js | 0 .../designs/mapWithSideContent/main/_TrackingByFilter.js | 0 .../designs/mapWithSideContent/main/_TrackingWithList.js | 0 .../mapWithSideContent/main/_TrackingWithListByFilter.js | 0 .../designs/textSearchFacetsList/Controller.js | 0 .../{app => oldapp}/designs/textSearchFacetsList/Layout.js | 0 .../designs/textSearchFacetsList/_AddFilter.js | 0 .../designs/textSearchFacetsList/main/Activity.js | 0 .../designs/textSearchFacetsList/main/Administrative.js | 0 .../designs/textSearchFacetsList/main/Bibliography.js | 0 .../designs/textSearchFacetsList/main/Domain.js | 0 .../designs/textSearchFacetsList/main/Organisation.js | 0 .../designs/textSearchFacetsList/main/Platform.js | 0 .../designs/textSearchFacetsList/main/Program.js | 0 .../designs/textSearchFacetsList/main/Project.js | 0 .../designs/textSearchFacetsList/main/ServiceOGC.js | 0 .../designs/textSearchFacetsList/main/Species.js | 0 .../designs/textSearchFacetsList/main/Taxon.js | 0 .../src/{app => oldapp}/designs/textSearchList/Controller.js | 0 .../src/{app => oldapp}/designs/textSearchList/_AddFilter.js | 0 .../designs/textSearchList/layout/BasicAndButtonsTopZone.js | 0 .../designs/textSearchList/layout/BasicTopZone.js | 0 .../src/{app => oldapp}/designs/textSearchList/main/Domain.js | 0 .../{app => oldapp}/designs/textSearchList/main/Selection.js | 0 .../{app => oldapp}/designs/textSearchList/main/ServiceOGC.js | 0 .../src/{app => oldapp}/details/views/ActivityAreaMapBase.js | 0 .../details/views/ActivityCatalogDetailsView.js | 2 +- client-app/src/{app => oldapp}/details/views/ActivityChart.js | 0 .../{app => oldapp}/details/views/ActivityCitationMapBase.js | 0 .../src/{app => oldapp}/details/views/ActivityDetailsView.js | 2 +- .../details/views/ActivityFixedTimeseriesChart.js | 0 .../details/views/ActivityFixedTimeseriesMap.js | 0 .../details/views/ActivityInfrastructureMapBase.js | 0 .../src/{app => oldapp}/details/views/ActivityLayerMapBase.js | 0 .../{app => oldapp}/details/views/BibliographyDetailsView.js | 0 .../src/{app => oldapp}/details/views/ContactDetailsView.js | 0 .../src/{app => oldapp}/details/views/DocumentDetailsView.js | 0 .../details/views/OrganisationCatalogDetailsView.js | 0 .../{app => oldapp}/details/views/OrganisationDetailsView.js | 0 .../details/views/PlatformCatalogDetailsView.js | 0 .../src/{app => oldapp}/details/views/PlatformDetailsView.js | 0 .../details/views/ProgramCatalogDetailsView.js | 0 .../src/{app => oldapp}/details/views/ProgramDetailsView.js | 0 .../details/views/ProjectCatalogDetailsView.js | 0 .../src/{app => oldapp}/details/views/ProjectDetailsView.js | 0 .../details/views/ServiceOGCCatalogDetailsView.js | 0 .../{app => oldapp}/details/views/ServiceOGCDetailsView.js | 0 .../details/views/SpeciesCatalogDetailsView.js | 0 .../src/{app => oldapp}/details/views/SpeciesDetailsView.js | 0 .../{app => oldapp}/details/views/StatisticsDetailsView.js | 0 .../details/views/_ActivityTimeSeriesDataManagement.js | 0 .../src/{app => oldapp}/edition/views/ActivityEditionView.js | 0 .../src/{app => oldapp}/edition/views/AnimalEditionView.js | 0 .../src/{app => oldapp}/edition/views/ConditionEditionView.js | 0 .../src/{app => oldapp}/edition/views/ContactEditionView.js | 0 .../src/{app => oldapp}/edition/views/DeviceEditionView.js | 0 .../src/{app => oldapp}/edition/views/DocumentEditionView.js | 0 .../edition/views/LoadDataDocumentEditionView.js | 0 .../edition/views/LoadDataToActivityEditionView.js | 0 .../edition/views/MetricsDefinitionEditionView.js | 0 .../edition/views/MisIdentificationEditionView.js | 0 .../{app => oldapp}/edition/views/OrganisationEditionView.js | 0 .../src/{app => oldapp}/edition/views/ParameterEditionView.js | 0 .../{app => oldapp}/edition/views/PermissionsEditionView.js | 0 .../src/{app => oldapp}/edition/views/PlatformEditionView.js | 0 .../src/{app => oldapp}/edition/views/ProgramEditionView.js | 0 .../src/{app => oldapp}/edition/views/ProjectEditionView.js | 0 .../{app => oldapp}/edition/views/ServiceOGCEditionView.js | 0 .../src/{app => oldapp}/edition/views/SpeciesEditionView.js | 0 .../src/{app => oldapp}/edition/views/UnitEditionView.js | 0 .../src/{app => oldapp}/edition/views/dataLoader/AddDataFT.js | 0 .../src/{app => oldapp}/edition/views/dataLoader/AddDataIF.js | 0 .../src/{app => oldapp}/edition/views/dataLoader/AddDataOC.js | 0 .../{app => oldapp}/edition/views/dataLoader/EditDataAR.js | 0 .../{app => oldapp}/edition/views/dataLoader/LoadDataAR.js | 0 .../{app => oldapp}/edition/views/dataLoader/LoadDataFT.js | 0 .../{app => oldapp}/edition/views/dataLoader/LoadDataOC.js | 0 .../{app => oldapp}/edition/views/dataLoader/LoadDataTR.js | 0 .../edition/views/dataLoader/_BaseDataToActivityEdition.js | 0 .../views/dataLoader/_BaseDataToActivityEditionItfc.js | 0 .../views/dataLoader/_BaseLoadDataToActivityEdition.js | 0 .../views/dataLoader/_BaseLoadDataToActivityEditionItfc.js | 0 client-app/src/{app => oldapp}/home/views/HomeView.js | 0 client-app/src/{app => oldapp}/home/views/ProductWidget.js | 0 client-app/src/{app => oldapp}/home/views/SearchBarWidget.js | 0 .../src/{app => oldapp}/home/views/SearchFastFilterWidget.js | 0 .../src/{app => oldapp}/home/views/SearchFilterWidget.js | 0 .../src/{app => oldapp}/home/views/SearchResultsWidget.js | 0 client-app/src/{app => oldapp}/home/views/SocialWidget.js | 0 client-app/src/{app => oldapp}/home/views/StatsWidget.js | 0 client-app/src/{app => oldapp}/home/views/_DashboardItem.js | 0 .../maintenance/domains/_HierarchicalDomain.js | 0 .../maintenance/domains/admin/views/AccessibilityView.js | 0 .../maintenance/domains/admin/views/ActivityFieldsView.js | 0 .../maintenance/domains/admin/views/ActivityTypesView.js | 0 .../maintenance/domains/admin/views/ContactRolesView.js | 0 .../maintenance/domains/admin/views/CountriesView.js | 0 .../maintenance/domains/admin/views/DeviceTypesView.js | 0 .../maintenance/domains/admin/views/DocumentTypesView.js | 0 .../maintenance/domains/admin/views/OrganisationRolesView.js | 0 .../maintenance/domains/admin/views/OrganisationTypesView.js | 0 .../maintenance/domains/admin/views/PlatformTypesView.js | 0 .../maintenance/domains/admin/views/ProjectGroupsView.js | 0 .../maintenance/domains/admin/views/ScopesView.js | 0 .../admin/views/templates/forms/ActivityTypesForm.html | 0 .../domains/admin/views/templates/forms/CountriesForm.html | 0 .../maintenance/domains/geometry/views/AreaTypesView.js | 0 .../maintenance/domains/geometry/views/DestinyView.js | 0 .../maintenance/domains/geometry/views/EndingView.js | 0 .../maintenance/domains/geometry/views/InspireThemesView.js | 0 .../maintenance/domains/geometry/views/LineTypesView.js | 0 .../maintenance/domains/geometry/views/MeshTypesView.js | 0 .../maintenance/domains/geometry/views/RasterTypesView.js | 0 .../maintenance/domains/geometry/views/RecordingTypesView.js | 0 .../maintenance/domains/geometry/views/ShorelineTypesView.js | 0 .../maintenance/domains/geometry/views/ThematicTypeView.js | 0 .../maintenance/domains/geometry/views/ToponymTypesView.js | 0 .../geometry/views/templates/forms/InspireThemesForm.html | 0 .../domains/geometry/views/templates/forms/LineTypesForm.html | 0 .../geometry/views/templates/forms/ThematicTypeForm.html | 0 .../domains/observations/views/AttributeTypesView.js | 0 .../domains/observations/views/CensingStatusView.js | 0 .../maintenance/domains/observations/views/ConfidenceView.js | 0 .../maintenance/domains/observations/views/EventGroupsView.js | 0 .../domains/observations/views/InfrastructureTypeView.js | 0 .../domains/observations/views/MetricGroupsView.js | 0 .../domains/observations/views/MetricsDefinitionsView.js | 0 .../maintenance/domains/observations/views/ObjectTypesView.js | 0 .../domains/observations/views/ObservationTypesView.js | 0 .../domains/observations/views/ParameterTypesView.js | 0 .../maintenance/domains/observations/views/ParametersView.js | 0 .../maintenance/domains/observations/views/SampleTypesView.js | 0 .../domains/observations/views/SeaConditionsView.js | 0 .../maintenance/domains/observations/views/UnitTypesView.js | 0 .../maintenance/domains/observations/views/UnitsView.js | 0 .../maintenance/domains/taxon/views/CanaryProtectionView.js | 0 .../maintenance/domains/taxon/views/EUProtectionView.js | 0 .../maintenance/domains/taxon/views/EcologyView.js | 0 .../maintenance/domains/taxon/views/EndemicityView.js | 0 .../maintenance/domains/taxon/views/InterestView.js | 0 .../maintenance/domains/taxon/views/LifeStagesView.js | 0 .../maintenance/domains/taxon/views/OriginView.js | 0 .../maintenance/domains/taxon/views/PermanenceView.js | 0 .../maintenance/domains/taxon/views/RankView.js | 0 .../maintenance/domains/taxon/views/SexView.js | 0 .../maintenance/domains/taxon/views/SpainProtectionView.js | 0 .../maintenance/domains/taxon/views/StatusView.js | 0 .../maintenance/domains/taxon/views/TrophicRegimeView.js | 0 .../maintenance/domains/templates/forms/DomainForm.html | 0 .../domains/templates/forms/HierarchicalDomainForm.html | 0 .../src/{app => oldapp}/maintenance/models/AccessModel.js | 0 .../{app => oldapp}/maintenance/models/PermissionsModel.js | 0 .../src/{app => oldapp}/maintenance/views/DomainView.js | 0 .../src/{app => oldapp}/maintenance/views/PermissionsView.js | 0 .../src/{app => oldapp}/maintenance/views/ServiceOGCView.js | 0 .../maintenance/views/templates/forms/AccessForm.html | 0 .../maintenance/views/templates/forms/CategoryLayerForm.html | 0 .../maintenance/views/templates/forms/DownloadsForm.html | 0 .../maintenance/views/templates/forms/PermissionsForm.html | 0 .../maintenance/views/templates/forms/ProtocolsForm.html | 0 .../maintenance/views/templates/forms/ServiceOGCForm.html | 0 .../views/templates/forms/ServiceOGCLayerSearchForm.html | 0 client-app/src/{app => oldapp}/nls/es/translation.js | 0 client-app/src/{app => oldapp}/nls/translation.js | 0 client-app/src/{app => oldapp}/products/views/OpenMapView.js | 0 .../{app => oldapp}/products/views/ServiceOGCCatalogView.js | 0 client-app/src/{app => oldapp}/user/models/FeedbackModel.js | 0 client-app/src/{app => oldapp}/user/models/PasswordModel.js | 0 client-app/src/{app => oldapp}/user/models/RegisterModel.js | 0 client-app/src/{app => oldapp}/user/models/UserEmailModel.js | 0 client-app/src/{app => oldapp}/user/models/UserImageModel.js | 0 client-app/src/{app => oldapp}/user/models/UserNameModel.js | 0 client-app/src/{app => oldapp}/user/models/UserSectorModel.js | 0 .../src/{app => oldapp}/user/views/ConfirmResettingView.js | 0 client-app/src/{app => oldapp}/user/views/FeedbackView.js | 0 .../src/{app => oldapp}/user/views/InnerWhatIsRedmicView.js | 0 client-app/src/{app => oldapp}/user/views/LoginView.js | 0 client-app/src/{app => oldapp}/user/views/RegisterView.js | 0 client-app/src/{app => oldapp}/user/views/ResettingView.js | 0 .../src/{app => oldapp}/user/views/TermsAndConditionsView.js | 0 client-app/src/{app => oldapp}/user/views/UserProfileView.js | 0 client-app/src/{app => oldapp}/user/views/WhatIsRedmicView.js | 0 .../src/{app => oldapp}/user/views/_ExternalUserBaseView.js | 0 .../user/views/templates/ConfirmResetting.html | 0 .../user/views/templates/ExternalUserBase.html | 0 .../src/{app => oldapp}/user/views/templates/Feedback.html | 0 .../src/{app => oldapp}/user/views/templates/Login.html | 0 .../src/{app => oldapp}/user/views/templates/Register.html | 0 .../src/{app => oldapp}/user/views/templates/Resetting.html | 0 .../user/views/templates/TermsAndConditions.html | 0 .../{app => oldapp}/user/views/templates/WhatIsRedmic.html | 0 .../user/views/templates/forms/ChangePasswordForm.html | 0 .../user/views/templates/forms/FeedbackForm.html | 0 .../user/views/templates/forms/RegisterForm.html | 0 .../user/views/templates/forms/UserEmailForm.html | 0 .../user/views/templates/forms/UserImageForm.html | 0 .../user/views/templates/forms/UserNameForm.html | 0 .../user/views/templates/forms/UserSectorForm.html | 0 .../viewers/models/PointClusterCategorizeModel.js | 0 .../src/{app => oldapp}/viewers/models/PointClusterModel.js | 0 .../src/{app => oldapp}/viewers/views/BibliographyView.js | 0 client-app/src/{app => oldapp}/viewers/views/ChartsView.js | 0 .../{app => oldapp}/viewers/views/RealTimeDashboardView.js | 0 client-app/src/{app => oldapp}/viewers/views/RealTimeView.js | 0 .../{app => oldapp}/viewers/views/SpeciesDistributionView.js | 0 .../src/{app => oldapp}/viewers/views/StacBrowserView.js | 0 client-app/src/{app => oldapp}/viewers/views/TrackingView.js | 0 client-app/src/{app => oldapp}/viewers/views/TrashCharts.js | 0 .../src/{app => oldapp}/viewers/views/TrashCollectionView.js | 0 client-app/src/{app => oldapp}/viewers/views/TrashDetails.js | 0 client-app/src/{app => oldapp}/viewers/views/TrashInfo.js | 0 .../views/_ObjectCollectionSeriesSelectionManagement.js | 0 .../src/{app => oldapp}/viewers/views/_SelectTimeInterval.js | 0 .../viewers/views/_TimeSeriesDataManagement.js | 0 .../viewers/views/_TimeSeriesSelectionManagement.js | 0 .../views/templates/forms/PointClusterCategorizeForm.html | 0 .../viewers/views/templates/forms/PointClusterForm.html | 0 .../views/templates/forms/SpeciesDistributionForm.html | 0 .../viewers/views/templates/forms/TrackingForm.html | 0 client-app/src/{app => oldapp}/views/404.js | 0 client-app/src/{app => oldapp}/views/ActivateAccount.js | 0 client-app/src/{app => oldapp}/views/NoSupportBrowser.js | 0 client-app/src/{app => oldapp}/views/UnderConstructionView.js | 0 client-app/src/{app => oldapp}/views/nls/es/translation.js | 0 client-app/src/{app => oldapp}/views/nls/translation.js | 0 .../src/{app => oldapp}/views/templates/NoSupportBrowser.html | 0 484 files changed, 6 insertions(+), 6 deletions(-) rename client-app/src/{app => oldapp}/administrative/taxonomy/views/ClassView.js (100%) rename client-app/src/{app => oldapp}/administrative/taxonomy/views/FamilyView.js (100%) rename client-app/src/{app => oldapp}/administrative/taxonomy/views/GenusView.js (100%) rename client-app/src/{app => oldapp}/administrative/taxonomy/views/KingdomView.js (100%) rename client-app/src/{app => oldapp}/administrative/taxonomy/views/MisIdentificationView.js (100%) rename client-app/src/{app => oldapp}/administrative/taxonomy/views/OrderView.js (100%) rename client-app/src/{app => oldapp}/administrative/taxonomy/views/PhylumView.js (100%) rename client-app/src/{app => oldapp}/administrative/taxonomy/views/SpeciesView.js (100%) rename client-app/src/{app => oldapp}/administrative/taxonomy/views/SubphylumView.js (100%) rename client-app/src/{app => oldapp}/administrative/taxonomy/views/TaxonomyView.js (100%) rename client-app/src/{app => oldapp}/administrative/taxonomy/views/_AddCompositeTaxon.js (100%) rename client-app/src/{app => oldapp}/administrative/taxonomy/views/templates/forms/KingdomForm.html (100%) rename client-app/src/{app => oldapp}/administrative/taxonomy/views/templates/forms/MisIdentificationForm.html (100%) rename client-app/src/{app => oldapp}/administrative/taxonomy/views/templates/forms/PeculiarityForm.html (100%) rename client-app/src/{app => oldapp}/administrative/taxonomy/views/templates/forms/RecoveryForm.html (100%) rename client-app/src/{app => oldapp}/administrative/taxonomy/views/templates/forms/SpeciesForm.html (100%) rename client-app/src/{app => oldapp}/administrative/taxonomy/views/templates/forms/SpecimenTagForm.html (100%) rename client-app/src/{app => oldapp}/administrative/taxonomy/views/templates/forms/TaxonForm.html (100%) rename client-app/src/{app => oldapp}/administrative/views/ActivityView.js (100%) rename client-app/src/{app => oldapp}/administrative/views/AnimalView.js (100%) rename client-app/src/{app => oldapp}/administrative/views/ContactView.js (100%) rename client-app/src/{app => oldapp}/administrative/views/DeviceView.js (100%) rename client-app/src/{app => oldapp}/administrative/views/DocumentView.js (100%) rename client-app/src/{app => oldapp}/administrative/views/OrganisationView.js (100%) rename client-app/src/{app => oldapp}/administrative/views/PlatformView.js (100%) rename client-app/src/{app => oldapp}/administrative/views/ProgramView.js (100%) rename client-app/src/{app => oldapp}/administrative/views/ProjectView.js (100%) rename client-app/src/{app => oldapp}/administrative/views/templates/forms/ActivityContactForm.html (100%) rename client-app/src/{app => oldapp}/administrative/views/templates/forms/ActivityEmbeddedContentForm.html (100%) rename client-app/src/{app => oldapp}/administrative/views/templates/forms/ActivityForm.html (100%) rename client-app/src/{app => oldapp}/administrative/views/templates/forms/ActivityOrganisationForm.html (100%) rename client-app/src/{app => oldapp}/administrative/views/templates/forms/ActivityPlatformForm.html (100%) rename client-app/src/{app => oldapp}/administrative/views/templates/forms/ActivityResourceForm.html (100%) rename client-app/src/{app => oldapp}/administrative/views/templates/forms/AnimalForm.html (100%) rename client-app/src/{app => oldapp}/administrative/views/templates/forms/CalibrationForm.html (100%) rename client-app/src/{app => oldapp}/administrative/views/templates/forms/ConditionForm.html (100%) rename client-app/src/{app => oldapp}/administrative/views/templates/forms/ContactForm.html (100%) rename client-app/src/{app => oldapp}/administrative/views/templates/forms/DeviceForm.html (100%) rename client-app/src/{app => oldapp}/administrative/views/templates/forms/DocumentForm.html (100%) rename client-app/src/{app => oldapp}/administrative/views/templates/forms/MetricsDefinitionForm.html (100%) rename client-app/src/{app => oldapp}/administrative/views/templates/forms/OrganisationForm.html (100%) rename client-app/src/{app => oldapp}/administrative/views/templates/forms/ParameterForm.html (100%) rename client-app/src/{app => oldapp}/administrative/views/templates/forms/PlatformForm.html (100%) rename client-app/src/{app => oldapp}/administrative/views/templates/forms/ProgramForm.html (100%) rename client-app/src/{app => oldapp}/administrative/views/templates/forms/ProjectForm.html (100%) rename client-app/src/{app => oldapp}/administrative/views/templates/forms/UnitForm.html (100%) rename client-app/src/{app => oldapp}/base/models/_Model.js (100%) rename client-app/src/{app => oldapp}/base/models/attr/ArrayAttr.js (100%) rename client-app/src/{app => oldapp}/base/models/attr/Attr.js (100%) rename client-app/src/{app => oldapp}/base/models/attr/ObjAttr.js (100%) rename client-app/src/{app => oldapp}/base/models/attr/RelationAttr.js (100%) rename client-app/src/{app => oldapp}/base/models/attr/_Attr.js (100%) rename client-app/src/{app => oldapp}/base/models/attr/_ComplexAttr.js (100%) rename client-app/src/{app => oldapp}/base/views/EditorLayerWithVariableForm.js (100%) rename client-app/src/{app => oldapp}/base/views/Module.js (100%) rename client-app/src/{app => oldapp}/base/views/_ListenRequestError.js (100%) rename client-app/src/{app => oldapp}/base/views/_LoadingWidget.js (100%) rename client-app/src/{app => oldapp}/base/views/_SettingsHandler.js (100%) rename client-app/src/{app => oldapp}/base/views/_View.js (100%) rename client-app/src/{app => oldapp}/base/views/_ViewHandle.js (100%) rename client-app/src/{app => oldapp}/base/views/_ViewListBase.js (100%) rename client-app/src/{app => oldapp}/base/views/extensions/_ActivityClosed.js (100%) rename client-app/src/{app => oldapp}/base/views/extensions/_AddAtlasCategory.js (100%) rename client-app/src/{app => oldapp}/base/views/extensions/_AddCompositeSearchInTooltipFromTextSearch.js (100%) rename client-app/src/{app => oldapp}/base/views/extensions/_AddForm.js (100%) rename client-app/src/{app => oldapp}/base/views/extensions/_AddFormItfc.js (100%) rename client-app/src/{app => oldapp}/base/views/extensions/_AddSelectInput.js (100%) rename client-app/src/{app => oldapp}/base/views/extensions/_AddSelectInputItfc.js (100%) rename client-app/src/{app => oldapp}/base/views/extensions/_AddSelectionHandlerKeypad.js (100%) rename client-app/src/{app => oldapp}/base/views/extensions/_AddTextSearchInput.js (100%) rename client-app/src/{app => oldapp}/base/views/extensions/_AddTextSearchInputItfc.js (100%) rename client-app/src/{app => oldapp}/base/views/extensions/_CompositeInTooltipFromIconKeypad.js (100%) rename client-app/src/{app => oldapp}/base/views/extensions/_CompositeSearchInTooltip.js (100%) rename client-app/src/{app => oldapp}/base/views/extensions/_Edition.js (100%) rename client-app/src/{app => oldapp}/base/views/extensions/_EditionCommons.js (100%) rename client-app/src/{app => oldapp}/base/views/extensions/_EditionFormList.js (100%) rename client-app/src/{app => oldapp}/base/views/extensions/_EditionLayerView.js (100%) rename client-app/src/{app => oldapp}/base/views/extensions/_EditionView.js (100%) rename client-app/src/{app => oldapp}/base/views/extensions/_EditionWizardView.js (100%) rename client-app/src/{app => oldapp}/base/views/extensions/_FormInDialogView.js (100%) rename client-app/src/{app => oldapp}/base/views/extensions/_GetActivityData.js (100%) rename client-app/src/{app => oldapp}/base/views/extensions/_GetActivityDataItfc.js (100%) rename client-app/src/{app => oldapp}/base/views/extensions/_InterceptCloseUpView.js (100%) rename client-app/src/{app => oldapp}/base/views/extensions/_ListenActivityDataAndAccessByActivityCategory.js (100%) rename client-app/src/{app => oldapp}/base/views/extensions/_LocalSelectionView.js (100%) rename client-app/src/{app => oldapp}/base/views/extensions/_LocalSelectionViewItfc.js (100%) rename client-app/src/{app => oldapp}/base/views/extensions/_OnShownAndRefresh.js (100%) rename client-app/src/{app => oldapp}/base/views/extensions/_ProcessInterval.js (100%) rename client-app/src/{app => oldapp}/base/views/extensions/_SelectInDoubleList.js (100%) rename client-app/src/{app => oldapp}/catalog/views/ActivitiesCatalogView.js (100%) rename client-app/src/{app => oldapp}/catalog/views/OrganisationsCatalogView.js (100%) rename client-app/src/{app => oldapp}/catalog/views/PlatformsCatalogView.js (100%) rename client-app/src/{app => oldapp}/catalog/views/ProgramsCatalogView.js (100%) rename client-app/src/{app => oldapp}/catalog/views/ProjectsCatalogView.js (100%) rename client-app/src/{app => oldapp}/catalog/views/SpeciesCatalogView.js (100%) rename client-app/src/{app => oldapp}/components/CookieLoader.js (100%) rename client-app/src/{app => oldapp}/components/ReCaptcha.js (100%) rename client-app/src/{app => oldapp}/components/steps/AccessSetStep.js (100%) rename client-app/src/{app => oldapp}/components/steps/ActivitySetStep.js (100%) rename client-app/src/{app => oldapp}/components/steps/AddGeomSiteStep.js (100%) rename client-app/src/{app => oldapp}/components/steps/AreaClassificationsSetStep.js (100%) rename client-app/src/{app => oldapp}/components/steps/CalibrationSetStep.js (100%) rename client-app/src/{app => oldapp}/components/steps/CitationStep.js (100%) rename client-app/src/{app => oldapp}/components/steps/ClassificationsStep.js (100%) rename client-app/src/{app => oldapp}/components/steps/ContactSetStep.js (100%) rename client-app/src/{app => oldapp}/components/steps/DataDefinitionSetStep.js (100%) rename client-app/src/{app => oldapp}/components/steps/DescribeSiteStep.js (100%) rename client-app/src/{app => oldapp}/components/steps/DocumentSetStep.js (100%) rename client-app/src/{app => oldapp}/components/steps/DocumentStepFiltered.js (100%) rename client-app/src/{app => oldapp}/components/steps/DownloadsSetStep.js (100%) rename client-app/src/{app => oldapp}/components/steps/EmbeddedContentSetStep.js (100%) rename client-app/src/{app => oldapp}/components/steps/MainDataStep.js (100%) rename client-app/src/{app => oldapp}/components/steps/MapSelectAreaStep.js (100%) rename client-app/src/{app => oldapp}/components/steps/OrganisationSetStep.js (100%) rename client-app/src/{app => oldapp}/components/steps/PlatformSetStep.js (100%) rename client-app/src/{app => oldapp}/components/steps/PreLoadMainDataStep.js (100%) rename client-app/src/{app => oldapp}/components/steps/ProtocolsSetStep.js (100%) rename client-app/src/{app => oldapp}/components/steps/RecoverySetStep.js (100%) rename client-app/src/{app => oldapp}/components/steps/RelationDataSetStep.js (100%) rename client-app/src/{app => oldapp}/components/steps/ResourceSetStep.js (100%) rename client-app/src/{app => oldapp}/components/steps/SelectActivityCategoryStep.js (100%) rename client-app/src/{app => oldapp}/components/steps/SelectLayerStep.js (100%) rename client-app/src/{app => oldapp}/components/steps/SelectRegisterTypeStep.js (100%) rename client-app/src/{app => oldapp}/components/steps/SpeciesMainDataStep.js (100%) rename client-app/src/{app => oldapp}/components/steps/SpecimenTagSetStep.js (100%) rename client-app/src/{app => oldapp}/components/steps/UnitSetStep.js (100%) rename client-app/src/{app => oldapp}/components/steps/_ClassificationsRelationData.js (100%) rename client-app/src/{app => oldapp}/components/steps/_DataListAndSaveRelationData.js (100%) rename client-app/src/{app => oldapp}/components/steps/_DateRelationData.js (100%) rename client-app/src/{app => oldapp}/components/steps/_MainData.js (100%) rename client-app/src/{app => oldapp}/components/steps/_ParametersRelationData.js (100%) rename client-app/src/{app => oldapp}/components/steps/_RememberDeleteItems.js (100%) rename client-app/src/{app => oldapp}/components/steps/_SelectOptionBox.js (100%) rename client-app/src/{app => oldapp}/components/viewCustomization/addGeomSite/views/Line.js (100%) rename client-app/src/{app => oldapp}/components/viewCustomization/addGeomSite/views/MultiPolygon.js (100%) rename client-app/src/{app => oldapp}/components/viewCustomization/addGeomSite/views/Point.js (100%) rename client-app/src/{app => oldapp}/components/viewCustomization/addGeomSite/views/_BaseGeometryForm.js (100%) rename client-app/src/{app => oldapp}/components/viewCustomization/addGeomSite/views/templates/LineForm.html (100%) rename client-app/src/{app => oldapp}/components/viewCustomization/addGeomSite/views/templates/PointForm.html (100%) rename client-app/src/{app => oldapp}/components/viewCustomization/describeSite/views/SelectStationByActivity.js (100%) rename client-app/src/{app => oldapp}/components/viewCustomization/describeSite/views/_AdditionalKeyGetter.js (100%) rename client-app/src/{app => oldapp}/components/viewCustomization/describeSite/views/templates/ARForm.html (100%) rename client-app/src/{app => oldapp}/components/viewCustomization/describeSite/views/templates/DescribeSiteForm.html (100%) rename client-app/src/{app => oldapp}/components/viewCustomization/describeSite/views/templates/IFForm.html (100%) rename client-app/src/{app => oldapp}/components/viewCustomization/loadFile/models/LoadFileModel.js (100%) rename client-app/src/{app => oldapp}/components/viewCustomization/loadFile/views/templates/ARFileForm.html (100%) rename client-app/src/{app => oldapp}/components/viewCustomization/loadFile/views/templates/LoadFileForm.html (100%) rename client-app/src/{app => oldapp}/components/viewCustomization/parameter/views/templates/FTForm.html (100%) rename client-app/src/{app => oldapp}/components/viewCustomization/parameter/views/templates/OCForm.html (100%) rename client-app/src/{app => oldapp}/components/viewCustomization/relationData/views/templates/AreaTypeForm.html (100%) rename client-app/src/{app => oldapp}/components/viewCustomization/relationData/views/templates/DateForm.html (100%) rename client-app/src/{app => oldapp}/components/viewCustomization/relationData/views/templates/DefaultForm.html (100%) rename client-app/src/{app => oldapp}/components/viewCustomization/relationData/views/templates/DeviceForm.html (100%) rename client-app/src/{app => oldapp}/components/viewCustomization/relationData/views/templates/PointGeometryForm.html (100%) rename client-app/src/{app => oldapp}/dataLoader/areas/views/AreaView.js (100%) rename client-app/src/{app => oldapp}/dataLoader/areas/views/templates/AreaClassificationsForm.html (100%) rename client-app/src/{app => oldapp}/dataLoader/base/_GeographicBase.js (100%) rename client-app/src/{app => oldapp}/dataLoader/citation/views/CitationView.js (100%) rename client-app/src/{app => oldapp}/dataLoader/citation/views/templates/CitationForm.html (100%) rename client-app/src/{app => oldapp}/dataLoader/infrastructure/views/InfrastructureAttributesView.js (100%) rename client-app/src/{app => oldapp}/dataLoader/infrastructure/views/InfrastructureView.js (100%) rename client-app/src/{app => oldapp}/dataLoader/infrastructure/views/templates/form/AttributesForm.html (100%) rename client-app/src/{app => oldapp}/dataLoader/sightings/models/SightingsModel.js (100%) rename client-app/src/{app => oldapp}/dataLoader/sightings/views/SightingsView.js (100%) rename client-app/src/{app => oldapp}/dataLoader/sightings/views/templates/SightingsForm.html (100%) rename client-app/src/{app => oldapp}/dataLoader/surveyParameters/views/ObjectCollectingSeriesDataView.js (100%) rename client-app/src/{app => oldapp}/dataLoader/surveyParameters/views/ObjectCollectionView.js (100%) rename client-app/src/{app => oldapp}/dataLoader/surveyParameters/views/SurveyStationSeriesDataView.js (100%) rename client-app/src/{app => oldapp}/dataLoader/surveyParameters/views/SurveyStationView.js (100%) rename client-app/src/{app => oldapp}/dataLoader/surveyParameters/views/_DataLoadedByStationManagement.js (100%) rename client-app/src/{app => oldapp}/dataLoader/surveyParameters/views/_SeriesDataView.js (100%) rename client-app/src/{app => oldapp}/dataLoader/surveyParameters/views/templates/ObjectCollectingForm.html (100%) rename client-app/src/{app => oldapp}/dataLoader/surveyParameters/views/templates/TimeSeriesForm.html (100%) rename client-app/src/{app => oldapp}/dataLoader/tracking/views/TrackingDataView.js (100%) rename client-app/src/{app => oldapp}/dataLoader/tracking/views/TrackingView.js (100%) rename client-app/src/{app => oldapp}/dataLoader/tracking/views/templates/form/TrackingPointForm.html (100%) rename client-app/src/{app => oldapp}/designs/base/_Browser.js (100%) rename client-app/src/{app => oldapp}/designs/base/_Controller.js (100%) rename client-app/src/{app => oldapp}/designs/base/_ControllerItfc.js (100%) rename client-app/src/{app => oldapp}/designs/base/_Layout.js (100%) rename client-app/src/{app => oldapp}/designs/base/_LayoutItfc.js (100%) rename client-app/src/{app => oldapp}/designs/base/_Main.js (100%) rename client-app/src/{app => oldapp}/designs/base/_MainItfc.js (100%) rename client-app/src/{app => oldapp}/designs/base/_ServiceOGC.js (100%) rename client-app/src/{app => oldapp}/designs/chart/Controller.js (100%) rename client-app/src/{app => oldapp}/designs/chart/layout/SideAndTopAndBottomContent.js (100%) rename client-app/src/{app => oldapp}/designs/chart/layout/TopAndBottomContent.js (100%) rename client-app/src/{app => oldapp}/designs/chart/layout/TopContent.js (100%) rename client-app/src/{app => oldapp}/designs/chart/main/ChartsWithLegendAndToolbarsAndSlider.js (100%) rename client-app/src/{app => oldapp}/designs/chart/main/ChartsWithToolbarsAndSlider.js (100%) rename client-app/src/{app => oldapp}/designs/chart/main/MultiPieChartWithToolbar.js (100%) rename client-app/src/{app => oldapp}/designs/chart/main/MultiWindRoseChartWithToolbar.js (100%) rename client-app/src/{app => oldapp}/designs/chart/main/WindRoseChartWithToolbar.js (100%) rename client-app/src/{app => oldapp}/designs/chart/main/_ChartsWithToolbarsAndSlider.js (100%) rename client-app/src/{app => oldapp}/designs/chart/main/_ChartsWithToolbarsAndSliderItfc.js (100%) rename client-app/src/{app => oldapp}/designs/chart/main/_ProcessDataDefinitionAndGetTimeSeries.js (100%) rename client-app/src/{app => oldapp}/designs/details/Controller.js (100%) rename client-app/src/{app => oldapp}/designs/details/Layout.js (100%) rename client-app/src/{app => oldapp}/designs/details/_AddBasicTitle.js (100%) rename client-app/src/{app => oldapp}/designs/details/_AddTitle.js (100%) rename client-app/src/{app => oldapp}/designs/details/_ControllerItfc.js (100%) rename client-app/src/{app => oldapp}/designs/details/main/ActivityLayerMap.js (100%) rename client-app/src/{app => oldapp}/designs/details/main/ActivityMap.js (100%) rename client-app/src/{app => oldapp}/designs/details/main/ActivityTrackingMap.js (100%) rename client-app/src/{app => oldapp}/designs/details/main/Contact.js (100%) rename client-app/src/{app => oldapp}/designs/details/main/Document.js (100%) rename client-app/src/{app => oldapp}/designs/details/main/DocumentPDF.js (100%) rename client-app/src/{app => oldapp}/designs/details/main/Organisation.js (100%) rename client-app/src/{app => oldapp}/designs/details/main/Platform.js (100%) rename client-app/src/{app => oldapp}/designs/details/main/Program.js (100%) rename client-app/src/{app => oldapp}/designs/details/main/Project.js (100%) rename client-app/src/{app => oldapp}/designs/details/main/ServiceOGC.js (100%) rename client-app/src/{app => oldapp}/designs/details/main/Species.js (100%) rename client-app/src/{app => oldapp}/designs/details/main/SpeciesLocation.js (100%) rename client-app/src/{app => oldapp}/designs/details/main/Statistics.js (100%) rename client-app/src/{app => oldapp}/designs/details/main/_ActivityBase.js (100%) rename client-app/src/{app => oldapp}/designs/details/main/_DetailsBase.js (100%) rename client-app/src/{app => oldapp}/designs/doubleList/Controller.js (100%) rename client-app/src/{app => oldapp}/designs/doubleList/layout/Layout.js (100%) rename client-app/src/{app => oldapp}/designs/doubleList/layout/TopLeftContentAndDoubleList.js (100%) rename client-app/src/{app => oldapp}/designs/doubleList/main/textSearchAndDoubleList.js (100%) rename client-app/src/{app => oldapp}/designs/dynamicDualContent/Controller.js (100%) rename client-app/src/{app => oldapp}/designs/dynamicDualContent/layout/FacetsInLeftSecondaryContent.js (100%) rename client-app/src/{app => oldapp}/designs/dynamicDualContent/layout/LeftSecondaryContent.js (100%) rename client-app/src/{app => oldapp}/designs/dynamicDualContent/layout/TopSecondaryContent.js (100%) rename client-app/src/{app => oldapp}/designs/dynamicDualContent/layout/_Layout.js (100%) rename client-app/src/{app => oldapp}/designs/dynamicDualContent/main/FacetsWithDynamicRightContent.js (100%) rename client-app/src/{app => oldapp}/designs/edition/Controller.js (100%) rename client-app/src/{app => oldapp}/designs/edition/Layout.js (100%) rename client-app/src/{app => oldapp}/designs/embeddedContent/Controller.js (100%) rename client-app/src/{app => oldapp}/designs/embeddedContent/Layout.js (100%) rename client-app/src/{app => oldapp}/designs/embeddedContentWithTopbar/Controller.js (100%) rename client-app/src/{app => oldapp}/designs/embeddedContentWithTopbar/layout/TopAndCenterContent.js (100%) rename client-app/src/{app => oldapp}/designs/embeddedContentWithTopbar/main/EmbeddedContentSelectionInTopbar.js (100%) rename client-app/src/{app => oldapp}/designs/externalTextSearchList/Controller.js (100%) rename client-app/src/{app => oldapp}/designs/externalTextSearchList/Layout.js (100%) rename client-app/src/{app => oldapp}/designs/externalTextSearchList/main/PlaceNames.js (100%) rename client-app/src/{app => oldapp}/designs/externalTextSearchList/main/Worms.js (100%) rename client-app/src/{app => oldapp}/designs/formList/Controller.js (100%) rename client-app/src/{app => oldapp}/designs/formList/_ControllerItfc.js (100%) rename client-app/src/{app => oldapp}/designs/formList/layout/Layout.js (100%) rename client-app/src/{app => oldapp}/designs/formList/layout/LayoutWithTopForm.js (100%) rename client-app/src/{app => oldapp}/designs/formList/main/FormListByStep.js (100%) rename client-app/src/{app => oldapp}/designs/formList/main/_RequestAndParseData.js (100%) rename client-app/src/{app => oldapp}/designs/list/Controller.js (100%) rename client-app/src/{app => oldapp}/designs/list/_AddFilter.js (100%) rename client-app/src/{app => oldapp}/designs/list/layout/Layout.js (100%) rename client-app/src/{app => oldapp}/designs/list/layout/ListWithTopContent.js (100%) rename client-app/src/{app => oldapp}/designs/list/layout/NoTitle.js (100%) rename client-app/src/{app => oldapp}/designs/mapWithSideContent/Controller.js (100%) rename client-app/src/{app => oldapp}/designs/mapWithSideContent/layout/MapAndContent.js (100%) rename client-app/src/{app => oldapp}/designs/mapWithSideContent/layout/MapAndContentAndTopbar.js (100%) rename client-app/src/{app => oldapp}/designs/mapWithSideContent/main/FilterAndGeographic.js (100%) rename client-app/src/{app => oldapp}/designs/mapWithSideContent/main/Geographic.js (100%) rename client-app/src/{app => oldapp}/designs/mapWithSideContent/main/GeographicEditor.js (100%) rename client-app/src/{app => oldapp}/designs/mapWithSideContent/main/Tracking.js (100%) rename client-app/src/{app => oldapp}/designs/mapWithSideContent/main/_TrackingByFilter.js (100%) rename client-app/src/{app => oldapp}/designs/mapWithSideContent/main/_TrackingWithList.js (100%) rename client-app/src/{app => oldapp}/designs/mapWithSideContent/main/_TrackingWithListByFilter.js (100%) rename client-app/src/{app => oldapp}/designs/textSearchFacetsList/Controller.js (100%) rename client-app/src/{app => oldapp}/designs/textSearchFacetsList/Layout.js (100%) rename client-app/src/{app => oldapp}/designs/textSearchFacetsList/_AddFilter.js (100%) rename client-app/src/{app => oldapp}/designs/textSearchFacetsList/main/Activity.js (100%) rename client-app/src/{app => oldapp}/designs/textSearchFacetsList/main/Administrative.js (100%) rename client-app/src/{app => oldapp}/designs/textSearchFacetsList/main/Bibliography.js (100%) rename client-app/src/{app => oldapp}/designs/textSearchFacetsList/main/Domain.js (100%) rename client-app/src/{app => oldapp}/designs/textSearchFacetsList/main/Organisation.js (100%) rename client-app/src/{app => oldapp}/designs/textSearchFacetsList/main/Platform.js (100%) rename client-app/src/{app => oldapp}/designs/textSearchFacetsList/main/Program.js (100%) rename client-app/src/{app => oldapp}/designs/textSearchFacetsList/main/Project.js (100%) rename client-app/src/{app => oldapp}/designs/textSearchFacetsList/main/ServiceOGC.js (100%) rename client-app/src/{app => oldapp}/designs/textSearchFacetsList/main/Species.js (100%) rename client-app/src/{app => oldapp}/designs/textSearchFacetsList/main/Taxon.js (100%) rename client-app/src/{app => oldapp}/designs/textSearchList/Controller.js (100%) rename client-app/src/{app => oldapp}/designs/textSearchList/_AddFilter.js (100%) rename client-app/src/{app => oldapp}/designs/textSearchList/layout/BasicAndButtonsTopZone.js (100%) rename client-app/src/{app => oldapp}/designs/textSearchList/layout/BasicTopZone.js (100%) rename client-app/src/{app => oldapp}/designs/textSearchList/main/Domain.js (100%) rename client-app/src/{app => oldapp}/designs/textSearchList/main/Selection.js (100%) rename client-app/src/{app => oldapp}/designs/textSearchList/main/ServiceOGC.js (100%) rename client-app/src/{app => oldapp}/details/views/ActivityAreaMapBase.js (100%) rename client-app/src/{app => oldapp}/details/views/ActivityCatalogDetailsView.js (91%) rename client-app/src/{app => oldapp}/details/views/ActivityChart.js (100%) rename client-app/src/{app => oldapp}/details/views/ActivityCitationMapBase.js (100%) rename client-app/src/{app => oldapp}/details/views/ActivityDetailsView.js (93%) rename client-app/src/{app => oldapp}/details/views/ActivityFixedTimeseriesChart.js (100%) rename client-app/src/{app => oldapp}/details/views/ActivityFixedTimeseriesMap.js (100%) rename client-app/src/{app => oldapp}/details/views/ActivityInfrastructureMapBase.js (100%) rename client-app/src/{app => oldapp}/details/views/ActivityLayerMapBase.js (100%) rename client-app/src/{app => oldapp}/details/views/BibliographyDetailsView.js (100%) rename client-app/src/{app => oldapp}/details/views/ContactDetailsView.js (100%) rename client-app/src/{app => oldapp}/details/views/DocumentDetailsView.js (100%) rename client-app/src/{app => oldapp}/details/views/OrganisationCatalogDetailsView.js (100%) rename client-app/src/{app => oldapp}/details/views/OrganisationDetailsView.js (100%) rename client-app/src/{app => oldapp}/details/views/PlatformCatalogDetailsView.js (100%) rename client-app/src/{app => oldapp}/details/views/PlatformDetailsView.js (100%) rename client-app/src/{app => oldapp}/details/views/ProgramCatalogDetailsView.js (100%) rename client-app/src/{app => oldapp}/details/views/ProgramDetailsView.js (100%) rename client-app/src/{app => oldapp}/details/views/ProjectCatalogDetailsView.js (100%) rename client-app/src/{app => oldapp}/details/views/ProjectDetailsView.js (100%) rename client-app/src/{app => oldapp}/details/views/ServiceOGCCatalogDetailsView.js (100%) rename client-app/src/{app => oldapp}/details/views/ServiceOGCDetailsView.js (100%) rename client-app/src/{app => oldapp}/details/views/SpeciesCatalogDetailsView.js (100%) rename client-app/src/{app => oldapp}/details/views/SpeciesDetailsView.js (100%) rename client-app/src/{app => oldapp}/details/views/StatisticsDetailsView.js (100%) rename client-app/src/{app => oldapp}/details/views/_ActivityTimeSeriesDataManagement.js (100%) rename client-app/src/{app => oldapp}/edition/views/ActivityEditionView.js (100%) rename client-app/src/{app => oldapp}/edition/views/AnimalEditionView.js (100%) rename client-app/src/{app => oldapp}/edition/views/ConditionEditionView.js (100%) rename client-app/src/{app => oldapp}/edition/views/ContactEditionView.js (100%) rename client-app/src/{app => oldapp}/edition/views/DeviceEditionView.js (100%) rename client-app/src/{app => oldapp}/edition/views/DocumentEditionView.js (100%) rename client-app/src/{app => oldapp}/edition/views/LoadDataDocumentEditionView.js (100%) rename client-app/src/{app => oldapp}/edition/views/LoadDataToActivityEditionView.js (100%) rename client-app/src/{app => oldapp}/edition/views/MetricsDefinitionEditionView.js (100%) rename client-app/src/{app => oldapp}/edition/views/MisIdentificationEditionView.js (100%) rename client-app/src/{app => oldapp}/edition/views/OrganisationEditionView.js (100%) rename client-app/src/{app => oldapp}/edition/views/ParameterEditionView.js (100%) rename client-app/src/{app => oldapp}/edition/views/PermissionsEditionView.js (100%) rename client-app/src/{app => oldapp}/edition/views/PlatformEditionView.js (100%) rename client-app/src/{app => oldapp}/edition/views/ProgramEditionView.js (100%) rename client-app/src/{app => oldapp}/edition/views/ProjectEditionView.js (100%) rename client-app/src/{app => oldapp}/edition/views/ServiceOGCEditionView.js (100%) rename client-app/src/{app => oldapp}/edition/views/SpeciesEditionView.js (100%) rename client-app/src/{app => oldapp}/edition/views/UnitEditionView.js (100%) rename client-app/src/{app => oldapp}/edition/views/dataLoader/AddDataFT.js (100%) rename client-app/src/{app => oldapp}/edition/views/dataLoader/AddDataIF.js (100%) rename client-app/src/{app => oldapp}/edition/views/dataLoader/AddDataOC.js (100%) rename client-app/src/{app => oldapp}/edition/views/dataLoader/EditDataAR.js (100%) rename client-app/src/{app => oldapp}/edition/views/dataLoader/LoadDataAR.js (100%) rename client-app/src/{app => oldapp}/edition/views/dataLoader/LoadDataFT.js (100%) rename client-app/src/{app => oldapp}/edition/views/dataLoader/LoadDataOC.js (100%) rename client-app/src/{app => oldapp}/edition/views/dataLoader/LoadDataTR.js (100%) rename client-app/src/{app => oldapp}/edition/views/dataLoader/_BaseDataToActivityEdition.js (100%) rename client-app/src/{app => oldapp}/edition/views/dataLoader/_BaseDataToActivityEditionItfc.js (100%) rename client-app/src/{app => oldapp}/edition/views/dataLoader/_BaseLoadDataToActivityEdition.js (100%) rename client-app/src/{app => oldapp}/edition/views/dataLoader/_BaseLoadDataToActivityEditionItfc.js (100%) rename client-app/src/{app => oldapp}/home/views/HomeView.js (100%) rename client-app/src/{app => oldapp}/home/views/ProductWidget.js (100%) rename client-app/src/{app => oldapp}/home/views/SearchBarWidget.js (100%) rename client-app/src/{app => oldapp}/home/views/SearchFastFilterWidget.js (100%) rename client-app/src/{app => oldapp}/home/views/SearchFilterWidget.js (100%) rename client-app/src/{app => oldapp}/home/views/SearchResultsWidget.js (100%) rename client-app/src/{app => oldapp}/home/views/SocialWidget.js (100%) rename client-app/src/{app => oldapp}/home/views/StatsWidget.js (100%) rename client-app/src/{app => oldapp}/home/views/_DashboardItem.js (100%) rename client-app/src/{app => oldapp}/maintenance/domains/_HierarchicalDomain.js (100%) rename client-app/src/{app => oldapp}/maintenance/domains/admin/views/AccessibilityView.js (100%) rename client-app/src/{app => oldapp}/maintenance/domains/admin/views/ActivityFieldsView.js (100%) rename client-app/src/{app => oldapp}/maintenance/domains/admin/views/ActivityTypesView.js (100%) rename client-app/src/{app => oldapp}/maintenance/domains/admin/views/ContactRolesView.js (100%) rename client-app/src/{app => oldapp}/maintenance/domains/admin/views/CountriesView.js (100%) rename client-app/src/{app => oldapp}/maintenance/domains/admin/views/DeviceTypesView.js (100%) rename client-app/src/{app => oldapp}/maintenance/domains/admin/views/DocumentTypesView.js (100%) rename client-app/src/{app => oldapp}/maintenance/domains/admin/views/OrganisationRolesView.js (100%) rename client-app/src/{app => oldapp}/maintenance/domains/admin/views/OrganisationTypesView.js (100%) rename client-app/src/{app => oldapp}/maintenance/domains/admin/views/PlatformTypesView.js (100%) rename client-app/src/{app => oldapp}/maintenance/domains/admin/views/ProjectGroupsView.js (100%) rename client-app/src/{app => oldapp}/maintenance/domains/admin/views/ScopesView.js (100%) rename client-app/src/{app => oldapp}/maintenance/domains/admin/views/templates/forms/ActivityTypesForm.html (100%) rename client-app/src/{app => oldapp}/maintenance/domains/admin/views/templates/forms/CountriesForm.html (100%) rename client-app/src/{app => oldapp}/maintenance/domains/geometry/views/AreaTypesView.js (100%) rename client-app/src/{app => oldapp}/maintenance/domains/geometry/views/DestinyView.js (100%) rename client-app/src/{app => oldapp}/maintenance/domains/geometry/views/EndingView.js (100%) rename client-app/src/{app => oldapp}/maintenance/domains/geometry/views/InspireThemesView.js (100%) rename client-app/src/{app => oldapp}/maintenance/domains/geometry/views/LineTypesView.js (100%) rename client-app/src/{app => oldapp}/maintenance/domains/geometry/views/MeshTypesView.js (100%) rename client-app/src/{app => oldapp}/maintenance/domains/geometry/views/RasterTypesView.js (100%) rename client-app/src/{app => oldapp}/maintenance/domains/geometry/views/RecordingTypesView.js (100%) rename client-app/src/{app => oldapp}/maintenance/domains/geometry/views/ShorelineTypesView.js (100%) rename client-app/src/{app => oldapp}/maintenance/domains/geometry/views/ThematicTypeView.js (100%) rename client-app/src/{app => oldapp}/maintenance/domains/geometry/views/ToponymTypesView.js (100%) rename client-app/src/{app => oldapp}/maintenance/domains/geometry/views/templates/forms/InspireThemesForm.html (100%) rename client-app/src/{app => oldapp}/maintenance/domains/geometry/views/templates/forms/LineTypesForm.html (100%) rename client-app/src/{app => oldapp}/maintenance/domains/geometry/views/templates/forms/ThematicTypeForm.html (100%) rename client-app/src/{app => oldapp}/maintenance/domains/observations/views/AttributeTypesView.js (100%) rename client-app/src/{app => oldapp}/maintenance/domains/observations/views/CensingStatusView.js (100%) rename client-app/src/{app => oldapp}/maintenance/domains/observations/views/ConfidenceView.js (100%) rename client-app/src/{app => oldapp}/maintenance/domains/observations/views/EventGroupsView.js (100%) rename client-app/src/{app => oldapp}/maintenance/domains/observations/views/InfrastructureTypeView.js (100%) rename client-app/src/{app => oldapp}/maintenance/domains/observations/views/MetricGroupsView.js (100%) rename client-app/src/{app => oldapp}/maintenance/domains/observations/views/MetricsDefinitionsView.js (100%) rename client-app/src/{app => oldapp}/maintenance/domains/observations/views/ObjectTypesView.js (100%) rename client-app/src/{app => oldapp}/maintenance/domains/observations/views/ObservationTypesView.js (100%) rename client-app/src/{app => oldapp}/maintenance/domains/observations/views/ParameterTypesView.js (100%) rename client-app/src/{app => oldapp}/maintenance/domains/observations/views/ParametersView.js (100%) rename client-app/src/{app => oldapp}/maintenance/domains/observations/views/SampleTypesView.js (100%) rename client-app/src/{app => oldapp}/maintenance/domains/observations/views/SeaConditionsView.js (100%) rename client-app/src/{app => oldapp}/maintenance/domains/observations/views/UnitTypesView.js (100%) rename client-app/src/{app => oldapp}/maintenance/domains/observations/views/UnitsView.js (100%) rename client-app/src/{app => oldapp}/maintenance/domains/taxon/views/CanaryProtectionView.js (100%) rename client-app/src/{app => oldapp}/maintenance/domains/taxon/views/EUProtectionView.js (100%) rename client-app/src/{app => oldapp}/maintenance/domains/taxon/views/EcologyView.js (100%) rename client-app/src/{app => oldapp}/maintenance/domains/taxon/views/EndemicityView.js (100%) rename client-app/src/{app => oldapp}/maintenance/domains/taxon/views/InterestView.js (100%) rename client-app/src/{app => oldapp}/maintenance/domains/taxon/views/LifeStagesView.js (100%) rename client-app/src/{app => oldapp}/maintenance/domains/taxon/views/OriginView.js (100%) rename client-app/src/{app => oldapp}/maintenance/domains/taxon/views/PermanenceView.js (100%) rename client-app/src/{app => oldapp}/maintenance/domains/taxon/views/RankView.js (100%) rename client-app/src/{app => oldapp}/maintenance/domains/taxon/views/SexView.js (100%) rename client-app/src/{app => oldapp}/maintenance/domains/taxon/views/SpainProtectionView.js (100%) rename client-app/src/{app => oldapp}/maintenance/domains/taxon/views/StatusView.js (100%) rename client-app/src/{app => oldapp}/maintenance/domains/taxon/views/TrophicRegimeView.js (100%) rename client-app/src/{app => oldapp}/maintenance/domains/templates/forms/DomainForm.html (100%) rename client-app/src/{app => oldapp}/maintenance/domains/templates/forms/HierarchicalDomainForm.html (100%) rename client-app/src/{app => oldapp}/maintenance/models/AccessModel.js (100%) rename client-app/src/{app => oldapp}/maintenance/models/PermissionsModel.js (100%) rename client-app/src/{app => oldapp}/maintenance/views/DomainView.js (100%) rename client-app/src/{app => oldapp}/maintenance/views/PermissionsView.js (100%) rename client-app/src/{app => oldapp}/maintenance/views/ServiceOGCView.js (100%) rename client-app/src/{app => oldapp}/maintenance/views/templates/forms/AccessForm.html (100%) rename client-app/src/{app => oldapp}/maintenance/views/templates/forms/CategoryLayerForm.html (100%) rename client-app/src/{app => oldapp}/maintenance/views/templates/forms/DownloadsForm.html (100%) rename client-app/src/{app => oldapp}/maintenance/views/templates/forms/PermissionsForm.html (100%) rename client-app/src/{app => oldapp}/maintenance/views/templates/forms/ProtocolsForm.html (100%) rename client-app/src/{app => oldapp}/maintenance/views/templates/forms/ServiceOGCForm.html (100%) rename client-app/src/{app => oldapp}/maintenance/views/templates/forms/ServiceOGCLayerSearchForm.html (100%) rename client-app/src/{app => oldapp}/nls/es/translation.js (100%) rename client-app/src/{app => oldapp}/nls/translation.js (100%) rename client-app/src/{app => oldapp}/products/views/OpenMapView.js (100%) rename client-app/src/{app => oldapp}/products/views/ServiceOGCCatalogView.js (100%) rename client-app/src/{app => oldapp}/user/models/FeedbackModel.js (100%) rename client-app/src/{app => oldapp}/user/models/PasswordModel.js (100%) rename client-app/src/{app => oldapp}/user/models/RegisterModel.js (100%) rename client-app/src/{app => oldapp}/user/models/UserEmailModel.js (100%) rename client-app/src/{app => oldapp}/user/models/UserImageModel.js (100%) rename client-app/src/{app => oldapp}/user/models/UserNameModel.js (100%) rename client-app/src/{app => oldapp}/user/models/UserSectorModel.js (100%) rename client-app/src/{app => oldapp}/user/views/ConfirmResettingView.js (100%) rename client-app/src/{app => oldapp}/user/views/FeedbackView.js (100%) rename client-app/src/{app => oldapp}/user/views/InnerWhatIsRedmicView.js (100%) rename client-app/src/{app => oldapp}/user/views/LoginView.js (100%) rename client-app/src/{app => oldapp}/user/views/RegisterView.js (100%) rename client-app/src/{app => oldapp}/user/views/ResettingView.js (100%) rename client-app/src/{app => oldapp}/user/views/TermsAndConditionsView.js (100%) rename client-app/src/{app => oldapp}/user/views/UserProfileView.js (100%) rename client-app/src/{app => oldapp}/user/views/WhatIsRedmicView.js (100%) rename client-app/src/{app => oldapp}/user/views/_ExternalUserBaseView.js (100%) rename client-app/src/{app => oldapp}/user/views/templates/ConfirmResetting.html (100%) rename client-app/src/{app => oldapp}/user/views/templates/ExternalUserBase.html (100%) rename client-app/src/{app => oldapp}/user/views/templates/Feedback.html (100%) rename client-app/src/{app => oldapp}/user/views/templates/Login.html (100%) rename client-app/src/{app => oldapp}/user/views/templates/Register.html (100%) rename client-app/src/{app => oldapp}/user/views/templates/Resetting.html (100%) rename client-app/src/{app => oldapp}/user/views/templates/TermsAndConditions.html (100%) rename client-app/src/{app => oldapp}/user/views/templates/WhatIsRedmic.html (100%) rename client-app/src/{app => oldapp}/user/views/templates/forms/ChangePasswordForm.html (100%) rename client-app/src/{app => oldapp}/user/views/templates/forms/FeedbackForm.html (100%) rename client-app/src/{app => oldapp}/user/views/templates/forms/RegisterForm.html (100%) rename client-app/src/{app => oldapp}/user/views/templates/forms/UserEmailForm.html (100%) rename client-app/src/{app => oldapp}/user/views/templates/forms/UserImageForm.html (100%) rename client-app/src/{app => oldapp}/user/views/templates/forms/UserNameForm.html (100%) rename client-app/src/{app => oldapp}/user/views/templates/forms/UserSectorForm.html (100%) rename client-app/src/{app => oldapp}/viewers/models/PointClusterCategorizeModel.js (100%) rename client-app/src/{app => oldapp}/viewers/models/PointClusterModel.js (100%) rename client-app/src/{app => oldapp}/viewers/views/BibliographyView.js (100%) rename client-app/src/{app => oldapp}/viewers/views/ChartsView.js (100%) rename client-app/src/{app => oldapp}/viewers/views/RealTimeDashboardView.js (100%) rename client-app/src/{app => oldapp}/viewers/views/RealTimeView.js (100%) rename client-app/src/{app => oldapp}/viewers/views/SpeciesDistributionView.js (100%) rename client-app/src/{app => oldapp}/viewers/views/StacBrowserView.js (100%) rename client-app/src/{app => oldapp}/viewers/views/TrackingView.js (100%) rename client-app/src/{app => oldapp}/viewers/views/TrashCharts.js (100%) rename client-app/src/{app => oldapp}/viewers/views/TrashCollectionView.js (100%) rename client-app/src/{app => oldapp}/viewers/views/TrashDetails.js (100%) rename client-app/src/{app => oldapp}/viewers/views/TrashInfo.js (100%) rename client-app/src/{app => oldapp}/viewers/views/_ObjectCollectionSeriesSelectionManagement.js (100%) rename client-app/src/{app => oldapp}/viewers/views/_SelectTimeInterval.js (100%) rename client-app/src/{app => oldapp}/viewers/views/_TimeSeriesDataManagement.js (100%) rename client-app/src/{app => oldapp}/viewers/views/_TimeSeriesSelectionManagement.js (100%) rename client-app/src/{app => oldapp}/viewers/views/templates/forms/PointClusterCategorizeForm.html (100%) rename client-app/src/{app => oldapp}/viewers/views/templates/forms/PointClusterForm.html (100%) rename client-app/src/{app => oldapp}/viewers/views/templates/forms/SpeciesDistributionForm.html (100%) rename client-app/src/{app => oldapp}/viewers/views/templates/forms/TrackingForm.html (100%) rename client-app/src/{app => oldapp}/views/404.js (100%) rename client-app/src/{app => oldapp}/views/ActivateAccount.js (100%) rename client-app/src/{app => oldapp}/views/NoSupportBrowser.js (100%) rename client-app/src/{app => oldapp}/views/UnderConstructionView.js (100%) rename client-app/src/{app => oldapp}/views/nls/es/translation.js (100%) rename client-app/src/{app => oldapp}/views/nls/translation.js (100%) rename client-app/src/{app => oldapp}/views/templates/NoSupportBrowser.html (100%) diff --git a/client-app/app.profile.js b/client-app/app.profile.js index a26273c3..dfd95a28 100644 --- a/client-app/app.profile.js +++ b/client-app/app.profile.js @@ -129,7 +129,7 @@ var profileObj = { } },{ name: 'app', - location: 'src/app', + location: 'src/oldapp', resourceTags: { amd: amdTagger } @@ -147,7 +147,7 @@ var profileObj = { } },{ name: 'src', - location: 'src/src', + location: 'src', resourceTags: { amd: amdTagger } diff --git a/client-app/src/catalog/detail/activity/ActivityDetail.js b/client-app/src/catalog/detail/activity/ActivityDetail.js index 3dde0eba..4d775c48 100644 --- a/client-app/src/catalog/detail/activity/ActivityDetail.js +++ b/client-app/src/catalog/detail/activity/ActivityDetail.js @@ -4,7 +4,7 @@ define([ , 'dojo/_base/declare' , 'dojo/_base/lang' , 'redmic/modules/base/_ExternalConfig' - , 'src/view/detail/activity/_ActivityLayoutWidget' + , 'src/catalog/detail/activity/_ActivityLayoutWidget' , 'templates/ActivityInfo' ], function( redmicConfig diff --git a/client-app/src/dojoConfig.js b/client-app/src/dojoConfig.js index 227b99c4..7234dc86 100644 --- a/client-app/src/dojoConfig.js +++ b/client-app/src/dojoConfig.js @@ -4,7 +4,7 @@ dojoConfig = { location: '../../src' },{ name: 'app', - location: '../../src/app' + location: '../../src/oldapp' },{ name: 'redmic', location: '../../src/redmic' diff --git a/client-app/src/app/administrative/taxonomy/views/ClassView.js b/client-app/src/oldapp/administrative/taxonomy/views/ClassView.js similarity index 100% rename from client-app/src/app/administrative/taxonomy/views/ClassView.js rename to client-app/src/oldapp/administrative/taxonomy/views/ClassView.js diff --git a/client-app/src/app/administrative/taxonomy/views/FamilyView.js b/client-app/src/oldapp/administrative/taxonomy/views/FamilyView.js similarity index 100% rename from client-app/src/app/administrative/taxonomy/views/FamilyView.js rename to client-app/src/oldapp/administrative/taxonomy/views/FamilyView.js diff --git a/client-app/src/app/administrative/taxonomy/views/GenusView.js b/client-app/src/oldapp/administrative/taxonomy/views/GenusView.js similarity index 100% rename from client-app/src/app/administrative/taxonomy/views/GenusView.js rename to client-app/src/oldapp/administrative/taxonomy/views/GenusView.js diff --git a/client-app/src/app/administrative/taxonomy/views/KingdomView.js b/client-app/src/oldapp/administrative/taxonomy/views/KingdomView.js similarity index 100% rename from client-app/src/app/administrative/taxonomy/views/KingdomView.js rename to client-app/src/oldapp/administrative/taxonomy/views/KingdomView.js diff --git a/client-app/src/app/administrative/taxonomy/views/MisIdentificationView.js b/client-app/src/oldapp/administrative/taxonomy/views/MisIdentificationView.js similarity index 100% rename from client-app/src/app/administrative/taxonomy/views/MisIdentificationView.js rename to client-app/src/oldapp/administrative/taxonomy/views/MisIdentificationView.js diff --git a/client-app/src/app/administrative/taxonomy/views/OrderView.js b/client-app/src/oldapp/administrative/taxonomy/views/OrderView.js similarity index 100% rename from client-app/src/app/administrative/taxonomy/views/OrderView.js rename to client-app/src/oldapp/administrative/taxonomy/views/OrderView.js diff --git a/client-app/src/app/administrative/taxonomy/views/PhylumView.js b/client-app/src/oldapp/administrative/taxonomy/views/PhylumView.js similarity index 100% rename from client-app/src/app/administrative/taxonomy/views/PhylumView.js rename to client-app/src/oldapp/administrative/taxonomy/views/PhylumView.js diff --git a/client-app/src/app/administrative/taxonomy/views/SpeciesView.js b/client-app/src/oldapp/administrative/taxonomy/views/SpeciesView.js similarity index 100% rename from client-app/src/app/administrative/taxonomy/views/SpeciesView.js rename to client-app/src/oldapp/administrative/taxonomy/views/SpeciesView.js diff --git a/client-app/src/app/administrative/taxonomy/views/SubphylumView.js b/client-app/src/oldapp/administrative/taxonomy/views/SubphylumView.js similarity index 100% rename from client-app/src/app/administrative/taxonomy/views/SubphylumView.js rename to client-app/src/oldapp/administrative/taxonomy/views/SubphylumView.js diff --git a/client-app/src/app/administrative/taxonomy/views/TaxonomyView.js b/client-app/src/oldapp/administrative/taxonomy/views/TaxonomyView.js similarity index 100% rename from client-app/src/app/administrative/taxonomy/views/TaxonomyView.js rename to client-app/src/oldapp/administrative/taxonomy/views/TaxonomyView.js diff --git a/client-app/src/app/administrative/taxonomy/views/_AddCompositeTaxon.js b/client-app/src/oldapp/administrative/taxonomy/views/_AddCompositeTaxon.js similarity index 100% rename from client-app/src/app/administrative/taxonomy/views/_AddCompositeTaxon.js rename to client-app/src/oldapp/administrative/taxonomy/views/_AddCompositeTaxon.js diff --git a/client-app/src/app/administrative/taxonomy/views/templates/forms/KingdomForm.html b/client-app/src/oldapp/administrative/taxonomy/views/templates/forms/KingdomForm.html similarity index 100% rename from client-app/src/app/administrative/taxonomy/views/templates/forms/KingdomForm.html rename to client-app/src/oldapp/administrative/taxonomy/views/templates/forms/KingdomForm.html diff --git a/client-app/src/app/administrative/taxonomy/views/templates/forms/MisIdentificationForm.html b/client-app/src/oldapp/administrative/taxonomy/views/templates/forms/MisIdentificationForm.html similarity index 100% rename from client-app/src/app/administrative/taxonomy/views/templates/forms/MisIdentificationForm.html rename to client-app/src/oldapp/administrative/taxonomy/views/templates/forms/MisIdentificationForm.html diff --git a/client-app/src/app/administrative/taxonomy/views/templates/forms/PeculiarityForm.html b/client-app/src/oldapp/administrative/taxonomy/views/templates/forms/PeculiarityForm.html similarity index 100% rename from client-app/src/app/administrative/taxonomy/views/templates/forms/PeculiarityForm.html rename to client-app/src/oldapp/administrative/taxonomy/views/templates/forms/PeculiarityForm.html diff --git a/client-app/src/app/administrative/taxonomy/views/templates/forms/RecoveryForm.html b/client-app/src/oldapp/administrative/taxonomy/views/templates/forms/RecoveryForm.html similarity index 100% rename from client-app/src/app/administrative/taxonomy/views/templates/forms/RecoveryForm.html rename to client-app/src/oldapp/administrative/taxonomy/views/templates/forms/RecoveryForm.html diff --git a/client-app/src/app/administrative/taxonomy/views/templates/forms/SpeciesForm.html b/client-app/src/oldapp/administrative/taxonomy/views/templates/forms/SpeciesForm.html similarity index 100% rename from client-app/src/app/administrative/taxonomy/views/templates/forms/SpeciesForm.html rename to client-app/src/oldapp/administrative/taxonomy/views/templates/forms/SpeciesForm.html diff --git a/client-app/src/app/administrative/taxonomy/views/templates/forms/SpecimenTagForm.html b/client-app/src/oldapp/administrative/taxonomy/views/templates/forms/SpecimenTagForm.html similarity index 100% rename from client-app/src/app/administrative/taxonomy/views/templates/forms/SpecimenTagForm.html rename to client-app/src/oldapp/administrative/taxonomy/views/templates/forms/SpecimenTagForm.html diff --git a/client-app/src/app/administrative/taxonomy/views/templates/forms/TaxonForm.html b/client-app/src/oldapp/administrative/taxonomy/views/templates/forms/TaxonForm.html similarity index 100% rename from client-app/src/app/administrative/taxonomy/views/templates/forms/TaxonForm.html rename to client-app/src/oldapp/administrative/taxonomy/views/templates/forms/TaxonForm.html diff --git a/client-app/src/app/administrative/views/ActivityView.js b/client-app/src/oldapp/administrative/views/ActivityView.js similarity index 100% rename from client-app/src/app/administrative/views/ActivityView.js rename to client-app/src/oldapp/administrative/views/ActivityView.js diff --git a/client-app/src/app/administrative/views/AnimalView.js b/client-app/src/oldapp/administrative/views/AnimalView.js similarity index 100% rename from client-app/src/app/administrative/views/AnimalView.js rename to client-app/src/oldapp/administrative/views/AnimalView.js diff --git a/client-app/src/app/administrative/views/ContactView.js b/client-app/src/oldapp/administrative/views/ContactView.js similarity index 100% rename from client-app/src/app/administrative/views/ContactView.js rename to client-app/src/oldapp/administrative/views/ContactView.js diff --git a/client-app/src/app/administrative/views/DeviceView.js b/client-app/src/oldapp/administrative/views/DeviceView.js similarity index 100% rename from client-app/src/app/administrative/views/DeviceView.js rename to client-app/src/oldapp/administrative/views/DeviceView.js diff --git a/client-app/src/app/administrative/views/DocumentView.js b/client-app/src/oldapp/administrative/views/DocumentView.js similarity index 100% rename from client-app/src/app/administrative/views/DocumentView.js rename to client-app/src/oldapp/administrative/views/DocumentView.js diff --git a/client-app/src/app/administrative/views/OrganisationView.js b/client-app/src/oldapp/administrative/views/OrganisationView.js similarity index 100% rename from client-app/src/app/administrative/views/OrganisationView.js rename to client-app/src/oldapp/administrative/views/OrganisationView.js diff --git a/client-app/src/app/administrative/views/PlatformView.js b/client-app/src/oldapp/administrative/views/PlatformView.js similarity index 100% rename from client-app/src/app/administrative/views/PlatformView.js rename to client-app/src/oldapp/administrative/views/PlatformView.js diff --git a/client-app/src/app/administrative/views/ProgramView.js b/client-app/src/oldapp/administrative/views/ProgramView.js similarity index 100% rename from client-app/src/app/administrative/views/ProgramView.js rename to client-app/src/oldapp/administrative/views/ProgramView.js diff --git a/client-app/src/app/administrative/views/ProjectView.js b/client-app/src/oldapp/administrative/views/ProjectView.js similarity index 100% rename from client-app/src/app/administrative/views/ProjectView.js rename to client-app/src/oldapp/administrative/views/ProjectView.js diff --git a/client-app/src/app/administrative/views/templates/forms/ActivityContactForm.html b/client-app/src/oldapp/administrative/views/templates/forms/ActivityContactForm.html similarity index 100% rename from client-app/src/app/administrative/views/templates/forms/ActivityContactForm.html rename to client-app/src/oldapp/administrative/views/templates/forms/ActivityContactForm.html diff --git a/client-app/src/app/administrative/views/templates/forms/ActivityEmbeddedContentForm.html b/client-app/src/oldapp/administrative/views/templates/forms/ActivityEmbeddedContentForm.html similarity index 100% rename from client-app/src/app/administrative/views/templates/forms/ActivityEmbeddedContentForm.html rename to client-app/src/oldapp/administrative/views/templates/forms/ActivityEmbeddedContentForm.html diff --git a/client-app/src/app/administrative/views/templates/forms/ActivityForm.html b/client-app/src/oldapp/administrative/views/templates/forms/ActivityForm.html similarity index 100% rename from client-app/src/app/administrative/views/templates/forms/ActivityForm.html rename to client-app/src/oldapp/administrative/views/templates/forms/ActivityForm.html diff --git a/client-app/src/app/administrative/views/templates/forms/ActivityOrganisationForm.html b/client-app/src/oldapp/administrative/views/templates/forms/ActivityOrganisationForm.html similarity index 100% rename from client-app/src/app/administrative/views/templates/forms/ActivityOrganisationForm.html rename to client-app/src/oldapp/administrative/views/templates/forms/ActivityOrganisationForm.html diff --git a/client-app/src/app/administrative/views/templates/forms/ActivityPlatformForm.html b/client-app/src/oldapp/administrative/views/templates/forms/ActivityPlatformForm.html similarity index 100% rename from client-app/src/app/administrative/views/templates/forms/ActivityPlatformForm.html rename to client-app/src/oldapp/administrative/views/templates/forms/ActivityPlatformForm.html diff --git a/client-app/src/app/administrative/views/templates/forms/ActivityResourceForm.html b/client-app/src/oldapp/administrative/views/templates/forms/ActivityResourceForm.html similarity index 100% rename from client-app/src/app/administrative/views/templates/forms/ActivityResourceForm.html rename to client-app/src/oldapp/administrative/views/templates/forms/ActivityResourceForm.html diff --git a/client-app/src/app/administrative/views/templates/forms/AnimalForm.html b/client-app/src/oldapp/administrative/views/templates/forms/AnimalForm.html similarity index 100% rename from client-app/src/app/administrative/views/templates/forms/AnimalForm.html rename to client-app/src/oldapp/administrative/views/templates/forms/AnimalForm.html diff --git a/client-app/src/app/administrative/views/templates/forms/CalibrationForm.html b/client-app/src/oldapp/administrative/views/templates/forms/CalibrationForm.html similarity index 100% rename from client-app/src/app/administrative/views/templates/forms/CalibrationForm.html rename to client-app/src/oldapp/administrative/views/templates/forms/CalibrationForm.html diff --git a/client-app/src/app/administrative/views/templates/forms/ConditionForm.html b/client-app/src/oldapp/administrative/views/templates/forms/ConditionForm.html similarity index 100% rename from client-app/src/app/administrative/views/templates/forms/ConditionForm.html rename to client-app/src/oldapp/administrative/views/templates/forms/ConditionForm.html diff --git a/client-app/src/app/administrative/views/templates/forms/ContactForm.html b/client-app/src/oldapp/administrative/views/templates/forms/ContactForm.html similarity index 100% rename from client-app/src/app/administrative/views/templates/forms/ContactForm.html rename to client-app/src/oldapp/administrative/views/templates/forms/ContactForm.html diff --git a/client-app/src/app/administrative/views/templates/forms/DeviceForm.html b/client-app/src/oldapp/administrative/views/templates/forms/DeviceForm.html similarity index 100% rename from client-app/src/app/administrative/views/templates/forms/DeviceForm.html rename to client-app/src/oldapp/administrative/views/templates/forms/DeviceForm.html diff --git a/client-app/src/app/administrative/views/templates/forms/DocumentForm.html b/client-app/src/oldapp/administrative/views/templates/forms/DocumentForm.html similarity index 100% rename from client-app/src/app/administrative/views/templates/forms/DocumentForm.html rename to client-app/src/oldapp/administrative/views/templates/forms/DocumentForm.html diff --git a/client-app/src/app/administrative/views/templates/forms/MetricsDefinitionForm.html b/client-app/src/oldapp/administrative/views/templates/forms/MetricsDefinitionForm.html similarity index 100% rename from client-app/src/app/administrative/views/templates/forms/MetricsDefinitionForm.html rename to client-app/src/oldapp/administrative/views/templates/forms/MetricsDefinitionForm.html diff --git a/client-app/src/app/administrative/views/templates/forms/OrganisationForm.html b/client-app/src/oldapp/administrative/views/templates/forms/OrganisationForm.html similarity index 100% rename from client-app/src/app/administrative/views/templates/forms/OrganisationForm.html rename to client-app/src/oldapp/administrative/views/templates/forms/OrganisationForm.html diff --git a/client-app/src/app/administrative/views/templates/forms/ParameterForm.html b/client-app/src/oldapp/administrative/views/templates/forms/ParameterForm.html similarity index 100% rename from client-app/src/app/administrative/views/templates/forms/ParameterForm.html rename to client-app/src/oldapp/administrative/views/templates/forms/ParameterForm.html diff --git a/client-app/src/app/administrative/views/templates/forms/PlatformForm.html b/client-app/src/oldapp/administrative/views/templates/forms/PlatformForm.html similarity index 100% rename from client-app/src/app/administrative/views/templates/forms/PlatformForm.html rename to client-app/src/oldapp/administrative/views/templates/forms/PlatformForm.html diff --git a/client-app/src/app/administrative/views/templates/forms/ProgramForm.html b/client-app/src/oldapp/administrative/views/templates/forms/ProgramForm.html similarity index 100% rename from client-app/src/app/administrative/views/templates/forms/ProgramForm.html rename to client-app/src/oldapp/administrative/views/templates/forms/ProgramForm.html diff --git a/client-app/src/app/administrative/views/templates/forms/ProjectForm.html b/client-app/src/oldapp/administrative/views/templates/forms/ProjectForm.html similarity index 100% rename from client-app/src/app/administrative/views/templates/forms/ProjectForm.html rename to client-app/src/oldapp/administrative/views/templates/forms/ProjectForm.html diff --git a/client-app/src/app/administrative/views/templates/forms/UnitForm.html b/client-app/src/oldapp/administrative/views/templates/forms/UnitForm.html similarity index 100% rename from client-app/src/app/administrative/views/templates/forms/UnitForm.html rename to client-app/src/oldapp/administrative/views/templates/forms/UnitForm.html diff --git a/client-app/src/app/base/models/_Model.js b/client-app/src/oldapp/base/models/_Model.js similarity index 100% rename from client-app/src/app/base/models/_Model.js rename to client-app/src/oldapp/base/models/_Model.js diff --git a/client-app/src/app/base/models/attr/ArrayAttr.js b/client-app/src/oldapp/base/models/attr/ArrayAttr.js similarity index 100% rename from client-app/src/app/base/models/attr/ArrayAttr.js rename to client-app/src/oldapp/base/models/attr/ArrayAttr.js diff --git a/client-app/src/app/base/models/attr/Attr.js b/client-app/src/oldapp/base/models/attr/Attr.js similarity index 100% rename from client-app/src/app/base/models/attr/Attr.js rename to client-app/src/oldapp/base/models/attr/Attr.js diff --git a/client-app/src/app/base/models/attr/ObjAttr.js b/client-app/src/oldapp/base/models/attr/ObjAttr.js similarity index 100% rename from client-app/src/app/base/models/attr/ObjAttr.js rename to client-app/src/oldapp/base/models/attr/ObjAttr.js diff --git a/client-app/src/app/base/models/attr/RelationAttr.js b/client-app/src/oldapp/base/models/attr/RelationAttr.js similarity index 100% rename from client-app/src/app/base/models/attr/RelationAttr.js rename to client-app/src/oldapp/base/models/attr/RelationAttr.js diff --git a/client-app/src/app/base/models/attr/_Attr.js b/client-app/src/oldapp/base/models/attr/_Attr.js similarity index 100% rename from client-app/src/app/base/models/attr/_Attr.js rename to client-app/src/oldapp/base/models/attr/_Attr.js diff --git a/client-app/src/app/base/models/attr/_ComplexAttr.js b/client-app/src/oldapp/base/models/attr/_ComplexAttr.js similarity index 100% rename from client-app/src/app/base/models/attr/_ComplexAttr.js rename to client-app/src/oldapp/base/models/attr/_ComplexAttr.js diff --git a/client-app/src/app/base/views/EditorLayerWithVariableForm.js b/client-app/src/oldapp/base/views/EditorLayerWithVariableForm.js similarity index 100% rename from client-app/src/app/base/views/EditorLayerWithVariableForm.js rename to client-app/src/oldapp/base/views/EditorLayerWithVariableForm.js diff --git a/client-app/src/app/base/views/Module.js b/client-app/src/oldapp/base/views/Module.js similarity index 100% rename from client-app/src/app/base/views/Module.js rename to client-app/src/oldapp/base/views/Module.js diff --git a/client-app/src/app/base/views/_ListenRequestError.js b/client-app/src/oldapp/base/views/_ListenRequestError.js similarity index 100% rename from client-app/src/app/base/views/_ListenRequestError.js rename to client-app/src/oldapp/base/views/_ListenRequestError.js diff --git a/client-app/src/app/base/views/_LoadingWidget.js b/client-app/src/oldapp/base/views/_LoadingWidget.js similarity index 100% rename from client-app/src/app/base/views/_LoadingWidget.js rename to client-app/src/oldapp/base/views/_LoadingWidget.js diff --git a/client-app/src/app/base/views/_SettingsHandler.js b/client-app/src/oldapp/base/views/_SettingsHandler.js similarity index 100% rename from client-app/src/app/base/views/_SettingsHandler.js rename to client-app/src/oldapp/base/views/_SettingsHandler.js diff --git a/client-app/src/app/base/views/_View.js b/client-app/src/oldapp/base/views/_View.js similarity index 100% rename from client-app/src/app/base/views/_View.js rename to client-app/src/oldapp/base/views/_View.js diff --git a/client-app/src/app/base/views/_ViewHandle.js b/client-app/src/oldapp/base/views/_ViewHandle.js similarity index 100% rename from client-app/src/app/base/views/_ViewHandle.js rename to client-app/src/oldapp/base/views/_ViewHandle.js diff --git a/client-app/src/app/base/views/_ViewListBase.js b/client-app/src/oldapp/base/views/_ViewListBase.js similarity index 100% rename from client-app/src/app/base/views/_ViewListBase.js rename to client-app/src/oldapp/base/views/_ViewListBase.js diff --git a/client-app/src/app/base/views/extensions/_ActivityClosed.js b/client-app/src/oldapp/base/views/extensions/_ActivityClosed.js similarity index 100% rename from client-app/src/app/base/views/extensions/_ActivityClosed.js rename to client-app/src/oldapp/base/views/extensions/_ActivityClosed.js diff --git a/client-app/src/app/base/views/extensions/_AddAtlasCategory.js b/client-app/src/oldapp/base/views/extensions/_AddAtlasCategory.js similarity index 100% rename from client-app/src/app/base/views/extensions/_AddAtlasCategory.js rename to client-app/src/oldapp/base/views/extensions/_AddAtlasCategory.js diff --git a/client-app/src/app/base/views/extensions/_AddCompositeSearchInTooltipFromTextSearch.js b/client-app/src/oldapp/base/views/extensions/_AddCompositeSearchInTooltipFromTextSearch.js similarity index 100% rename from client-app/src/app/base/views/extensions/_AddCompositeSearchInTooltipFromTextSearch.js rename to client-app/src/oldapp/base/views/extensions/_AddCompositeSearchInTooltipFromTextSearch.js diff --git a/client-app/src/app/base/views/extensions/_AddForm.js b/client-app/src/oldapp/base/views/extensions/_AddForm.js similarity index 100% rename from client-app/src/app/base/views/extensions/_AddForm.js rename to client-app/src/oldapp/base/views/extensions/_AddForm.js diff --git a/client-app/src/app/base/views/extensions/_AddFormItfc.js b/client-app/src/oldapp/base/views/extensions/_AddFormItfc.js similarity index 100% rename from client-app/src/app/base/views/extensions/_AddFormItfc.js rename to client-app/src/oldapp/base/views/extensions/_AddFormItfc.js diff --git a/client-app/src/app/base/views/extensions/_AddSelectInput.js b/client-app/src/oldapp/base/views/extensions/_AddSelectInput.js similarity index 100% rename from client-app/src/app/base/views/extensions/_AddSelectInput.js rename to client-app/src/oldapp/base/views/extensions/_AddSelectInput.js diff --git a/client-app/src/app/base/views/extensions/_AddSelectInputItfc.js b/client-app/src/oldapp/base/views/extensions/_AddSelectInputItfc.js similarity index 100% rename from client-app/src/app/base/views/extensions/_AddSelectInputItfc.js rename to client-app/src/oldapp/base/views/extensions/_AddSelectInputItfc.js diff --git a/client-app/src/app/base/views/extensions/_AddSelectionHandlerKeypad.js b/client-app/src/oldapp/base/views/extensions/_AddSelectionHandlerKeypad.js similarity index 100% rename from client-app/src/app/base/views/extensions/_AddSelectionHandlerKeypad.js rename to client-app/src/oldapp/base/views/extensions/_AddSelectionHandlerKeypad.js diff --git a/client-app/src/app/base/views/extensions/_AddTextSearchInput.js b/client-app/src/oldapp/base/views/extensions/_AddTextSearchInput.js similarity index 100% rename from client-app/src/app/base/views/extensions/_AddTextSearchInput.js rename to client-app/src/oldapp/base/views/extensions/_AddTextSearchInput.js diff --git a/client-app/src/app/base/views/extensions/_AddTextSearchInputItfc.js b/client-app/src/oldapp/base/views/extensions/_AddTextSearchInputItfc.js similarity index 100% rename from client-app/src/app/base/views/extensions/_AddTextSearchInputItfc.js rename to client-app/src/oldapp/base/views/extensions/_AddTextSearchInputItfc.js diff --git a/client-app/src/app/base/views/extensions/_CompositeInTooltipFromIconKeypad.js b/client-app/src/oldapp/base/views/extensions/_CompositeInTooltipFromIconKeypad.js similarity index 100% rename from client-app/src/app/base/views/extensions/_CompositeInTooltipFromIconKeypad.js rename to client-app/src/oldapp/base/views/extensions/_CompositeInTooltipFromIconKeypad.js diff --git a/client-app/src/app/base/views/extensions/_CompositeSearchInTooltip.js b/client-app/src/oldapp/base/views/extensions/_CompositeSearchInTooltip.js similarity index 100% rename from client-app/src/app/base/views/extensions/_CompositeSearchInTooltip.js rename to client-app/src/oldapp/base/views/extensions/_CompositeSearchInTooltip.js diff --git a/client-app/src/app/base/views/extensions/_Edition.js b/client-app/src/oldapp/base/views/extensions/_Edition.js similarity index 100% rename from client-app/src/app/base/views/extensions/_Edition.js rename to client-app/src/oldapp/base/views/extensions/_Edition.js diff --git a/client-app/src/app/base/views/extensions/_EditionCommons.js b/client-app/src/oldapp/base/views/extensions/_EditionCommons.js similarity index 100% rename from client-app/src/app/base/views/extensions/_EditionCommons.js rename to client-app/src/oldapp/base/views/extensions/_EditionCommons.js diff --git a/client-app/src/app/base/views/extensions/_EditionFormList.js b/client-app/src/oldapp/base/views/extensions/_EditionFormList.js similarity index 100% rename from client-app/src/app/base/views/extensions/_EditionFormList.js rename to client-app/src/oldapp/base/views/extensions/_EditionFormList.js diff --git a/client-app/src/app/base/views/extensions/_EditionLayerView.js b/client-app/src/oldapp/base/views/extensions/_EditionLayerView.js similarity index 100% rename from client-app/src/app/base/views/extensions/_EditionLayerView.js rename to client-app/src/oldapp/base/views/extensions/_EditionLayerView.js diff --git a/client-app/src/app/base/views/extensions/_EditionView.js b/client-app/src/oldapp/base/views/extensions/_EditionView.js similarity index 100% rename from client-app/src/app/base/views/extensions/_EditionView.js rename to client-app/src/oldapp/base/views/extensions/_EditionView.js diff --git a/client-app/src/app/base/views/extensions/_EditionWizardView.js b/client-app/src/oldapp/base/views/extensions/_EditionWizardView.js similarity index 100% rename from client-app/src/app/base/views/extensions/_EditionWizardView.js rename to client-app/src/oldapp/base/views/extensions/_EditionWizardView.js diff --git a/client-app/src/app/base/views/extensions/_FormInDialogView.js b/client-app/src/oldapp/base/views/extensions/_FormInDialogView.js similarity index 100% rename from client-app/src/app/base/views/extensions/_FormInDialogView.js rename to client-app/src/oldapp/base/views/extensions/_FormInDialogView.js diff --git a/client-app/src/app/base/views/extensions/_GetActivityData.js b/client-app/src/oldapp/base/views/extensions/_GetActivityData.js similarity index 100% rename from client-app/src/app/base/views/extensions/_GetActivityData.js rename to client-app/src/oldapp/base/views/extensions/_GetActivityData.js diff --git a/client-app/src/app/base/views/extensions/_GetActivityDataItfc.js b/client-app/src/oldapp/base/views/extensions/_GetActivityDataItfc.js similarity index 100% rename from client-app/src/app/base/views/extensions/_GetActivityDataItfc.js rename to client-app/src/oldapp/base/views/extensions/_GetActivityDataItfc.js diff --git a/client-app/src/app/base/views/extensions/_InterceptCloseUpView.js b/client-app/src/oldapp/base/views/extensions/_InterceptCloseUpView.js similarity index 100% rename from client-app/src/app/base/views/extensions/_InterceptCloseUpView.js rename to client-app/src/oldapp/base/views/extensions/_InterceptCloseUpView.js diff --git a/client-app/src/app/base/views/extensions/_ListenActivityDataAndAccessByActivityCategory.js b/client-app/src/oldapp/base/views/extensions/_ListenActivityDataAndAccessByActivityCategory.js similarity index 100% rename from client-app/src/app/base/views/extensions/_ListenActivityDataAndAccessByActivityCategory.js rename to client-app/src/oldapp/base/views/extensions/_ListenActivityDataAndAccessByActivityCategory.js diff --git a/client-app/src/app/base/views/extensions/_LocalSelectionView.js b/client-app/src/oldapp/base/views/extensions/_LocalSelectionView.js similarity index 100% rename from client-app/src/app/base/views/extensions/_LocalSelectionView.js rename to client-app/src/oldapp/base/views/extensions/_LocalSelectionView.js diff --git a/client-app/src/app/base/views/extensions/_LocalSelectionViewItfc.js b/client-app/src/oldapp/base/views/extensions/_LocalSelectionViewItfc.js similarity index 100% rename from client-app/src/app/base/views/extensions/_LocalSelectionViewItfc.js rename to client-app/src/oldapp/base/views/extensions/_LocalSelectionViewItfc.js diff --git a/client-app/src/app/base/views/extensions/_OnShownAndRefresh.js b/client-app/src/oldapp/base/views/extensions/_OnShownAndRefresh.js similarity index 100% rename from client-app/src/app/base/views/extensions/_OnShownAndRefresh.js rename to client-app/src/oldapp/base/views/extensions/_OnShownAndRefresh.js diff --git a/client-app/src/app/base/views/extensions/_ProcessInterval.js b/client-app/src/oldapp/base/views/extensions/_ProcessInterval.js similarity index 100% rename from client-app/src/app/base/views/extensions/_ProcessInterval.js rename to client-app/src/oldapp/base/views/extensions/_ProcessInterval.js diff --git a/client-app/src/app/base/views/extensions/_SelectInDoubleList.js b/client-app/src/oldapp/base/views/extensions/_SelectInDoubleList.js similarity index 100% rename from client-app/src/app/base/views/extensions/_SelectInDoubleList.js rename to client-app/src/oldapp/base/views/extensions/_SelectInDoubleList.js diff --git a/client-app/src/app/catalog/views/ActivitiesCatalogView.js b/client-app/src/oldapp/catalog/views/ActivitiesCatalogView.js similarity index 100% rename from client-app/src/app/catalog/views/ActivitiesCatalogView.js rename to client-app/src/oldapp/catalog/views/ActivitiesCatalogView.js diff --git a/client-app/src/app/catalog/views/OrganisationsCatalogView.js b/client-app/src/oldapp/catalog/views/OrganisationsCatalogView.js similarity index 100% rename from client-app/src/app/catalog/views/OrganisationsCatalogView.js rename to client-app/src/oldapp/catalog/views/OrganisationsCatalogView.js diff --git a/client-app/src/app/catalog/views/PlatformsCatalogView.js b/client-app/src/oldapp/catalog/views/PlatformsCatalogView.js similarity index 100% rename from client-app/src/app/catalog/views/PlatformsCatalogView.js rename to client-app/src/oldapp/catalog/views/PlatformsCatalogView.js diff --git a/client-app/src/app/catalog/views/ProgramsCatalogView.js b/client-app/src/oldapp/catalog/views/ProgramsCatalogView.js similarity index 100% rename from client-app/src/app/catalog/views/ProgramsCatalogView.js rename to client-app/src/oldapp/catalog/views/ProgramsCatalogView.js diff --git a/client-app/src/app/catalog/views/ProjectsCatalogView.js b/client-app/src/oldapp/catalog/views/ProjectsCatalogView.js similarity index 100% rename from client-app/src/app/catalog/views/ProjectsCatalogView.js rename to client-app/src/oldapp/catalog/views/ProjectsCatalogView.js diff --git a/client-app/src/app/catalog/views/SpeciesCatalogView.js b/client-app/src/oldapp/catalog/views/SpeciesCatalogView.js similarity index 100% rename from client-app/src/app/catalog/views/SpeciesCatalogView.js rename to client-app/src/oldapp/catalog/views/SpeciesCatalogView.js diff --git a/client-app/src/app/components/CookieLoader.js b/client-app/src/oldapp/components/CookieLoader.js similarity index 100% rename from client-app/src/app/components/CookieLoader.js rename to client-app/src/oldapp/components/CookieLoader.js diff --git a/client-app/src/app/components/ReCaptcha.js b/client-app/src/oldapp/components/ReCaptcha.js similarity index 100% rename from client-app/src/app/components/ReCaptcha.js rename to client-app/src/oldapp/components/ReCaptcha.js diff --git a/client-app/src/app/components/steps/AccessSetStep.js b/client-app/src/oldapp/components/steps/AccessSetStep.js similarity index 100% rename from client-app/src/app/components/steps/AccessSetStep.js rename to client-app/src/oldapp/components/steps/AccessSetStep.js diff --git a/client-app/src/app/components/steps/ActivitySetStep.js b/client-app/src/oldapp/components/steps/ActivitySetStep.js similarity index 100% rename from client-app/src/app/components/steps/ActivitySetStep.js rename to client-app/src/oldapp/components/steps/ActivitySetStep.js diff --git a/client-app/src/app/components/steps/AddGeomSiteStep.js b/client-app/src/oldapp/components/steps/AddGeomSiteStep.js similarity index 100% rename from client-app/src/app/components/steps/AddGeomSiteStep.js rename to client-app/src/oldapp/components/steps/AddGeomSiteStep.js diff --git a/client-app/src/app/components/steps/AreaClassificationsSetStep.js b/client-app/src/oldapp/components/steps/AreaClassificationsSetStep.js similarity index 100% rename from client-app/src/app/components/steps/AreaClassificationsSetStep.js rename to client-app/src/oldapp/components/steps/AreaClassificationsSetStep.js diff --git a/client-app/src/app/components/steps/CalibrationSetStep.js b/client-app/src/oldapp/components/steps/CalibrationSetStep.js similarity index 100% rename from client-app/src/app/components/steps/CalibrationSetStep.js rename to client-app/src/oldapp/components/steps/CalibrationSetStep.js diff --git a/client-app/src/app/components/steps/CitationStep.js b/client-app/src/oldapp/components/steps/CitationStep.js similarity index 100% rename from client-app/src/app/components/steps/CitationStep.js rename to client-app/src/oldapp/components/steps/CitationStep.js diff --git a/client-app/src/app/components/steps/ClassificationsStep.js b/client-app/src/oldapp/components/steps/ClassificationsStep.js similarity index 100% rename from client-app/src/app/components/steps/ClassificationsStep.js rename to client-app/src/oldapp/components/steps/ClassificationsStep.js diff --git a/client-app/src/app/components/steps/ContactSetStep.js b/client-app/src/oldapp/components/steps/ContactSetStep.js similarity index 100% rename from client-app/src/app/components/steps/ContactSetStep.js rename to client-app/src/oldapp/components/steps/ContactSetStep.js diff --git a/client-app/src/app/components/steps/DataDefinitionSetStep.js b/client-app/src/oldapp/components/steps/DataDefinitionSetStep.js similarity index 100% rename from client-app/src/app/components/steps/DataDefinitionSetStep.js rename to client-app/src/oldapp/components/steps/DataDefinitionSetStep.js diff --git a/client-app/src/app/components/steps/DescribeSiteStep.js b/client-app/src/oldapp/components/steps/DescribeSiteStep.js similarity index 100% rename from client-app/src/app/components/steps/DescribeSiteStep.js rename to client-app/src/oldapp/components/steps/DescribeSiteStep.js diff --git a/client-app/src/app/components/steps/DocumentSetStep.js b/client-app/src/oldapp/components/steps/DocumentSetStep.js similarity index 100% rename from client-app/src/app/components/steps/DocumentSetStep.js rename to client-app/src/oldapp/components/steps/DocumentSetStep.js diff --git a/client-app/src/app/components/steps/DocumentStepFiltered.js b/client-app/src/oldapp/components/steps/DocumentStepFiltered.js similarity index 100% rename from client-app/src/app/components/steps/DocumentStepFiltered.js rename to client-app/src/oldapp/components/steps/DocumentStepFiltered.js diff --git a/client-app/src/app/components/steps/DownloadsSetStep.js b/client-app/src/oldapp/components/steps/DownloadsSetStep.js similarity index 100% rename from client-app/src/app/components/steps/DownloadsSetStep.js rename to client-app/src/oldapp/components/steps/DownloadsSetStep.js diff --git a/client-app/src/app/components/steps/EmbeddedContentSetStep.js b/client-app/src/oldapp/components/steps/EmbeddedContentSetStep.js similarity index 100% rename from client-app/src/app/components/steps/EmbeddedContentSetStep.js rename to client-app/src/oldapp/components/steps/EmbeddedContentSetStep.js diff --git a/client-app/src/app/components/steps/MainDataStep.js b/client-app/src/oldapp/components/steps/MainDataStep.js similarity index 100% rename from client-app/src/app/components/steps/MainDataStep.js rename to client-app/src/oldapp/components/steps/MainDataStep.js diff --git a/client-app/src/app/components/steps/MapSelectAreaStep.js b/client-app/src/oldapp/components/steps/MapSelectAreaStep.js similarity index 100% rename from client-app/src/app/components/steps/MapSelectAreaStep.js rename to client-app/src/oldapp/components/steps/MapSelectAreaStep.js diff --git a/client-app/src/app/components/steps/OrganisationSetStep.js b/client-app/src/oldapp/components/steps/OrganisationSetStep.js similarity index 100% rename from client-app/src/app/components/steps/OrganisationSetStep.js rename to client-app/src/oldapp/components/steps/OrganisationSetStep.js diff --git a/client-app/src/app/components/steps/PlatformSetStep.js b/client-app/src/oldapp/components/steps/PlatformSetStep.js similarity index 100% rename from client-app/src/app/components/steps/PlatformSetStep.js rename to client-app/src/oldapp/components/steps/PlatformSetStep.js diff --git a/client-app/src/app/components/steps/PreLoadMainDataStep.js b/client-app/src/oldapp/components/steps/PreLoadMainDataStep.js similarity index 100% rename from client-app/src/app/components/steps/PreLoadMainDataStep.js rename to client-app/src/oldapp/components/steps/PreLoadMainDataStep.js diff --git a/client-app/src/app/components/steps/ProtocolsSetStep.js b/client-app/src/oldapp/components/steps/ProtocolsSetStep.js similarity index 100% rename from client-app/src/app/components/steps/ProtocolsSetStep.js rename to client-app/src/oldapp/components/steps/ProtocolsSetStep.js diff --git a/client-app/src/app/components/steps/RecoverySetStep.js b/client-app/src/oldapp/components/steps/RecoverySetStep.js similarity index 100% rename from client-app/src/app/components/steps/RecoverySetStep.js rename to client-app/src/oldapp/components/steps/RecoverySetStep.js diff --git a/client-app/src/app/components/steps/RelationDataSetStep.js b/client-app/src/oldapp/components/steps/RelationDataSetStep.js similarity index 100% rename from client-app/src/app/components/steps/RelationDataSetStep.js rename to client-app/src/oldapp/components/steps/RelationDataSetStep.js diff --git a/client-app/src/app/components/steps/ResourceSetStep.js b/client-app/src/oldapp/components/steps/ResourceSetStep.js similarity index 100% rename from client-app/src/app/components/steps/ResourceSetStep.js rename to client-app/src/oldapp/components/steps/ResourceSetStep.js diff --git a/client-app/src/app/components/steps/SelectActivityCategoryStep.js b/client-app/src/oldapp/components/steps/SelectActivityCategoryStep.js similarity index 100% rename from client-app/src/app/components/steps/SelectActivityCategoryStep.js rename to client-app/src/oldapp/components/steps/SelectActivityCategoryStep.js diff --git a/client-app/src/app/components/steps/SelectLayerStep.js b/client-app/src/oldapp/components/steps/SelectLayerStep.js similarity index 100% rename from client-app/src/app/components/steps/SelectLayerStep.js rename to client-app/src/oldapp/components/steps/SelectLayerStep.js diff --git a/client-app/src/app/components/steps/SelectRegisterTypeStep.js b/client-app/src/oldapp/components/steps/SelectRegisterTypeStep.js similarity index 100% rename from client-app/src/app/components/steps/SelectRegisterTypeStep.js rename to client-app/src/oldapp/components/steps/SelectRegisterTypeStep.js diff --git a/client-app/src/app/components/steps/SpeciesMainDataStep.js b/client-app/src/oldapp/components/steps/SpeciesMainDataStep.js similarity index 100% rename from client-app/src/app/components/steps/SpeciesMainDataStep.js rename to client-app/src/oldapp/components/steps/SpeciesMainDataStep.js diff --git a/client-app/src/app/components/steps/SpecimenTagSetStep.js b/client-app/src/oldapp/components/steps/SpecimenTagSetStep.js similarity index 100% rename from client-app/src/app/components/steps/SpecimenTagSetStep.js rename to client-app/src/oldapp/components/steps/SpecimenTagSetStep.js diff --git a/client-app/src/app/components/steps/UnitSetStep.js b/client-app/src/oldapp/components/steps/UnitSetStep.js similarity index 100% rename from client-app/src/app/components/steps/UnitSetStep.js rename to client-app/src/oldapp/components/steps/UnitSetStep.js diff --git a/client-app/src/app/components/steps/_ClassificationsRelationData.js b/client-app/src/oldapp/components/steps/_ClassificationsRelationData.js similarity index 100% rename from client-app/src/app/components/steps/_ClassificationsRelationData.js rename to client-app/src/oldapp/components/steps/_ClassificationsRelationData.js diff --git a/client-app/src/app/components/steps/_DataListAndSaveRelationData.js b/client-app/src/oldapp/components/steps/_DataListAndSaveRelationData.js similarity index 100% rename from client-app/src/app/components/steps/_DataListAndSaveRelationData.js rename to client-app/src/oldapp/components/steps/_DataListAndSaveRelationData.js diff --git a/client-app/src/app/components/steps/_DateRelationData.js b/client-app/src/oldapp/components/steps/_DateRelationData.js similarity index 100% rename from client-app/src/app/components/steps/_DateRelationData.js rename to client-app/src/oldapp/components/steps/_DateRelationData.js diff --git a/client-app/src/app/components/steps/_MainData.js b/client-app/src/oldapp/components/steps/_MainData.js similarity index 100% rename from client-app/src/app/components/steps/_MainData.js rename to client-app/src/oldapp/components/steps/_MainData.js diff --git a/client-app/src/app/components/steps/_ParametersRelationData.js b/client-app/src/oldapp/components/steps/_ParametersRelationData.js similarity index 100% rename from client-app/src/app/components/steps/_ParametersRelationData.js rename to client-app/src/oldapp/components/steps/_ParametersRelationData.js diff --git a/client-app/src/app/components/steps/_RememberDeleteItems.js b/client-app/src/oldapp/components/steps/_RememberDeleteItems.js similarity index 100% rename from client-app/src/app/components/steps/_RememberDeleteItems.js rename to client-app/src/oldapp/components/steps/_RememberDeleteItems.js diff --git a/client-app/src/app/components/steps/_SelectOptionBox.js b/client-app/src/oldapp/components/steps/_SelectOptionBox.js similarity index 100% rename from client-app/src/app/components/steps/_SelectOptionBox.js rename to client-app/src/oldapp/components/steps/_SelectOptionBox.js diff --git a/client-app/src/app/components/viewCustomization/addGeomSite/views/Line.js b/client-app/src/oldapp/components/viewCustomization/addGeomSite/views/Line.js similarity index 100% rename from client-app/src/app/components/viewCustomization/addGeomSite/views/Line.js rename to client-app/src/oldapp/components/viewCustomization/addGeomSite/views/Line.js diff --git a/client-app/src/app/components/viewCustomization/addGeomSite/views/MultiPolygon.js b/client-app/src/oldapp/components/viewCustomization/addGeomSite/views/MultiPolygon.js similarity index 100% rename from client-app/src/app/components/viewCustomization/addGeomSite/views/MultiPolygon.js rename to client-app/src/oldapp/components/viewCustomization/addGeomSite/views/MultiPolygon.js diff --git a/client-app/src/app/components/viewCustomization/addGeomSite/views/Point.js b/client-app/src/oldapp/components/viewCustomization/addGeomSite/views/Point.js similarity index 100% rename from client-app/src/app/components/viewCustomization/addGeomSite/views/Point.js rename to client-app/src/oldapp/components/viewCustomization/addGeomSite/views/Point.js diff --git a/client-app/src/app/components/viewCustomization/addGeomSite/views/_BaseGeometryForm.js b/client-app/src/oldapp/components/viewCustomization/addGeomSite/views/_BaseGeometryForm.js similarity index 100% rename from client-app/src/app/components/viewCustomization/addGeomSite/views/_BaseGeometryForm.js rename to client-app/src/oldapp/components/viewCustomization/addGeomSite/views/_BaseGeometryForm.js diff --git a/client-app/src/app/components/viewCustomization/addGeomSite/views/templates/LineForm.html b/client-app/src/oldapp/components/viewCustomization/addGeomSite/views/templates/LineForm.html similarity index 100% rename from client-app/src/app/components/viewCustomization/addGeomSite/views/templates/LineForm.html rename to client-app/src/oldapp/components/viewCustomization/addGeomSite/views/templates/LineForm.html diff --git a/client-app/src/app/components/viewCustomization/addGeomSite/views/templates/PointForm.html b/client-app/src/oldapp/components/viewCustomization/addGeomSite/views/templates/PointForm.html similarity index 100% rename from client-app/src/app/components/viewCustomization/addGeomSite/views/templates/PointForm.html rename to client-app/src/oldapp/components/viewCustomization/addGeomSite/views/templates/PointForm.html diff --git a/client-app/src/app/components/viewCustomization/describeSite/views/SelectStationByActivity.js b/client-app/src/oldapp/components/viewCustomization/describeSite/views/SelectStationByActivity.js similarity index 100% rename from client-app/src/app/components/viewCustomization/describeSite/views/SelectStationByActivity.js rename to client-app/src/oldapp/components/viewCustomization/describeSite/views/SelectStationByActivity.js diff --git a/client-app/src/app/components/viewCustomization/describeSite/views/_AdditionalKeyGetter.js b/client-app/src/oldapp/components/viewCustomization/describeSite/views/_AdditionalKeyGetter.js similarity index 100% rename from client-app/src/app/components/viewCustomization/describeSite/views/_AdditionalKeyGetter.js rename to client-app/src/oldapp/components/viewCustomization/describeSite/views/_AdditionalKeyGetter.js diff --git a/client-app/src/app/components/viewCustomization/describeSite/views/templates/ARForm.html b/client-app/src/oldapp/components/viewCustomization/describeSite/views/templates/ARForm.html similarity index 100% rename from client-app/src/app/components/viewCustomization/describeSite/views/templates/ARForm.html rename to client-app/src/oldapp/components/viewCustomization/describeSite/views/templates/ARForm.html diff --git a/client-app/src/app/components/viewCustomization/describeSite/views/templates/DescribeSiteForm.html b/client-app/src/oldapp/components/viewCustomization/describeSite/views/templates/DescribeSiteForm.html similarity index 100% rename from client-app/src/app/components/viewCustomization/describeSite/views/templates/DescribeSiteForm.html rename to client-app/src/oldapp/components/viewCustomization/describeSite/views/templates/DescribeSiteForm.html diff --git a/client-app/src/app/components/viewCustomization/describeSite/views/templates/IFForm.html b/client-app/src/oldapp/components/viewCustomization/describeSite/views/templates/IFForm.html similarity index 100% rename from client-app/src/app/components/viewCustomization/describeSite/views/templates/IFForm.html rename to client-app/src/oldapp/components/viewCustomization/describeSite/views/templates/IFForm.html diff --git a/client-app/src/app/components/viewCustomization/loadFile/models/LoadFileModel.js b/client-app/src/oldapp/components/viewCustomization/loadFile/models/LoadFileModel.js similarity index 100% rename from client-app/src/app/components/viewCustomization/loadFile/models/LoadFileModel.js rename to client-app/src/oldapp/components/viewCustomization/loadFile/models/LoadFileModel.js diff --git a/client-app/src/app/components/viewCustomization/loadFile/views/templates/ARFileForm.html b/client-app/src/oldapp/components/viewCustomization/loadFile/views/templates/ARFileForm.html similarity index 100% rename from client-app/src/app/components/viewCustomization/loadFile/views/templates/ARFileForm.html rename to client-app/src/oldapp/components/viewCustomization/loadFile/views/templates/ARFileForm.html diff --git a/client-app/src/app/components/viewCustomization/loadFile/views/templates/LoadFileForm.html b/client-app/src/oldapp/components/viewCustomization/loadFile/views/templates/LoadFileForm.html similarity index 100% rename from client-app/src/app/components/viewCustomization/loadFile/views/templates/LoadFileForm.html rename to client-app/src/oldapp/components/viewCustomization/loadFile/views/templates/LoadFileForm.html diff --git a/client-app/src/app/components/viewCustomization/parameter/views/templates/FTForm.html b/client-app/src/oldapp/components/viewCustomization/parameter/views/templates/FTForm.html similarity index 100% rename from client-app/src/app/components/viewCustomization/parameter/views/templates/FTForm.html rename to client-app/src/oldapp/components/viewCustomization/parameter/views/templates/FTForm.html diff --git a/client-app/src/app/components/viewCustomization/parameter/views/templates/OCForm.html b/client-app/src/oldapp/components/viewCustomization/parameter/views/templates/OCForm.html similarity index 100% rename from client-app/src/app/components/viewCustomization/parameter/views/templates/OCForm.html rename to client-app/src/oldapp/components/viewCustomization/parameter/views/templates/OCForm.html diff --git a/client-app/src/app/components/viewCustomization/relationData/views/templates/AreaTypeForm.html b/client-app/src/oldapp/components/viewCustomization/relationData/views/templates/AreaTypeForm.html similarity index 100% rename from client-app/src/app/components/viewCustomization/relationData/views/templates/AreaTypeForm.html rename to client-app/src/oldapp/components/viewCustomization/relationData/views/templates/AreaTypeForm.html diff --git a/client-app/src/app/components/viewCustomization/relationData/views/templates/DateForm.html b/client-app/src/oldapp/components/viewCustomization/relationData/views/templates/DateForm.html similarity index 100% rename from client-app/src/app/components/viewCustomization/relationData/views/templates/DateForm.html rename to client-app/src/oldapp/components/viewCustomization/relationData/views/templates/DateForm.html diff --git a/client-app/src/app/components/viewCustomization/relationData/views/templates/DefaultForm.html b/client-app/src/oldapp/components/viewCustomization/relationData/views/templates/DefaultForm.html similarity index 100% rename from client-app/src/app/components/viewCustomization/relationData/views/templates/DefaultForm.html rename to client-app/src/oldapp/components/viewCustomization/relationData/views/templates/DefaultForm.html diff --git a/client-app/src/app/components/viewCustomization/relationData/views/templates/DeviceForm.html b/client-app/src/oldapp/components/viewCustomization/relationData/views/templates/DeviceForm.html similarity index 100% rename from client-app/src/app/components/viewCustomization/relationData/views/templates/DeviceForm.html rename to client-app/src/oldapp/components/viewCustomization/relationData/views/templates/DeviceForm.html diff --git a/client-app/src/app/components/viewCustomization/relationData/views/templates/PointGeometryForm.html b/client-app/src/oldapp/components/viewCustomization/relationData/views/templates/PointGeometryForm.html similarity index 100% rename from client-app/src/app/components/viewCustomization/relationData/views/templates/PointGeometryForm.html rename to client-app/src/oldapp/components/viewCustomization/relationData/views/templates/PointGeometryForm.html diff --git a/client-app/src/app/dataLoader/areas/views/AreaView.js b/client-app/src/oldapp/dataLoader/areas/views/AreaView.js similarity index 100% rename from client-app/src/app/dataLoader/areas/views/AreaView.js rename to client-app/src/oldapp/dataLoader/areas/views/AreaView.js diff --git a/client-app/src/app/dataLoader/areas/views/templates/AreaClassificationsForm.html b/client-app/src/oldapp/dataLoader/areas/views/templates/AreaClassificationsForm.html similarity index 100% rename from client-app/src/app/dataLoader/areas/views/templates/AreaClassificationsForm.html rename to client-app/src/oldapp/dataLoader/areas/views/templates/AreaClassificationsForm.html diff --git a/client-app/src/app/dataLoader/base/_GeographicBase.js b/client-app/src/oldapp/dataLoader/base/_GeographicBase.js similarity index 100% rename from client-app/src/app/dataLoader/base/_GeographicBase.js rename to client-app/src/oldapp/dataLoader/base/_GeographicBase.js diff --git a/client-app/src/app/dataLoader/citation/views/CitationView.js b/client-app/src/oldapp/dataLoader/citation/views/CitationView.js similarity index 100% rename from client-app/src/app/dataLoader/citation/views/CitationView.js rename to client-app/src/oldapp/dataLoader/citation/views/CitationView.js diff --git a/client-app/src/app/dataLoader/citation/views/templates/CitationForm.html b/client-app/src/oldapp/dataLoader/citation/views/templates/CitationForm.html similarity index 100% rename from client-app/src/app/dataLoader/citation/views/templates/CitationForm.html rename to client-app/src/oldapp/dataLoader/citation/views/templates/CitationForm.html diff --git a/client-app/src/app/dataLoader/infrastructure/views/InfrastructureAttributesView.js b/client-app/src/oldapp/dataLoader/infrastructure/views/InfrastructureAttributesView.js similarity index 100% rename from client-app/src/app/dataLoader/infrastructure/views/InfrastructureAttributesView.js rename to client-app/src/oldapp/dataLoader/infrastructure/views/InfrastructureAttributesView.js diff --git a/client-app/src/app/dataLoader/infrastructure/views/InfrastructureView.js b/client-app/src/oldapp/dataLoader/infrastructure/views/InfrastructureView.js similarity index 100% rename from client-app/src/app/dataLoader/infrastructure/views/InfrastructureView.js rename to client-app/src/oldapp/dataLoader/infrastructure/views/InfrastructureView.js diff --git a/client-app/src/app/dataLoader/infrastructure/views/templates/form/AttributesForm.html b/client-app/src/oldapp/dataLoader/infrastructure/views/templates/form/AttributesForm.html similarity index 100% rename from client-app/src/app/dataLoader/infrastructure/views/templates/form/AttributesForm.html rename to client-app/src/oldapp/dataLoader/infrastructure/views/templates/form/AttributesForm.html diff --git a/client-app/src/app/dataLoader/sightings/models/SightingsModel.js b/client-app/src/oldapp/dataLoader/sightings/models/SightingsModel.js similarity index 100% rename from client-app/src/app/dataLoader/sightings/models/SightingsModel.js rename to client-app/src/oldapp/dataLoader/sightings/models/SightingsModel.js diff --git a/client-app/src/app/dataLoader/sightings/views/SightingsView.js b/client-app/src/oldapp/dataLoader/sightings/views/SightingsView.js similarity index 100% rename from client-app/src/app/dataLoader/sightings/views/SightingsView.js rename to client-app/src/oldapp/dataLoader/sightings/views/SightingsView.js diff --git a/client-app/src/app/dataLoader/sightings/views/templates/SightingsForm.html b/client-app/src/oldapp/dataLoader/sightings/views/templates/SightingsForm.html similarity index 100% rename from client-app/src/app/dataLoader/sightings/views/templates/SightingsForm.html rename to client-app/src/oldapp/dataLoader/sightings/views/templates/SightingsForm.html diff --git a/client-app/src/app/dataLoader/surveyParameters/views/ObjectCollectingSeriesDataView.js b/client-app/src/oldapp/dataLoader/surveyParameters/views/ObjectCollectingSeriesDataView.js similarity index 100% rename from client-app/src/app/dataLoader/surveyParameters/views/ObjectCollectingSeriesDataView.js rename to client-app/src/oldapp/dataLoader/surveyParameters/views/ObjectCollectingSeriesDataView.js diff --git a/client-app/src/app/dataLoader/surveyParameters/views/ObjectCollectionView.js b/client-app/src/oldapp/dataLoader/surveyParameters/views/ObjectCollectionView.js similarity index 100% rename from client-app/src/app/dataLoader/surveyParameters/views/ObjectCollectionView.js rename to client-app/src/oldapp/dataLoader/surveyParameters/views/ObjectCollectionView.js diff --git a/client-app/src/app/dataLoader/surveyParameters/views/SurveyStationSeriesDataView.js b/client-app/src/oldapp/dataLoader/surveyParameters/views/SurveyStationSeriesDataView.js similarity index 100% rename from client-app/src/app/dataLoader/surveyParameters/views/SurveyStationSeriesDataView.js rename to client-app/src/oldapp/dataLoader/surveyParameters/views/SurveyStationSeriesDataView.js diff --git a/client-app/src/app/dataLoader/surveyParameters/views/SurveyStationView.js b/client-app/src/oldapp/dataLoader/surveyParameters/views/SurveyStationView.js similarity index 100% rename from client-app/src/app/dataLoader/surveyParameters/views/SurveyStationView.js rename to client-app/src/oldapp/dataLoader/surveyParameters/views/SurveyStationView.js diff --git a/client-app/src/app/dataLoader/surveyParameters/views/_DataLoadedByStationManagement.js b/client-app/src/oldapp/dataLoader/surveyParameters/views/_DataLoadedByStationManagement.js similarity index 100% rename from client-app/src/app/dataLoader/surveyParameters/views/_DataLoadedByStationManagement.js rename to client-app/src/oldapp/dataLoader/surveyParameters/views/_DataLoadedByStationManagement.js diff --git a/client-app/src/app/dataLoader/surveyParameters/views/_SeriesDataView.js b/client-app/src/oldapp/dataLoader/surveyParameters/views/_SeriesDataView.js similarity index 100% rename from client-app/src/app/dataLoader/surveyParameters/views/_SeriesDataView.js rename to client-app/src/oldapp/dataLoader/surveyParameters/views/_SeriesDataView.js diff --git a/client-app/src/app/dataLoader/surveyParameters/views/templates/ObjectCollectingForm.html b/client-app/src/oldapp/dataLoader/surveyParameters/views/templates/ObjectCollectingForm.html similarity index 100% rename from client-app/src/app/dataLoader/surveyParameters/views/templates/ObjectCollectingForm.html rename to client-app/src/oldapp/dataLoader/surveyParameters/views/templates/ObjectCollectingForm.html diff --git a/client-app/src/app/dataLoader/surveyParameters/views/templates/TimeSeriesForm.html b/client-app/src/oldapp/dataLoader/surveyParameters/views/templates/TimeSeriesForm.html similarity index 100% rename from client-app/src/app/dataLoader/surveyParameters/views/templates/TimeSeriesForm.html rename to client-app/src/oldapp/dataLoader/surveyParameters/views/templates/TimeSeriesForm.html diff --git a/client-app/src/app/dataLoader/tracking/views/TrackingDataView.js b/client-app/src/oldapp/dataLoader/tracking/views/TrackingDataView.js similarity index 100% rename from client-app/src/app/dataLoader/tracking/views/TrackingDataView.js rename to client-app/src/oldapp/dataLoader/tracking/views/TrackingDataView.js diff --git a/client-app/src/app/dataLoader/tracking/views/TrackingView.js b/client-app/src/oldapp/dataLoader/tracking/views/TrackingView.js similarity index 100% rename from client-app/src/app/dataLoader/tracking/views/TrackingView.js rename to client-app/src/oldapp/dataLoader/tracking/views/TrackingView.js diff --git a/client-app/src/app/dataLoader/tracking/views/templates/form/TrackingPointForm.html b/client-app/src/oldapp/dataLoader/tracking/views/templates/form/TrackingPointForm.html similarity index 100% rename from client-app/src/app/dataLoader/tracking/views/templates/form/TrackingPointForm.html rename to client-app/src/oldapp/dataLoader/tracking/views/templates/form/TrackingPointForm.html diff --git a/client-app/src/app/designs/base/_Browser.js b/client-app/src/oldapp/designs/base/_Browser.js similarity index 100% rename from client-app/src/app/designs/base/_Browser.js rename to client-app/src/oldapp/designs/base/_Browser.js diff --git a/client-app/src/app/designs/base/_Controller.js b/client-app/src/oldapp/designs/base/_Controller.js similarity index 100% rename from client-app/src/app/designs/base/_Controller.js rename to client-app/src/oldapp/designs/base/_Controller.js diff --git a/client-app/src/app/designs/base/_ControllerItfc.js b/client-app/src/oldapp/designs/base/_ControllerItfc.js similarity index 100% rename from client-app/src/app/designs/base/_ControllerItfc.js rename to client-app/src/oldapp/designs/base/_ControllerItfc.js diff --git a/client-app/src/app/designs/base/_Layout.js b/client-app/src/oldapp/designs/base/_Layout.js similarity index 100% rename from client-app/src/app/designs/base/_Layout.js rename to client-app/src/oldapp/designs/base/_Layout.js diff --git a/client-app/src/app/designs/base/_LayoutItfc.js b/client-app/src/oldapp/designs/base/_LayoutItfc.js similarity index 100% rename from client-app/src/app/designs/base/_LayoutItfc.js rename to client-app/src/oldapp/designs/base/_LayoutItfc.js diff --git a/client-app/src/app/designs/base/_Main.js b/client-app/src/oldapp/designs/base/_Main.js similarity index 100% rename from client-app/src/app/designs/base/_Main.js rename to client-app/src/oldapp/designs/base/_Main.js diff --git a/client-app/src/app/designs/base/_MainItfc.js b/client-app/src/oldapp/designs/base/_MainItfc.js similarity index 100% rename from client-app/src/app/designs/base/_MainItfc.js rename to client-app/src/oldapp/designs/base/_MainItfc.js diff --git a/client-app/src/app/designs/base/_ServiceOGC.js b/client-app/src/oldapp/designs/base/_ServiceOGC.js similarity index 100% rename from client-app/src/app/designs/base/_ServiceOGC.js rename to client-app/src/oldapp/designs/base/_ServiceOGC.js diff --git a/client-app/src/app/designs/chart/Controller.js b/client-app/src/oldapp/designs/chart/Controller.js similarity index 100% rename from client-app/src/app/designs/chart/Controller.js rename to client-app/src/oldapp/designs/chart/Controller.js diff --git a/client-app/src/app/designs/chart/layout/SideAndTopAndBottomContent.js b/client-app/src/oldapp/designs/chart/layout/SideAndTopAndBottomContent.js similarity index 100% rename from client-app/src/app/designs/chart/layout/SideAndTopAndBottomContent.js rename to client-app/src/oldapp/designs/chart/layout/SideAndTopAndBottomContent.js diff --git a/client-app/src/app/designs/chart/layout/TopAndBottomContent.js b/client-app/src/oldapp/designs/chart/layout/TopAndBottomContent.js similarity index 100% rename from client-app/src/app/designs/chart/layout/TopAndBottomContent.js rename to client-app/src/oldapp/designs/chart/layout/TopAndBottomContent.js diff --git a/client-app/src/app/designs/chart/layout/TopContent.js b/client-app/src/oldapp/designs/chart/layout/TopContent.js similarity index 100% rename from client-app/src/app/designs/chart/layout/TopContent.js rename to client-app/src/oldapp/designs/chart/layout/TopContent.js diff --git a/client-app/src/app/designs/chart/main/ChartsWithLegendAndToolbarsAndSlider.js b/client-app/src/oldapp/designs/chart/main/ChartsWithLegendAndToolbarsAndSlider.js similarity index 100% rename from client-app/src/app/designs/chart/main/ChartsWithLegendAndToolbarsAndSlider.js rename to client-app/src/oldapp/designs/chart/main/ChartsWithLegendAndToolbarsAndSlider.js diff --git a/client-app/src/app/designs/chart/main/ChartsWithToolbarsAndSlider.js b/client-app/src/oldapp/designs/chart/main/ChartsWithToolbarsAndSlider.js similarity index 100% rename from client-app/src/app/designs/chart/main/ChartsWithToolbarsAndSlider.js rename to client-app/src/oldapp/designs/chart/main/ChartsWithToolbarsAndSlider.js diff --git a/client-app/src/app/designs/chart/main/MultiPieChartWithToolbar.js b/client-app/src/oldapp/designs/chart/main/MultiPieChartWithToolbar.js similarity index 100% rename from client-app/src/app/designs/chart/main/MultiPieChartWithToolbar.js rename to client-app/src/oldapp/designs/chart/main/MultiPieChartWithToolbar.js diff --git a/client-app/src/app/designs/chart/main/MultiWindRoseChartWithToolbar.js b/client-app/src/oldapp/designs/chart/main/MultiWindRoseChartWithToolbar.js similarity index 100% rename from client-app/src/app/designs/chart/main/MultiWindRoseChartWithToolbar.js rename to client-app/src/oldapp/designs/chart/main/MultiWindRoseChartWithToolbar.js diff --git a/client-app/src/app/designs/chart/main/WindRoseChartWithToolbar.js b/client-app/src/oldapp/designs/chart/main/WindRoseChartWithToolbar.js similarity index 100% rename from client-app/src/app/designs/chart/main/WindRoseChartWithToolbar.js rename to client-app/src/oldapp/designs/chart/main/WindRoseChartWithToolbar.js diff --git a/client-app/src/app/designs/chart/main/_ChartsWithToolbarsAndSlider.js b/client-app/src/oldapp/designs/chart/main/_ChartsWithToolbarsAndSlider.js similarity index 100% rename from client-app/src/app/designs/chart/main/_ChartsWithToolbarsAndSlider.js rename to client-app/src/oldapp/designs/chart/main/_ChartsWithToolbarsAndSlider.js diff --git a/client-app/src/app/designs/chart/main/_ChartsWithToolbarsAndSliderItfc.js b/client-app/src/oldapp/designs/chart/main/_ChartsWithToolbarsAndSliderItfc.js similarity index 100% rename from client-app/src/app/designs/chart/main/_ChartsWithToolbarsAndSliderItfc.js rename to client-app/src/oldapp/designs/chart/main/_ChartsWithToolbarsAndSliderItfc.js diff --git a/client-app/src/app/designs/chart/main/_ProcessDataDefinitionAndGetTimeSeries.js b/client-app/src/oldapp/designs/chart/main/_ProcessDataDefinitionAndGetTimeSeries.js similarity index 100% rename from client-app/src/app/designs/chart/main/_ProcessDataDefinitionAndGetTimeSeries.js rename to client-app/src/oldapp/designs/chart/main/_ProcessDataDefinitionAndGetTimeSeries.js diff --git a/client-app/src/app/designs/details/Controller.js b/client-app/src/oldapp/designs/details/Controller.js similarity index 100% rename from client-app/src/app/designs/details/Controller.js rename to client-app/src/oldapp/designs/details/Controller.js diff --git a/client-app/src/app/designs/details/Layout.js b/client-app/src/oldapp/designs/details/Layout.js similarity index 100% rename from client-app/src/app/designs/details/Layout.js rename to client-app/src/oldapp/designs/details/Layout.js diff --git a/client-app/src/app/designs/details/_AddBasicTitle.js b/client-app/src/oldapp/designs/details/_AddBasicTitle.js similarity index 100% rename from client-app/src/app/designs/details/_AddBasicTitle.js rename to client-app/src/oldapp/designs/details/_AddBasicTitle.js diff --git a/client-app/src/app/designs/details/_AddTitle.js b/client-app/src/oldapp/designs/details/_AddTitle.js similarity index 100% rename from client-app/src/app/designs/details/_AddTitle.js rename to client-app/src/oldapp/designs/details/_AddTitle.js diff --git a/client-app/src/app/designs/details/_ControllerItfc.js b/client-app/src/oldapp/designs/details/_ControllerItfc.js similarity index 100% rename from client-app/src/app/designs/details/_ControllerItfc.js rename to client-app/src/oldapp/designs/details/_ControllerItfc.js diff --git a/client-app/src/app/designs/details/main/ActivityLayerMap.js b/client-app/src/oldapp/designs/details/main/ActivityLayerMap.js similarity index 100% rename from client-app/src/app/designs/details/main/ActivityLayerMap.js rename to client-app/src/oldapp/designs/details/main/ActivityLayerMap.js diff --git a/client-app/src/app/designs/details/main/ActivityMap.js b/client-app/src/oldapp/designs/details/main/ActivityMap.js similarity index 100% rename from client-app/src/app/designs/details/main/ActivityMap.js rename to client-app/src/oldapp/designs/details/main/ActivityMap.js diff --git a/client-app/src/app/designs/details/main/ActivityTrackingMap.js b/client-app/src/oldapp/designs/details/main/ActivityTrackingMap.js similarity index 100% rename from client-app/src/app/designs/details/main/ActivityTrackingMap.js rename to client-app/src/oldapp/designs/details/main/ActivityTrackingMap.js diff --git a/client-app/src/app/designs/details/main/Contact.js b/client-app/src/oldapp/designs/details/main/Contact.js similarity index 100% rename from client-app/src/app/designs/details/main/Contact.js rename to client-app/src/oldapp/designs/details/main/Contact.js diff --git a/client-app/src/app/designs/details/main/Document.js b/client-app/src/oldapp/designs/details/main/Document.js similarity index 100% rename from client-app/src/app/designs/details/main/Document.js rename to client-app/src/oldapp/designs/details/main/Document.js diff --git a/client-app/src/app/designs/details/main/DocumentPDF.js b/client-app/src/oldapp/designs/details/main/DocumentPDF.js similarity index 100% rename from client-app/src/app/designs/details/main/DocumentPDF.js rename to client-app/src/oldapp/designs/details/main/DocumentPDF.js diff --git a/client-app/src/app/designs/details/main/Organisation.js b/client-app/src/oldapp/designs/details/main/Organisation.js similarity index 100% rename from client-app/src/app/designs/details/main/Organisation.js rename to client-app/src/oldapp/designs/details/main/Organisation.js diff --git a/client-app/src/app/designs/details/main/Platform.js b/client-app/src/oldapp/designs/details/main/Platform.js similarity index 100% rename from client-app/src/app/designs/details/main/Platform.js rename to client-app/src/oldapp/designs/details/main/Platform.js diff --git a/client-app/src/app/designs/details/main/Program.js b/client-app/src/oldapp/designs/details/main/Program.js similarity index 100% rename from client-app/src/app/designs/details/main/Program.js rename to client-app/src/oldapp/designs/details/main/Program.js diff --git a/client-app/src/app/designs/details/main/Project.js b/client-app/src/oldapp/designs/details/main/Project.js similarity index 100% rename from client-app/src/app/designs/details/main/Project.js rename to client-app/src/oldapp/designs/details/main/Project.js diff --git a/client-app/src/app/designs/details/main/ServiceOGC.js b/client-app/src/oldapp/designs/details/main/ServiceOGC.js similarity index 100% rename from client-app/src/app/designs/details/main/ServiceOGC.js rename to client-app/src/oldapp/designs/details/main/ServiceOGC.js diff --git a/client-app/src/app/designs/details/main/Species.js b/client-app/src/oldapp/designs/details/main/Species.js similarity index 100% rename from client-app/src/app/designs/details/main/Species.js rename to client-app/src/oldapp/designs/details/main/Species.js diff --git a/client-app/src/app/designs/details/main/SpeciesLocation.js b/client-app/src/oldapp/designs/details/main/SpeciesLocation.js similarity index 100% rename from client-app/src/app/designs/details/main/SpeciesLocation.js rename to client-app/src/oldapp/designs/details/main/SpeciesLocation.js diff --git a/client-app/src/app/designs/details/main/Statistics.js b/client-app/src/oldapp/designs/details/main/Statistics.js similarity index 100% rename from client-app/src/app/designs/details/main/Statistics.js rename to client-app/src/oldapp/designs/details/main/Statistics.js diff --git a/client-app/src/app/designs/details/main/_ActivityBase.js b/client-app/src/oldapp/designs/details/main/_ActivityBase.js similarity index 100% rename from client-app/src/app/designs/details/main/_ActivityBase.js rename to client-app/src/oldapp/designs/details/main/_ActivityBase.js diff --git a/client-app/src/app/designs/details/main/_DetailsBase.js b/client-app/src/oldapp/designs/details/main/_DetailsBase.js similarity index 100% rename from client-app/src/app/designs/details/main/_DetailsBase.js rename to client-app/src/oldapp/designs/details/main/_DetailsBase.js diff --git a/client-app/src/app/designs/doubleList/Controller.js b/client-app/src/oldapp/designs/doubleList/Controller.js similarity index 100% rename from client-app/src/app/designs/doubleList/Controller.js rename to client-app/src/oldapp/designs/doubleList/Controller.js diff --git a/client-app/src/app/designs/doubleList/layout/Layout.js b/client-app/src/oldapp/designs/doubleList/layout/Layout.js similarity index 100% rename from client-app/src/app/designs/doubleList/layout/Layout.js rename to client-app/src/oldapp/designs/doubleList/layout/Layout.js diff --git a/client-app/src/app/designs/doubleList/layout/TopLeftContentAndDoubleList.js b/client-app/src/oldapp/designs/doubleList/layout/TopLeftContentAndDoubleList.js similarity index 100% rename from client-app/src/app/designs/doubleList/layout/TopLeftContentAndDoubleList.js rename to client-app/src/oldapp/designs/doubleList/layout/TopLeftContentAndDoubleList.js diff --git a/client-app/src/app/designs/doubleList/main/textSearchAndDoubleList.js b/client-app/src/oldapp/designs/doubleList/main/textSearchAndDoubleList.js similarity index 100% rename from client-app/src/app/designs/doubleList/main/textSearchAndDoubleList.js rename to client-app/src/oldapp/designs/doubleList/main/textSearchAndDoubleList.js diff --git a/client-app/src/app/designs/dynamicDualContent/Controller.js b/client-app/src/oldapp/designs/dynamicDualContent/Controller.js similarity index 100% rename from client-app/src/app/designs/dynamicDualContent/Controller.js rename to client-app/src/oldapp/designs/dynamicDualContent/Controller.js diff --git a/client-app/src/app/designs/dynamicDualContent/layout/FacetsInLeftSecondaryContent.js b/client-app/src/oldapp/designs/dynamicDualContent/layout/FacetsInLeftSecondaryContent.js similarity index 100% rename from client-app/src/app/designs/dynamicDualContent/layout/FacetsInLeftSecondaryContent.js rename to client-app/src/oldapp/designs/dynamicDualContent/layout/FacetsInLeftSecondaryContent.js diff --git a/client-app/src/app/designs/dynamicDualContent/layout/LeftSecondaryContent.js b/client-app/src/oldapp/designs/dynamicDualContent/layout/LeftSecondaryContent.js similarity index 100% rename from client-app/src/app/designs/dynamicDualContent/layout/LeftSecondaryContent.js rename to client-app/src/oldapp/designs/dynamicDualContent/layout/LeftSecondaryContent.js diff --git a/client-app/src/app/designs/dynamicDualContent/layout/TopSecondaryContent.js b/client-app/src/oldapp/designs/dynamicDualContent/layout/TopSecondaryContent.js similarity index 100% rename from client-app/src/app/designs/dynamicDualContent/layout/TopSecondaryContent.js rename to client-app/src/oldapp/designs/dynamicDualContent/layout/TopSecondaryContent.js diff --git a/client-app/src/app/designs/dynamicDualContent/layout/_Layout.js b/client-app/src/oldapp/designs/dynamicDualContent/layout/_Layout.js similarity index 100% rename from client-app/src/app/designs/dynamicDualContent/layout/_Layout.js rename to client-app/src/oldapp/designs/dynamicDualContent/layout/_Layout.js diff --git a/client-app/src/app/designs/dynamicDualContent/main/FacetsWithDynamicRightContent.js b/client-app/src/oldapp/designs/dynamicDualContent/main/FacetsWithDynamicRightContent.js similarity index 100% rename from client-app/src/app/designs/dynamicDualContent/main/FacetsWithDynamicRightContent.js rename to client-app/src/oldapp/designs/dynamicDualContent/main/FacetsWithDynamicRightContent.js diff --git a/client-app/src/app/designs/edition/Controller.js b/client-app/src/oldapp/designs/edition/Controller.js similarity index 100% rename from client-app/src/app/designs/edition/Controller.js rename to client-app/src/oldapp/designs/edition/Controller.js diff --git a/client-app/src/app/designs/edition/Layout.js b/client-app/src/oldapp/designs/edition/Layout.js similarity index 100% rename from client-app/src/app/designs/edition/Layout.js rename to client-app/src/oldapp/designs/edition/Layout.js diff --git a/client-app/src/app/designs/embeddedContent/Controller.js b/client-app/src/oldapp/designs/embeddedContent/Controller.js similarity index 100% rename from client-app/src/app/designs/embeddedContent/Controller.js rename to client-app/src/oldapp/designs/embeddedContent/Controller.js diff --git a/client-app/src/app/designs/embeddedContent/Layout.js b/client-app/src/oldapp/designs/embeddedContent/Layout.js similarity index 100% rename from client-app/src/app/designs/embeddedContent/Layout.js rename to client-app/src/oldapp/designs/embeddedContent/Layout.js diff --git a/client-app/src/app/designs/embeddedContentWithTopbar/Controller.js b/client-app/src/oldapp/designs/embeddedContentWithTopbar/Controller.js similarity index 100% rename from client-app/src/app/designs/embeddedContentWithTopbar/Controller.js rename to client-app/src/oldapp/designs/embeddedContentWithTopbar/Controller.js diff --git a/client-app/src/app/designs/embeddedContentWithTopbar/layout/TopAndCenterContent.js b/client-app/src/oldapp/designs/embeddedContentWithTopbar/layout/TopAndCenterContent.js similarity index 100% rename from client-app/src/app/designs/embeddedContentWithTopbar/layout/TopAndCenterContent.js rename to client-app/src/oldapp/designs/embeddedContentWithTopbar/layout/TopAndCenterContent.js diff --git a/client-app/src/app/designs/embeddedContentWithTopbar/main/EmbeddedContentSelectionInTopbar.js b/client-app/src/oldapp/designs/embeddedContentWithTopbar/main/EmbeddedContentSelectionInTopbar.js similarity index 100% rename from client-app/src/app/designs/embeddedContentWithTopbar/main/EmbeddedContentSelectionInTopbar.js rename to client-app/src/oldapp/designs/embeddedContentWithTopbar/main/EmbeddedContentSelectionInTopbar.js diff --git a/client-app/src/app/designs/externalTextSearchList/Controller.js b/client-app/src/oldapp/designs/externalTextSearchList/Controller.js similarity index 100% rename from client-app/src/app/designs/externalTextSearchList/Controller.js rename to client-app/src/oldapp/designs/externalTextSearchList/Controller.js diff --git a/client-app/src/app/designs/externalTextSearchList/Layout.js b/client-app/src/oldapp/designs/externalTextSearchList/Layout.js similarity index 100% rename from client-app/src/app/designs/externalTextSearchList/Layout.js rename to client-app/src/oldapp/designs/externalTextSearchList/Layout.js diff --git a/client-app/src/app/designs/externalTextSearchList/main/PlaceNames.js b/client-app/src/oldapp/designs/externalTextSearchList/main/PlaceNames.js similarity index 100% rename from client-app/src/app/designs/externalTextSearchList/main/PlaceNames.js rename to client-app/src/oldapp/designs/externalTextSearchList/main/PlaceNames.js diff --git a/client-app/src/app/designs/externalTextSearchList/main/Worms.js b/client-app/src/oldapp/designs/externalTextSearchList/main/Worms.js similarity index 100% rename from client-app/src/app/designs/externalTextSearchList/main/Worms.js rename to client-app/src/oldapp/designs/externalTextSearchList/main/Worms.js diff --git a/client-app/src/app/designs/formList/Controller.js b/client-app/src/oldapp/designs/formList/Controller.js similarity index 100% rename from client-app/src/app/designs/formList/Controller.js rename to client-app/src/oldapp/designs/formList/Controller.js diff --git a/client-app/src/app/designs/formList/_ControllerItfc.js b/client-app/src/oldapp/designs/formList/_ControllerItfc.js similarity index 100% rename from client-app/src/app/designs/formList/_ControllerItfc.js rename to client-app/src/oldapp/designs/formList/_ControllerItfc.js diff --git a/client-app/src/app/designs/formList/layout/Layout.js b/client-app/src/oldapp/designs/formList/layout/Layout.js similarity index 100% rename from client-app/src/app/designs/formList/layout/Layout.js rename to client-app/src/oldapp/designs/formList/layout/Layout.js diff --git a/client-app/src/app/designs/formList/layout/LayoutWithTopForm.js b/client-app/src/oldapp/designs/formList/layout/LayoutWithTopForm.js similarity index 100% rename from client-app/src/app/designs/formList/layout/LayoutWithTopForm.js rename to client-app/src/oldapp/designs/formList/layout/LayoutWithTopForm.js diff --git a/client-app/src/app/designs/formList/main/FormListByStep.js b/client-app/src/oldapp/designs/formList/main/FormListByStep.js similarity index 100% rename from client-app/src/app/designs/formList/main/FormListByStep.js rename to client-app/src/oldapp/designs/formList/main/FormListByStep.js diff --git a/client-app/src/app/designs/formList/main/_RequestAndParseData.js b/client-app/src/oldapp/designs/formList/main/_RequestAndParseData.js similarity index 100% rename from client-app/src/app/designs/formList/main/_RequestAndParseData.js rename to client-app/src/oldapp/designs/formList/main/_RequestAndParseData.js diff --git a/client-app/src/app/designs/list/Controller.js b/client-app/src/oldapp/designs/list/Controller.js similarity index 100% rename from client-app/src/app/designs/list/Controller.js rename to client-app/src/oldapp/designs/list/Controller.js diff --git a/client-app/src/app/designs/list/_AddFilter.js b/client-app/src/oldapp/designs/list/_AddFilter.js similarity index 100% rename from client-app/src/app/designs/list/_AddFilter.js rename to client-app/src/oldapp/designs/list/_AddFilter.js diff --git a/client-app/src/app/designs/list/layout/Layout.js b/client-app/src/oldapp/designs/list/layout/Layout.js similarity index 100% rename from client-app/src/app/designs/list/layout/Layout.js rename to client-app/src/oldapp/designs/list/layout/Layout.js diff --git a/client-app/src/app/designs/list/layout/ListWithTopContent.js b/client-app/src/oldapp/designs/list/layout/ListWithTopContent.js similarity index 100% rename from client-app/src/app/designs/list/layout/ListWithTopContent.js rename to client-app/src/oldapp/designs/list/layout/ListWithTopContent.js diff --git a/client-app/src/app/designs/list/layout/NoTitle.js b/client-app/src/oldapp/designs/list/layout/NoTitle.js similarity index 100% rename from client-app/src/app/designs/list/layout/NoTitle.js rename to client-app/src/oldapp/designs/list/layout/NoTitle.js diff --git a/client-app/src/app/designs/mapWithSideContent/Controller.js b/client-app/src/oldapp/designs/mapWithSideContent/Controller.js similarity index 100% rename from client-app/src/app/designs/mapWithSideContent/Controller.js rename to client-app/src/oldapp/designs/mapWithSideContent/Controller.js diff --git a/client-app/src/app/designs/mapWithSideContent/layout/MapAndContent.js b/client-app/src/oldapp/designs/mapWithSideContent/layout/MapAndContent.js similarity index 100% rename from client-app/src/app/designs/mapWithSideContent/layout/MapAndContent.js rename to client-app/src/oldapp/designs/mapWithSideContent/layout/MapAndContent.js diff --git a/client-app/src/app/designs/mapWithSideContent/layout/MapAndContentAndTopbar.js b/client-app/src/oldapp/designs/mapWithSideContent/layout/MapAndContentAndTopbar.js similarity index 100% rename from client-app/src/app/designs/mapWithSideContent/layout/MapAndContentAndTopbar.js rename to client-app/src/oldapp/designs/mapWithSideContent/layout/MapAndContentAndTopbar.js diff --git a/client-app/src/app/designs/mapWithSideContent/main/FilterAndGeographic.js b/client-app/src/oldapp/designs/mapWithSideContent/main/FilterAndGeographic.js similarity index 100% rename from client-app/src/app/designs/mapWithSideContent/main/FilterAndGeographic.js rename to client-app/src/oldapp/designs/mapWithSideContent/main/FilterAndGeographic.js diff --git a/client-app/src/app/designs/mapWithSideContent/main/Geographic.js b/client-app/src/oldapp/designs/mapWithSideContent/main/Geographic.js similarity index 100% rename from client-app/src/app/designs/mapWithSideContent/main/Geographic.js rename to client-app/src/oldapp/designs/mapWithSideContent/main/Geographic.js diff --git a/client-app/src/app/designs/mapWithSideContent/main/GeographicEditor.js b/client-app/src/oldapp/designs/mapWithSideContent/main/GeographicEditor.js similarity index 100% rename from client-app/src/app/designs/mapWithSideContent/main/GeographicEditor.js rename to client-app/src/oldapp/designs/mapWithSideContent/main/GeographicEditor.js diff --git a/client-app/src/app/designs/mapWithSideContent/main/Tracking.js b/client-app/src/oldapp/designs/mapWithSideContent/main/Tracking.js similarity index 100% rename from client-app/src/app/designs/mapWithSideContent/main/Tracking.js rename to client-app/src/oldapp/designs/mapWithSideContent/main/Tracking.js diff --git a/client-app/src/app/designs/mapWithSideContent/main/_TrackingByFilter.js b/client-app/src/oldapp/designs/mapWithSideContent/main/_TrackingByFilter.js similarity index 100% rename from client-app/src/app/designs/mapWithSideContent/main/_TrackingByFilter.js rename to client-app/src/oldapp/designs/mapWithSideContent/main/_TrackingByFilter.js diff --git a/client-app/src/app/designs/mapWithSideContent/main/_TrackingWithList.js b/client-app/src/oldapp/designs/mapWithSideContent/main/_TrackingWithList.js similarity index 100% rename from client-app/src/app/designs/mapWithSideContent/main/_TrackingWithList.js rename to client-app/src/oldapp/designs/mapWithSideContent/main/_TrackingWithList.js diff --git a/client-app/src/app/designs/mapWithSideContent/main/_TrackingWithListByFilter.js b/client-app/src/oldapp/designs/mapWithSideContent/main/_TrackingWithListByFilter.js similarity index 100% rename from client-app/src/app/designs/mapWithSideContent/main/_TrackingWithListByFilter.js rename to client-app/src/oldapp/designs/mapWithSideContent/main/_TrackingWithListByFilter.js diff --git a/client-app/src/app/designs/textSearchFacetsList/Controller.js b/client-app/src/oldapp/designs/textSearchFacetsList/Controller.js similarity index 100% rename from client-app/src/app/designs/textSearchFacetsList/Controller.js rename to client-app/src/oldapp/designs/textSearchFacetsList/Controller.js diff --git a/client-app/src/app/designs/textSearchFacetsList/Layout.js b/client-app/src/oldapp/designs/textSearchFacetsList/Layout.js similarity index 100% rename from client-app/src/app/designs/textSearchFacetsList/Layout.js rename to client-app/src/oldapp/designs/textSearchFacetsList/Layout.js diff --git a/client-app/src/app/designs/textSearchFacetsList/_AddFilter.js b/client-app/src/oldapp/designs/textSearchFacetsList/_AddFilter.js similarity index 100% rename from client-app/src/app/designs/textSearchFacetsList/_AddFilter.js rename to client-app/src/oldapp/designs/textSearchFacetsList/_AddFilter.js diff --git a/client-app/src/app/designs/textSearchFacetsList/main/Activity.js b/client-app/src/oldapp/designs/textSearchFacetsList/main/Activity.js similarity index 100% rename from client-app/src/app/designs/textSearchFacetsList/main/Activity.js rename to client-app/src/oldapp/designs/textSearchFacetsList/main/Activity.js diff --git a/client-app/src/app/designs/textSearchFacetsList/main/Administrative.js b/client-app/src/oldapp/designs/textSearchFacetsList/main/Administrative.js similarity index 100% rename from client-app/src/app/designs/textSearchFacetsList/main/Administrative.js rename to client-app/src/oldapp/designs/textSearchFacetsList/main/Administrative.js diff --git a/client-app/src/app/designs/textSearchFacetsList/main/Bibliography.js b/client-app/src/oldapp/designs/textSearchFacetsList/main/Bibliography.js similarity index 100% rename from client-app/src/app/designs/textSearchFacetsList/main/Bibliography.js rename to client-app/src/oldapp/designs/textSearchFacetsList/main/Bibliography.js diff --git a/client-app/src/app/designs/textSearchFacetsList/main/Domain.js b/client-app/src/oldapp/designs/textSearchFacetsList/main/Domain.js similarity index 100% rename from client-app/src/app/designs/textSearchFacetsList/main/Domain.js rename to client-app/src/oldapp/designs/textSearchFacetsList/main/Domain.js diff --git a/client-app/src/app/designs/textSearchFacetsList/main/Organisation.js b/client-app/src/oldapp/designs/textSearchFacetsList/main/Organisation.js similarity index 100% rename from client-app/src/app/designs/textSearchFacetsList/main/Organisation.js rename to client-app/src/oldapp/designs/textSearchFacetsList/main/Organisation.js diff --git a/client-app/src/app/designs/textSearchFacetsList/main/Platform.js b/client-app/src/oldapp/designs/textSearchFacetsList/main/Platform.js similarity index 100% rename from client-app/src/app/designs/textSearchFacetsList/main/Platform.js rename to client-app/src/oldapp/designs/textSearchFacetsList/main/Platform.js diff --git a/client-app/src/app/designs/textSearchFacetsList/main/Program.js b/client-app/src/oldapp/designs/textSearchFacetsList/main/Program.js similarity index 100% rename from client-app/src/app/designs/textSearchFacetsList/main/Program.js rename to client-app/src/oldapp/designs/textSearchFacetsList/main/Program.js diff --git a/client-app/src/app/designs/textSearchFacetsList/main/Project.js b/client-app/src/oldapp/designs/textSearchFacetsList/main/Project.js similarity index 100% rename from client-app/src/app/designs/textSearchFacetsList/main/Project.js rename to client-app/src/oldapp/designs/textSearchFacetsList/main/Project.js diff --git a/client-app/src/app/designs/textSearchFacetsList/main/ServiceOGC.js b/client-app/src/oldapp/designs/textSearchFacetsList/main/ServiceOGC.js similarity index 100% rename from client-app/src/app/designs/textSearchFacetsList/main/ServiceOGC.js rename to client-app/src/oldapp/designs/textSearchFacetsList/main/ServiceOGC.js diff --git a/client-app/src/app/designs/textSearchFacetsList/main/Species.js b/client-app/src/oldapp/designs/textSearchFacetsList/main/Species.js similarity index 100% rename from client-app/src/app/designs/textSearchFacetsList/main/Species.js rename to client-app/src/oldapp/designs/textSearchFacetsList/main/Species.js diff --git a/client-app/src/app/designs/textSearchFacetsList/main/Taxon.js b/client-app/src/oldapp/designs/textSearchFacetsList/main/Taxon.js similarity index 100% rename from client-app/src/app/designs/textSearchFacetsList/main/Taxon.js rename to client-app/src/oldapp/designs/textSearchFacetsList/main/Taxon.js diff --git a/client-app/src/app/designs/textSearchList/Controller.js b/client-app/src/oldapp/designs/textSearchList/Controller.js similarity index 100% rename from client-app/src/app/designs/textSearchList/Controller.js rename to client-app/src/oldapp/designs/textSearchList/Controller.js diff --git a/client-app/src/app/designs/textSearchList/_AddFilter.js b/client-app/src/oldapp/designs/textSearchList/_AddFilter.js similarity index 100% rename from client-app/src/app/designs/textSearchList/_AddFilter.js rename to client-app/src/oldapp/designs/textSearchList/_AddFilter.js diff --git a/client-app/src/app/designs/textSearchList/layout/BasicAndButtonsTopZone.js b/client-app/src/oldapp/designs/textSearchList/layout/BasicAndButtonsTopZone.js similarity index 100% rename from client-app/src/app/designs/textSearchList/layout/BasicAndButtonsTopZone.js rename to client-app/src/oldapp/designs/textSearchList/layout/BasicAndButtonsTopZone.js diff --git a/client-app/src/app/designs/textSearchList/layout/BasicTopZone.js b/client-app/src/oldapp/designs/textSearchList/layout/BasicTopZone.js similarity index 100% rename from client-app/src/app/designs/textSearchList/layout/BasicTopZone.js rename to client-app/src/oldapp/designs/textSearchList/layout/BasicTopZone.js diff --git a/client-app/src/app/designs/textSearchList/main/Domain.js b/client-app/src/oldapp/designs/textSearchList/main/Domain.js similarity index 100% rename from client-app/src/app/designs/textSearchList/main/Domain.js rename to client-app/src/oldapp/designs/textSearchList/main/Domain.js diff --git a/client-app/src/app/designs/textSearchList/main/Selection.js b/client-app/src/oldapp/designs/textSearchList/main/Selection.js similarity index 100% rename from client-app/src/app/designs/textSearchList/main/Selection.js rename to client-app/src/oldapp/designs/textSearchList/main/Selection.js diff --git a/client-app/src/app/designs/textSearchList/main/ServiceOGC.js b/client-app/src/oldapp/designs/textSearchList/main/ServiceOGC.js similarity index 100% rename from client-app/src/app/designs/textSearchList/main/ServiceOGC.js rename to client-app/src/oldapp/designs/textSearchList/main/ServiceOGC.js diff --git a/client-app/src/app/details/views/ActivityAreaMapBase.js b/client-app/src/oldapp/details/views/ActivityAreaMapBase.js similarity index 100% rename from client-app/src/app/details/views/ActivityAreaMapBase.js rename to client-app/src/oldapp/details/views/ActivityAreaMapBase.js diff --git a/client-app/src/app/details/views/ActivityCatalogDetailsView.js b/client-app/src/oldapp/details/views/ActivityCatalogDetailsView.js similarity index 91% rename from client-app/src/app/details/views/ActivityCatalogDetailsView.js rename to client-app/src/oldapp/details/views/ActivityCatalogDetailsView.js index 9ce71351..8a2dad7d 100644 --- a/client-app/src/app/details/views/ActivityCatalogDetailsView.js +++ b/client-app/src/oldapp/details/views/ActivityCatalogDetailsView.js @@ -1,7 +1,7 @@ define([ 'src/redmicConfig' , 'dojo/_base/declare' - , 'src/view/detail/activity/ActivityDetail' + , 'src/catalog/detail/activity/ActivityDetail' ], function( redmicConfig , declare diff --git a/client-app/src/app/details/views/ActivityChart.js b/client-app/src/oldapp/details/views/ActivityChart.js similarity index 100% rename from client-app/src/app/details/views/ActivityChart.js rename to client-app/src/oldapp/details/views/ActivityChart.js diff --git a/client-app/src/app/details/views/ActivityCitationMapBase.js b/client-app/src/oldapp/details/views/ActivityCitationMapBase.js similarity index 100% rename from client-app/src/app/details/views/ActivityCitationMapBase.js rename to client-app/src/oldapp/details/views/ActivityCitationMapBase.js diff --git a/client-app/src/app/details/views/ActivityDetailsView.js b/client-app/src/oldapp/details/views/ActivityDetailsView.js similarity index 93% rename from client-app/src/app/details/views/ActivityDetailsView.js rename to client-app/src/oldapp/details/views/ActivityDetailsView.js index 6c138f96..b3e3b751 100644 --- a/client-app/src/app/details/views/ActivityDetailsView.js +++ b/client-app/src/oldapp/details/views/ActivityDetailsView.js @@ -1,7 +1,7 @@ define([ 'src/redmicConfig' , 'dojo/_base/declare' - , 'src/view/detail/activity/ActivityDetail' + , 'src/catalog/detail/activity/ActivityDetail' ], function( redmicConfig , declare diff --git a/client-app/src/app/details/views/ActivityFixedTimeseriesChart.js b/client-app/src/oldapp/details/views/ActivityFixedTimeseriesChart.js similarity index 100% rename from client-app/src/app/details/views/ActivityFixedTimeseriesChart.js rename to client-app/src/oldapp/details/views/ActivityFixedTimeseriesChart.js diff --git a/client-app/src/app/details/views/ActivityFixedTimeseriesMap.js b/client-app/src/oldapp/details/views/ActivityFixedTimeseriesMap.js similarity index 100% rename from client-app/src/app/details/views/ActivityFixedTimeseriesMap.js rename to client-app/src/oldapp/details/views/ActivityFixedTimeseriesMap.js diff --git a/client-app/src/app/details/views/ActivityInfrastructureMapBase.js b/client-app/src/oldapp/details/views/ActivityInfrastructureMapBase.js similarity index 100% rename from client-app/src/app/details/views/ActivityInfrastructureMapBase.js rename to client-app/src/oldapp/details/views/ActivityInfrastructureMapBase.js diff --git a/client-app/src/app/details/views/ActivityLayerMapBase.js b/client-app/src/oldapp/details/views/ActivityLayerMapBase.js similarity index 100% rename from client-app/src/app/details/views/ActivityLayerMapBase.js rename to client-app/src/oldapp/details/views/ActivityLayerMapBase.js diff --git a/client-app/src/app/details/views/BibliographyDetailsView.js b/client-app/src/oldapp/details/views/BibliographyDetailsView.js similarity index 100% rename from client-app/src/app/details/views/BibliographyDetailsView.js rename to client-app/src/oldapp/details/views/BibliographyDetailsView.js diff --git a/client-app/src/app/details/views/ContactDetailsView.js b/client-app/src/oldapp/details/views/ContactDetailsView.js similarity index 100% rename from client-app/src/app/details/views/ContactDetailsView.js rename to client-app/src/oldapp/details/views/ContactDetailsView.js diff --git a/client-app/src/app/details/views/DocumentDetailsView.js b/client-app/src/oldapp/details/views/DocumentDetailsView.js similarity index 100% rename from client-app/src/app/details/views/DocumentDetailsView.js rename to client-app/src/oldapp/details/views/DocumentDetailsView.js diff --git a/client-app/src/app/details/views/OrganisationCatalogDetailsView.js b/client-app/src/oldapp/details/views/OrganisationCatalogDetailsView.js similarity index 100% rename from client-app/src/app/details/views/OrganisationCatalogDetailsView.js rename to client-app/src/oldapp/details/views/OrganisationCatalogDetailsView.js diff --git a/client-app/src/app/details/views/OrganisationDetailsView.js b/client-app/src/oldapp/details/views/OrganisationDetailsView.js similarity index 100% rename from client-app/src/app/details/views/OrganisationDetailsView.js rename to client-app/src/oldapp/details/views/OrganisationDetailsView.js diff --git a/client-app/src/app/details/views/PlatformCatalogDetailsView.js b/client-app/src/oldapp/details/views/PlatformCatalogDetailsView.js similarity index 100% rename from client-app/src/app/details/views/PlatformCatalogDetailsView.js rename to client-app/src/oldapp/details/views/PlatformCatalogDetailsView.js diff --git a/client-app/src/app/details/views/PlatformDetailsView.js b/client-app/src/oldapp/details/views/PlatformDetailsView.js similarity index 100% rename from client-app/src/app/details/views/PlatformDetailsView.js rename to client-app/src/oldapp/details/views/PlatformDetailsView.js diff --git a/client-app/src/app/details/views/ProgramCatalogDetailsView.js b/client-app/src/oldapp/details/views/ProgramCatalogDetailsView.js similarity index 100% rename from client-app/src/app/details/views/ProgramCatalogDetailsView.js rename to client-app/src/oldapp/details/views/ProgramCatalogDetailsView.js diff --git a/client-app/src/app/details/views/ProgramDetailsView.js b/client-app/src/oldapp/details/views/ProgramDetailsView.js similarity index 100% rename from client-app/src/app/details/views/ProgramDetailsView.js rename to client-app/src/oldapp/details/views/ProgramDetailsView.js diff --git a/client-app/src/app/details/views/ProjectCatalogDetailsView.js b/client-app/src/oldapp/details/views/ProjectCatalogDetailsView.js similarity index 100% rename from client-app/src/app/details/views/ProjectCatalogDetailsView.js rename to client-app/src/oldapp/details/views/ProjectCatalogDetailsView.js diff --git a/client-app/src/app/details/views/ProjectDetailsView.js b/client-app/src/oldapp/details/views/ProjectDetailsView.js similarity index 100% rename from client-app/src/app/details/views/ProjectDetailsView.js rename to client-app/src/oldapp/details/views/ProjectDetailsView.js diff --git a/client-app/src/app/details/views/ServiceOGCCatalogDetailsView.js b/client-app/src/oldapp/details/views/ServiceOGCCatalogDetailsView.js similarity index 100% rename from client-app/src/app/details/views/ServiceOGCCatalogDetailsView.js rename to client-app/src/oldapp/details/views/ServiceOGCCatalogDetailsView.js diff --git a/client-app/src/app/details/views/ServiceOGCDetailsView.js b/client-app/src/oldapp/details/views/ServiceOGCDetailsView.js similarity index 100% rename from client-app/src/app/details/views/ServiceOGCDetailsView.js rename to client-app/src/oldapp/details/views/ServiceOGCDetailsView.js diff --git a/client-app/src/app/details/views/SpeciesCatalogDetailsView.js b/client-app/src/oldapp/details/views/SpeciesCatalogDetailsView.js similarity index 100% rename from client-app/src/app/details/views/SpeciesCatalogDetailsView.js rename to client-app/src/oldapp/details/views/SpeciesCatalogDetailsView.js diff --git a/client-app/src/app/details/views/SpeciesDetailsView.js b/client-app/src/oldapp/details/views/SpeciesDetailsView.js similarity index 100% rename from client-app/src/app/details/views/SpeciesDetailsView.js rename to client-app/src/oldapp/details/views/SpeciesDetailsView.js diff --git a/client-app/src/app/details/views/StatisticsDetailsView.js b/client-app/src/oldapp/details/views/StatisticsDetailsView.js similarity index 100% rename from client-app/src/app/details/views/StatisticsDetailsView.js rename to client-app/src/oldapp/details/views/StatisticsDetailsView.js diff --git a/client-app/src/app/details/views/_ActivityTimeSeriesDataManagement.js b/client-app/src/oldapp/details/views/_ActivityTimeSeriesDataManagement.js similarity index 100% rename from client-app/src/app/details/views/_ActivityTimeSeriesDataManagement.js rename to client-app/src/oldapp/details/views/_ActivityTimeSeriesDataManagement.js diff --git a/client-app/src/app/edition/views/ActivityEditionView.js b/client-app/src/oldapp/edition/views/ActivityEditionView.js similarity index 100% rename from client-app/src/app/edition/views/ActivityEditionView.js rename to client-app/src/oldapp/edition/views/ActivityEditionView.js diff --git a/client-app/src/app/edition/views/AnimalEditionView.js b/client-app/src/oldapp/edition/views/AnimalEditionView.js similarity index 100% rename from client-app/src/app/edition/views/AnimalEditionView.js rename to client-app/src/oldapp/edition/views/AnimalEditionView.js diff --git a/client-app/src/app/edition/views/ConditionEditionView.js b/client-app/src/oldapp/edition/views/ConditionEditionView.js similarity index 100% rename from client-app/src/app/edition/views/ConditionEditionView.js rename to client-app/src/oldapp/edition/views/ConditionEditionView.js diff --git a/client-app/src/app/edition/views/ContactEditionView.js b/client-app/src/oldapp/edition/views/ContactEditionView.js similarity index 100% rename from client-app/src/app/edition/views/ContactEditionView.js rename to client-app/src/oldapp/edition/views/ContactEditionView.js diff --git a/client-app/src/app/edition/views/DeviceEditionView.js b/client-app/src/oldapp/edition/views/DeviceEditionView.js similarity index 100% rename from client-app/src/app/edition/views/DeviceEditionView.js rename to client-app/src/oldapp/edition/views/DeviceEditionView.js diff --git a/client-app/src/app/edition/views/DocumentEditionView.js b/client-app/src/oldapp/edition/views/DocumentEditionView.js similarity index 100% rename from client-app/src/app/edition/views/DocumentEditionView.js rename to client-app/src/oldapp/edition/views/DocumentEditionView.js diff --git a/client-app/src/app/edition/views/LoadDataDocumentEditionView.js b/client-app/src/oldapp/edition/views/LoadDataDocumentEditionView.js similarity index 100% rename from client-app/src/app/edition/views/LoadDataDocumentEditionView.js rename to client-app/src/oldapp/edition/views/LoadDataDocumentEditionView.js diff --git a/client-app/src/app/edition/views/LoadDataToActivityEditionView.js b/client-app/src/oldapp/edition/views/LoadDataToActivityEditionView.js similarity index 100% rename from client-app/src/app/edition/views/LoadDataToActivityEditionView.js rename to client-app/src/oldapp/edition/views/LoadDataToActivityEditionView.js diff --git a/client-app/src/app/edition/views/MetricsDefinitionEditionView.js b/client-app/src/oldapp/edition/views/MetricsDefinitionEditionView.js similarity index 100% rename from client-app/src/app/edition/views/MetricsDefinitionEditionView.js rename to client-app/src/oldapp/edition/views/MetricsDefinitionEditionView.js diff --git a/client-app/src/app/edition/views/MisIdentificationEditionView.js b/client-app/src/oldapp/edition/views/MisIdentificationEditionView.js similarity index 100% rename from client-app/src/app/edition/views/MisIdentificationEditionView.js rename to client-app/src/oldapp/edition/views/MisIdentificationEditionView.js diff --git a/client-app/src/app/edition/views/OrganisationEditionView.js b/client-app/src/oldapp/edition/views/OrganisationEditionView.js similarity index 100% rename from client-app/src/app/edition/views/OrganisationEditionView.js rename to client-app/src/oldapp/edition/views/OrganisationEditionView.js diff --git a/client-app/src/app/edition/views/ParameterEditionView.js b/client-app/src/oldapp/edition/views/ParameterEditionView.js similarity index 100% rename from client-app/src/app/edition/views/ParameterEditionView.js rename to client-app/src/oldapp/edition/views/ParameterEditionView.js diff --git a/client-app/src/app/edition/views/PermissionsEditionView.js b/client-app/src/oldapp/edition/views/PermissionsEditionView.js similarity index 100% rename from client-app/src/app/edition/views/PermissionsEditionView.js rename to client-app/src/oldapp/edition/views/PermissionsEditionView.js diff --git a/client-app/src/app/edition/views/PlatformEditionView.js b/client-app/src/oldapp/edition/views/PlatformEditionView.js similarity index 100% rename from client-app/src/app/edition/views/PlatformEditionView.js rename to client-app/src/oldapp/edition/views/PlatformEditionView.js diff --git a/client-app/src/app/edition/views/ProgramEditionView.js b/client-app/src/oldapp/edition/views/ProgramEditionView.js similarity index 100% rename from client-app/src/app/edition/views/ProgramEditionView.js rename to client-app/src/oldapp/edition/views/ProgramEditionView.js diff --git a/client-app/src/app/edition/views/ProjectEditionView.js b/client-app/src/oldapp/edition/views/ProjectEditionView.js similarity index 100% rename from client-app/src/app/edition/views/ProjectEditionView.js rename to client-app/src/oldapp/edition/views/ProjectEditionView.js diff --git a/client-app/src/app/edition/views/ServiceOGCEditionView.js b/client-app/src/oldapp/edition/views/ServiceOGCEditionView.js similarity index 100% rename from client-app/src/app/edition/views/ServiceOGCEditionView.js rename to client-app/src/oldapp/edition/views/ServiceOGCEditionView.js diff --git a/client-app/src/app/edition/views/SpeciesEditionView.js b/client-app/src/oldapp/edition/views/SpeciesEditionView.js similarity index 100% rename from client-app/src/app/edition/views/SpeciesEditionView.js rename to client-app/src/oldapp/edition/views/SpeciesEditionView.js diff --git a/client-app/src/app/edition/views/UnitEditionView.js b/client-app/src/oldapp/edition/views/UnitEditionView.js similarity index 100% rename from client-app/src/app/edition/views/UnitEditionView.js rename to client-app/src/oldapp/edition/views/UnitEditionView.js diff --git a/client-app/src/app/edition/views/dataLoader/AddDataFT.js b/client-app/src/oldapp/edition/views/dataLoader/AddDataFT.js similarity index 100% rename from client-app/src/app/edition/views/dataLoader/AddDataFT.js rename to client-app/src/oldapp/edition/views/dataLoader/AddDataFT.js diff --git a/client-app/src/app/edition/views/dataLoader/AddDataIF.js b/client-app/src/oldapp/edition/views/dataLoader/AddDataIF.js similarity index 100% rename from client-app/src/app/edition/views/dataLoader/AddDataIF.js rename to client-app/src/oldapp/edition/views/dataLoader/AddDataIF.js diff --git a/client-app/src/app/edition/views/dataLoader/AddDataOC.js b/client-app/src/oldapp/edition/views/dataLoader/AddDataOC.js similarity index 100% rename from client-app/src/app/edition/views/dataLoader/AddDataOC.js rename to client-app/src/oldapp/edition/views/dataLoader/AddDataOC.js diff --git a/client-app/src/app/edition/views/dataLoader/EditDataAR.js b/client-app/src/oldapp/edition/views/dataLoader/EditDataAR.js similarity index 100% rename from client-app/src/app/edition/views/dataLoader/EditDataAR.js rename to client-app/src/oldapp/edition/views/dataLoader/EditDataAR.js diff --git a/client-app/src/app/edition/views/dataLoader/LoadDataAR.js b/client-app/src/oldapp/edition/views/dataLoader/LoadDataAR.js similarity index 100% rename from client-app/src/app/edition/views/dataLoader/LoadDataAR.js rename to client-app/src/oldapp/edition/views/dataLoader/LoadDataAR.js diff --git a/client-app/src/app/edition/views/dataLoader/LoadDataFT.js b/client-app/src/oldapp/edition/views/dataLoader/LoadDataFT.js similarity index 100% rename from client-app/src/app/edition/views/dataLoader/LoadDataFT.js rename to client-app/src/oldapp/edition/views/dataLoader/LoadDataFT.js diff --git a/client-app/src/app/edition/views/dataLoader/LoadDataOC.js b/client-app/src/oldapp/edition/views/dataLoader/LoadDataOC.js similarity index 100% rename from client-app/src/app/edition/views/dataLoader/LoadDataOC.js rename to client-app/src/oldapp/edition/views/dataLoader/LoadDataOC.js diff --git a/client-app/src/app/edition/views/dataLoader/LoadDataTR.js b/client-app/src/oldapp/edition/views/dataLoader/LoadDataTR.js similarity index 100% rename from client-app/src/app/edition/views/dataLoader/LoadDataTR.js rename to client-app/src/oldapp/edition/views/dataLoader/LoadDataTR.js diff --git a/client-app/src/app/edition/views/dataLoader/_BaseDataToActivityEdition.js b/client-app/src/oldapp/edition/views/dataLoader/_BaseDataToActivityEdition.js similarity index 100% rename from client-app/src/app/edition/views/dataLoader/_BaseDataToActivityEdition.js rename to client-app/src/oldapp/edition/views/dataLoader/_BaseDataToActivityEdition.js diff --git a/client-app/src/app/edition/views/dataLoader/_BaseDataToActivityEditionItfc.js b/client-app/src/oldapp/edition/views/dataLoader/_BaseDataToActivityEditionItfc.js similarity index 100% rename from client-app/src/app/edition/views/dataLoader/_BaseDataToActivityEditionItfc.js rename to client-app/src/oldapp/edition/views/dataLoader/_BaseDataToActivityEditionItfc.js diff --git a/client-app/src/app/edition/views/dataLoader/_BaseLoadDataToActivityEdition.js b/client-app/src/oldapp/edition/views/dataLoader/_BaseLoadDataToActivityEdition.js similarity index 100% rename from client-app/src/app/edition/views/dataLoader/_BaseLoadDataToActivityEdition.js rename to client-app/src/oldapp/edition/views/dataLoader/_BaseLoadDataToActivityEdition.js diff --git a/client-app/src/app/edition/views/dataLoader/_BaseLoadDataToActivityEditionItfc.js b/client-app/src/oldapp/edition/views/dataLoader/_BaseLoadDataToActivityEditionItfc.js similarity index 100% rename from client-app/src/app/edition/views/dataLoader/_BaseLoadDataToActivityEditionItfc.js rename to client-app/src/oldapp/edition/views/dataLoader/_BaseLoadDataToActivityEditionItfc.js diff --git a/client-app/src/app/home/views/HomeView.js b/client-app/src/oldapp/home/views/HomeView.js similarity index 100% rename from client-app/src/app/home/views/HomeView.js rename to client-app/src/oldapp/home/views/HomeView.js diff --git a/client-app/src/app/home/views/ProductWidget.js b/client-app/src/oldapp/home/views/ProductWidget.js similarity index 100% rename from client-app/src/app/home/views/ProductWidget.js rename to client-app/src/oldapp/home/views/ProductWidget.js diff --git a/client-app/src/app/home/views/SearchBarWidget.js b/client-app/src/oldapp/home/views/SearchBarWidget.js similarity index 100% rename from client-app/src/app/home/views/SearchBarWidget.js rename to client-app/src/oldapp/home/views/SearchBarWidget.js diff --git a/client-app/src/app/home/views/SearchFastFilterWidget.js b/client-app/src/oldapp/home/views/SearchFastFilterWidget.js similarity index 100% rename from client-app/src/app/home/views/SearchFastFilterWidget.js rename to client-app/src/oldapp/home/views/SearchFastFilterWidget.js diff --git a/client-app/src/app/home/views/SearchFilterWidget.js b/client-app/src/oldapp/home/views/SearchFilterWidget.js similarity index 100% rename from client-app/src/app/home/views/SearchFilterWidget.js rename to client-app/src/oldapp/home/views/SearchFilterWidget.js diff --git a/client-app/src/app/home/views/SearchResultsWidget.js b/client-app/src/oldapp/home/views/SearchResultsWidget.js similarity index 100% rename from client-app/src/app/home/views/SearchResultsWidget.js rename to client-app/src/oldapp/home/views/SearchResultsWidget.js diff --git a/client-app/src/app/home/views/SocialWidget.js b/client-app/src/oldapp/home/views/SocialWidget.js similarity index 100% rename from client-app/src/app/home/views/SocialWidget.js rename to client-app/src/oldapp/home/views/SocialWidget.js diff --git a/client-app/src/app/home/views/StatsWidget.js b/client-app/src/oldapp/home/views/StatsWidget.js similarity index 100% rename from client-app/src/app/home/views/StatsWidget.js rename to client-app/src/oldapp/home/views/StatsWidget.js diff --git a/client-app/src/app/home/views/_DashboardItem.js b/client-app/src/oldapp/home/views/_DashboardItem.js similarity index 100% rename from client-app/src/app/home/views/_DashboardItem.js rename to client-app/src/oldapp/home/views/_DashboardItem.js diff --git a/client-app/src/app/maintenance/domains/_HierarchicalDomain.js b/client-app/src/oldapp/maintenance/domains/_HierarchicalDomain.js similarity index 100% rename from client-app/src/app/maintenance/domains/_HierarchicalDomain.js rename to client-app/src/oldapp/maintenance/domains/_HierarchicalDomain.js diff --git a/client-app/src/app/maintenance/domains/admin/views/AccessibilityView.js b/client-app/src/oldapp/maintenance/domains/admin/views/AccessibilityView.js similarity index 100% rename from client-app/src/app/maintenance/domains/admin/views/AccessibilityView.js rename to client-app/src/oldapp/maintenance/domains/admin/views/AccessibilityView.js diff --git a/client-app/src/app/maintenance/domains/admin/views/ActivityFieldsView.js b/client-app/src/oldapp/maintenance/domains/admin/views/ActivityFieldsView.js similarity index 100% rename from client-app/src/app/maintenance/domains/admin/views/ActivityFieldsView.js rename to client-app/src/oldapp/maintenance/domains/admin/views/ActivityFieldsView.js diff --git a/client-app/src/app/maintenance/domains/admin/views/ActivityTypesView.js b/client-app/src/oldapp/maintenance/domains/admin/views/ActivityTypesView.js similarity index 100% rename from client-app/src/app/maintenance/domains/admin/views/ActivityTypesView.js rename to client-app/src/oldapp/maintenance/domains/admin/views/ActivityTypesView.js diff --git a/client-app/src/app/maintenance/domains/admin/views/ContactRolesView.js b/client-app/src/oldapp/maintenance/domains/admin/views/ContactRolesView.js similarity index 100% rename from client-app/src/app/maintenance/domains/admin/views/ContactRolesView.js rename to client-app/src/oldapp/maintenance/domains/admin/views/ContactRolesView.js diff --git a/client-app/src/app/maintenance/domains/admin/views/CountriesView.js b/client-app/src/oldapp/maintenance/domains/admin/views/CountriesView.js similarity index 100% rename from client-app/src/app/maintenance/domains/admin/views/CountriesView.js rename to client-app/src/oldapp/maintenance/domains/admin/views/CountriesView.js diff --git a/client-app/src/app/maintenance/domains/admin/views/DeviceTypesView.js b/client-app/src/oldapp/maintenance/domains/admin/views/DeviceTypesView.js similarity index 100% rename from client-app/src/app/maintenance/domains/admin/views/DeviceTypesView.js rename to client-app/src/oldapp/maintenance/domains/admin/views/DeviceTypesView.js diff --git a/client-app/src/app/maintenance/domains/admin/views/DocumentTypesView.js b/client-app/src/oldapp/maintenance/domains/admin/views/DocumentTypesView.js similarity index 100% rename from client-app/src/app/maintenance/domains/admin/views/DocumentTypesView.js rename to client-app/src/oldapp/maintenance/domains/admin/views/DocumentTypesView.js diff --git a/client-app/src/app/maintenance/domains/admin/views/OrganisationRolesView.js b/client-app/src/oldapp/maintenance/domains/admin/views/OrganisationRolesView.js similarity index 100% rename from client-app/src/app/maintenance/domains/admin/views/OrganisationRolesView.js rename to client-app/src/oldapp/maintenance/domains/admin/views/OrganisationRolesView.js diff --git a/client-app/src/app/maintenance/domains/admin/views/OrganisationTypesView.js b/client-app/src/oldapp/maintenance/domains/admin/views/OrganisationTypesView.js similarity index 100% rename from client-app/src/app/maintenance/domains/admin/views/OrganisationTypesView.js rename to client-app/src/oldapp/maintenance/domains/admin/views/OrganisationTypesView.js diff --git a/client-app/src/app/maintenance/domains/admin/views/PlatformTypesView.js b/client-app/src/oldapp/maintenance/domains/admin/views/PlatformTypesView.js similarity index 100% rename from client-app/src/app/maintenance/domains/admin/views/PlatformTypesView.js rename to client-app/src/oldapp/maintenance/domains/admin/views/PlatformTypesView.js diff --git a/client-app/src/app/maintenance/domains/admin/views/ProjectGroupsView.js b/client-app/src/oldapp/maintenance/domains/admin/views/ProjectGroupsView.js similarity index 100% rename from client-app/src/app/maintenance/domains/admin/views/ProjectGroupsView.js rename to client-app/src/oldapp/maintenance/domains/admin/views/ProjectGroupsView.js diff --git a/client-app/src/app/maintenance/domains/admin/views/ScopesView.js b/client-app/src/oldapp/maintenance/domains/admin/views/ScopesView.js similarity index 100% rename from client-app/src/app/maintenance/domains/admin/views/ScopesView.js rename to client-app/src/oldapp/maintenance/domains/admin/views/ScopesView.js diff --git a/client-app/src/app/maintenance/domains/admin/views/templates/forms/ActivityTypesForm.html b/client-app/src/oldapp/maintenance/domains/admin/views/templates/forms/ActivityTypesForm.html similarity index 100% rename from client-app/src/app/maintenance/domains/admin/views/templates/forms/ActivityTypesForm.html rename to client-app/src/oldapp/maintenance/domains/admin/views/templates/forms/ActivityTypesForm.html diff --git a/client-app/src/app/maintenance/domains/admin/views/templates/forms/CountriesForm.html b/client-app/src/oldapp/maintenance/domains/admin/views/templates/forms/CountriesForm.html similarity index 100% rename from client-app/src/app/maintenance/domains/admin/views/templates/forms/CountriesForm.html rename to client-app/src/oldapp/maintenance/domains/admin/views/templates/forms/CountriesForm.html diff --git a/client-app/src/app/maintenance/domains/geometry/views/AreaTypesView.js b/client-app/src/oldapp/maintenance/domains/geometry/views/AreaTypesView.js similarity index 100% rename from client-app/src/app/maintenance/domains/geometry/views/AreaTypesView.js rename to client-app/src/oldapp/maintenance/domains/geometry/views/AreaTypesView.js diff --git a/client-app/src/app/maintenance/domains/geometry/views/DestinyView.js b/client-app/src/oldapp/maintenance/domains/geometry/views/DestinyView.js similarity index 100% rename from client-app/src/app/maintenance/domains/geometry/views/DestinyView.js rename to client-app/src/oldapp/maintenance/domains/geometry/views/DestinyView.js diff --git a/client-app/src/app/maintenance/domains/geometry/views/EndingView.js b/client-app/src/oldapp/maintenance/domains/geometry/views/EndingView.js similarity index 100% rename from client-app/src/app/maintenance/domains/geometry/views/EndingView.js rename to client-app/src/oldapp/maintenance/domains/geometry/views/EndingView.js diff --git a/client-app/src/app/maintenance/domains/geometry/views/InspireThemesView.js b/client-app/src/oldapp/maintenance/domains/geometry/views/InspireThemesView.js similarity index 100% rename from client-app/src/app/maintenance/domains/geometry/views/InspireThemesView.js rename to client-app/src/oldapp/maintenance/domains/geometry/views/InspireThemesView.js diff --git a/client-app/src/app/maintenance/domains/geometry/views/LineTypesView.js b/client-app/src/oldapp/maintenance/domains/geometry/views/LineTypesView.js similarity index 100% rename from client-app/src/app/maintenance/domains/geometry/views/LineTypesView.js rename to client-app/src/oldapp/maintenance/domains/geometry/views/LineTypesView.js diff --git a/client-app/src/app/maintenance/domains/geometry/views/MeshTypesView.js b/client-app/src/oldapp/maintenance/domains/geometry/views/MeshTypesView.js similarity index 100% rename from client-app/src/app/maintenance/domains/geometry/views/MeshTypesView.js rename to client-app/src/oldapp/maintenance/domains/geometry/views/MeshTypesView.js diff --git a/client-app/src/app/maintenance/domains/geometry/views/RasterTypesView.js b/client-app/src/oldapp/maintenance/domains/geometry/views/RasterTypesView.js similarity index 100% rename from client-app/src/app/maintenance/domains/geometry/views/RasterTypesView.js rename to client-app/src/oldapp/maintenance/domains/geometry/views/RasterTypesView.js diff --git a/client-app/src/app/maintenance/domains/geometry/views/RecordingTypesView.js b/client-app/src/oldapp/maintenance/domains/geometry/views/RecordingTypesView.js similarity index 100% rename from client-app/src/app/maintenance/domains/geometry/views/RecordingTypesView.js rename to client-app/src/oldapp/maintenance/domains/geometry/views/RecordingTypesView.js diff --git a/client-app/src/app/maintenance/domains/geometry/views/ShorelineTypesView.js b/client-app/src/oldapp/maintenance/domains/geometry/views/ShorelineTypesView.js similarity index 100% rename from client-app/src/app/maintenance/domains/geometry/views/ShorelineTypesView.js rename to client-app/src/oldapp/maintenance/domains/geometry/views/ShorelineTypesView.js diff --git a/client-app/src/app/maintenance/domains/geometry/views/ThematicTypeView.js b/client-app/src/oldapp/maintenance/domains/geometry/views/ThematicTypeView.js similarity index 100% rename from client-app/src/app/maintenance/domains/geometry/views/ThematicTypeView.js rename to client-app/src/oldapp/maintenance/domains/geometry/views/ThematicTypeView.js diff --git a/client-app/src/app/maintenance/domains/geometry/views/ToponymTypesView.js b/client-app/src/oldapp/maintenance/domains/geometry/views/ToponymTypesView.js similarity index 100% rename from client-app/src/app/maintenance/domains/geometry/views/ToponymTypesView.js rename to client-app/src/oldapp/maintenance/domains/geometry/views/ToponymTypesView.js diff --git a/client-app/src/app/maintenance/domains/geometry/views/templates/forms/InspireThemesForm.html b/client-app/src/oldapp/maintenance/domains/geometry/views/templates/forms/InspireThemesForm.html similarity index 100% rename from client-app/src/app/maintenance/domains/geometry/views/templates/forms/InspireThemesForm.html rename to client-app/src/oldapp/maintenance/domains/geometry/views/templates/forms/InspireThemesForm.html diff --git a/client-app/src/app/maintenance/domains/geometry/views/templates/forms/LineTypesForm.html b/client-app/src/oldapp/maintenance/domains/geometry/views/templates/forms/LineTypesForm.html similarity index 100% rename from client-app/src/app/maintenance/domains/geometry/views/templates/forms/LineTypesForm.html rename to client-app/src/oldapp/maintenance/domains/geometry/views/templates/forms/LineTypesForm.html diff --git a/client-app/src/app/maintenance/domains/geometry/views/templates/forms/ThematicTypeForm.html b/client-app/src/oldapp/maintenance/domains/geometry/views/templates/forms/ThematicTypeForm.html similarity index 100% rename from client-app/src/app/maintenance/domains/geometry/views/templates/forms/ThematicTypeForm.html rename to client-app/src/oldapp/maintenance/domains/geometry/views/templates/forms/ThematicTypeForm.html diff --git a/client-app/src/app/maintenance/domains/observations/views/AttributeTypesView.js b/client-app/src/oldapp/maintenance/domains/observations/views/AttributeTypesView.js similarity index 100% rename from client-app/src/app/maintenance/domains/observations/views/AttributeTypesView.js rename to client-app/src/oldapp/maintenance/domains/observations/views/AttributeTypesView.js diff --git a/client-app/src/app/maintenance/domains/observations/views/CensingStatusView.js b/client-app/src/oldapp/maintenance/domains/observations/views/CensingStatusView.js similarity index 100% rename from client-app/src/app/maintenance/domains/observations/views/CensingStatusView.js rename to client-app/src/oldapp/maintenance/domains/observations/views/CensingStatusView.js diff --git a/client-app/src/app/maintenance/domains/observations/views/ConfidenceView.js b/client-app/src/oldapp/maintenance/domains/observations/views/ConfidenceView.js similarity index 100% rename from client-app/src/app/maintenance/domains/observations/views/ConfidenceView.js rename to client-app/src/oldapp/maintenance/domains/observations/views/ConfidenceView.js diff --git a/client-app/src/app/maintenance/domains/observations/views/EventGroupsView.js b/client-app/src/oldapp/maintenance/domains/observations/views/EventGroupsView.js similarity index 100% rename from client-app/src/app/maintenance/domains/observations/views/EventGroupsView.js rename to client-app/src/oldapp/maintenance/domains/observations/views/EventGroupsView.js diff --git a/client-app/src/app/maintenance/domains/observations/views/InfrastructureTypeView.js b/client-app/src/oldapp/maintenance/domains/observations/views/InfrastructureTypeView.js similarity index 100% rename from client-app/src/app/maintenance/domains/observations/views/InfrastructureTypeView.js rename to client-app/src/oldapp/maintenance/domains/observations/views/InfrastructureTypeView.js diff --git a/client-app/src/app/maintenance/domains/observations/views/MetricGroupsView.js b/client-app/src/oldapp/maintenance/domains/observations/views/MetricGroupsView.js similarity index 100% rename from client-app/src/app/maintenance/domains/observations/views/MetricGroupsView.js rename to client-app/src/oldapp/maintenance/domains/observations/views/MetricGroupsView.js diff --git a/client-app/src/app/maintenance/domains/observations/views/MetricsDefinitionsView.js b/client-app/src/oldapp/maintenance/domains/observations/views/MetricsDefinitionsView.js similarity index 100% rename from client-app/src/app/maintenance/domains/observations/views/MetricsDefinitionsView.js rename to client-app/src/oldapp/maintenance/domains/observations/views/MetricsDefinitionsView.js diff --git a/client-app/src/app/maintenance/domains/observations/views/ObjectTypesView.js b/client-app/src/oldapp/maintenance/domains/observations/views/ObjectTypesView.js similarity index 100% rename from client-app/src/app/maintenance/domains/observations/views/ObjectTypesView.js rename to client-app/src/oldapp/maintenance/domains/observations/views/ObjectTypesView.js diff --git a/client-app/src/app/maintenance/domains/observations/views/ObservationTypesView.js b/client-app/src/oldapp/maintenance/domains/observations/views/ObservationTypesView.js similarity index 100% rename from client-app/src/app/maintenance/domains/observations/views/ObservationTypesView.js rename to client-app/src/oldapp/maintenance/domains/observations/views/ObservationTypesView.js diff --git a/client-app/src/app/maintenance/domains/observations/views/ParameterTypesView.js b/client-app/src/oldapp/maintenance/domains/observations/views/ParameterTypesView.js similarity index 100% rename from client-app/src/app/maintenance/domains/observations/views/ParameterTypesView.js rename to client-app/src/oldapp/maintenance/domains/observations/views/ParameterTypesView.js diff --git a/client-app/src/app/maintenance/domains/observations/views/ParametersView.js b/client-app/src/oldapp/maintenance/domains/observations/views/ParametersView.js similarity index 100% rename from client-app/src/app/maintenance/domains/observations/views/ParametersView.js rename to client-app/src/oldapp/maintenance/domains/observations/views/ParametersView.js diff --git a/client-app/src/app/maintenance/domains/observations/views/SampleTypesView.js b/client-app/src/oldapp/maintenance/domains/observations/views/SampleTypesView.js similarity index 100% rename from client-app/src/app/maintenance/domains/observations/views/SampleTypesView.js rename to client-app/src/oldapp/maintenance/domains/observations/views/SampleTypesView.js diff --git a/client-app/src/app/maintenance/domains/observations/views/SeaConditionsView.js b/client-app/src/oldapp/maintenance/domains/observations/views/SeaConditionsView.js similarity index 100% rename from client-app/src/app/maintenance/domains/observations/views/SeaConditionsView.js rename to client-app/src/oldapp/maintenance/domains/observations/views/SeaConditionsView.js diff --git a/client-app/src/app/maintenance/domains/observations/views/UnitTypesView.js b/client-app/src/oldapp/maintenance/domains/observations/views/UnitTypesView.js similarity index 100% rename from client-app/src/app/maintenance/domains/observations/views/UnitTypesView.js rename to client-app/src/oldapp/maintenance/domains/observations/views/UnitTypesView.js diff --git a/client-app/src/app/maintenance/domains/observations/views/UnitsView.js b/client-app/src/oldapp/maintenance/domains/observations/views/UnitsView.js similarity index 100% rename from client-app/src/app/maintenance/domains/observations/views/UnitsView.js rename to client-app/src/oldapp/maintenance/domains/observations/views/UnitsView.js diff --git a/client-app/src/app/maintenance/domains/taxon/views/CanaryProtectionView.js b/client-app/src/oldapp/maintenance/domains/taxon/views/CanaryProtectionView.js similarity index 100% rename from client-app/src/app/maintenance/domains/taxon/views/CanaryProtectionView.js rename to client-app/src/oldapp/maintenance/domains/taxon/views/CanaryProtectionView.js diff --git a/client-app/src/app/maintenance/domains/taxon/views/EUProtectionView.js b/client-app/src/oldapp/maintenance/domains/taxon/views/EUProtectionView.js similarity index 100% rename from client-app/src/app/maintenance/domains/taxon/views/EUProtectionView.js rename to client-app/src/oldapp/maintenance/domains/taxon/views/EUProtectionView.js diff --git a/client-app/src/app/maintenance/domains/taxon/views/EcologyView.js b/client-app/src/oldapp/maintenance/domains/taxon/views/EcologyView.js similarity index 100% rename from client-app/src/app/maintenance/domains/taxon/views/EcologyView.js rename to client-app/src/oldapp/maintenance/domains/taxon/views/EcologyView.js diff --git a/client-app/src/app/maintenance/domains/taxon/views/EndemicityView.js b/client-app/src/oldapp/maintenance/domains/taxon/views/EndemicityView.js similarity index 100% rename from client-app/src/app/maintenance/domains/taxon/views/EndemicityView.js rename to client-app/src/oldapp/maintenance/domains/taxon/views/EndemicityView.js diff --git a/client-app/src/app/maintenance/domains/taxon/views/InterestView.js b/client-app/src/oldapp/maintenance/domains/taxon/views/InterestView.js similarity index 100% rename from client-app/src/app/maintenance/domains/taxon/views/InterestView.js rename to client-app/src/oldapp/maintenance/domains/taxon/views/InterestView.js diff --git a/client-app/src/app/maintenance/domains/taxon/views/LifeStagesView.js b/client-app/src/oldapp/maintenance/domains/taxon/views/LifeStagesView.js similarity index 100% rename from client-app/src/app/maintenance/domains/taxon/views/LifeStagesView.js rename to client-app/src/oldapp/maintenance/domains/taxon/views/LifeStagesView.js diff --git a/client-app/src/app/maintenance/domains/taxon/views/OriginView.js b/client-app/src/oldapp/maintenance/domains/taxon/views/OriginView.js similarity index 100% rename from client-app/src/app/maintenance/domains/taxon/views/OriginView.js rename to client-app/src/oldapp/maintenance/domains/taxon/views/OriginView.js diff --git a/client-app/src/app/maintenance/domains/taxon/views/PermanenceView.js b/client-app/src/oldapp/maintenance/domains/taxon/views/PermanenceView.js similarity index 100% rename from client-app/src/app/maintenance/domains/taxon/views/PermanenceView.js rename to client-app/src/oldapp/maintenance/domains/taxon/views/PermanenceView.js diff --git a/client-app/src/app/maintenance/domains/taxon/views/RankView.js b/client-app/src/oldapp/maintenance/domains/taxon/views/RankView.js similarity index 100% rename from client-app/src/app/maintenance/domains/taxon/views/RankView.js rename to client-app/src/oldapp/maintenance/domains/taxon/views/RankView.js diff --git a/client-app/src/app/maintenance/domains/taxon/views/SexView.js b/client-app/src/oldapp/maintenance/domains/taxon/views/SexView.js similarity index 100% rename from client-app/src/app/maintenance/domains/taxon/views/SexView.js rename to client-app/src/oldapp/maintenance/domains/taxon/views/SexView.js diff --git a/client-app/src/app/maintenance/domains/taxon/views/SpainProtectionView.js b/client-app/src/oldapp/maintenance/domains/taxon/views/SpainProtectionView.js similarity index 100% rename from client-app/src/app/maintenance/domains/taxon/views/SpainProtectionView.js rename to client-app/src/oldapp/maintenance/domains/taxon/views/SpainProtectionView.js diff --git a/client-app/src/app/maintenance/domains/taxon/views/StatusView.js b/client-app/src/oldapp/maintenance/domains/taxon/views/StatusView.js similarity index 100% rename from client-app/src/app/maintenance/domains/taxon/views/StatusView.js rename to client-app/src/oldapp/maintenance/domains/taxon/views/StatusView.js diff --git a/client-app/src/app/maintenance/domains/taxon/views/TrophicRegimeView.js b/client-app/src/oldapp/maintenance/domains/taxon/views/TrophicRegimeView.js similarity index 100% rename from client-app/src/app/maintenance/domains/taxon/views/TrophicRegimeView.js rename to client-app/src/oldapp/maintenance/domains/taxon/views/TrophicRegimeView.js diff --git a/client-app/src/app/maintenance/domains/templates/forms/DomainForm.html b/client-app/src/oldapp/maintenance/domains/templates/forms/DomainForm.html similarity index 100% rename from client-app/src/app/maintenance/domains/templates/forms/DomainForm.html rename to client-app/src/oldapp/maintenance/domains/templates/forms/DomainForm.html diff --git a/client-app/src/app/maintenance/domains/templates/forms/HierarchicalDomainForm.html b/client-app/src/oldapp/maintenance/domains/templates/forms/HierarchicalDomainForm.html similarity index 100% rename from client-app/src/app/maintenance/domains/templates/forms/HierarchicalDomainForm.html rename to client-app/src/oldapp/maintenance/domains/templates/forms/HierarchicalDomainForm.html diff --git a/client-app/src/app/maintenance/models/AccessModel.js b/client-app/src/oldapp/maintenance/models/AccessModel.js similarity index 100% rename from client-app/src/app/maintenance/models/AccessModel.js rename to client-app/src/oldapp/maintenance/models/AccessModel.js diff --git a/client-app/src/app/maintenance/models/PermissionsModel.js b/client-app/src/oldapp/maintenance/models/PermissionsModel.js similarity index 100% rename from client-app/src/app/maintenance/models/PermissionsModel.js rename to client-app/src/oldapp/maintenance/models/PermissionsModel.js diff --git a/client-app/src/app/maintenance/views/DomainView.js b/client-app/src/oldapp/maintenance/views/DomainView.js similarity index 100% rename from client-app/src/app/maintenance/views/DomainView.js rename to client-app/src/oldapp/maintenance/views/DomainView.js diff --git a/client-app/src/app/maintenance/views/PermissionsView.js b/client-app/src/oldapp/maintenance/views/PermissionsView.js similarity index 100% rename from client-app/src/app/maintenance/views/PermissionsView.js rename to client-app/src/oldapp/maintenance/views/PermissionsView.js diff --git a/client-app/src/app/maintenance/views/ServiceOGCView.js b/client-app/src/oldapp/maintenance/views/ServiceOGCView.js similarity index 100% rename from client-app/src/app/maintenance/views/ServiceOGCView.js rename to client-app/src/oldapp/maintenance/views/ServiceOGCView.js diff --git a/client-app/src/app/maintenance/views/templates/forms/AccessForm.html b/client-app/src/oldapp/maintenance/views/templates/forms/AccessForm.html similarity index 100% rename from client-app/src/app/maintenance/views/templates/forms/AccessForm.html rename to client-app/src/oldapp/maintenance/views/templates/forms/AccessForm.html diff --git a/client-app/src/app/maintenance/views/templates/forms/CategoryLayerForm.html b/client-app/src/oldapp/maintenance/views/templates/forms/CategoryLayerForm.html similarity index 100% rename from client-app/src/app/maintenance/views/templates/forms/CategoryLayerForm.html rename to client-app/src/oldapp/maintenance/views/templates/forms/CategoryLayerForm.html diff --git a/client-app/src/app/maintenance/views/templates/forms/DownloadsForm.html b/client-app/src/oldapp/maintenance/views/templates/forms/DownloadsForm.html similarity index 100% rename from client-app/src/app/maintenance/views/templates/forms/DownloadsForm.html rename to client-app/src/oldapp/maintenance/views/templates/forms/DownloadsForm.html diff --git a/client-app/src/app/maintenance/views/templates/forms/PermissionsForm.html b/client-app/src/oldapp/maintenance/views/templates/forms/PermissionsForm.html similarity index 100% rename from client-app/src/app/maintenance/views/templates/forms/PermissionsForm.html rename to client-app/src/oldapp/maintenance/views/templates/forms/PermissionsForm.html diff --git a/client-app/src/app/maintenance/views/templates/forms/ProtocolsForm.html b/client-app/src/oldapp/maintenance/views/templates/forms/ProtocolsForm.html similarity index 100% rename from client-app/src/app/maintenance/views/templates/forms/ProtocolsForm.html rename to client-app/src/oldapp/maintenance/views/templates/forms/ProtocolsForm.html diff --git a/client-app/src/app/maintenance/views/templates/forms/ServiceOGCForm.html b/client-app/src/oldapp/maintenance/views/templates/forms/ServiceOGCForm.html similarity index 100% rename from client-app/src/app/maintenance/views/templates/forms/ServiceOGCForm.html rename to client-app/src/oldapp/maintenance/views/templates/forms/ServiceOGCForm.html diff --git a/client-app/src/app/maintenance/views/templates/forms/ServiceOGCLayerSearchForm.html b/client-app/src/oldapp/maintenance/views/templates/forms/ServiceOGCLayerSearchForm.html similarity index 100% rename from client-app/src/app/maintenance/views/templates/forms/ServiceOGCLayerSearchForm.html rename to client-app/src/oldapp/maintenance/views/templates/forms/ServiceOGCLayerSearchForm.html diff --git a/client-app/src/app/nls/es/translation.js b/client-app/src/oldapp/nls/es/translation.js similarity index 100% rename from client-app/src/app/nls/es/translation.js rename to client-app/src/oldapp/nls/es/translation.js diff --git a/client-app/src/app/nls/translation.js b/client-app/src/oldapp/nls/translation.js similarity index 100% rename from client-app/src/app/nls/translation.js rename to client-app/src/oldapp/nls/translation.js diff --git a/client-app/src/app/products/views/OpenMapView.js b/client-app/src/oldapp/products/views/OpenMapView.js similarity index 100% rename from client-app/src/app/products/views/OpenMapView.js rename to client-app/src/oldapp/products/views/OpenMapView.js diff --git a/client-app/src/app/products/views/ServiceOGCCatalogView.js b/client-app/src/oldapp/products/views/ServiceOGCCatalogView.js similarity index 100% rename from client-app/src/app/products/views/ServiceOGCCatalogView.js rename to client-app/src/oldapp/products/views/ServiceOGCCatalogView.js diff --git a/client-app/src/app/user/models/FeedbackModel.js b/client-app/src/oldapp/user/models/FeedbackModel.js similarity index 100% rename from client-app/src/app/user/models/FeedbackModel.js rename to client-app/src/oldapp/user/models/FeedbackModel.js diff --git a/client-app/src/app/user/models/PasswordModel.js b/client-app/src/oldapp/user/models/PasswordModel.js similarity index 100% rename from client-app/src/app/user/models/PasswordModel.js rename to client-app/src/oldapp/user/models/PasswordModel.js diff --git a/client-app/src/app/user/models/RegisterModel.js b/client-app/src/oldapp/user/models/RegisterModel.js similarity index 100% rename from client-app/src/app/user/models/RegisterModel.js rename to client-app/src/oldapp/user/models/RegisterModel.js diff --git a/client-app/src/app/user/models/UserEmailModel.js b/client-app/src/oldapp/user/models/UserEmailModel.js similarity index 100% rename from client-app/src/app/user/models/UserEmailModel.js rename to client-app/src/oldapp/user/models/UserEmailModel.js diff --git a/client-app/src/app/user/models/UserImageModel.js b/client-app/src/oldapp/user/models/UserImageModel.js similarity index 100% rename from client-app/src/app/user/models/UserImageModel.js rename to client-app/src/oldapp/user/models/UserImageModel.js diff --git a/client-app/src/app/user/models/UserNameModel.js b/client-app/src/oldapp/user/models/UserNameModel.js similarity index 100% rename from client-app/src/app/user/models/UserNameModel.js rename to client-app/src/oldapp/user/models/UserNameModel.js diff --git a/client-app/src/app/user/models/UserSectorModel.js b/client-app/src/oldapp/user/models/UserSectorModel.js similarity index 100% rename from client-app/src/app/user/models/UserSectorModel.js rename to client-app/src/oldapp/user/models/UserSectorModel.js diff --git a/client-app/src/app/user/views/ConfirmResettingView.js b/client-app/src/oldapp/user/views/ConfirmResettingView.js similarity index 100% rename from client-app/src/app/user/views/ConfirmResettingView.js rename to client-app/src/oldapp/user/views/ConfirmResettingView.js diff --git a/client-app/src/app/user/views/FeedbackView.js b/client-app/src/oldapp/user/views/FeedbackView.js similarity index 100% rename from client-app/src/app/user/views/FeedbackView.js rename to client-app/src/oldapp/user/views/FeedbackView.js diff --git a/client-app/src/app/user/views/InnerWhatIsRedmicView.js b/client-app/src/oldapp/user/views/InnerWhatIsRedmicView.js similarity index 100% rename from client-app/src/app/user/views/InnerWhatIsRedmicView.js rename to client-app/src/oldapp/user/views/InnerWhatIsRedmicView.js diff --git a/client-app/src/app/user/views/LoginView.js b/client-app/src/oldapp/user/views/LoginView.js similarity index 100% rename from client-app/src/app/user/views/LoginView.js rename to client-app/src/oldapp/user/views/LoginView.js diff --git a/client-app/src/app/user/views/RegisterView.js b/client-app/src/oldapp/user/views/RegisterView.js similarity index 100% rename from client-app/src/app/user/views/RegisterView.js rename to client-app/src/oldapp/user/views/RegisterView.js diff --git a/client-app/src/app/user/views/ResettingView.js b/client-app/src/oldapp/user/views/ResettingView.js similarity index 100% rename from client-app/src/app/user/views/ResettingView.js rename to client-app/src/oldapp/user/views/ResettingView.js diff --git a/client-app/src/app/user/views/TermsAndConditionsView.js b/client-app/src/oldapp/user/views/TermsAndConditionsView.js similarity index 100% rename from client-app/src/app/user/views/TermsAndConditionsView.js rename to client-app/src/oldapp/user/views/TermsAndConditionsView.js diff --git a/client-app/src/app/user/views/UserProfileView.js b/client-app/src/oldapp/user/views/UserProfileView.js similarity index 100% rename from client-app/src/app/user/views/UserProfileView.js rename to client-app/src/oldapp/user/views/UserProfileView.js diff --git a/client-app/src/app/user/views/WhatIsRedmicView.js b/client-app/src/oldapp/user/views/WhatIsRedmicView.js similarity index 100% rename from client-app/src/app/user/views/WhatIsRedmicView.js rename to client-app/src/oldapp/user/views/WhatIsRedmicView.js diff --git a/client-app/src/app/user/views/_ExternalUserBaseView.js b/client-app/src/oldapp/user/views/_ExternalUserBaseView.js similarity index 100% rename from client-app/src/app/user/views/_ExternalUserBaseView.js rename to client-app/src/oldapp/user/views/_ExternalUserBaseView.js diff --git a/client-app/src/app/user/views/templates/ConfirmResetting.html b/client-app/src/oldapp/user/views/templates/ConfirmResetting.html similarity index 100% rename from client-app/src/app/user/views/templates/ConfirmResetting.html rename to client-app/src/oldapp/user/views/templates/ConfirmResetting.html diff --git a/client-app/src/app/user/views/templates/ExternalUserBase.html b/client-app/src/oldapp/user/views/templates/ExternalUserBase.html similarity index 100% rename from client-app/src/app/user/views/templates/ExternalUserBase.html rename to client-app/src/oldapp/user/views/templates/ExternalUserBase.html diff --git a/client-app/src/app/user/views/templates/Feedback.html b/client-app/src/oldapp/user/views/templates/Feedback.html similarity index 100% rename from client-app/src/app/user/views/templates/Feedback.html rename to client-app/src/oldapp/user/views/templates/Feedback.html diff --git a/client-app/src/app/user/views/templates/Login.html b/client-app/src/oldapp/user/views/templates/Login.html similarity index 100% rename from client-app/src/app/user/views/templates/Login.html rename to client-app/src/oldapp/user/views/templates/Login.html diff --git a/client-app/src/app/user/views/templates/Register.html b/client-app/src/oldapp/user/views/templates/Register.html similarity index 100% rename from client-app/src/app/user/views/templates/Register.html rename to client-app/src/oldapp/user/views/templates/Register.html diff --git a/client-app/src/app/user/views/templates/Resetting.html b/client-app/src/oldapp/user/views/templates/Resetting.html similarity index 100% rename from client-app/src/app/user/views/templates/Resetting.html rename to client-app/src/oldapp/user/views/templates/Resetting.html diff --git a/client-app/src/app/user/views/templates/TermsAndConditions.html b/client-app/src/oldapp/user/views/templates/TermsAndConditions.html similarity index 100% rename from client-app/src/app/user/views/templates/TermsAndConditions.html rename to client-app/src/oldapp/user/views/templates/TermsAndConditions.html diff --git a/client-app/src/app/user/views/templates/WhatIsRedmic.html b/client-app/src/oldapp/user/views/templates/WhatIsRedmic.html similarity index 100% rename from client-app/src/app/user/views/templates/WhatIsRedmic.html rename to client-app/src/oldapp/user/views/templates/WhatIsRedmic.html diff --git a/client-app/src/app/user/views/templates/forms/ChangePasswordForm.html b/client-app/src/oldapp/user/views/templates/forms/ChangePasswordForm.html similarity index 100% rename from client-app/src/app/user/views/templates/forms/ChangePasswordForm.html rename to client-app/src/oldapp/user/views/templates/forms/ChangePasswordForm.html diff --git a/client-app/src/app/user/views/templates/forms/FeedbackForm.html b/client-app/src/oldapp/user/views/templates/forms/FeedbackForm.html similarity index 100% rename from client-app/src/app/user/views/templates/forms/FeedbackForm.html rename to client-app/src/oldapp/user/views/templates/forms/FeedbackForm.html diff --git a/client-app/src/app/user/views/templates/forms/RegisterForm.html b/client-app/src/oldapp/user/views/templates/forms/RegisterForm.html similarity index 100% rename from client-app/src/app/user/views/templates/forms/RegisterForm.html rename to client-app/src/oldapp/user/views/templates/forms/RegisterForm.html diff --git a/client-app/src/app/user/views/templates/forms/UserEmailForm.html b/client-app/src/oldapp/user/views/templates/forms/UserEmailForm.html similarity index 100% rename from client-app/src/app/user/views/templates/forms/UserEmailForm.html rename to client-app/src/oldapp/user/views/templates/forms/UserEmailForm.html diff --git a/client-app/src/app/user/views/templates/forms/UserImageForm.html b/client-app/src/oldapp/user/views/templates/forms/UserImageForm.html similarity index 100% rename from client-app/src/app/user/views/templates/forms/UserImageForm.html rename to client-app/src/oldapp/user/views/templates/forms/UserImageForm.html diff --git a/client-app/src/app/user/views/templates/forms/UserNameForm.html b/client-app/src/oldapp/user/views/templates/forms/UserNameForm.html similarity index 100% rename from client-app/src/app/user/views/templates/forms/UserNameForm.html rename to client-app/src/oldapp/user/views/templates/forms/UserNameForm.html diff --git a/client-app/src/app/user/views/templates/forms/UserSectorForm.html b/client-app/src/oldapp/user/views/templates/forms/UserSectorForm.html similarity index 100% rename from client-app/src/app/user/views/templates/forms/UserSectorForm.html rename to client-app/src/oldapp/user/views/templates/forms/UserSectorForm.html diff --git a/client-app/src/app/viewers/models/PointClusterCategorizeModel.js b/client-app/src/oldapp/viewers/models/PointClusterCategorizeModel.js similarity index 100% rename from client-app/src/app/viewers/models/PointClusterCategorizeModel.js rename to client-app/src/oldapp/viewers/models/PointClusterCategorizeModel.js diff --git a/client-app/src/app/viewers/models/PointClusterModel.js b/client-app/src/oldapp/viewers/models/PointClusterModel.js similarity index 100% rename from client-app/src/app/viewers/models/PointClusterModel.js rename to client-app/src/oldapp/viewers/models/PointClusterModel.js diff --git a/client-app/src/app/viewers/views/BibliographyView.js b/client-app/src/oldapp/viewers/views/BibliographyView.js similarity index 100% rename from client-app/src/app/viewers/views/BibliographyView.js rename to client-app/src/oldapp/viewers/views/BibliographyView.js diff --git a/client-app/src/app/viewers/views/ChartsView.js b/client-app/src/oldapp/viewers/views/ChartsView.js similarity index 100% rename from client-app/src/app/viewers/views/ChartsView.js rename to client-app/src/oldapp/viewers/views/ChartsView.js diff --git a/client-app/src/app/viewers/views/RealTimeDashboardView.js b/client-app/src/oldapp/viewers/views/RealTimeDashboardView.js similarity index 100% rename from client-app/src/app/viewers/views/RealTimeDashboardView.js rename to client-app/src/oldapp/viewers/views/RealTimeDashboardView.js diff --git a/client-app/src/app/viewers/views/RealTimeView.js b/client-app/src/oldapp/viewers/views/RealTimeView.js similarity index 100% rename from client-app/src/app/viewers/views/RealTimeView.js rename to client-app/src/oldapp/viewers/views/RealTimeView.js diff --git a/client-app/src/app/viewers/views/SpeciesDistributionView.js b/client-app/src/oldapp/viewers/views/SpeciesDistributionView.js similarity index 100% rename from client-app/src/app/viewers/views/SpeciesDistributionView.js rename to client-app/src/oldapp/viewers/views/SpeciesDistributionView.js diff --git a/client-app/src/app/viewers/views/StacBrowserView.js b/client-app/src/oldapp/viewers/views/StacBrowserView.js similarity index 100% rename from client-app/src/app/viewers/views/StacBrowserView.js rename to client-app/src/oldapp/viewers/views/StacBrowserView.js diff --git a/client-app/src/app/viewers/views/TrackingView.js b/client-app/src/oldapp/viewers/views/TrackingView.js similarity index 100% rename from client-app/src/app/viewers/views/TrackingView.js rename to client-app/src/oldapp/viewers/views/TrackingView.js diff --git a/client-app/src/app/viewers/views/TrashCharts.js b/client-app/src/oldapp/viewers/views/TrashCharts.js similarity index 100% rename from client-app/src/app/viewers/views/TrashCharts.js rename to client-app/src/oldapp/viewers/views/TrashCharts.js diff --git a/client-app/src/app/viewers/views/TrashCollectionView.js b/client-app/src/oldapp/viewers/views/TrashCollectionView.js similarity index 100% rename from client-app/src/app/viewers/views/TrashCollectionView.js rename to client-app/src/oldapp/viewers/views/TrashCollectionView.js diff --git a/client-app/src/app/viewers/views/TrashDetails.js b/client-app/src/oldapp/viewers/views/TrashDetails.js similarity index 100% rename from client-app/src/app/viewers/views/TrashDetails.js rename to client-app/src/oldapp/viewers/views/TrashDetails.js diff --git a/client-app/src/app/viewers/views/TrashInfo.js b/client-app/src/oldapp/viewers/views/TrashInfo.js similarity index 100% rename from client-app/src/app/viewers/views/TrashInfo.js rename to client-app/src/oldapp/viewers/views/TrashInfo.js diff --git a/client-app/src/app/viewers/views/_ObjectCollectionSeriesSelectionManagement.js b/client-app/src/oldapp/viewers/views/_ObjectCollectionSeriesSelectionManagement.js similarity index 100% rename from client-app/src/app/viewers/views/_ObjectCollectionSeriesSelectionManagement.js rename to client-app/src/oldapp/viewers/views/_ObjectCollectionSeriesSelectionManagement.js diff --git a/client-app/src/app/viewers/views/_SelectTimeInterval.js b/client-app/src/oldapp/viewers/views/_SelectTimeInterval.js similarity index 100% rename from client-app/src/app/viewers/views/_SelectTimeInterval.js rename to client-app/src/oldapp/viewers/views/_SelectTimeInterval.js diff --git a/client-app/src/app/viewers/views/_TimeSeriesDataManagement.js b/client-app/src/oldapp/viewers/views/_TimeSeriesDataManagement.js similarity index 100% rename from client-app/src/app/viewers/views/_TimeSeriesDataManagement.js rename to client-app/src/oldapp/viewers/views/_TimeSeriesDataManagement.js diff --git a/client-app/src/app/viewers/views/_TimeSeriesSelectionManagement.js b/client-app/src/oldapp/viewers/views/_TimeSeriesSelectionManagement.js similarity index 100% rename from client-app/src/app/viewers/views/_TimeSeriesSelectionManagement.js rename to client-app/src/oldapp/viewers/views/_TimeSeriesSelectionManagement.js diff --git a/client-app/src/app/viewers/views/templates/forms/PointClusterCategorizeForm.html b/client-app/src/oldapp/viewers/views/templates/forms/PointClusterCategorizeForm.html similarity index 100% rename from client-app/src/app/viewers/views/templates/forms/PointClusterCategorizeForm.html rename to client-app/src/oldapp/viewers/views/templates/forms/PointClusterCategorizeForm.html diff --git a/client-app/src/app/viewers/views/templates/forms/PointClusterForm.html b/client-app/src/oldapp/viewers/views/templates/forms/PointClusterForm.html similarity index 100% rename from client-app/src/app/viewers/views/templates/forms/PointClusterForm.html rename to client-app/src/oldapp/viewers/views/templates/forms/PointClusterForm.html diff --git a/client-app/src/app/viewers/views/templates/forms/SpeciesDistributionForm.html b/client-app/src/oldapp/viewers/views/templates/forms/SpeciesDistributionForm.html similarity index 100% rename from client-app/src/app/viewers/views/templates/forms/SpeciesDistributionForm.html rename to client-app/src/oldapp/viewers/views/templates/forms/SpeciesDistributionForm.html diff --git a/client-app/src/app/viewers/views/templates/forms/TrackingForm.html b/client-app/src/oldapp/viewers/views/templates/forms/TrackingForm.html similarity index 100% rename from client-app/src/app/viewers/views/templates/forms/TrackingForm.html rename to client-app/src/oldapp/viewers/views/templates/forms/TrackingForm.html diff --git a/client-app/src/app/views/404.js b/client-app/src/oldapp/views/404.js similarity index 100% rename from client-app/src/app/views/404.js rename to client-app/src/oldapp/views/404.js diff --git a/client-app/src/app/views/ActivateAccount.js b/client-app/src/oldapp/views/ActivateAccount.js similarity index 100% rename from client-app/src/app/views/ActivateAccount.js rename to client-app/src/oldapp/views/ActivateAccount.js diff --git a/client-app/src/app/views/NoSupportBrowser.js b/client-app/src/oldapp/views/NoSupportBrowser.js similarity index 100% rename from client-app/src/app/views/NoSupportBrowser.js rename to client-app/src/oldapp/views/NoSupportBrowser.js diff --git a/client-app/src/app/views/UnderConstructionView.js b/client-app/src/oldapp/views/UnderConstructionView.js similarity index 100% rename from client-app/src/app/views/UnderConstructionView.js rename to client-app/src/oldapp/views/UnderConstructionView.js diff --git a/client-app/src/app/views/nls/es/translation.js b/client-app/src/oldapp/views/nls/es/translation.js similarity index 100% rename from client-app/src/app/views/nls/es/translation.js rename to client-app/src/oldapp/views/nls/es/translation.js diff --git a/client-app/src/app/views/nls/translation.js b/client-app/src/oldapp/views/nls/translation.js similarity index 100% rename from client-app/src/app/views/nls/translation.js rename to client-app/src/oldapp/views/nls/translation.js diff --git a/client-app/src/app/views/templates/NoSupportBrowser.html b/client-app/src/oldapp/views/templates/NoSupportBrowser.html similarity index 100% rename from client-app/src/app/views/templates/NoSupportBrowser.html rename to client-app/src/oldapp/views/templates/NoSupportBrowser.html -- GitLab From 157dca97341661161d30854b25fd0c41197c3ed7 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Tue, 23 Jul 2024 11:44:35 +0100 Subject: [PATCH 025/249] =?UTF-8?q?Reubica=20componente=20principal=20de?= =?UTF-8?q?=20la=20aplicaci=C3=B3n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client-app/app.profile.js | 2 +- client-app/src/{redmic/modules => }/app/App.js | 8 ++++---- client-app/src/{redmic/modules => }/app/ModuleStore.js | 0 client-app/src/{redmic/modules => }/app/Router.js | 0 client-app/src/{redmic/modules => }/app/_app.js | 0 client-app/src/{redmic/modules => }/app/_appItfc.js | 0 client-app/src/{redmic/modules => }/app/innerApp.js | 2 +- client-app/src/{redmic/modules => }/app/outerApp.js | 2 +- grunt/config/cleanBuiltApp.js | 2 +- server-app/views/index.pug | 2 +- 10 files changed, 9 insertions(+), 9 deletions(-) rename client-app/src/{redmic/modules => }/app/App.js (98%) rename client-app/src/{redmic/modules => }/app/ModuleStore.js (100%) rename client-app/src/{redmic/modules => }/app/Router.js (100%) rename client-app/src/{redmic/modules => }/app/_app.js (100%) rename client-app/src/{redmic/modules => }/app/_appItfc.js (100%) rename client-app/src/{redmic/modules => }/app/innerApp.js (99%) rename client-app/src/{redmic/modules => }/app/outerApp.js (94%) diff --git a/client-app/app.profile.js b/client-app/app.profile.js index dfd95a28..4232727c 100644 --- a/client-app/app.profile.js +++ b/client-app/app.profile.js @@ -401,7 +401,7 @@ var profileObj = { }; var viewLayers = { - 'redmic/modules/app/App': {} + 'src/app/App': {} , 'app/views/404': {} , 'app/views/ActivateAccount': {} diff --git a/client-app/src/redmic/modules/app/App.js b/client-app/src/app/App.js similarity index 98% rename from client-app/src/redmic/modules/app/App.js rename to client-app/src/app/App.js index 775a72de..215bbb1f 100644 --- a/client-app/src/redmic/modules/app/App.js +++ b/client-app/src/app/App.js @@ -7,10 +7,10 @@ define([ , 'dojo/has' , 'put-selector/put' , 'redmic/base/CheckBrowser' - , 'redmic/modules/app/innerApp' - , 'redmic/modules/app/ModuleStore' - , 'redmic/modules/app/outerApp' - , 'redmic/modules/app/Router' + , 'src/app/innerApp' + , 'src/app/ModuleStore' + , 'src/app/outerApp' + , 'src/app/Router' , 'redmic/modules/notification/CommunicationCenter' , 'redmic/modules/notification/Alert' , 'redmic/modules/base/Credentials' diff --git a/client-app/src/redmic/modules/app/ModuleStore.js b/client-app/src/app/ModuleStore.js similarity index 100% rename from client-app/src/redmic/modules/app/ModuleStore.js rename to client-app/src/app/ModuleStore.js diff --git a/client-app/src/redmic/modules/app/Router.js b/client-app/src/app/Router.js similarity index 100% rename from client-app/src/redmic/modules/app/Router.js rename to client-app/src/app/Router.js diff --git a/client-app/src/redmic/modules/app/_app.js b/client-app/src/app/_app.js similarity index 100% rename from client-app/src/redmic/modules/app/_app.js rename to client-app/src/app/_app.js diff --git a/client-app/src/redmic/modules/app/_appItfc.js b/client-app/src/app/_appItfc.js similarity index 100% rename from client-app/src/redmic/modules/app/_appItfc.js rename to client-app/src/app/_appItfc.js diff --git a/client-app/src/redmic/modules/app/innerApp.js b/client-app/src/app/innerApp.js similarity index 99% rename from client-app/src/redmic/modules/app/innerApp.js rename to client-app/src/app/innerApp.js index d95f9b53..97ebf062 100644 --- a/client-app/src/redmic/modules/app/innerApp.js +++ b/client-app/src/app/innerApp.js @@ -5,7 +5,7 @@ define([ , 'dojo/dom-class' , 'put-selector/put' , 'redmic/base/Credentials' - , 'redmic/modules/app/_app' + , 'src/app/_app' , 'redmic/modules/components/Sidebar/MainSidebarImpl' , 'redmic/modules/components/Topbar' , 'redmic/modules/notification/Notification' diff --git a/client-app/src/redmic/modules/app/outerApp.js b/client-app/src/app/outerApp.js similarity index 94% rename from client-app/src/redmic/modules/app/outerApp.js rename to client-app/src/app/outerApp.js index 65581940..517a084a 100644 --- a/client-app/src/redmic/modules/app/outerApp.js +++ b/client-app/src/app/outerApp.js @@ -1,7 +1,7 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/modules/app/_app' + , 'src/app/_app' ], function( declare , lang diff --git a/grunt/config/cleanBuiltApp.js b/grunt/config/cleanBuiltApp.js index 044227d7..56c074b3 100644 --- a/grunt/config/cleanBuiltApp.js +++ b/grunt/config/cleanBuiltApp.js @@ -20,7 +20,7 @@ module.exports = function(grunt) { filesToDelete = [strippedFiles, uncompressedFiles], filesToKeep = [ 'dojo/dojo.js', 'dojo/resources/blank.gif', 'dojox/widget/ColorPicker/images/*.png', - 'leaflet/dist/images/*.png', 'redmic/modules/app/App.js' + 'leaflet/dist/images/*.png', 'src/app/App.js' ]; grunt.config('redmicConfig.resourcesToCleanInBuiltApp', { diff --git a/server-app/views/index.pug b/server-app/views/index.pug index 45771bb4..8924ea10 100644 --- a/server-app/views/index.pug +++ b/server-app/views/index.pug @@ -9,7 +9,7 @@ block root script. require([ - 'redmic/modules/app/App' + 'src/app/App' ], function( App ) { -- GitLab From 1c6feb1fdb7838af559c626de770894b157f10c3 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Tue, 23 Jul 2024 12:46:58 +0100 Subject: [PATCH 026/249] Reubica utilidades dispersas en src/utils, limpia MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Recoloca algunas dependencias que no son módulos pero se usan desde ellos en un lugar común, dedicado a utilidades variadas que se importan desde varios ámbitos. También se limpian recursos en desuso y se unifican algunos que sólo se emplean desde un lugar concreto, para facilitar el mantenimiento. --- client-app/src/app/App.js | 2 +- .../src/{redmic/base => app}/CheckBrowser.js | 0 client-app/src/app/innerApp.js | 2 +- .../src/catalog/detail/_WidgetDefinition.js | 2 +- .../src/oldapp/base/models/attr/_Attr.js | 2 +- .../src/oldapp/base/views/_ViewListBase.js | 2 +- .../src/oldapp/components/CookieLoader.js | 2 +- .../oldapp/designs/details/main/Document.js | 2 +- client-app/src/oldapp/home/views/HomeView.js | 2 +- .../src/oldapp/user/views/FeedbackView.js | 2 +- client-app/src/oldapp/user/views/LoginView.js | 2 +- .../src/oldapp/user/views/UserProfileView.js | 2 +- .../viewers/views/SpeciesDistributionView.js | 2 +- .../src/oldapp/views/ActivateAccount.js | 2 +- .../src/redmic/dialog/LockDialogImpl.js | 111 ------------------ .../src/redmic/dialog/_DialogComplexItfc.js | 50 -------- .../src/redmic/modules/base/Credentials.js | 2 +- client-app/src/redmic/modules/base/Manager.js | 2 +- .../src/redmic/modules/base/_AuthFirewall.js | 4 +- client-app/src/redmic/modules/base/_Module.js | 2 +- .../src/redmic/modules/base/_ShowInPopup.js | 4 +- .../modules/browser/bars/SelectionBox.js | 2 +- .../modules/components/ExternalConfig.js | 2 +- .../modules/components/PDFViewer/PDFViewer.js | 2 +- .../redmic/modules/form/FormContainerImpl.js | 2 +- .../src/redmic/modules/form/_ShowInDialog.js | 2 +- .../{ => modules/form}/form/FormContainer.js | 0 .../redmic/{ => modules/form}/form/Select.js | 0 .../{ => modules/form}/form/UploadInput.js | 2 +- .../form}/form/nls/UploadInput.js | 0 .../form}/form/nls/es/UploadInput.js | 0 .../form}/form/templates/Select.html | 0 .../form}/form/templates/UploadInput.html | 0 .../redmic/modules/form/input/GeometryImpl.js | 2 +- .../redmic/modules/form/input/SelectImpl.js | 2 +- .../modules/form/input/UploadFileImpl.js | 8 +- .../src/redmic/modules/map/MapButton.js | 2 +- .../redmic/modules/map/layer/GridLayerImpl.js | 2 +- .../redmic/modules/selection/SelectionBox.js | 2 +- .../modules/selection/SelectionManager.js | 2 +- .../modules/selection/_SelectorPersistence.js | 2 +- .../src/redmic/modules/socket/Socket.js | 2 +- client-app/src/redmic/modules/socket/Task.js | 2 +- .../src/redmic/modules/socket/_IngestData.js | 2 +- .../src/redmic/modules/socket/_Report.js | 2 +- .../src/redmic/modules/socket/_Worms.js | 2 +- .../redmic/modules/store/RestManagerImpl.js | 2 +- .../src/redmic/modules/user/UserArea.js | 2 +- .../src/redmic/view/effects/Animation.js | 77 ------------ .../{ => widgets}/layout/DialogComplex.js | 2 +- .../{ => widgets}/layout/DialogSimple.js | 2 +- .../{ => widgets}/layout/_DialogBase.js | 0 .../src/{redmic/base => utils}/Credentials.js | 2 +- .../{redmic/base => utils}/GuestChecker.js | 2 +- .../src/{redmic/base => utils}/Mediator.js | 0 .../base => utils}/RedmicLocalStorage.js | 0 .../validation => utils}/stringFormats.js | 0 client-app/src/{redmic/base => utils}/tv4.js | 2 +- client-app/tests/_intern-unit.js | 2 +- .../base/views/extensions/test_EditionView.js | 2 +- .../unit/app/viewers/views/test_ChartsView.js | 2 +- .../tests/unit/redmic/base/testCredentials.js | 4 +- .../tests/unit/redmic/base/testMediator.js | 2 +- .../redmic/base/testRedmicLocalStorage.js | 2 +- .../tests/unit/redmic/form/testUploadInput.js | 2 +- .../unit/redmic/modules/base/testManager.js | 2 +- .../redmic/modules/base/testNotification.js | 2 +- .../redmic/modules/base/testSelectionBox.js | 2 +- .../unit/redmic/modules/base/test_Module.js | 2 +- .../redmic/modules/browser/bars/testOrder.js | 2 +- .../modules/browser/bars/testPagination.js | 2 +- .../modules/browser/bars/testSelectionBox.js | 2 +- .../redmic/modules/browser/bars/testTotal.js | 2 +- .../modules/browser/buttons/testButtons.js | 2 +- .../redmic/modules/browser/row/testRow.js | 2 +- .../modules/browser/testHierarchicalImpl.js | 2 +- .../redmic/modules/browser/testListImpl.js | 2 +- .../testInfoChartsContainerImpl.js | 2 +- .../chart/Toolbar/testSliderSelectorImpl.js | 2 +- .../layer/ChartLayer/testLinearChartImpl.js | 2 +- .../modules/form/inputs/testCheckBoxImpl.js | 4 +- .../form/inputs/testDateTextBoxImpl.js | 4 +- .../form/inputs/testFilteringInputImpl.js | 4 +- .../form/inputs/testNumberSpinnerImpl.js | 4 +- .../form/inputs/testNumberTextBoxImpl.js | 4 +- .../modules/form/inputs/testTextAreaImpl.js | 4 +- .../modules/form/inputs/testTextBoxImpl.js | 4 +- .../unit/redmic/modules/form/testForm.js | 4 +- .../redmic/modules/gateway/testGateway.js | 2 +- .../modules/layout/details/testDetails.js | 4 +- .../modules/layout/wizard/testWizard.js | 2 +- .../redmic/modules/map/testLeafletImpl.js | 2 +- .../redmic/modules/model/testModelImpl.js | 2 +- .../notification/test_Communication.js | 4 +- .../modules/notification/test_Notification.js | 4 +- .../redmic/modules/search/testFacetsImpl.js | 2 +- .../unit/redmic/modules/search/testSearch.js | 2 +- .../redmic/modules/selection/testSelector.js | 2 +- .../unit/redmic/modules/socket/testSocket.js | 4 +- .../redmic/modules/store/testRestManager.js | 2 +- .../unit/redmic/modules/tree/testTree.js | 2 +- .../unit/redmic/modules/wizard/testWizard.js | 2 +- 102 files changed, 106 insertions(+), 344 deletions(-) rename client-app/src/{redmic/base => app}/CheckBrowser.js (100%) delete mode 100644 client-app/src/redmic/dialog/LockDialogImpl.js delete mode 100644 client-app/src/redmic/dialog/_DialogComplexItfc.js rename client-app/src/redmic/{ => modules/form}/form/FormContainer.js (100%) rename client-app/src/redmic/{ => modules/form}/form/Select.js (100%) rename client-app/src/redmic/{ => modules/form}/form/UploadInput.js (99%) rename client-app/src/redmic/{ => modules/form}/form/nls/UploadInput.js (100%) rename client-app/src/redmic/{ => modules/form}/form/nls/es/UploadInput.js (100%) rename client-app/src/redmic/{ => modules/form}/form/templates/Select.html (100%) rename client-app/src/redmic/{ => modules/form}/form/templates/UploadInput.html (100%) delete mode 100644 client-app/src/redmic/view/effects/Animation.js rename client-app/src/redmic/{ => widgets}/layout/DialogComplex.js (99%) rename client-app/src/redmic/{ => widgets}/layout/DialogSimple.js (99%) rename client-app/src/redmic/{ => widgets}/layout/_DialogBase.js (100%) rename client-app/src/{redmic/base => utils}/Credentials.js (98%) rename client-app/src/{redmic/base => utils}/GuestChecker.js (98%) rename client-app/src/{redmic/base => utils}/Mediator.js (100%) rename client-app/src/{redmic/base => utils}/RedmicLocalStorage.js (100%) rename client-app/src/{redmic/validation => utils}/stringFormats.js (100%) rename client-app/src/{redmic/base => utils}/tv4.js (98%) diff --git a/client-app/src/app/App.js b/client-app/src/app/App.js index 215bbb1f..d0d5152d 100644 --- a/client-app/src/app/App.js +++ b/client-app/src/app/App.js @@ -6,7 +6,7 @@ define([ , 'dojo/dom' , 'dojo/has' , 'put-selector/put' - , 'redmic/base/CheckBrowser' + , 'src/app/CheckBrowser' , 'src/app/innerApp' , 'src/app/ModuleStore' , 'src/app/outerApp' diff --git a/client-app/src/redmic/base/CheckBrowser.js b/client-app/src/app/CheckBrowser.js similarity index 100% rename from client-app/src/redmic/base/CheckBrowser.js rename to client-app/src/app/CheckBrowser.js diff --git a/client-app/src/app/innerApp.js b/client-app/src/app/innerApp.js index 97ebf062..04883011 100644 --- a/client-app/src/app/innerApp.js +++ b/client-app/src/app/innerApp.js @@ -4,7 +4,7 @@ define([ , 'dojo/aspect' , 'dojo/dom-class' , 'put-selector/put' - , 'redmic/base/Credentials' + , 'src/utils/Credentials' , 'src/app/_app' , 'redmic/modules/components/Sidebar/MainSidebarImpl' , 'redmic/modules/components/Topbar' diff --git a/client-app/src/catalog/detail/_WidgetDefinition.js b/client-app/src/catalog/detail/_WidgetDefinition.js index 6a2a92cf..76e4df23 100644 --- a/client-app/src/catalog/detail/_WidgetDefinition.js +++ b/client-app/src/catalog/detail/_WidgetDefinition.js @@ -9,7 +9,7 @@ define([ , 'app/details/views/ActivityLayerMapBase' , 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/base/Credentials' + , 'src/utils/Credentials' , 'redmic/modules/base/_Filter' , 'redmic/modules/browser/_ButtonsInRow' , 'redmic/modules/browser/_Framework' diff --git a/client-app/src/oldapp/base/models/attr/_Attr.js b/client-app/src/oldapp/base/models/attr/_Attr.js index fc811c02..4fbf1151 100644 --- a/client-app/src/oldapp/base/models/attr/_Attr.js +++ b/client-app/src/oldapp/base/models/attr/_Attr.js @@ -5,7 +5,7 @@ define([ , "dojo/Stateful" , "dojo/topic" , "json-schema-ref-parser/ref-parser.min" - , "redmic/base/tv4" + , "src/utils/tv4" ], function( declare , lang diff --git a/client-app/src/oldapp/base/views/_ViewListBase.js b/client-app/src/oldapp/base/views/_ViewListBase.js index 06e1594f..7de9f74b 100644 --- a/client-app/src/oldapp/base/views/_ViewListBase.js +++ b/client-app/src/oldapp/base/views/_ViewListBase.js @@ -6,7 +6,7 @@ define([ , "dojo/_base/lang" , "dojo/aspect" , "put-selector/put" - , "redmic/base/Credentials" + , "src/utils/Credentials" ], function ( _Module , _Show diff --git a/client-app/src/oldapp/components/CookieLoader.js b/client-app/src/oldapp/components/CookieLoader.js index bc5c13ca..f2a69b0e 100644 --- a/client-app/src/oldapp/components/CookieLoader.js +++ b/client-app/src/oldapp/components/CookieLoader.js @@ -4,7 +4,7 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/i18n!app/nls/translation" - , "redmic/base/Credentials" + , "src/utils/Credentials" ], function( alertify , redmicConfig diff --git a/client-app/src/oldapp/designs/details/main/Document.js b/client-app/src/oldapp/designs/details/main/Document.js index 14d04024..415423d0 100644 --- a/client-app/src/oldapp/designs/details/main/Document.js +++ b/client-app/src/oldapp/designs/details/main/Document.js @@ -2,7 +2,7 @@ define([ 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/base/Credentials' + , 'src/utils/Credentials' , 'templates/DocumentInfo' , './_DetailsBase' , './DocumentPDF' diff --git a/client-app/src/oldapp/home/views/HomeView.js b/client-app/src/oldapp/home/views/HomeView.js index 8ade6f42..ecc5307a 100644 --- a/client-app/src/oldapp/home/views/HomeView.js +++ b/client-app/src/oldapp/home/views/HomeView.js @@ -11,7 +11,7 @@ define([ , 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/base/Credentials' + , 'src/utils/Credentials' , 'redmic/modules/base/_Filter' , 'redmic/modules/layout/templateDisplayer/TemplateDisplayer' , 'templates/InitialInfo' diff --git a/client-app/src/oldapp/user/views/FeedbackView.js b/client-app/src/oldapp/user/views/FeedbackView.js index 3d49ecdc..29591164 100644 --- a/client-app/src/oldapp/user/views/FeedbackView.js +++ b/client-app/src/oldapp/user/views/FeedbackView.js @@ -8,7 +8,7 @@ define([ , "dojo/_base/lang" , "dojo/query" , "dojo/text!./templates/Feedback.html" - , "redmic/base/Credentials" + , "src/utils/Credentials" , "redmic/modules/form/FormContainerImpl" , "redmic/modules/form/_ListenModelHasChanged" , "redmic/modules/model/ModelImpl" diff --git a/client-app/src/oldapp/user/views/LoginView.js b/client-app/src/oldapp/user/views/LoginView.js index 6772456b..137f172d 100644 --- a/client-app/src/oldapp/user/views/LoginView.js +++ b/client-app/src/oldapp/user/views/LoginView.js @@ -5,7 +5,7 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/text!./templates/Login.html" - , "redmic/base/Credentials" + , "src/utils/Credentials" , 'redmic/modules/base/_Store' ], function( alertify diff --git a/client-app/src/oldapp/user/views/UserProfileView.js b/client-app/src/oldapp/user/views/UserProfileView.js index 93dd2ba4..412e9516 100644 --- a/client-app/src/oldapp/user/views/UserProfileView.js +++ b/client-app/src/oldapp/user/views/UserProfileView.js @@ -9,7 +9,7 @@ define([ , "app/user/models/UserSectorModel" , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/base/Credentials" + , "src/utils/Credentials" , "redmic/modules/base/_Window" , "redmic/modules/base/_Persistence" , "redmic/modules/browser/_ButtonsInRow" diff --git a/client-app/src/oldapp/viewers/views/SpeciesDistributionView.js b/client-app/src/oldapp/viewers/views/SpeciesDistributionView.js index 34d01647..1eaabc9b 100644 --- a/client-app/src/oldapp/viewers/views/SpeciesDistributionView.js +++ b/client-app/src/oldapp/viewers/views/SpeciesDistributionView.js @@ -8,7 +8,7 @@ define([ , "dojo/aspect" , "dojo/Deferred" , "put-selector/put" - , "redmic/base/Credentials" + , "src/utils/Credentials" , "redmic/modules/atlas/Atlas" , "redmic/modules/base/_Filter" , "redmic/modules/base/_Selection" diff --git a/client-app/src/oldapp/views/ActivateAccount.js b/client-app/src/oldapp/views/ActivateAccount.js index 87bf7258..f3c14799 100644 --- a/client-app/src/oldapp/views/ActivateAccount.js +++ b/client-app/src/oldapp/views/ActivateAccount.js @@ -3,7 +3,7 @@ define([ , 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/request' - , 'redmic/base/RedmicLocalStorage' + , 'src/utils/RedmicLocalStorage' ], function( redmicConfig , declare diff --git a/client-app/src/redmic/dialog/LockDialogImpl.js b/client-app/src/redmic/dialog/LockDialogImpl.js deleted file mode 100644 index 076a7464..00000000 --- a/client-app/src/redmic/dialog/LockDialogImpl.js +++ /dev/null @@ -1,111 +0,0 @@ -define([ - "dojo/_base/declare" - , "dojo/_base/lang" - , "dojo/Deferred" - , "redmic/dialog/_DialogComplexItfc" - , "redmic/layout/DialogComplex" -], function( - declare - , lang - , Deferred - , _DialogComplexItfc - , DialogComplex -){ - return declare(_DialogComplexItfc, { - // summary: - // Implementación de popup bloqueante. - - // config: Object - // Opciones por defecto. - - constructor: function(args) { - - this.config = { - dialog: null, - dialogPromiseShow: null, - dialogPromiseHide: null, - ownEvents: { - HIDE: "hide", - CHANGECONTENT: "changeContent" - } - }; - - lang.mixin(this, this.config, args); - }, - - postCreate: function() { - - this.dialog = new DialogComplex({ - width: this.width || 6, - height: this.height || "lg" - }); - - this.dialog.on(this.ownEvents.HIDE, lang.hitch(this, this._groupEventArgs, 'HIDE')); - this.on(this.ownEvents.CHANGECONTENT, lang.hitch(this, this._setCenterContent)); - }, - - _showContent: function(/*Object*/ content, /*String*/ evt) { - - if (content && content.bottomContent && content.centerContent) { - this._setBottomContent(content.bottomContent); - this._setCenterContent(content.centerContent); - } else if (content && content.fullContent) { - this._setFullContent(content.fullContent); - } - - this._show().then(lang.hitch(this, function() { - this.emit(evt); - })); - }, - - _show: function() { - - this.dialog.set("title", this.title); - - if (!this.dialogPromiseHide || (this.dialogPromiseHide && this.dialogPromiseHide.isFulfilled())) { - this.dialogPromiseShow = this.dialog.show(); - return this.dialogPromiseShow; - } else { - return this.dialogPromiseHide.always(lang.hitch(this, function() { - this.dialogPromiseShow = this.dialog.show(); - return this.dialogPromiseShow; - })); - } - }, - - _hideContent: function(/*String*/ evt) { - - this._hide().then(lang.hitch(this, function() { - this.emit(evt); - })); - }, - - _hide: function() { - - if (!this.dialogPromiseShow || (this.dialogPromiseShow && this.dialogPromiseShow.isFulfilled())) { - this.dialogPromiseHide = this.dialog.hide(); - return this.dialogPromiseHide; - } else { - return this.dialogPromiseShow.always(lang.hitch(this, function() { - this.dialogPromiseHide = this.dialog.hide(); - return this.dialogPromiseHide; - })); - } - }, - - _setCenterContent: function(centerContent) { - - this.dialog.set("centerContent", centerContent); - }, - - _setBottomContent: function(bottomContent) { - - this.dialog.set("bottomContent", bottomContent); - }, - - _setFullContent: function(fullContent) { - - this.dialog.set("fullContent", fullContent); - } - }); -}); diff --git a/client-app/src/redmic/dialog/_DialogComplexItfc.js b/client-app/src/redmic/dialog/_DialogComplexItfc.js deleted file mode 100644 index 925d3a44..00000000 --- a/client-app/src/redmic/dialog/_DialogComplexItfc.js +++ /dev/null @@ -1,50 +0,0 @@ -define([ - "dojo/_base/declare" -], function( - declare -){ - return declare(null, { - // summary: - // Se definen los métodos necesarios para usar un lockDialog (diálogo bloqueante) en el módulo Details.js - // description: - // Proporciona la interfaz de los métodos usados en Grid.js. - - // config: Object - // Opciones por defecto. - - _showContent: function(/*Object*/ content, /*String*/ evt) { - - console.warn("Not implemented method"); - }, - - _show: function() { - - console.warn("Not implemented method"); - }, - - _hideContent: function(/*String*/ evt) { - - console.warn("Not implemented method"); - }, - - _hide: function() { - - console.warn("Not implemented method"); - }, - - _setCenterContent: function(centerContent) { - - console.warn("Not implemented method"); - }, - - _setBottomContent: function(bottomContent) { - - console.warn("Not implemented method"); - }, - - _setFullContent: function(fullContent) { - - console.warn("Not implemented method"); - } - }); -}); \ No newline at end of file diff --git a/client-app/src/redmic/modules/base/Credentials.js b/client-app/src/redmic/modules/base/Credentials.js index bdfc40b0..c734cee6 100644 --- a/client-app/src/redmic/modules/base/Credentials.js +++ b/client-app/src/redmic/modules/base/Credentials.js @@ -4,7 +4,7 @@ define([ , 'dojo/_base/lang' , 'redmic/modules/base/_Module' , 'redmic/modules/base/_Store' - , 'redmic/base/Credentials' + , 'src/utils/Credentials' ], function( redmicConfig , declare diff --git a/client-app/src/redmic/modules/base/Manager.js b/client-app/src/redmic/modules/base/Manager.js index 1b17c0c4..a8f94d5d 100644 --- a/client-app/src/redmic/modules/base/Manager.js +++ b/client-app/src/redmic/modules/base/Manager.js @@ -5,7 +5,7 @@ define([ , 'dojo/_base/lang' , 'dojo/topic' , 'put-selector/put' - , 'redmic/base/Credentials' + , 'src/utils/Credentials' , 'redmic/modules/base/_Module' , 'redmic/modules/base/_Show' ], diff --git a/client-app/src/redmic/modules/base/_AuthFirewall.js b/client-app/src/redmic/modules/base/_AuthFirewall.js index 98e42f53..021fb605 100644 --- a/client-app/src/redmic/modules/base/_AuthFirewall.js +++ b/client-app/src/redmic/modules/base/_AuthFirewall.js @@ -2,8 +2,8 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/base/Credentials" - , "redmic/base/GuestChecker" + , "src/utils/Credentials" + , "src/utils/GuestChecker" ], function( declare , lang diff --git a/client-app/src/redmic/modules/base/_Module.js b/client-app/src/redmic/modules/base/_Module.js index 873db255..d7a860b6 100644 --- a/client-app/src/redmic/modules/base/_Module.js +++ b/client-app/src/redmic/modules/base/_Module.js @@ -10,7 +10,7 @@ define([ , "dojo/on" , "dojo/promise/all" , "RWidgets/Utilities" - , "redmic/base/Mediator" + , "src/utils/Mediator" , "./_ChkCollection" , "./_CommunicationCenter" , "./_ManageClickEvent" diff --git a/client-app/src/redmic/modules/base/_ShowInPopup.js b/client-app/src/redmic/modules/base/_ShowInPopup.js index b123d304..75a75532 100644 --- a/client-app/src/redmic/modules/base/_ShowInPopup.js +++ b/client-app/src/redmic/modules/base/_ShowInPopup.js @@ -3,8 +3,8 @@ define([ , 'dojo/_base/lang' , 'dojo/Deferred' , 'dojo/promise/all' - , 'redmic/layout/DialogComplex' - , 'redmic/layout/DialogSimple' + , 'RWidgets/layout/DialogComplex' + , 'RWidgets/layout/DialogSimple' , 'put-selector/put' ], function( ContentPane diff --git a/client-app/src/redmic/modules/browser/bars/SelectionBox.js b/client-app/src/redmic/modules/browser/bars/SelectionBox.js index 5791eb25..6d7bb277 100644 --- a/client-app/src/redmic/modules/browser/bars/SelectionBox.js +++ b/client-app/src/redmic/modules/browser/bars/SelectionBox.js @@ -2,7 +2,7 @@ define([ 'alertify/alertify.min' , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/base/Credentials" + , "src/utils/Credentials" , "redmic/modules/base/_Module" , "redmic/modules/base/_Show" , "redmic/modules/selection/SelectionBox" diff --git a/client-app/src/redmic/modules/components/ExternalConfig.js b/client-app/src/redmic/modules/components/ExternalConfig.js index bf72bb84..16510604 100644 --- a/client-app/src/redmic/modules/components/ExternalConfig.js +++ b/client-app/src/redmic/modules/components/ExternalConfig.js @@ -4,7 +4,7 @@ define([ , 'dojo/_base/lang' , 'redmic/modules/base/_Module' , 'redmic/modules/base/_Store' - , 'redmic/base/Credentials' + , 'src/utils/Credentials' ], function( redmicConfig , declare diff --git a/client-app/src/redmic/modules/components/PDFViewer/PDFViewer.js b/client-app/src/redmic/modules/components/PDFViewer/PDFViewer.js index 71e01100..7acf9d57 100644 --- a/client-app/src/redmic/modules/components/PDFViewer/PDFViewer.js +++ b/client-app/src/redmic/modules/components/PDFViewer/PDFViewer.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/base/Credentials" + , "src/utils/Credentials" , "redmic/modules/base/_Module" , "redmic/modules/base/_Show" , "redmic/modules/layout/templateDisplayer/TemplateDisplayer" diff --git a/client-app/src/redmic/modules/form/FormContainerImpl.js b/client-app/src/redmic/modules/form/FormContainerImpl.js index f9c6b22b..87df42ba 100644 --- a/client-app/src/redmic/modules/form/FormContainerImpl.js +++ b/client-app/src/redmic/modules/form/FormContainerImpl.js @@ -4,7 +4,7 @@ define([ , "dojo/aspect" , "dojo/Deferred" , "dojo/promise/all" - , "redmic/form/FormContainer" + , "redmic/modules/form/form/FormContainer" , "./Form" ], function( declare diff --git a/client-app/src/redmic/modules/form/_ShowInDialog.js b/client-app/src/redmic/modules/form/_ShowInDialog.js index 8e5ab1e9..ceabac29 100644 --- a/client-app/src/redmic/modules/form/_ShowInDialog.js +++ b/client-app/src/redmic/modules/form/_ShowInDialog.js @@ -4,7 +4,7 @@ define([ , "dojo/_base/lang" , "dojo/aspect" , 'put-selector/put' - , "redmic/layout/DialogComplex" + , "RWidgets/layout/DialogComplex" , "redmic/modules/form/_CreateKeypad" ], function( ContentPane diff --git a/client-app/src/redmic/form/FormContainer.js b/client-app/src/redmic/modules/form/form/FormContainer.js similarity index 100% rename from client-app/src/redmic/form/FormContainer.js rename to client-app/src/redmic/modules/form/form/FormContainer.js diff --git a/client-app/src/redmic/form/Select.js b/client-app/src/redmic/modules/form/form/Select.js similarity index 100% rename from client-app/src/redmic/form/Select.js rename to client-app/src/redmic/modules/form/form/Select.js diff --git a/client-app/src/redmic/form/UploadInput.js b/client-app/src/redmic/modules/form/form/UploadInput.js similarity index 99% rename from client-app/src/redmic/form/UploadInput.js rename to client-app/src/redmic/modules/form/form/UploadInput.js index 4dc197c1..51899c0f 100644 --- a/client-app/src/redmic/form/UploadInput.js +++ b/client-app/src/redmic/modules/form/form/UploadInput.js @@ -10,7 +10,7 @@ define([ , 'dojo/i18n!./nls/UploadInput' , 'dojo/text!./templates/UploadInput.html' , 'put-selector/put' - , 'redmic/base/Credentials' + , 'src/utils/Credentials' , 'dropzone/dropzone-amd-module.min' ], function( diff --git a/client-app/src/redmic/form/nls/UploadInput.js b/client-app/src/redmic/modules/form/form/nls/UploadInput.js similarity index 100% rename from client-app/src/redmic/form/nls/UploadInput.js rename to client-app/src/redmic/modules/form/form/nls/UploadInput.js diff --git a/client-app/src/redmic/form/nls/es/UploadInput.js b/client-app/src/redmic/modules/form/form/nls/es/UploadInput.js similarity index 100% rename from client-app/src/redmic/form/nls/es/UploadInput.js rename to client-app/src/redmic/modules/form/form/nls/es/UploadInput.js diff --git a/client-app/src/redmic/form/templates/Select.html b/client-app/src/redmic/modules/form/form/templates/Select.html similarity index 100% rename from client-app/src/redmic/form/templates/Select.html rename to client-app/src/redmic/modules/form/form/templates/Select.html diff --git a/client-app/src/redmic/form/templates/UploadInput.html b/client-app/src/redmic/modules/form/form/templates/UploadInput.html similarity index 100% rename from client-app/src/redmic/form/templates/UploadInput.html rename to client-app/src/redmic/modules/form/form/templates/UploadInput.html diff --git a/client-app/src/redmic/modules/form/input/GeometryImpl.js b/client-app/src/redmic/modules/form/input/GeometryImpl.js index 0de46db6..133fa5d9 100644 --- a/client-app/src/redmic/modules/form/input/GeometryImpl.js +++ b/client-app/src/redmic/modules/form/input/GeometryImpl.js @@ -4,7 +4,7 @@ define([ , 'dojo/_base/declare' , 'dojo/_base/lang' , 'put-selector/put' - , 'redmic/form/UploadInput' + , 'redmic/modules/form/form/UploadInput' , 'redmic/modules/form/input/Input' ], function( redmicConfig diff --git a/client-app/src/redmic/modules/form/input/SelectImpl.js b/client-app/src/redmic/modules/form/input/SelectImpl.js index 532e6c7a..207c0301 100644 --- a/client-app/src/redmic/modules/form/input/SelectImpl.js +++ b/client-app/src/redmic/modules/form/input/SelectImpl.js @@ -4,7 +4,7 @@ define([ , "dojo/_base/lang" , "dojo/aspect" , "RWidgets/Utilities" - , "redmic/form/Select" + , "redmic/modules/form/form/Select" , "redmic/modules/base/_Store" , "redmic/modules/form/input/Input" ], function( diff --git a/client-app/src/redmic/modules/form/input/UploadFileImpl.js b/client-app/src/redmic/modules/form/input/UploadFileImpl.js index cb6cbe73..ab975821 100644 --- a/client-app/src/redmic/modules/form/input/UploadFileImpl.js +++ b/client-app/src/redmic/modules/form/input/UploadFileImpl.js @@ -3,10 +3,10 @@ define([ , 'dojo/_base/lang' , 'dojo/Deferred' , 'dojo/on' - , 'redmic/base/Credentials' - , 'redmic/form/UploadInput' + , 'src/utils/Credentials' + , 'redmic/modules/form/form/UploadInput' , 'redmic/modules/form/input/Input' - , 'redmic/validation/stringFormats' + , 'src/utils/stringFormats' , 'RWidgets/Utilities' ], function( declare @@ -219,4 +219,4 @@ define([ this._enable(); } }); -}); \ No newline at end of file +}); diff --git a/client-app/src/redmic/modules/map/MapButton.js b/client-app/src/redmic/modules/map/MapButton.js index ebb10162..e3d4688a 100644 --- a/client-app/src/redmic/modules/map/MapButton.js +++ b/client-app/src/redmic/modules/map/MapButton.js @@ -5,7 +5,7 @@ define([ , "dojo/dom-class" , "dojo/Stateful" , "put-selector/put" - , "redmic/base/Mediator" + , "src/utils/Mediator" ], function( _WidgetBase , declare diff --git a/client-app/src/redmic/modules/map/layer/GridLayerImpl.js b/client-app/src/redmic/modules/map/layer/GridLayerImpl.js index 7a7e1471..5d44f5e5 100644 --- a/client-app/src/redmic/modules/map/layer/GridLayerImpl.js +++ b/client-app/src/redmic/modules/map/layer/GridLayerImpl.js @@ -4,7 +4,7 @@ define([ , "dojo/_base/lang" , "dojo/aspect" , 'leaflet/leaflet' - , "redmic/base/Credentials" + , "src/utils/Credentials" , "redmic/modules/filter/Filter" , "./MapLayer" ], function( diff --git a/client-app/src/redmic/modules/selection/SelectionBox.js b/client-app/src/redmic/modules/selection/SelectionBox.js index c5d5feac..f9d1d4e9 100644 --- a/client-app/src/redmic/modules/selection/SelectionBox.js +++ b/client-app/src/redmic/modules/selection/SelectionBox.js @@ -3,7 +3,7 @@ define([ , 'dojo/_base/lang' , 'dojo/Deferred' , 'put-selector/put' - , 'redmic/base/Credentials' + , 'src/utils/Credentials' , 'redmic/modules/base/_ListenQueryParams' , 'redmic/modules/base/_Module' , 'redmic/modules/base/_Show' diff --git a/client-app/src/redmic/modules/selection/SelectionManager.js b/client-app/src/redmic/modules/selection/SelectionManager.js index 447a7c7a..5c481835 100644 --- a/client-app/src/redmic/modules/selection/SelectionManager.js +++ b/client-app/src/redmic/modules/selection/SelectionManager.js @@ -5,7 +5,7 @@ define([ , 'dojo/_base/lang' , 'dojo/Deferred' , 'put-selector/put' - , 'redmic/base/Credentials' + , 'src/utils/Credentials' , 'redmic/modules/base/_Module' , 'redmic/modules/base/_Selection' , 'redmic/modules/base/_Show' diff --git a/client-app/src/redmic/modules/selection/_SelectorPersistence.js b/client-app/src/redmic/modules/selection/_SelectorPersistence.js index a052755a..ceb041c9 100644 --- a/client-app/src/redmic/modules/selection/_SelectorPersistence.js +++ b/client-app/src/redmic/modules/selection/_SelectorPersistence.js @@ -3,7 +3,7 @@ define([ , 'dojo/_base/lang' , 'redmic/modules/base/_Persistence' , 'redmic/modules/base/_Store' - , 'redmic/base/Credentials' + , 'src/utils/Credentials' ], function( declare , lang diff --git a/client-app/src/redmic/modules/socket/Socket.js b/client-app/src/redmic/modules/socket/Socket.js index d7eb5dda..ed7b60b3 100644 --- a/client-app/src/redmic/modules/socket/Socket.js +++ b/client-app/src/redmic/modules/socket/Socket.js @@ -3,7 +3,7 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "redmic/modules/base/_Module" - , "redmic/base/Credentials" + , "src/utils/Credentials" , 'sockjs/sockjs.min' , 'stomp-websocket/stomp.min' diff --git a/client-app/src/redmic/modules/socket/Task.js b/client-app/src/redmic/modules/socket/Task.js index dd794236..0fde6486 100644 --- a/client-app/src/redmic/modules/socket/Task.js +++ b/client-app/src/redmic/modules/socket/Task.js @@ -5,7 +5,7 @@ define([ , "redmic/modules/base/_Module" , "redmic/modules/base/_Store" , "redmic/modules/base/_Selection" - , "redmic/base/Credentials" + , "src/utils/Credentials" ], function( declare , lang diff --git a/client-app/src/redmic/modules/socket/_IngestData.js b/client-app/src/redmic/modules/socket/_IngestData.js index 47be6bcb..78d19809 100644 --- a/client-app/src/redmic/modules/socket/_IngestData.js +++ b/client-app/src/redmic/modules/socket/_IngestData.js @@ -3,7 +3,7 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/base/Credentials" + , "src/utils/Credentials" ], function( redmicConfig , declare diff --git a/client-app/src/redmic/modules/socket/_Report.js b/client-app/src/redmic/modules/socket/_Report.js index 7032ed10..6d54edeb 100644 --- a/client-app/src/redmic/modules/socket/_Report.js +++ b/client-app/src/redmic/modules/socket/_Report.js @@ -4,7 +4,7 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/base/Credentials" + , "src/utils/Credentials" ], function( alertify , redmicConfig diff --git a/client-app/src/redmic/modules/socket/_Worms.js b/client-app/src/redmic/modules/socket/_Worms.js index 8376c329..3c448802 100644 --- a/client-app/src/redmic/modules/socket/_Worms.js +++ b/client-app/src/redmic/modules/socket/_Worms.js @@ -3,7 +3,7 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/base/Credentials" + , "src/utils/Credentials" ], function( redmicConfig , declare diff --git a/client-app/src/redmic/modules/store/RestManagerImpl.js b/client-app/src/redmic/modules/store/RestManagerImpl.js index b42ea8a1..a058c925 100644 --- a/client-app/src/redmic/modules/store/RestManagerImpl.js +++ b/client-app/src/redmic/modules/store/RestManagerImpl.js @@ -5,7 +5,7 @@ define([ , 'dojo/request' , 'dojo/request/notify' , 'dojo/request/registry' - , 'redmic/base/Credentials' + , 'src/utils/Credentials' , './RestManager' ], function( redmicConfig diff --git a/client-app/src/redmic/modules/user/UserArea.js b/client-app/src/redmic/modules/user/UserArea.js index c7e524a6..e8021afc 100644 --- a/client-app/src/redmic/modules/user/UserArea.js +++ b/client-app/src/redmic/modules/user/UserArea.js @@ -10,7 +10,7 @@ define([ , 'redmic/modules/base/_Store' , 'redmic/modules/layout/listMenu/ListMenu' , 'redmic/modules/layout/templateDisplayer/TemplateDisplayer' - , 'redmic/base/Credentials' + , 'src/utils/Credentials' , 'templates/UserTopbarImage' , 'templates/UserTopbarMenu' ], function( diff --git a/client-app/src/redmic/view/effects/Animation.js b/client-app/src/redmic/view/effects/Animation.js deleted file mode 100644 index b17bcc1f..00000000 --- a/client-app/src/redmic/view/effects/Animation.js +++ /dev/null @@ -1,77 +0,0 @@ -define([ - "dojo/_base/declare" - , "dojo/_base/html" - , "dojo/_base/fx" - , "dojo/_base/lang" -], function( - declare - , html - , baseFx - , lang -){ - return declare(null, { - - fadeInInProgress: null, - fadeOutInProgress: null, - - _transition:function(newWidget, oldWidget){ - - // Needed later for calling this.inherited(arguments); - that = this; - var a = arguments; - - // An animation was stopped: don't do the whole animation thing, reset everything, - // called this.inherited(arguments) as if nothing happened - if( this.fadeInInProgress || this.fadeOutInProgress ){ - - // Stop animations - if( this.fadeInInProgress ){ this.fadeInInProgress.stop(); } - if( this.fadeOutInProgress ){ this.fadeOutInProgress.stop(); } - - // Reset opacity for everything - html.style(newWidget.domNode, "opacity", 1); - html.style(oldWidget.domNode, "opacity", 1); - - // call inherited(arguments) as if nothing happened - this.inherited(arguments); - return; - } - - // //////////////////////////////////////// - // // FADEOUT - // //////////////////////////////////////// - // console.log("Fade out starting"); - that.fadeOutInProgress = baseFx.fadeOut({ - node:oldWidget.domNode, - duration: 150, - onStop: function(){ - that.fadeOutInProgress = null; - }, - - // //////////////////////////////////////// - // // FADEIN - // //////////////////////////////////////// - onEnd: function(){ - that.fadeOutInProgress = null; - - // Make the widget transparent, and then call inherited -- which will do the actual switch. - html.style(newWidget.domNode, "opacity", 0); - that.inherited(a); - - // At this point the widget is visible, selected but transparent. - // Let's fix that... - that.fadeInInProgress = baseFx.fadeIn({ - node:newWidget.domNode, - duration: 150, - onStop: function(){ - that.fadeInInProgress = null; - }, - onEnd: function(){ - that.fadeInInProgress = null; - } - }).play(); - } - }).play(); - } - }); // Declare -}); // Define diff --git a/client-app/src/redmic/layout/DialogComplex.js b/client-app/src/redmic/widgets/layout/DialogComplex.js similarity index 99% rename from client-app/src/redmic/layout/DialogComplex.js rename to client-app/src/redmic/widgets/layout/DialogComplex.js index 62047095..afed281c 100644 --- a/client-app/src/redmic/layout/DialogComplex.js +++ b/client-app/src/redmic/widgets/layout/DialogComplex.js @@ -5,7 +5,7 @@ define([ , 'dojo/_base/lang' , 'dojo/query' , 'put-selector/put' - , 'redmic/layout/_DialogBase' + , 'RWidgets/layout/_DialogBase' ], function( ContentPane , registry diff --git a/client-app/src/redmic/layout/DialogSimple.js b/client-app/src/redmic/widgets/layout/DialogSimple.js similarity index 99% rename from client-app/src/redmic/layout/DialogSimple.js rename to client-app/src/redmic/widgets/layout/DialogSimple.js index 1da09468..bd788733 100644 --- a/client-app/src/redmic/layout/DialogSimple.js +++ b/client-app/src/redmic/widgets/layout/DialogSimple.js @@ -2,7 +2,7 @@ define([ 'dijit/registry' , 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/layout/_DialogBase' + , 'RWidgets/layout/_DialogBase' ], function( registry , declare diff --git a/client-app/src/redmic/layout/_DialogBase.js b/client-app/src/redmic/widgets/layout/_DialogBase.js similarity index 100% rename from client-app/src/redmic/layout/_DialogBase.js rename to client-app/src/redmic/widgets/layout/_DialogBase.js diff --git a/client-app/src/redmic/base/Credentials.js b/client-app/src/utils/Credentials.js similarity index 98% rename from client-app/src/redmic/base/Credentials.js rename to client-app/src/utils/Credentials.js index ee9136b3..e0c51763 100644 --- a/client-app/src/redmic/base/Credentials.js +++ b/client-app/src/utils/Credentials.js @@ -3,7 +3,7 @@ define([ , 'dojo/_base/lang' , 'dojo/Evented' , 'dojo/has' - , 'redmic/base/RedmicLocalStorage' + , 'src/utils/RedmicLocalStorage' ], function( declare , lang diff --git a/client-app/src/redmic/base/GuestChecker.js b/client-app/src/utils/GuestChecker.js similarity index 98% rename from client-app/src/redmic/base/GuestChecker.js rename to client-app/src/utils/GuestChecker.js index a03c019c..0864e5f7 100644 --- a/client-app/src/redmic/base/GuestChecker.js +++ b/client-app/src/utils/GuestChecker.js @@ -3,7 +3,7 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/i18n!app/nls/translation" - , "redmic/base/Credentials" + , "src/utils/Credentials" ], function( alertify , declare diff --git a/client-app/src/redmic/base/Mediator.js b/client-app/src/utils/Mediator.js similarity index 100% rename from client-app/src/redmic/base/Mediator.js rename to client-app/src/utils/Mediator.js diff --git a/client-app/src/redmic/base/RedmicLocalStorage.js b/client-app/src/utils/RedmicLocalStorage.js similarity index 100% rename from client-app/src/redmic/base/RedmicLocalStorage.js rename to client-app/src/utils/RedmicLocalStorage.js diff --git a/client-app/src/redmic/validation/stringFormats.js b/client-app/src/utils/stringFormats.js similarity index 100% rename from client-app/src/redmic/validation/stringFormats.js rename to client-app/src/utils/stringFormats.js diff --git a/client-app/src/redmic/base/tv4.js b/client-app/src/utils/tv4.js similarity index 98% rename from client-app/src/redmic/base/tv4.js rename to client-app/src/utils/tv4.js index 0cb616a4..25e553f0 100644 --- a/client-app/src/redmic/base/tv4.js +++ b/client-app/src/utils/tv4.js @@ -2,7 +2,7 @@ define([ 'dojo/_base/lang' , 'dojo/has' , 'RWidgets/Utilities' - , 'redmic/validation/stringFormats' + , 'src/utils/stringFormats' , 'tv4/tv4' ], function( lang diff --git a/client-app/tests/_intern-unit.js b/client-app/tests/_intern-unit.js index eff49879..b78485a4 100644 --- a/client-app/tests/_intern-unit.js +++ b/client-app/tests/_intern-unit.js @@ -40,7 +40,7 @@ module.exports = function(args) { , suitesPrefix + 'redmic/modules/chart/ChartsContainer/testInfoChartsContainerImpl' , suitesPrefix + 'redmic/modules/chart/layer/ChartLayer/testLinearChartImpl' , suitesPrefix + 'redmic/modules/chart/Toolbar/testSliderSelectorImpl' - , suitesPrefix + 'redmic/form/testUploadInput' + , suitesPrefix + 'redmic/modules/form/form/testUploadInput' , suitesPrefix + 'redmic/modules/browser/testListImpl' , suitesPrefix + 'redmic/modules/browser/testHierarchicalImpl' , suitesPrefix + 'redmic/modules/browser/row/testRow' diff --git a/client-app/tests/unit/app/base/views/extensions/test_EditionView.js b/client-app/tests/unit/app/base/views/extensions/test_EditionView.js index 1f9ffb5d..5376a9d1 100644 --- a/client-app/tests/unit/app/base/views/extensions/test_EditionView.js +++ b/client-app/tests/unit/app/base/views/extensions/test_EditionView.js @@ -6,7 +6,7 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/i18n!app/nls/translation" - , "redmic/base/Mediator" + , "src/utils/Mediator" , "redmic/modules/base/Selector" , "redmic/modules/store/MasterStore" ], function( diff --git a/client-app/tests/unit/app/viewers/views/test_ChartsView.js b/client-app/tests/unit/app/viewers/views/test_ChartsView.js index ba88d939..8d446f00 100644 --- a/client-app/tests/unit/app/viewers/views/test_ChartsView.js +++ b/client-app/tests/unit/app/viewers/views/test_ChartsView.js @@ -4,7 +4,7 @@ define([ , "dojo/date/stamp" , "app/viewers/views/ChartsView" , "redmic/modules/store/MasterStore" - , "redmic/base/Mediator" + , "src/utils/Mediator" ], function( declare , lang diff --git a/client-app/tests/unit/redmic/base/testCredentials.js b/client-app/tests/unit/redmic/base/testCredentials.js index b89ae35a..6bff0a1a 100644 --- a/client-app/tests/unit/redmic/base/testCredentials.js +++ b/client-app/tests/unit/redmic/base/testCredentials.js @@ -1,6 +1,6 @@ define([ - "redmic/base/Credentials" - , "redmic/base/RedmicLocalStorage" + "src/utils/Credentials" + , "src/utils/RedmicLocalStorage" ], function( Credentials , RedmicLocalStorage diff --git a/client-app/tests/unit/redmic/base/testMediator.js b/client-app/tests/unit/redmic/base/testMediator.js index 10b72a19..f2c4a74a 100644 --- a/client-app/tests/unit/redmic/base/testMediator.js +++ b/client-app/tests/unit/redmic/base/testMediator.js @@ -1,5 +1,5 @@ define([ - "redmic/base/Mediator" + "src/utils/Mediator" ], function( Mediator ){ diff --git a/client-app/tests/unit/redmic/base/testRedmicLocalStorage.js b/client-app/tests/unit/redmic/base/testRedmicLocalStorage.js index 2f5e695a..700693ee 100644 --- a/client-app/tests/unit/redmic/base/testRedmicLocalStorage.js +++ b/client-app/tests/unit/redmic/base/testRedmicLocalStorage.js @@ -1,5 +1,5 @@ define([ - "redmic/base/RedmicLocalStorage" + "src/utils/RedmicLocalStorage" ], function( RedmicLocalStorage ){ diff --git a/client-app/tests/unit/redmic/form/testUploadInput.js b/client-app/tests/unit/redmic/form/testUploadInput.js index a280bc01..e038a0bd 100644 --- a/client-app/tests/unit/redmic/form/testUploadInput.js +++ b/client-app/tests/unit/redmic/form/testUploadInput.js @@ -2,7 +2,7 @@ define([ 'dojo/_base/lang' , 'dojo/Deferred' , 'dojo/on' - , 'redmic/form/UploadInput' + , 'redmic/modules/form/form/UploadInput' ], function( lang , Deferred diff --git a/client-app/tests/unit/redmic/modules/base/testManager.js b/client-app/tests/unit/redmic/modules/base/testManager.js index 00549113..a39eb3a3 100644 --- a/client-app/tests/unit/redmic/modules/base/testManager.js +++ b/client-app/tests/unit/redmic/modules/base/testManager.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "redmic/modules/base/Manager" - , "redmic/base/Mediator" + , "src/utils/Mediator" ], function( declare , lang diff --git a/client-app/tests/unit/redmic/modules/base/testNotification.js b/client-app/tests/unit/redmic/modules/base/testNotification.js index 23eca5d9..673c1d7a 100644 --- a/client-app/tests/unit/redmic/modules/base/testNotification.js +++ b/client-app/tests/unit/redmic/modules/base/testNotification.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "redmic/modules/base/Notification" - , "redmic/base/Mediator" + , "src/utils/Mediator" ], function( declare , lang diff --git a/client-app/tests/unit/redmic/modules/base/testSelectionBox.js b/client-app/tests/unit/redmic/modules/base/testSelectionBox.js index e901b4fb..51000120 100644 --- a/client-app/tests/unit/redmic/modules/base/testSelectionBox.js +++ b/client-app/tests/unit/redmic/modules/base/testSelectionBox.js @@ -3,7 +3,7 @@ define([ , "dojo/_base/lang" , "put-selector/put" , "redmic/modules/base/SelectionBox" - , "redmic/base/Mediator" + , "src/utils/Mediator" ], function( declare , lang diff --git a/client-app/tests/unit/redmic/modules/base/test_Module.js b/client-app/tests/unit/redmic/modules/base/test_Module.js index 2f0d0e22..5b74faf6 100644 --- a/client-app/tests/unit/redmic/modules/base/test_Module.js +++ b/client-app/tests/unit/redmic/modules/base/test_Module.js @@ -4,7 +4,7 @@ define([ , 'dojo/Deferred' , 'dojo/promise/all' , 'redmic/modules/base/_Module' - , 'redmic/base/Mediator' + , 'src/utils/Mediator' ], function( declare diff --git a/client-app/tests/unit/redmic/modules/browser/bars/testOrder.js b/client-app/tests/unit/redmic/modules/browser/bars/testOrder.js index be822a75..73cfa981 100644 --- a/client-app/tests/unit/redmic/modules/browser/bars/testOrder.js +++ b/client-app/tests/unit/redmic/modules/browser/bars/testOrder.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "put-selector/put" - , "redmic/base/Mediator" + , "src/utils/Mediator" , "redmic/modules/browser/bars/Order" ], function( declare diff --git a/client-app/tests/unit/redmic/modules/browser/bars/testPagination.js b/client-app/tests/unit/redmic/modules/browser/bars/testPagination.js index 5f787dd3..b888d6ac 100644 --- a/client-app/tests/unit/redmic/modules/browser/bars/testPagination.js +++ b/client-app/tests/unit/redmic/modules/browser/bars/testPagination.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "put-selector/put" - , "redmic/base/Mediator" + , "src/utils/Mediator" , "redmic/modules/browser/bars/Pagination" , "templates/DomainList" ], function( diff --git a/client-app/tests/unit/redmic/modules/browser/bars/testSelectionBox.js b/client-app/tests/unit/redmic/modules/browser/bars/testSelectionBox.js index 074ffc4d..652b498e 100644 --- a/client-app/tests/unit/redmic/modules/browser/bars/testSelectionBox.js +++ b/client-app/tests/unit/redmic/modules/browser/bars/testSelectionBox.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "put-selector/put" - , "redmic/base/Mediator" + , "src/utils/Mediator" , "redmic/modules/browser/bars/SelectionBox" ], function( declare diff --git a/client-app/tests/unit/redmic/modules/browser/bars/testTotal.js b/client-app/tests/unit/redmic/modules/browser/bars/testTotal.js index d2b680c9..df0b882d 100644 --- a/client-app/tests/unit/redmic/modules/browser/bars/testTotal.js +++ b/client-app/tests/unit/redmic/modules/browser/bars/testTotal.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "put-selector/put" - , "redmic/base/Mediator" + , "src/utils/Mediator" , "redmic/modules/browser/bars/Total" , "redmic/modules/browser/ListImpl" , "templates/DomainList" diff --git a/client-app/tests/unit/redmic/modules/browser/buttons/testButtons.js b/client-app/tests/unit/redmic/modules/browser/buttons/testButtons.js index 0fe8cc63..e3b1c239 100644 --- a/client-app/tests/unit/redmic/modules/browser/buttons/testButtons.js +++ b/client-app/tests/unit/redmic/modules/browser/buttons/testButtons.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "put-selector/put" - , "redmic/base/Mediator" + , "src/utils/Mediator" , "redmic/modules/browser/buttons/_GroupButtons" , "redmic/modules/browser/buttons/Buttons" ], function( diff --git a/client-app/tests/unit/redmic/modules/browser/row/testRow.js b/client-app/tests/unit/redmic/modules/browser/row/testRow.js index f6ed79c6..0696f37c 100644 --- a/client-app/tests/unit/redmic/modules/browser/row/testRow.js +++ b/client-app/tests/unit/redmic/modules/browser/row/testRow.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "put-selector/put" - , "redmic/base/Mediator" + , "src/utils/Mediator" , "redmic/modules/browser/row/_Buttons" , "redmic/modules/browser/row/_Hierarchical" , "redmic/modules/browser/row/_HierarchicalSelect" diff --git a/client-app/tests/unit/redmic/modules/browser/testHierarchicalImpl.js b/client-app/tests/unit/redmic/modules/browser/testHierarchicalImpl.js index c130b296..1e48fe70 100644 --- a/client-app/tests/unit/redmic/modules/browser/testHierarchicalImpl.js +++ b/client-app/tests/unit/redmic/modules/browser/testHierarchicalImpl.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/dom-class" - , "redmic/base/Mediator" + , "src/utils/Mediator" , "redmic/modules/browser/_ButtonsInRow" , "redmic/modules/browser/_Framework" , "redmic/modules/browser/_GeoJsonParser" diff --git a/client-app/tests/unit/redmic/modules/browser/testListImpl.js b/client-app/tests/unit/redmic/modules/browser/testListImpl.js index 9f613de4..b33bd57f 100644 --- a/client-app/tests/unit/redmic/modules/browser/testListImpl.js +++ b/client-app/tests/unit/redmic/modules/browser/testListImpl.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/dom-class" - , "redmic/base/Mediator" + , "src/utils/Mediator" , "redmic/modules/browser/_ButtonsInRow" , "redmic/modules/browser/_DragAndDrop" , "redmic/modules/browser/_EditionTable" diff --git a/client-app/tests/unit/redmic/modules/chart/ChartsContainer/testInfoChartsContainerImpl.js b/client-app/tests/unit/redmic/modules/chart/ChartsContainer/testInfoChartsContainerImpl.js index 990a571a..71d31c8d 100644 --- a/client-app/tests/unit/redmic/modules/chart/ChartsContainer/testInfoChartsContainerImpl.js +++ b/client-app/tests/unit/redmic/modules/chart/ChartsContainer/testInfoChartsContainerImpl.js @@ -4,7 +4,7 @@ define([ , 'dojo/Deferred' , 'dojo/promise/all' , 'put-selector/put' - , 'redmic/base/Mediator' + , 'src/utils/Mediator' , 'redmic/modules/chart/ChartsContainer/InfoChartsContainerImpl' , 'redmic/modules/chart/layer/ChartLayer/LinearChartImpl' ], function( diff --git a/client-app/tests/unit/redmic/modules/chart/Toolbar/testSliderSelectorImpl.js b/client-app/tests/unit/redmic/modules/chart/Toolbar/testSliderSelectorImpl.js index 3e407028..b7295ac7 100644 --- a/client-app/tests/unit/redmic/modules/chart/Toolbar/testSliderSelectorImpl.js +++ b/client-app/tests/unit/redmic/modules/chart/Toolbar/testSliderSelectorImpl.js @@ -2,7 +2,7 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' , 'put-selector/put' - , 'redmic/base/Mediator' + , 'src/utils/Mediator' , 'redmic/modules/chart/Toolbar/SliderSelectorImpl' ], function( declare diff --git a/client-app/tests/unit/redmic/modules/chart/layer/ChartLayer/testLinearChartImpl.js b/client-app/tests/unit/redmic/modules/chart/layer/ChartLayer/testLinearChartImpl.js index fe2bd23c..2e4d4862 100644 --- a/client-app/tests/unit/redmic/modules/chart/layer/ChartLayer/testLinearChartImpl.js +++ b/client-app/tests/unit/redmic/modules/chart/layer/ChartLayer/testLinearChartImpl.js @@ -2,7 +2,7 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' , 'put-selector/put' - , 'redmic/base/Mediator' + , 'src/utils/Mediator' , 'redmic/modules/chart/ChartsContainer/InfoChartsContainerImpl' , 'redmic/modules/chart/layer/ChartLayer/LinearChartImpl' ], function( diff --git a/client-app/tests/unit/redmic/modules/form/inputs/testCheckBoxImpl.js b/client-app/tests/unit/redmic/modules/form/inputs/testCheckBoxImpl.js index 0ec04305..6325b758 100644 --- a/client-app/tests/unit/redmic/modules/form/inputs/testCheckBoxImpl.js +++ b/client-app/tests/unit/redmic/modules/form/inputs/testCheckBoxImpl.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/base/Mediator" + , "src/utils/Mediator" , "redmic/modules/model/ModelImpl" , "redmic/modules/form/inputs/CheckBoxImpl" , "tests/redmic/modules/model/SupportModel" @@ -133,4 +133,4 @@ define([ } } }); -}); \ No newline at end of file +}); diff --git a/client-app/tests/unit/redmic/modules/form/inputs/testDateTextBoxImpl.js b/client-app/tests/unit/redmic/modules/form/inputs/testDateTextBoxImpl.js index 20c9e63f..856192c9 100644 --- a/client-app/tests/unit/redmic/modules/form/inputs/testDateTextBoxImpl.js +++ b/client-app/tests/unit/redmic/modules/form/inputs/testDateTextBoxImpl.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/base/Mediator" + , "src/utils/Mediator" , "redmic/modules/model/ModelImpl" , "redmic/modules/form/inputs/DateTextBoxImpl" , "tests/redmic/modules/model/SupportModel" @@ -132,4 +132,4 @@ define([ } } }); -}); \ No newline at end of file +}); diff --git a/client-app/tests/unit/redmic/modules/form/inputs/testFilteringInputImpl.js b/client-app/tests/unit/redmic/modules/form/inputs/testFilteringInputImpl.js index d448b76b..eee9ffc2 100644 --- a/client-app/tests/unit/redmic/modules/form/inputs/testFilteringInputImpl.js +++ b/client-app/tests/unit/redmic/modules/form/inputs/testFilteringInputImpl.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/base/Mediator" + , "src/utils/Mediator" , "redmic/modules/model/ModelImpl" , "redmic/modules/form/inputs/FilteringInputImpl" , "tests/redmic/modules/model/SupportModel" @@ -158,4 +158,4 @@ define([ } } }); -}); \ No newline at end of file +}); diff --git a/client-app/tests/unit/redmic/modules/form/inputs/testNumberSpinnerImpl.js b/client-app/tests/unit/redmic/modules/form/inputs/testNumberSpinnerImpl.js index 789c8c33..d8a6ed1c 100644 --- a/client-app/tests/unit/redmic/modules/form/inputs/testNumberSpinnerImpl.js +++ b/client-app/tests/unit/redmic/modules/form/inputs/testNumberSpinnerImpl.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/base/Mediator" + , "src/utils/Mediator" , "redmic/modules/model/ModelImpl" , "redmic/modules/form/inputs/NumberSpinnerImpl" , "tests/redmic/modules/model/SupportModel" @@ -130,4 +130,4 @@ define([ } } }); -}); \ No newline at end of file +}); diff --git a/client-app/tests/unit/redmic/modules/form/inputs/testNumberTextBoxImpl.js b/client-app/tests/unit/redmic/modules/form/inputs/testNumberTextBoxImpl.js index 0e969b0c..fe6ba1bf 100644 --- a/client-app/tests/unit/redmic/modules/form/inputs/testNumberTextBoxImpl.js +++ b/client-app/tests/unit/redmic/modules/form/inputs/testNumberTextBoxImpl.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/base/Mediator" + , "src/utils/Mediator" , "redmic/modules/model/ModelImpl" , "redmic/modules/form/inputs/NumberTextBoxImpl" , "tests/redmic/modules/model/SupportModel" @@ -130,4 +130,4 @@ define([ } } }); -}); \ No newline at end of file +}); diff --git a/client-app/tests/unit/redmic/modules/form/inputs/testTextAreaImpl.js b/client-app/tests/unit/redmic/modules/form/inputs/testTextAreaImpl.js index 8f165b52..59cadacb 100644 --- a/client-app/tests/unit/redmic/modules/form/inputs/testTextAreaImpl.js +++ b/client-app/tests/unit/redmic/modules/form/inputs/testTextAreaImpl.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/base/Mediator" + , "src/utils/Mediator" , "redmic/modules/model/ModelImpl" , "redmic/modules/form/inputs/TextAreaImpl" , "tests/redmic/modules/model/SupportModel" @@ -140,4 +140,4 @@ define([ } } }); -}); \ No newline at end of file +}); diff --git a/client-app/tests/unit/redmic/modules/form/inputs/testTextBoxImpl.js b/client-app/tests/unit/redmic/modules/form/inputs/testTextBoxImpl.js index 08e4e5cf..5e7d4a59 100644 --- a/client-app/tests/unit/redmic/modules/form/inputs/testTextBoxImpl.js +++ b/client-app/tests/unit/redmic/modules/form/inputs/testTextBoxImpl.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/base/Mediator" + , "src/utils/Mediator" , "redmic/modules/model/ModelImpl" , "redmic/modules/form/inputs/TextBoxImpl" , "tests/redmic/modules/model/SupportModel" @@ -376,4 +376,4 @@ define([ }*/ } }); -}); \ No newline at end of file +}); diff --git a/client-app/tests/unit/redmic/modules/form/testForm.js b/client-app/tests/unit/redmic/modules/form/testForm.js index 6dfdda28..6ea34b2e 100644 --- a/client-app/tests/unit/redmic/modules/form/testForm.js +++ b/client-app/tests/unit/redmic/modules/form/testForm.js @@ -5,11 +5,11 @@ define([ , "dojo/_base/lang" , "dojo/i18n!app/nls/translation" , "put-selector/put" - , "redmic/base/Mediator" + , "src/utils/Mediator" , "redmic/dialog/LockDialogImpl" , "redmic/modules/form/FormContainerImpl" , "redmic/modules/form/UploadFileImpl" - , "redmic/form/FormContainer" + , "redmic/modules/form/form/FormContainer" ], function( _Persistent , Model diff --git a/client-app/tests/unit/redmic/modules/gateway/testGateway.js b/client-app/tests/unit/redmic/modules/gateway/testGateway.js index 18aeb90c..ade681b7 100644 --- a/client-app/tests/unit/redmic/modules/gateway/testGateway.js +++ b/client-app/tests/unit/redmic/modules/gateway/testGateway.js @@ -3,7 +3,7 @@ define([ , 'dojo/_base/lang' , 'dojo/Deferred' , 'dojo/DeferredList' - , 'redmic/base/Mediator' + , 'src/utils/Mediator' , 'redmic/modules/gateway/_GatewayItfc' , 'redmic/modules/gateway/Gateway' ], function( diff --git a/client-app/tests/unit/redmic/modules/layout/details/testDetails.js b/client-app/tests/unit/redmic/modules/layout/details/testDetails.js index 4b0f3215..26cda798 100644 --- a/client-app/tests/unit/redmic/modules/layout/details/testDetails.js +++ b/client-app/tests/unit/redmic/modules/layout/details/testDetails.js @@ -3,9 +3,9 @@ define([ , "dojo/_base/lang" , "dojo/i18n!app/nls/translation" , "put-selector/put" - , "redmic/base/Mediator" + , "src/utils/Mediator" , "redmic/dialog/LockDialogImpl" - , "redmic/layout/Keypad" + , "RWidgets/layout/Keypad" , "redmic/modules/layout/details/Details" , "redmic/modules/layout/details/DojoTemplateImpl" , "redmic/modules/layout/details/HandleBarsTemplateImpl" diff --git a/client-app/tests/unit/redmic/modules/layout/wizard/testWizard.js b/client-app/tests/unit/redmic/modules/layout/wizard/testWizard.js index e4d1e308..33fe4896 100644 --- a/client-app/tests/unit/redmic/modules/layout/wizard/testWizard.js +++ b/client-app/tests/unit/redmic/modules/layout/wizard/testWizard.js @@ -3,7 +3,7 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "put-selector/put" - , "redmic/base/Mediator" + , "src/utils/Mediator" , "redmic/modules/base/_Module" , "redmic/modules/base/_Show" , "redmic/modules/layout/wizard/_StepNavigation" diff --git a/client-app/tests/unit/redmic/modules/map/testLeafletImpl.js b/client-app/tests/unit/redmic/modules/map/testLeafletImpl.js index d44cf19e..4902b08c 100644 --- a/client-app/tests/unit/redmic/modules/map/testLeafletImpl.js +++ b/client-app/tests/unit/redmic/modules/map/testLeafletImpl.js @@ -1,5 +1,5 @@ define([ - 'redmic/base/Mediator' + 'src/utils/Mediator' , 'redmic/modules/map/LeafletImpl' ], function( Mediator diff --git a/client-app/tests/unit/redmic/modules/model/testModelImpl.js b/client-app/tests/unit/redmic/modules/model/testModelImpl.js index 3cf5a45d..724baf44 100644 --- a/client-app/tests/unit/redmic/modules/model/testModelImpl.js +++ b/client-app/tests/unit/redmic/modules/model/testModelImpl.js @@ -1,6 +1,6 @@ define([ 'dojo/_base/declare' - , 'redmic/base/Mediator' + , 'src/utils/Mediator' , 'redmic/modules/model/ModelImpl' ], function( declare diff --git a/client-app/tests/unit/redmic/modules/notification/test_Communication.js b/client-app/tests/unit/redmic/modules/notification/test_Communication.js index de1562a8..6c9b81b7 100644 --- a/client-app/tests/unit/redmic/modules/notification/test_Communication.js +++ b/client-app/tests/unit/redmic/modules/notification/test_Communication.js @@ -4,7 +4,7 @@ define([ , "redmic/modules/notification/CommunicationCenter" , "redmic/modules/notification/Alert" , "redmic/modules/notification/Notification" - , "redmic/base/Mediator" + , "src/utils/Mediator" ], function( declare , lang @@ -72,4 +72,4 @@ define([ } } }); -}); \ No newline at end of file +}); diff --git a/client-app/tests/unit/redmic/modules/notification/test_Notification.js b/client-app/tests/unit/redmic/modules/notification/test_Notification.js index 69f932bc..94f35063 100644 --- a/client-app/tests/unit/redmic/modules/notification/test_Notification.js +++ b/client-app/tests/unit/redmic/modules/notification/test_Notification.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "redmic/modules/notification/Notification" - , "redmic/base/Mediator" + , "src/utils/Mediator" ], function( declare , lang @@ -453,4 +453,4 @@ define([ } } }); -}); \ No newline at end of file +}); diff --git a/client-app/tests/unit/redmic/modules/search/testFacetsImpl.js b/client-app/tests/unit/redmic/modules/search/testFacetsImpl.js index 8e285697..c4f8d33a 100644 --- a/client-app/tests/unit/redmic/modules/search/testFacetsImpl.js +++ b/client-app/tests/unit/redmic/modules/search/testFacetsImpl.js @@ -1,5 +1,5 @@ define([ - 'redmic/base/Mediator' + 'src/utils/Mediator' , 'redmic/modules/search/FacetsImpl' ], function( Mediator diff --git a/client-app/tests/unit/redmic/modules/search/testSearch.js b/client-app/tests/unit/redmic/modules/search/testSearch.js index 88ceb8fe..6e9d5632 100644 --- a/client-app/tests/unit/redmic/modules/search/testSearch.js +++ b/client-app/tests/unit/redmic/modules/search/testSearch.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "put-selector/put" - , "redmic/base/Mediator" + , "src/utils/Mediator" , "redmic/modules/search/Search" , "redmic/modules/search/TextSearchImpl" , "redmic/modules/search/MapSearchImpl" diff --git a/client-app/tests/unit/redmic/modules/selection/testSelector.js b/client-app/tests/unit/redmic/modules/selection/testSelector.js index d0d947fe..fba9b2c0 100644 --- a/client-app/tests/unit/redmic/modules/selection/testSelector.js +++ b/client-app/tests/unit/redmic/modules/selection/testSelector.js @@ -1,7 +1,7 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/base/Mediator' + , 'src/utils/Mediator' , 'redmic/modules/selection/Selector' ], function( declare diff --git a/client-app/tests/unit/redmic/modules/socket/testSocket.js b/client-app/tests/unit/redmic/modules/socket/testSocket.js index 2b473329..e7e146cf 100644 --- a/client-app/tests/unit/redmic/modules/socket/testSocket.js +++ b/client-app/tests/unit/redmic/modules/socket/testSocket.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/Deferred" - , "redmic/base/Mediator" + , "src/utils/Mediator" , "redmic/modules/base/Socket" ], function( declare @@ -80,4 +80,4 @@ define([ } } }); -}); \ No newline at end of file +}); diff --git a/client-app/tests/unit/redmic/modules/store/testRestManager.js b/client-app/tests/unit/redmic/modules/store/testRestManager.js index d112f4e5..556eb3da 100644 --- a/client-app/tests/unit/redmic/modules/store/testRestManager.js +++ b/client-app/tests/unit/redmic/modules/store/testRestManager.js @@ -1,5 +1,5 @@ define([ - 'redmic/base/Mediator' + 'src/utils/Mediator' , 'redmic/modules/store/RestManagerImpl' ], function( diff --git a/client-app/tests/unit/redmic/modules/tree/testTree.js b/client-app/tests/unit/redmic/modules/tree/testTree.js index ebc204da..9b61734b 100644 --- a/client-app/tests/unit/redmic/modules/tree/testTree.js +++ b/client-app/tests/unit/redmic/modules/tree/testTree.js @@ -1,6 +1,6 @@ define([ 'dojo/_base/declare' - , 'redmic/base/Mediator' + , 'src/utils/Mediator' , 'redmic/modules/tree/_LazyLoad' , 'redmic/modules/tree/_LeafSelection' , 'redmic/modules/tree/CbtreeImpl' diff --git a/client-app/tests/unit/redmic/modules/wizard/testWizard.js b/client-app/tests/unit/redmic/modules/wizard/testWizard.js index a8d14720..06e3ee1a 100644 --- a/client-app/tests/unit/redmic/modules/wizard/testWizard.js +++ b/client-app/tests/unit/redmic/modules/wizard/testWizard.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "put-selector/put" - , "redmic/base/Mediator" + , "src/utils/Mediator" , "redmic/modules/wizard/Wizard" , "redmic/modules/wizard/FacetsWizardImpl" ], function( -- GitLab From df7b369a1112591fe6c279d5f0fc39bb6f494c7f Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Tue, 23 Jul 2024 13:16:40 +0100 Subject: [PATCH 027/249] =?UTF-8?q?Reubica=20redmic=20widgets=20como=20col?= =?UTF-8?q?ecci=C3=B3n=20de=20utils?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client-app/app.profile.js | 2 +- client-app/src/dojoConfig.js | 2 +- client-app/src/{redmic => utils}/widgets/Button.js | 0 client-app/src/{redmic => utils}/widgets/ComboButton.js | 0 client-app/src/{redmic => utils}/widgets/Converter.js | 0 client-app/src/{redmic => utils}/widgets/DatePicker.js | 0 client-app/src/{redmic => utils}/widgets/Facet.js | 0 client-app/src/{redmic => utils}/widgets/FilteringSelect.js | 0 client-app/src/{redmic => utils}/widgets/KeywordsInput.js | 0 client-app/src/{redmic => utils}/widgets/Map.js | 0 client-app/src/{redmic => utils}/widgets/ProgressSlider.js | 0 client-app/src/{redmic => utils}/widgets/README.md | 0 client-app/src/{redmic => utils}/widgets/RangeSlider.js | 0 client-app/src/{redmic => utils}/widgets/RedmicUtilities.js | 0 client-app/src/{redmic => utils}/widgets/Slider.js | 0 client-app/src/{redmic => utils}/widgets/Switch.js | 0 client-app/src/{redmic => utils}/widgets/TemplateWidget.js | 0 client-app/src/{redmic => utils}/widgets/TextSearch.js | 0 client-app/src/{redmic => utils}/widgets/TimeSelect.js | 0 client-app/src/{redmic => utils}/widgets/ToggleButton.js | 0 client-app/src/{redmic => utils}/widgets/Utilities.js | 0 .../src/{redmic => utils}/widgets/ValueAndUnitSelector.js | 0 .../src/{redmic => utils}/widgets/extensions/_ShowValue.js | 0 .../src/{redmic => utils}/widgets/layout/DialogComplex.js | 0 client-app/src/{redmic => utils}/widgets/layout/DialogSimple.js | 0 client-app/src/{redmic => utils}/widgets/layout/_DialogBase.js | 0 26 files changed, 2 insertions(+), 2 deletions(-) rename client-app/src/{redmic => utils}/widgets/Button.js (100%) rename client-app/src/{redmic => utils}/widgets/ComboButton.js (100%) rename client-app/src/{redmic => utils}/widgets/Converter.js (100%) rename client-app/src/{redmic => utils}/widgets/DatePicker.js (100%) rename client-app/src/{redmic => utils}/widgets/Facet.js (100%) rename client-app/src/{redmic => utils}/widgets/FilteringSelect.js (100%) rename client-app/src/{redmic => utils}/widgets/KeywordsInput.js (100%) rename client-app/src/{redmic => utils}/widgets/Map.js (100%) rename client-app/src/{redmic => utils}/widgets/ProgressSlider.js (100%) rename client-app/src/{redmic => utils}/widgets/README.md (100%) rename client-app/src/{redmic => utils}/widgets/RangeSlider.js (100%) rename client-app/src/{redmic => utils}/widgets/RedmicUtilities.js (100%) rename client-app/src/{redmic => utils}/widgets/Slider.js (100%) rename client-app/src/{redmic => utils}/widgets/Switch.js (100%) rename client-app/src/{redmic => utils}/widgets/TemplateWidget.js (100%) rename client-app/src/{redmic => utils}/widgets/TextSearch.js (100%) rename client-app/src/{redmic => utils}/widgets/TimeSelect.js (100%) rename client-app/src/{redmic => utils}/widgets/ToggleButton.js (100%) rename client-app/src/{redmic => utils}/widgets/Utilities.js (100%) rename client-app/src/{redmic => utils}/widgets/ValueAndUnitSelector.js (100%) rename client-app/src/{redmic => utils}/widgets/extensions/_ShowValue.js (100%) rename client-app/src/{redmic => utils}/widgets/layout/DialogComplex.js (100%) rename client-app/src/{redmic => utils}/widgets/layout/DialogSimple.js (100%) rename client-app/src/{redmic => utils}/widgets/layout/_DialogBase.js (100%) diff --git a/client-app/app.profile.js b/client-app/app.profile.js index 4232727c..fecabe50 100644 --- a/client-app/app.profile.js +++ b/client-app/app.profile.js @@ -135,7 +135,7 @@ var profileObj = { } },{ name: 'RWidgets', - location: 'src/redmic/widgets', + location: 'src/utils/widgets', resourceTags: { amd: amdTagger } diff --git a/client-app/src/dojoConfig.js b/client-app/src/dojoConfig.js index 7234dc86..6880dda9 100644 --- a/client-app/src/dojoConfig.js +++ b/client-app/src/dojoConfig.js @@ -10,7 +10,7 @@ dojoConfig = { location: '../../src/redmic' },{ name: 'RWidgets', - location: '../../src/redmic/widgets' + location: '../../src/utils/widgets' },{ name: 'dojo', location: '../dojo' diff --git a/client-app/src/redmic/widgets/Button.js b/client-app/src/utils/widgets/Button.js similarity index 100% rename from client-app/src/redmic/widgets/Button.js rename to client-app/src/utils/widgets/Button.js diff --git a/client-app/src/redmic/widgets/ComboButton.js b/client-app/src/utils/widgets/ComboButton.js similarity index 100% rename from client-app/src/redmic/widgets/ComboButton.js rename to client-app/src/utils/widgets/ComboButton.js diff --git a/client-app/src/redmic/widgets/Converter.js b/client-app/src/utils/widgets/Converter.js similarity index 100% rename from client-app/src/redmic/widgets/Converter.js rename to client-app/src/utils/widgets/Converter.js diff --git a/client-app/src/redmic/widgets/DatePicker.js b/client-app/src/utils/widgets/DatePicker.js similarity index 100% rename from client-app/src/redmic/widgets/DatePicker.js rename to client-app/src/utils/widgets/DatePicker.js diff --git a/client-app/src/redmic/widgets/Facet.js b/client-app/src/utils/widgets/Facet.js similarity index 100% rename from client-app/src/redmic/widgets/Facet.js rename to client-app/src/utils/widgets/Facet.js diff --git a/client-app/src/redmic/widgets/FilteringSelect.js b/client-app/src/utils/widgets/FilteringSelect.js similarity index 100% rename from client-app/src/redmic/widgets/FilteringSelect.js rename to client-app/src/utils/widgets/FilteringSelect.js diff --git a/client-app/src/redmic/widgets/KeywordsInput.js b/client-app/src/utils/widgets/KeywordsInput.js similarity index 100% rename from client-app/src/redmic/widgets/KeywordsInput.js rename to client-app/src/utils/widgets/KeywordsInput.js diff --git a/client-app/src/redmic/widgets/Map.js b/client-app/src/utils/widgets/Map.js similarity index 100% rename from client-app/src/redmic/widgets/Map.js rename to client-app/src/utils/widgets/Map.js diff --git a/client-app/src/redmic/widgets/ProgressSlider.js b/client-app/src/utils/widgets/ProgressSlider.js similarity index 100% rename from client-app/src/redmic/widgets/ProgressSlider.js rename to client-app/src/utils/widgets/ProgressSlider.js diff --git a/client-app/src/redmic/widgets/README.md b/client-app/src/utils/widgets/README.md similarity index 100% rename from client-app/src/redmic/widgets/README.md rename to client-app/src/utils/widgets/README.md diff --git a/client-app/src/redmic/widgets/RangeSlider.js b/client-app/src/utils/widgets/RangeSlider.js similarity index 100% rename from client-app/src/redmic/widgets/RangeSlider.js rename to client-app/src/utils/widgets/RangeSlider.js diff --git a/client-app/src/redmic/widgets/RedmicUtilities.js b/client-app/src/utils/widgets/RedmicUtilities.js similarity index 100% rename from client-app/src/redmic/widgets/RedmicUtilities.js rename to client-app/src/utils/widgets/RedmicUtilities.js diff --git a/client-app/src/redmic/widgets/Slider.js b/client-app/src/utils/widgets/Slider.js similarity index 100% rename from client-app/src/redmic/widgets/Slider.js rename to client-app/src/utils/widgets/Slider.js diff --git a/client-app/src/redmic/widgets/Switch.js b/client-app/src/utils/widgets/Switch.js similarity index 100% rename from client-app/src/redmic/widgets/Switch.js rename to client-app/src/utils/widgets/Switch.js diff --git a/client-app/src/redmic/widgets/TemplateWidget.js b/client-app/src/utils/widgets/TemplateWidget.js similarity index 100% rename from client-app/src/redmic/widgets/TemplateWidget.js rename to client-app/src/utils/widgets/TemplateWidget.js diff --git a/client-app/src/redmic/widgets/TextSearch.js b/client-app/src/utils/widgets/TextSearch.js similarity index 100% rename from client-app/src/redmic/widgets/TextSearch.js rename to client-app/src/utils/widgets/TextSearch.js diff --git a/client-app/src/redmic/widgets/TimeSelect.js b/client-app/src/utils/widgets/TimeSelect.js similarity index 100% rename from client-app/src/redmic/widgets/TimeSelect.js rename to client-app/src/utils/widgets/TimeSelect.js diff --git a/client-app/src/redmic/widgets/ToggleButton.js b/client-app/src/utils/widgets/ToggleButton.js similarity index 100% rename from client-app/src/redmic/widgets/ToggleButton.js rename to client-app/src/utils/widgets/ToggleButton.js diff --git a/client-app/src/redmic/widgets/Utilities.js b/client-app/src/utils/widgets/Utilities.js similarity index 100% rename from client-app/src/redmic/widgets/Utilities.js rename to client-app/src/utils/widgets/Utilities.js diff --git a/client-app/src/redmic/widgets/ValueAndUnitSelector.js b/client-app/src/utils/widgets/ValueAndUnitSelector.js similarity index 100% rename from client-app/src/redmic/widgets/ValueAndUnitSelector.js rename to client-app/src/utils/widgets/ValueAndUnitSelector.js diff --git a/client-app/src/redmic/widgets/extensions/_ShowValue.js b/client-app/src/utils/widgets/extensions/_ShowValue.js similarity index 100% rename from client-app/src/redmic/widgets/extensions/_ShowValue.js rename to client-app/src/utils/widgets/extensions/_ShowValue.js diff --git a/client-app/src/redmic/widgets/layout/DialogComplex.js b/client-app/src/utils/widgets/layout/DialogComplex.js similarity index 100% rename from client-app/src/redmic/widgets/layout/DialogComplex.js rename to client-app/src/utils/widgets/layout/DialogComplex.js diff --git a/client-app/src/redmic/widgets/layout/DialogSimple.js b/client-app/src/utils/widgets/layout/DialogSimple.js similarity index 100% rename from client-app/src/redmic/widgets/layout/DialogSimple.js rename to client-app/src/utils/widgets/layout/DialogSimple.js diff --git a/client-app/src/redmic/widgets/layout/_DialogBase.js b/client-app/src/utils/widgets/layout/_DialogBase.js similarity index 100% rename from client-app/src/redmic/widgets/layout/_DialogBase.js rename to client-app/src/utils/widgets/layout/_DialogBase.js -- GitLab From 8c8813ba34c970c7ea241b2b3df0991701276816 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Tue, 23 Jul 2024 13:30:56 +0100 Subject: [PATCH 028/249] =?UTF-8?q?Reubica=20m=C3=B3dulos=20en=20src/compo?= =?UTF-8?q?nent?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A partir de ahora, los módulos que definen componentes que se comunican mediante publicaciones y suscripciones siguiendo el patrón mediator, se encuentran en el directorio src/component. Las únicas excepciones a esto son el módulo App (que tiene directorio propio) y las vistas (que se corresponden con una ruta en la app). --- README.md | 4 +- client-app/app.profile.js | 6 +- client-app/src/app/App.js | 20 ++--- client-app/src/app/ModuleStore.js | 2 +- client-app/src/app/Router.js | 4 +- client-app/src/app/_app.js | 4 +- client-app/src/app/_appItfc.js | 2 +- client-app/src/app/innerApp.js | 18 ++--- .../src/catalog/detail/_WidgetDefinition.js | 20 ++--- .../catalog/detail/activity/ActivityDetail.js | 2 +- .../modules => component}/atlas/Atlas.js | 20 ++--- .../atlas/_AtlasLayersManagement.js | 4 +- .../atlas/_AtlasLegendManagement.js | 0 .../modules => component}/base/Analytics.js | 2 +- .../modules => component}/base/Credentials.js | 4 +- .../modules => component}/base/Loading.js | 2 +- .../modules => component}/base/Manager.js | 4 +- .../base/_AuthFirewall.js | 0 .../base/_ChkCollection.js | 0 .../base/_CommunicationCenter.js | 0 .../base/_ExternalConfig.js | 0 .../modules => component}/base/_Filter.js | 2 +- .../modules => component}/base/_FilterItfc.js | 2 +- .../modules => component}/base/_Itfc.js | 0 .../base/_ListenQueryParams.js | 0 .../base/_ListenQueryParamsItfc.js | 2 +- .../base/_ListenWindowResize.js | 0 .../base/_ManageClickEvent.js | 0 .../modules => component}/base/_Module.js | 0 .../modules => component}/base/_ModuleItfc.js | 2 +- .../base/_Persistence.js | 0 .../base/_PersistenceItfc.js | 2 +- .../modules => component}/base/_Selection.js | 4 +- .../base/_SelectionBase.js | 0 .../base/_SelectionItfc.js | 2 +- .../modules => component}/base/_Show.js | 4 +- .../base/_ShowInPopup.js | 0 .../base/_ShowInTooltip.js | 0 .../modules => component}/base/_ShowItfc.js | 2 +- .../modules => component}/base/_ShowOnEvt.js | 0 .../modules => component}/base/_Store.js | 2 +- .../modules => component}/base/_StoreItfc.js | 2 +- .../modules => component}/base/_Window.js | 0 .../modules => component}/browser/Browser.js | 6 +- .../browser/HierarchicalImpl.js | 0 .../modules => component}/browser/ListImpl.js | 0 .../browser/_BrowserItfc.js | 2 +- .../browser/_ButtonsInRow.js | 0 .../browser/_DataTypeParser.js | 0 .../browser/_DragAndDrop.js | 0 .../browser/_EditionTable.js | 8 +- .../browser/_Framework.js | 0 .../browser/_GeoJsonParser.js | 0 .../browser/_HierarchicalDragAndDrop.js | 0 .../browser/_HierarchicalLazyLoad.js | 0 .../browser/_HierarchicalSelect.js | 0 .../browser/_HierarchicalTable.js | 0 .../browser/_MultiTemplate.js | 0 .../browser/_NoDataTemplate.js | 0 .../modules => component}/browser/_Select.js | 2 +- .../modules => component}/browser/_Table.js | 6 +- .../browser/bars/Order.js | 4 +- .../browser/bars/Pagination.js | 6 +- .../browser/bars/SelectionBox.js | 8 +- .../browser/bars/Total.js | 6 +- .../browser/bars/_SelectBox.js | 0 .../browser/buttons/Buttons.js | 4 +- .../browser/buttons/_ButtonsItfc.js | 2 +- .../browser/buttons/_GroupButtons.js | 0 .../modules => component}/browser/row/Row.js | 4 +- .../browser/row/_Buttons.js | 4 +- .../browser/row/_Hierarchical.js | 0 .../browser/row/_HierarchicalSelect.js | 0 .../browser/row/_HierarchicalTable.js | 0 .../browser/row/_RowItfc.js | 2 +- .../browser/row/_Select.js | 0 .../browser/row/_Table.js | 0 .../chart/ChartsContainer/ChartsContainer.js | 4 +- .../InfoChartsContainerImpl.js | 0 .../SliderChartsContainerImpl.js | 2 +- .../ChartsContainer/_AngularAxisDrawing.js | 2 +- .../_AngularAxisWithGridDrawing.js | 4 +- .../chart/ChartsContainer/_AxesDrawing.js | 0 .../chart/ChartsContainer/_AxesDrawingItfc.js | 2 +- .../chart/ChartsContainer/_BreadcrumbsBar.js | 0 .../ChartsContainer/_ChartsContainerItfc.js | 2 +- .../chart/ChartsContainer/_ColorSelection.js | 0 .../ChartsContainer/_ColorSelectionItfc.js | 2 +- .../_DomainHistoryNavigation.js | 0 .../ChartsContainer/_GroupedLegendBar.js | 0 .../chart/ChartsContainer/_InfoOnEmptyData.js | 0 .../ChartsContainer/_InfoOnLayerEvent.js | 0 .../ChartsContainer/_InfoOnLayerEventItfc.js | 2 +- .../chart/ChartsContainer/_InfoOnMouseOver.js | 0 .../ChartsContainer/_InfoOnZeroValueData.js | 0 .../ChartsContainer/_InfoTooltipManagement.js | 0 .../ChartsContainer/_LayerColorSelection.js | 2 +- .../chart/ChartsContainer/_LegendBar.js | 0 .../ChartsContainer/_LegendBarCommons.js | 0 .../ChartsContainer/_LegendBarCommonsItfc.js | 2 +- .../ChartsContainer/_RadialAxisDrawing.js | 2 +- .../_RadialAxisWithGridDrawing.js | 4 +- .../chart/ChartsContainer/_SummaryBox.js | 0 .../ChartsContainer/_TemporalAxisDrawing.js | 4 +- .../_TemporalAxisWithGridDrawing.js | 4 +- .../ChartsContainer/_VerticalAxesDrawing.js | 2 +- .../_VerticalAxesWithGridDrawing.js | 4 +- .../chart/ChartsContainer/_ZoomByDragging.js | 0 .../chart/SmartLegend/SmartLegend.js | 18 ++--- .../SmartLegend/TimeSeriesSmartLegendImpl.js | 2 +- .../chart/SmartLegend/_SmartLegendItfc.js | 2 +- .../chart/Toolbar/AggregationToolImpl.js | 6 +- .../chart/Toolbar/DataSelectorImpl.js | 6 +- .../chart/Toolbar/DateFilterImpl.js | 6 +- .../chart/Toolbar/GridManagementImpl.js | 6 +- .../chart/Toolbar/SliderSelectorImpl.js | 6 +- .../chart/Toolbar/Toolbar.js | 4 +- .../chart/Toolbar/_ToolbarItfc.js | 2 +- .../chart/layer/Axis/AngularAxisImpl.js | 2 +- .../chart/layer/Axis/AngularGridAxisImpl.js | 0 .../chart/layer/Axis/Axis.js | 4 +- .../layer/Axis/HorizontalGridAxisImpl.js | 0 .../chart/layer/Axis/RadialAxisImpl.js | 0 .../chart/layer/Axis/RadialGridAxisImpl.js | 0 .../chart/layer/Axis/TemporalAxisImpl.js | 0 .../chart/layer/Axis/VerticalAxisImpl.js | 0 .../chart/layer/Axis/VerticalGridAxisImpl.js | 0 .../chart/layer/Axis/_AxisItfc.js | 2 +- .../chart/layer/Axis/_HorizontalCommons.js | 0 .../chart/layer/Axis/_VerticalCommons.js | 0 .../chart/layer/Axis/_VerticalCommonsItfc.js | 2 +- .../chart/layer/ChartLayer/ChartLayer.js | 4 +- .../chart/layer/ChartLayer/LinearChartImpl.js | 0 .../layer/ChartLayer/MultiPieChartImpl.js | 0 .../chart/layer/ChartLayer/PieChartImpl.js | 0 .../layer/ChartLayer/WindRoseChartImpl.js | 2 +- .../layer/ChartLayer/_CategoryLayerCommons.js | 0 .../ChartLayer/_CategoryLayerCommonsItfc.js | 2 +- .../layer/ChartLayer/_ChartHoleManagement.js | 0 .../chart/layer/ChartLayer/_ChartLayerItfc.js | 2 +- .../layer/ChartLayer/_CircularLayerCommons.js | 0 .../ChartLayer/_CircularLayerCommonsItfc.js | 2 +- .../ChartLayer/_ColorHierarchyGeneration.js | 0 .../layer/ChartLayer/_LevelNavigation.js | 2 +- .../layer/ChartLayer/_MultipleWindRose.js | 0 .../layer/ChartLayer/_ObtainableValue.js | 0 .../layer/ChartLayer/_ObtainableValueItfc.js | 2 +- .../chart/layer/ChartLayer/_PieCommons.js | 0 .../layer/ChartLayer/_PutButtonInHole.js | 2 +- .../layer/ChartLayer/_PutButtonInHoleItfc.js | 2 +- .../chart/layer/ChartLayer/_QueryableValue.js | 0 .../chart/layer/ChartLayer/_ShowInfoInHole.js | 4 +- .../layer/ChartLayer/_SimplePieCommons.js | 0 .../chart/layer/ChartLayer/_SimpleWindRose.js | 0 .../ChartLayer/_VariableRadiusByDepth.js | 0 .../chart/layer/_LayerCommons.js | 0 .../chart/layer/_LayerCommonsItfc.js | 2 +- .../chart/layer/_PolarLayerCommons.js | 0 .../chart/layer/_PolarLayerCommonsItfc.js | 2 +- .../components/ExternalConfig.js | 4 +- .../components/Keypad/IconKeypadImpl.js | 0 .../components/Keypad/Keypad.js | 4 +- .../components/Keypad/TrizoneKeypadImpl.js | 0 .../components/Keypad/_KeypadItfc.js | 2 +- .../components/PDFViewer/PDFViewer.js | 6 +- .../ProgressSlider/ProgressSlider.js | 6 +- .../ProgressSlider/StepAndRateEditor.js | 6 +- .../components/Sidebar/MainSidebarImpl.js | 4 +- .../components/Sidebar/Sidebar.js | 4 +- .../components/Sidebar/_Secondary.js | 0 .../components/Topbar.js | 12 +-- .../modules => component}/filter/Filter.js | 6 +- .../modules => component}/form/Form.js | 6 +- .../form/FormContainerImpl.js | 2 +- .../form/_BaseCreateKeypad.js | 0 .../form/_CreateInternalKeypad.js | 2 +- .../form/_CreateKeypad.js | 4 +- .../modules => component}/form/_FormItfc.js | 2 +- .../form/_ListenModelHasChanged.js | 0 .../form/_PublicateChanges.js | 0 .../form/_ShowInDialog.js | 2 +- .../form/_ShowInTableList.js | 2 +- .../form/form/FormContainer.js | 74 +++++++++---------- .../modules => component}/form/form/Select.js | 0 .../form/form/UploadInput.js | 0 .../form/form/nls/UploadInput.js | 0 .../form/form/nls/es/UploadInput.js | 0 .../form/form/templates/Select.html | 0 .../form/form/templates/UploadInput.html | 0 .../form/input/AnnotationImpl.js | 4 +- .../form/input/ButtonImpl.js | 4 +- .../form/input/CheckBoxGroupImpl.js | 4 +- .../form/input/CheckBoxImpl.js | 2 +- .../form/input/ColorImpl.js | 4 +- .../form/input/ColorPickerImpl.js | 4 +- .../form/input/ColorPickerTextBoxImpl.js | 4 +- .../form/input/ColorsRampImpl.js | 4 +- .../form/input/DateRangeComplexImpl.js | 10 +-- .../form/input/DateRangeImpl.js | 4 +- .../form/input/DateRangeTextBoxImpl.js | 4 +- .../form/input/DateTextBoxImpl.js | 4 +- .../form/input/DateTimeImpl.js | 4 +- .../form/input/DateTimeTextBoxImpl.js | 6 +- .../form/input/FilteringSelectImpl.js | 4 +- .../GeographicCoordinatesComponentImpl.js | 2 +- .../form/input/GeometryImpl.js | 4 +- .../modules => component}/form/input/Input.js | 4 +- .../form/input/KeywordsImpl.js | 4 +- .../form/input/MapSearchImpl.js | 4 +- .../form/input/MultiSelectImpl.js | 4 +- .../form/input/NumberSpinnerImpl.js | 2 +- .../form/input/NumberTextBoxImpl.js | 2 +- .../form/input/PointImpl.js | 8 +- .../form/input/RadioButtonGroupImpl.js | 4 +- .../form/input/RadioButtonImpl.js | 4 +- .../form/input/RangeImpl.js | 6 +- .../form/input/RangeSliderImpl.js | 4 +- .../form/input/SelectImpl.js | 6 +- .../form/input/SelectOnListPopupImpl.js | 10 +-- .../form/input/SliderImpl.js | 4 +- .../form/input/TextAreaImpl.js | 4 +- .../form/input/TextBoxImpl.js | 4 +- .../form/input/UploadFileImpl.js | 4 +- .../form/input/ValueAndUnitSelectorImpl.js | 4 +- .../form/input/_BaseDateTime.js | 0 .../form/input/_BaseMultiSelectImpl.js | 10 +-- .../form/input/_BaseRange.js | 6 +- .../_BaseTextBoxWidthExpandTooltipImpl.js | 4 +- .../form/input/_BaseWidthExpandTooltipImpl.js | 4 +- .../form/input/_DeleteOnClear.js | 0 .../form/input/_Dependence.js | 0 .../form/input/_DisableInput.js | 0 .../form/input/_IgnoreNonexistentProperty.js | 0 .../form/input/_InputItfc.js | 2 +- .../form/input/_NodesCreation.js | 6 +- .../form/input/_SelectOnPopupImpl.js | 2 +- .../gateway/AddItemGatewayImpl.js | 2 +- .../modules => component}/gateway/Gateway.js | 2 +- .../gateway/LocalSelectorGatewayImpl.js | 2 +- .../gateway/MapCenteringGatewayImpl.js | 0 .../gateway/_GatewayItfc.js | 2 +- .../layout/TabsDisplayer.js | 4 +- .../layout/dataDisplayer/DataDisplayer.js | 4 +- .../genericDisplayer/GenericDisplayer.js | 4 +- .../GenericWithTopbarDisplayerImpl.js | 0 .../layout/listMenu/ListMenu.js | 4 +- .../nestedContent/NestedBrowsersImpl.js | 10 +-- .../layout/nestedContent/NestedContent.js | 8 +- .../templateDisplayer/TemplateDisplayer.js | 6 +- .../layout/wizard/Wizard.js | 6 +- .../layout/wizard/_CompleteBySelection.js | 2 +- .../layout/wizard/_StepBreadcrumbs.js | 0 .../layout/wizard/_StepNavigation.js | 2 +- .../layout/wizard/_WizardStep.js | 2 +- .../layout/wizard/_WizardStepItfc.js | 2 +- .../modules => component}/map/LeafletImpl.js | 0 .../{redmic/modules => component}/map/Map.js | 4 +- .../modules => component}/map/MapButton.js | 0 .../map/StaticLayersDefinition.js | 0 .../modules => component}/map/_ImportWkt.js | 0 .../modules => component}/map/_LeafletDraw.js | 0 .../map/_LeafletImplItfc.js | 2 +- .../map/_LeafletWidgetsManagement.js | 0 .../map/_ListenContainers.js | 0 .../modules => component}/map/_MapItfc.js | 2 +- .../map/_OverlayLayersManagement.js | 0 .../map/_PlaceNamesButton.js | 4 +- .../map/_StaticLayersManagement.js | 2 +- .../map/layer/DrawingLayerImpl.js | 0 .../map/layer/GeoJsonLayerImpl.js | 0 .../map/layer/GridLayerImpl.js | 2 +- .../map/layer/MapLayer.js | 4 +- .../map/layer/PruneClusterLayerImpl.js | 0 .../map/layer/TrackingLayerImpl.js | 2 +- .../map/layer/TrackingLine.js | 2 +- .../map/layer/WmsLayerImpl.js | 2 +- .../map/layer/_AddFilter.js | 2 +- .../map/layer/_AnimateMarker.js | 0 .../map/layer/_D3Expansion.js | 0 .../map/layer/_Editable.js | 2 +- .../map/layer/_GeoJsonLayerItfc.js | 2 +- .../map/layer/_Highlightable.js | 0 .../map/layer/_LayerProtocols.js | 0 .../map/layer/_ListenBounds.js | 0 .../map/layer/_ListenZoom.js | 0 .../map/layer/_MapLayerItfc.js | 2 +- .../map/layer/_PruneClusterLayerItfc.js | 2 +- .../map/layer/_PublishInfo.js | 0 .../map/layer/_PublishInfoItfc.js | 2 +- .../map/layer/_RadiusCommons.js | 0 .../map/layer/_RadiusOnClick.js | 2 +- .../map/layer/_RadiusOnSelect.js | 2 +- .../map/layer/_SelectOnClick.js | 0 .../map/layer/_Selectable.js | 2 +- .../map/layer/_SelectableItfc.js | 2 +- .../map/layer/_TrackingDataManagement.js | 0 .../map/layer/_TrackingMarkersManagement.js | 0 .../mapQuery/QueryOnMap.js | 2 +- .../mapQuery/_ContentManagement.js | 0 .../mapQuery/_ResultsBrowser.js | 6 +- .../metaTags/MetaTags.js | 2 +- .../metaTags/metaTagsContent.js | 0 .../modules => component}/model/Model.js | 6 +- .../modules => component}/model/ModelImpl.js | 0 .../modules => component}/model/_ModelItfc.js | 2 +- .../notification/Alert.js | 2 +- .../notification/CommunicationCenter.js | 2 +- .../notification/Notification.js | 10 +-- .../notification/NotificationSidebar.js | 6 +- .../notification/TaskNotification.js | 16 ++-- .../search/CompositeImpl.js | 0 .../search/DateRangeImpl.js | 0 .../search/FacetsImpl.js | 0 .../search/GeographicImpl.js | 0 .../search/MultiSelectImpl.js | 8 +- .../modules => component}/search/RangeImpl.js | 2 +- .../modules => component}/search/Search.js | 4 +- .../modules => component}/search/TextImpl.js | 2 +- .../search/_HideFormByAction.js | 0 .../search/_SearchItfc.js | 2 +- .../selection/SelectionBox.js | 16 ++-- .../selection/SelectionManager.js | 8 +- .../selection/Selector.js | 4 +- .../selection/_SelectorItfc.js | 2 +- .../selection/_SelectorPersistence.js | 4 +- .../modules => component}/socket/Socket.js | 2 +- .../modules => component}/socket/Task.js | 8 +- .../socket/_IngestData.js | 0 .../modules => component}/socket/_Report.js | 0 .../modules => component}/socket/_Worms.js | 0 .../store/RequestJoiner/AtlasDataImpl.js | 0 .../store/RequestJoiner/RequestJoiner.js | 4 +- .../store/RequestJoiner/_RequestJoinerItfc.js | 2 +- .../store/RestManager.js | 2 +- .../store/RestManagerImpl.js | 0 .../store/_RestManagerItfc.js | 2 +- .../modules => component}/tree/CbtreeImpl.js | 0 .../modules => component}/tree/Tree.js | 6 +- .../tree/_HierarchicalFilter.js | 0 .../modules => component}/tree/_LazyLoad.js | 4 +- .../tree/_LeafSelection.js | 0 .../tree/_SelectionBox.js | 2 +- .../modules => component}/tree/_TreeItfc.js | 2 +- .../user/FullscreenToggle.js | 4 +- .../user/LanguageSelector.js | 10 +-- .../modules => component}/user/UserArea.js | 14 ++-- .../taxonomy/views/MisIdentificationView.js | 8 +- .../base/views/EditorLayerWithVariableForm.js | 4 +- .../src/oldapp/base/views/_SettingsHandler.js | 4 +- .../src/oldapp/base/views/_ViewListBase.js | 4 +- .../base/views/extensions/_ActivityClosed.js | 2 +- .../views/extensions/_AddAtlasCategory.js | 10 +-- .../oldapp/base/views/extensions/_AddForm.js | 6 +- .../base/views/extensions/_AddFormItfc.js | 2 +- .../base/views/extensions/_AddSelectInput.js | 2 +- .../views/extensions/_AddSelectInputItfc.js | 4 +- .../extensions/_AddSelectionHandlerKeypad.js | 4 +- .../views/extensions/_AddTextSearchInput.js | 4 +- .../extensions/_AddTextSearchInputItfc.js | 4 +- .../_CompositeInTooltipFromIconKeypad.js | 2 +- .../extensions/_CompositeSearchInTooltip.js | 8 +- .../base/views/extensions/_EditionFormList.js | 2 +- .../base/views/extensions/_EditionView.js | 4 +- .../views/extensions/_EditionWizardView.js | 2 +- .../views/extensions/_FormInDialogView.js | 6 +- .../views/extensions/_GetActivityDataItfc.js | 2 +- .../views/extensions/_LocalSelectionView.js | 4 +- .../extensions/_LocalSelectionViewItfc.js | 2 +- .../views/extensions/_SelectInDoubleList.js | 2 +- .../components/steps/AddGeomSiteStep.js | 2 +- .../oldapp/components/steps/CitationStep.js | 10 +-- .../components/steps/ClassificationsStep.js | 6 +- .../components/steps/DataDefinitionSetStep.js | 2 +- .../components/steps/DescribeSiteStep.js | 8 +- .../components/steps/DocumentStepFiltered.js | 2 +- .../oldapp/components/steps/MainDataStep.js | 4 +- .../components/steps/MapSelectAreaStep.js | 6 +- .../components/steps/RelationDataSetStep.js | 8 +- .../components/steps/SelectLayerStep.js | 6 +- .../components/steps/SpeciesMainDataStep.js | 2 +- .../steps/_DataListAndSaveRelationData.js | 6 +- .../src/oldapp/components/steps/_MainData.js | 4 +- .../components/steps/_SelectOptionBox.js | 4 +- .../addGeomSite/views/Line.js | 2 +- .../addGeomSite/views/MultiPolygon.js | 4 +- .../addGeomSite/views/Point.js | 4 +- .../oldapp/dataLoader/base/_GeographicBase.js | 12 +-- .../dataLoader/citation/views/CitationView.js | 2 +- .../views/ObjectCollectingSeriesDataView.js | 10 +-- .../views/SurveyStationSeriesDataView.js | 10 +-- .../surveyParameters/views/_SeriesDataView.js | 12 +-- .../tracking/views/TrackingDataView.js | 8 +- .../src/oldapp/designs/base/_Browser.js | 8 +- .../src/oldapp/designs/base/_Controller.js | 4 +- .../oldapp/designs/base/_ControllerItfc.js | 2 +- .../src/oldapp/designs/base/_LayoutItfc.js | 2 +- .../src/oldapp/designs/base/_MainItfc.js | 2 +- .../src/oldapp/designs/base/_ServiceOGC.js | 2 +- .../src/oldapp/designs/chart/Controller.js | 2 +- .../ChartsWithLegendAndToolbarsAndSlider.js | 2 +- .../chart/main/MultiPieChartWithToolbar.js | 16 ++-- .../main/MultiWindRoseChartWithToolbar.js | 12 +-- .../chart/main/WindRoseChartWithToolbar.js | 10 +-- .../main/_ChartsWithToolbarsAndSlider.js | 14 ++-- .../main/_ChartsWithToolbarsAndSliderItfc.js | 2 +- .../_ProcessDataDefinitionAndGetTimeSeries.js | 4 +- .../src/oldapp/designs/details/Controller.js | 4 +- .../src/oldapp/designs/details/_AddTitle.js | 2 +- .../oldapp/designs/details/_ControllerItfc.js | 2 +- .../designs/details/main/ActivityMap.js | 4 +- .../designs/details/main/DocumentPDF.js | 2 +- .../oldapp/designs/details/main/Platform.js | 6 +- .../oldapp/designs/details/main/ServiceOGC.js | 8 +- .../oldapp/designs/details/main/Species.js | 4 +- .../designs/details/main/SpeciesLocation.js | 14 ++-- .../oldapp/designs/details/main/Statistics.js | 4 +- .../oldapp/designs/doubleList/Controller.js | 8 +- .../main/textSearchAndDoubleList.js | 6 +- .../src/oldapp/designs/edition/Controller.js | 12 +-- .../designs/embeddedContent/Controller.js | 4 +- .../embeddedContentWithTopbar/Controller.js | 2 +- .../externalTextSearchList/Controller.js | 4 +- .../externalTextSearchList/main/PlaceNames.js | 6 +- .../externalTextSearchList/main/Worms.js | 4 +- .../src/oldapp/designs/formList/Controller.js | 4 +- .../designs/formList/_ControllerItfc.js | 2 +- .../src/oldapp/designs/list/_AddFilter.js | 2 +- .../designs/mapWithSideContent/Controller.js | 4 +- .../main/FilterAndGeographic.js | 18 ++--- .../mapWithSideContent/main/Geographic.js | 26 +++---- .../main/GeographicEditor.js | 48 ++++++------ .../mapWithSideContent/main/Tracking.js | 20 ++--- .../main/_TrackingByFilter.js | 2 +- .../main/_TrackingWithList.js | 16 ++-- .../textSearchFacetsList/Controller.js | 8 +- .../textSearchFacetsList/main/Activity.js | 8 +- .../main/Administrative.js | 8 +- .../textSearchFacetsList/main/Bibliography.js | 8 +- .../textSearchFacetsList/main/Domain.js | 4 +- .../textSearchFacetsList/main/Organisation.js | 8 +- .../textSearchFacetsList/main/Platform.js | 8 +- .../textSearchFacetsList/main/Program.js | 8 +- .../textSearchFacetsList/main/Project.js | 8 +- .../textSearchFacetsList/main/ServiceOGC.js | 4 +- .../textSearchFacetsList/main/Species.js | 14 ++-- .../textSearchFacetsList/main/Taxon.js | 10 +-- .../designs/textSearchList/Controller.js | 4 +- .../designs/textSearchList/main/Domain.js | 6 +- .../designs/textSearchList/main/Selection.js | 4 +- .../designs/textSearchList/main/ServiceOGC.js | 2 +- .../details/views/ActivityAreaMapBase.js | 2 +- .../src/oldapp/details/views/ActivityChart.js | 8 +- .../details/views/ActivityLayerMapBase.js | 2 +- .../edition/views/ActivityEditionView.js | 2 +- .../edition/views/ConditionEditionView.js | 2 +- .../oldapp/edition/views/DeviceEditionView.js | 2 +- .../views/LoadDataToActivityEditionView.js | 2 +- .../views/MetricsDefinitionEditionView.js | 2 +- .../views/MisIdentificationEditionView.js | 2 +- .../edition/views/ParameterEditionView.js | 2 +- .../oldapp/edition/views/UnitEditionView.js | 2 +- .../edition/views/dataLoader/LoadDataOC.js | 4 +- .../edition/views/dataLoader/LoadDataTR.js | 6 +- .../_BaseDataToActivityEditionItfc.js | 2 +- .../_BaseLoadDataToActivityEditionItfc.js | 2 +- client-app/src/oldapp/home/views/HomeView.js | 4 +- .../src/oldapp/home/views/ProductWidget.js | 10 +-- .../src/oldapp/home/views/SearchBarWidget.js | 10 +-- .../home/views/SearchFastFilterWidget.js | 6 +- .../oldapp/home/views/SearchFilterWidget.js | 6 +- .../oldapp/home/views/SearchResultsWidget.js | 18 ++--- .../src/oldapp/home/views/StatsWidget.js | 14 ++-- .../src/oldapp/home/views/_DashboardItem.js | 4 +- .../domains/_HierarchicalDomain.js | 2 +- .../maintenance/views/PermissionsView.js | 8 +- .../src/oldapp/products/views/OpenMapView.js | 6 +- .../oldapp/user/views/ConfirmResettingView.js | 4 +- .../src/oldapp/user/views/FeedbackView.js | 6 +- .../user/views/InnerWhatIsRedmicView.js | 6 +- client-app/src/oldapp/user/views/LoginView.js | 2 +- .../src/oldapp/user/views/RegisterView.js | 8 +- .../src/oldapp/user/views/ResettingView.js | 2 +- .../src/oldapp/user/views/UserProfileView.js | 20 ++--- .../user/views/_ExternalUserBaseView.js | 4 +- .../src/oldapp/viewers/views/ChartsView.js | 28 +++---- .../viewers/views/RealTimeDashboardView.js | 22 +++--- .../src/oldapp/viewers/views/RealTimeView.js | 26 +++---- .../viewers/views/SpeciesDistributionView.js | 56 +++++++------- .../oldapp/viewers/views/StacBrowserView.js | 2 +- .../src/oldapp/viewers/views/TrackingView.js | 28 +++---- .../src/oldapp/viewers/views/TrashCharts.js | 18 ++--- .../viewers/views/TrashCollectionView.js | 32 ++++---- .../src/oldapp/viewers/views/TrashDetails.js | 12 +-- .../src/oldapp/viewers/views/TrashInfo.js | 6 +- .../viewers/views/_SelectTimeInterval.js | 4 +- .../views/_TimeSeriesDataManagement.js | 6 +- .../views/_TimeSeriesSelectionManagement.js | 2 +- client-app/tests/_intern-unit.js | 70 +++++++++--------- .../components/Keypad/testKeypadScript.js | 4 +- .../MapSearchImpl/testMapSearchImplScript.js | 2 +- .../testUploadFileImplScript.js | 2 +- .../modules/form/testFormWithKeypadScript.js | 4 +- .../modules/search/testFacetsImplScript.js | 2 +- .../base/views/extensions/test_EditionView.js | 4 +- .../unit/app/viewers/views/test_ChartsView.js | 2 +- .../tests/unit/redmic/form/testUploadInput.js | 2 +- .../unit/redmic/modules/base/testManager.js | 2 +- .../redmic/modules/base/testNotification.js | 2 +- .../redmic/modules/base/testSelectionBox.js | 2 +- .../unit/redmic/modules/base/test_Module.js | 2 +- .../redmic/modules/browser/bars/testOrder.js | 2 +- .../modules/browser/bars/testPagination.js | 2 +- .../modules/browser/bars/testSelectionBox.js | 2 +- .../redmic/modules/browser/bars/testTotal.js | 4 +- .../modules/browser/buttons/testButtons.js | 4 +- .../redmic/modules/browser/row/testRow.js | 10 +-- .../modules/browser/testHierarchicalImpl.js | 20 ++--- .../redmic/modules/browser/testListImpl.js | 20 ++--- .../testInfoChartsContainerImpl.js | 4 +- .../chart/Toolbar/testSliderSelectorImpl.js | 2 +- .../layer/ChartLayer/testLinearChartImpl.js | 4 +- .../modules/form/inputs/testCheckBoxImpl.js | 6 +- .../form/inputs/testDateTextBoxImpl.js | 6 +- .../form/inputs/testFilteringInputImpl.js | 6 +- .../form/inputs/testNumberSpinnerImpl.js | 6 +- .../form/inputs/testNumberTextBoxImpl.js | 6 +- .../modules/form/inputs/testTextAreaImpl.js | 6 +- .../modules/form/inputs/testTextBoxImpl.js | 6 +- .../unit/redmic/modules/form/testForm.js | 6 +- .../redmic/modules/gateway/testGateway.js | 4 +- .../modules/layout/details/testDetails.js | 6 +- .../modules/layout/wizard/testWizard.js | 8 +- .../redmic/modules/map/testLeafletImpl.js | 2 +- .../redmic/modules/model/testModelImpl.js | 2 +- .../notification/test_Communication.js | 6 +- .../modules/notification/test_Notification.js | 2 +- .../redmic/modules/search/testFacetsImpl.js | 2 +- .../unit/redmic/modules/search/testSearch.js | 6 +- .../redmic/modules/selection/testSelector.js | 2 +- .../unit/redmic/modules/socket/testSocket.js | 2 +- .../redmic/modules/store/testRestManager.js | 2 +- .../unit/redmic/modules/tree/testTree.js | 6 +- .../unit/redmic/modules/wizard/testWizard.js | 4 +- 543 files changed, 1159 insertions(+), 1159 deletions(-) rename client-app/src/{redmic/modules => component}/atlas/Atlas.js (97%) rename client-app/src/{redmic/modules => component}/atlas/_AtlasLayersManagement.js (98%) rename client-app/src/{redmic/modules => component}/atlas/_AtlasLegendManagement.js (100%) rename client-app/src/{redmic/modules => component}/base/Analytics.js (99%) rename client-app/src/{redmic/modules => component}/base/Credentials.js (98%) rename client-app/src/{redmic/modules => component}/base/Loading.js (99%) rename client-app/src/{redmic/modules => component}/base/Manager.js (99%) rename client-app/src/{redmic/modules => component}/base/_AuthFirewall.js (100%) rename client-app/src/{redmic/modules => component}/base/_ChkCollection.js (100%) rename client-app/src/{redmic/modules => component}/base/_CommunicationCenter.js (100%) rename client-app/src/{redmic/modules => component}/base/_ExternalConfig.js (100%) rename client-app/src/{redmic/modules => component}/base/_Filter.js (99%) rename client-app/src/{redmic/modules => component}/base/_FilterItfc.js (93%) rename client-app/src/{redmic/modules => component}/base/_Itfc.js (100%) rename client-app/src/{redmic/modules => component}/base/_ListenQueryParams.js (100%) rename client-app/src/{redmic/modules => component}/base/_ListenQueryParamsItfc.js (93%) rename client-app/src/{redmic/modules => component}/base/_ListenWindowResize.js (100%) rename client-app/src/{redmic/modules => component}/base/_ManageClickEvent.js (100%) rename client-app/src/{redmic/modules => component}/base/_Module.js (100%) rename client-app/src/{redmic/modules => component}/base/_ModuleItfc.js (95%) rename client-app/src/{redmic/modules => component}/base/_Persistence.js (100%) rename client-app/src/{redmic/modules => component}/base/_PersistenceItfc.js (94%) rename client-app/src/{redmic/modules => component}/base/_Selection.js (99%) rename client-app/src/{redmic/modules => component}/base/_SelectionBase.js (100%) rename client-app/src/{redmic/modules => component}/base/_SelectionItfc.js (94%) rename client-app/src/{redmic/modules => component}/base/_Show.js (99%) rename client-app/src/{redmic/modules => component}/base/_ShowInPopup.js (100%) rename client-app/src/{redmic/modules => component}/base/_ShowInTooltip.js (100%) rename client-app/src/{redmic/modules => component}/base/_ShowItfc.js (95%) rename client-app/src/{redmic/modules => component}/base/_ShowOnEvt.js (100%) rename client-app/src/{redmic/modules => component}/base/_Store.js (99%) rename client-app/src/{redmic/modules => component}/base/_StoreItfc.js (95%) rename client-app/src/{redmic/modules => component}/base/_Window.js (100%) rename client-app/src/{redmic/modules => component}/browser/Browser.js (99%) rename client-app/src/{redmic/modules => component}/browser/HierarchicalImpl.js (100%) rename client-app/src/{redmic/modules => component}/browser/ListImpl.js (100%) rename client-app/src/{redmic/modules => component}/browser/_BrowserItfc.js (92%) rename client-app/src/{redmic/modules => component}/browser/_ButtonsInRow.js (100%) rename client-app/src/{redmic/modules => component}/browser/_DataTypeParser.js (100%) rename client-app/src/{redmic/modules => component}/browser/_DragAndDrop.js (100%) rename client-app/src/{redmic/modules => component}/browser/_EditionTable.js (96%) rename client-app/src/{redmic/modules => component}/browser/_Framework.js (100%) rename client-app/src/{redmic/modules => component}/browser/_GeoJsonParser.js (100%) rename client-app/src/{redmic/modules => component}/browser/_HierarchicalDragAndDrop.js (100%) rename client-app/src/{redmic/modules => component}/browser/_HierarchicalLazyLoad.js (100%) rename client-app/src/{redmic/modules => component}/browser/_HierarchicalSelect.js (100%) rename client-app/src/{redmic/modules => component}/browser/_HierarchicalTable.js (100%) rename client-app/src/{redmic/modules => component}/browser/_MultiTemplate.js (100%) rename client-app/src/{redmic/modules => component}/browser/_NoDataTemplate.js (100%) rename client-app/src/{redmic/modules => component}/browser/_Select.js (99%) rename client-app/src/{redmic/modules => component}/browser/_Table.js (98%) rename client-app/src/{redmic/modules => component}/browser/bars/Order.js (98%) rename client-app/src/{redmic/modules => component}/browser/bars/Pagination.js (98%) rename client-app/src/{redmic/modules => component}/browser/bars/SelectionBox.js (96%) rename client-app/src/{redmic/modules => component}/browser/bars/Total.js (95%) rename client-app/src/{redmic/modules => component}/browser/bars/_SelectBox.js (100%) rename client-app/src/{redmic/modules => component}/browser/buttons/Buttons.js (99%) rename client-app/src/{redmic/modules => component}/browser/buttons/_ButtonsItfc.js (91%) rename client-app/src/{redmic/modules => component}/browser/buttons/_GroupButtons.js (100%) rename client-app/src/{redmic/modules => component}/browser/row/Row.js (98%) rename client-app/src/{redmic/modules => component}/browser/row/_Buttons.js (95%) rename client-app/src/{redmic/modules => component}/browser/row/_Hierarchical.js (100%) rename client-app/src/{redmic/modules => component}/browser/row/_HierarchicalSelect.js (100%) rename client-app/src/{redmic/modules => component}/browser/row/_HierarchicalTable.js (100%) rename client-app/src/{redmic/modules => component}/browser/row/_RowItfc.js (91%) rename client-app/src/{redmic/modules => component}/browser/row/_Select.js (100%) rename client-app/src/{redmic/modules => component}/browser/row/_Table.js (100%) rename client-app/src/{redmic/modules => component}/chart/ChartsContainer/ChartsContainer.js (99%) rename client-app/src/{redmic/modules => component}/chart/ChartsContainer/InfoChartsContainerImpl.js (100%) rename client-app/src/{redmic/modules => component}/chart/ChartsContainer/SliderChartsContainerImpl.js (99%) rename client-app/src/{redmic/modules => component}/chart/ChartsContainer/_AngularAxisDrawing.js (98%) rename client-app/src/{redmic/modules => component}/chart/ChartsContainer/_AngularAxisWithGridDrawing.js (96%) rename client-app/src/{redmic/modules => component}/chart/ChartsContainer/_AxesDrawing.js (100%) rename client-app/src/{redmic/modules => component}/chart/ChartsContainer/_AxesDrawingItfc.js (95%) rename client-app/src/{redmic/modules => component}/chart/ChartsContainer/_BreadcrumbsBar.js (100%) rename client-app/src/{redmic/modules => component}/chart/ChartsContainer/_ChartsContainerItfc.js (96%) rename client-app/src/{redmic/modules => component}/chart/ChartsContainer/_ColorSelection.js (100%) rename client-app/src/{redmic/modules => component}/chart/ChartsContainer/_ColorSelectionItfc.js (92%) rename client-app/src/{redmic/modules => component}/chart/ChartsContainer/_DomainHistoryNavigation.js (100%) rename client-app/src/{redmic/modules => component}/chart/ChartsContainer/_GroupedLegendBar.js (100%) rename client-app/src/{redmic/modules => component}/chart/ChartsContainer/_InfoOnEmptyData.js (100%) rename client-app/src/{redmic/modules => component}/chart/ChartsContainer/_InfoOnLayerEvent.js (100%) rename client-app/src/{redmic/modules => component}/chart/ChartsContainer/_InfoOnLayerEventItfc.js (92%) rename client-app/src/{redmic/modules => component}/chart/ChartsContainer/_InfoOnMouseOver.js (100%) rename client-app/src/{redmic/modules => component}/chart/ChartsContainer/_InfoOnZeroValueData.js (100%) rename client-app/src/{redmic/modules => component}/chart/ChartsContainer/_InfoTooltipManagement.js (100%) rename client-app/src/{redmic/modules => component}/chart/ChartsContainer/_LayerColorSelection.js (98%) rename client-app/src/{redmic/modules => component}/chart/ChartsContainer/_LegendBar.js (100%) rename client-app/src/{redmic/modules => component}/chart/ChartsContainer/_LegendBarCommons.js (100%) rename client-app/src/{redmic/modules => component}/chart/ChartsContainer/_LegendBarCommonsItfc.js (93%) rename client-app/src/{redmic/modules => component}/chart/ChartsContainer/_RadialAxisDrawing.js (99%) rename client-app/src/{redmic/modules => component}/chart/ChartsContainer/_RadialAxisWithGridDrawing.js (96%) rename client-app/src/{redmic/modules => component}/chart/ChartsContainer/_SummaryBox.js (100%) rename client-app/src/{redmic/modules => component}/chart/ChartsContainer/_TemporalAxisDrawing.js (98%) rename client-app/src/{redmic/modules => component}/chart/ChartsContainer/_TemporalAxisWithGridDrawing.js (96%) rename client-app/src/{redmic/modules => component}/chart/ChartsContainer/_VerticalAxesDrawing.js (99%) rename client-app/src/{redmic/modules => component}/chart/ChartsContainer/_VerticalAxesWithGridDrawing.js (96%) rename client-app/src/{redmic/modules => component}/chart/ChartsContainer/_ZoomByDragging.js (100%) rename client-app/src/{redmic/modules => component}/chart/SmartLegend/SmartLegend.js (98%) rename client-app/src/{redmic/modules => component}/chart/SmartLegend/TimeSeriesSmartLegendImpl.js (97%) rename client-app/src/{redmic/modules => component}/chart/SmartLegend/_SmartLegendItfc.js (94%) rename client-app/src/{redmic/modules => component}/chart/Toolbar/AggregationToolImpl.js (98%) rename client-app/src/{redmic/modules => component}/chart/Toolbar/DataSelectorImpl.js (95%) rename client-app/src/{redmic/modules => component}/chart/Toolbar/DateFilterImpl.js (94%) rename client-app/src/{redmic/modules => component}/chart/Toolbar/GridManagementImpl.js (98%) rename client-app/src/{redmic/modules => component}/chart/Toolbar/SliderSelectorImpl.js (95%) rename client-app/src/{redmic/modules => component}/chart/Toolbar/Toolbar.js (92%) rename client-app/src/{redmic/modules => component}/chart/Toolbar/_ToolbarItfc.js (92%) rename client-app/src/{redmic/modules => component}/chart/layer/Axis/AngularAxisImpl.js (98%) rename client-app/src/{redmic/modules => component}/chart/layer/Axis/AngularGridAxisImpl.js (100%) rename client-app/src/{redmic/modules => component}/chart/layer/Axis/Axis.js (96%) rename client-app/src/{redmic/modules => component}/chart/layer/Axis/HorizontalGridAxisImpl.js (100%) rename client-app/src/{redmic/modules => component}/chart/layer/Axis/RadialAxisImpl.js (100%) rename client-app/src/{redmic/modules => component}/chart/layer/Axis/RadialGridAxisImpl.js (100%) rename client-app/src/{redmic/modules => component}/chart/layer/Axis/TemporalAxisImpl.js (100%) rename client-app/src/{redmic/modules => component}/chart/layer/Axis/VerticalAxisImpl.js (100%) rename client-app/src/{redmic/modules => component}/chart/layer/Axis/VerticalGridAxisImpl.js (100%) rename client-app/src/{redmic/modules => component}/chart/layer/Axis/_AxisItfc.js (93%) rename client-app/src/{redmic/modules => component}/chart/layer/Axis/_HorizontalCommons.js (100%) rename client-app/src/{redmic/modules => component}/chart/layer/Axis/_VerticalCommons.js (100%) rename client-app/src/{redmic/modules => component}/chart/layer/Axis/_VerticalCommonsItfc.js (93%) rename client-app/src/{redmic/modules => component}/chart/layer/ChartLayer/ChartLayer.js (98%) rename client-app/src/{redmic/modules => component}/chart/layer/ChartLayer/LinearChartImpl.js (100%) rename client-app/src/{redmic/modules => component}/chart/layer/ChartLayer/MultiPieChartImpl.js (100%) rename client-app/src/{redmic/modules => component}/chart/layer/ChartLayer/PieChartImpl.js (100%) rename client-app/src/{redmic/modules => component}/chart/layer/ChartLayer/WindRoseChartImpl.js (99%) rename client-app/src/{redmic/modules => component}/chart/layer/ChartLayer/_CategoryLayerCommons.js (100%) rename client-app/src/{redmic/modules => component}/chart/layer/ChartLayer/_CategoryLayerCommonsItfc.js (94%) rename client-app/src/{redmic/modules => component}/chart/layer/ChartLayer/_ChartHoleManagement.js (100%) rename client-app/src/{redmic/modules => component}/chart/layer/ChartLayer/_ChartLayerItfc.js (95%) rename client-app/src/{redmic/modules => component}/chart/layer/ChartLayer/_CircularLayerCommons.js (100%) rename client-app/src/{redmic/modules => component}/chart/layer/ChartLayer/_CircularLayerCommonsItfc.js (94%) rename client-app/src/{redmic/modules => component}/chart/layer/ChartLayer/_ColorHierarchyGeneration.js (100%) rename client-app/src/{redmic/modules => component}/chart/layer/ChartLayer/_LevelNavigation.js (98%) rename client-app/src/{redmic/modules => component}/chart/layer/ChartLayer/_MultipleWindRose.js (100%) rename client-app/src/{redmic/modules => component}/chart/layer/ChartLayer/_ObtainableValue.js (100%) rename client-app/src/{redmic/modules => component}/chart/layer/ChartLayer/_ObtainableValueItfc.js (92%) rename client-app/src/{redmic/modules => component}/chart/layer/ChartLayer/_PieCommons.js (100%) rename client-app/src/{redmic/modules => component}/chart/layer/ChartLayer/_PutButtonInHole.js (98%) rename client-app/src/{redmic/modules => component}/chart/layer/ChartLayer/_PutButtonInHoleItfc.js (92%) rename client-app/src/{redmic/modules => component}/chart/layer/ChartLayer/_QueryableValue.js (100%) rename client-app/src/{redmic/modules => component}/chart/layer/ChartLayer/_ShowInfoInHole.js (97%) rename client-app/src/{redmic/modules => component}/chart/layer/ChartLayer/_SimplePieCommons.js (100%) rename client-app/src/{redmic/modules => component}/chart/layer/ChartLayer/_SimpleWindRose.js (100%) rename client-app/src/{redmic/modules => component}/chart/layer/ChartLayer/_VariableRadiusByDepth.js (100%) rename client-app/src/{redmic/modules => component}/chart/layer/_LayerCommons.js (100%) rename client-app/src/{redmic/modules => component}/chart/layer/_LayerCommonsItfc.js (94%) rename client-app/src/{redmic/modules => component}/chart/layer/_PolarLayerCommons.js (100%) rename client-app/src/{redmic/modules => component}/chart/layer/_PolarLayerCommonsItfc.js (92%) rename client-app/src/{redmic/modules => component}/components/ExternalConfig.js (98%) rename client-app/src/{redmic/modules => component}/components/Keypad/IconKeypadImpl.js (100%) rename client-app/src/{redmic/modules => component}/components/Keypad/Keypad.js (97%) rename client-app/src/{redmic/modules => component}/components/Keypad/TrizoneKeypadImpl.js (100%) rename client-app/src/{redmic/modules => component}/components/Keypad/_KeypadItfc.js (94%) rename client-app/src/{redmic/modules => component}/components/PDFViewer/PDFViewer.js (97%) rename client-app/src/{redmic/modules => component}/components/ProgressSlider/ProgressSlider.js (97%) rename client-app/src/{redmic/modules => component}/components/ProgressSlider/StepAndRateEditor.js (98%) rename client-app/src/{redmic/modules => component}/components/Sidebar/MainSidebarImpl.js (93%) rename client-app/src/{redmic/modules => component}/components/Sidebar/Sidebar.js (99%) rename client-app/src/{redmic/modules => component}/components/Sidebar/_Secondary.js (100%) rename client-app/src/{redmic/modules => component}/components/Topbar.js (93%) rename client-app/src/{redmic/modules => component}/filter/Filter.js (98%) rename client-app/src/{redmic/modules => component}/form/Form.js (98%) rename client-app/src/{redmic/modules => component}/form/FormContainerImpl.js (99%) rename client-app/src/{redmic/modules => component}/form/_BaseCreateKeypad.js (100%) rename client-app/src/{redmic/modules => component}/form/_CreateInternalKeypad.js (95%) rename client-app/src/{redmic/modules => component}/form/_CreateKeypad.js (97%) rename client-app/src/{redmic/modules => component}/form/_FormItfc.js (95%) rename client-app/src/{redmic/modules => component}/form/_ListenModelHasChanged.js (100%) rename client-app/src/{redmic/modules => component}/form/_PublicateChanges.js (100%) rename client-app/src/{redmic/modules => component}/form/_ShowInDialog.js (97%) rename client-app/src/{redmic/modules => component}/form/_ShowInTableList.js (98%) rename client-app/src/{redmic/modules => component}/form/form/FormContainer.js (89%) rename client-app/src/{redmic/modules => component}/form/form/Select.js (100%) rename client-app/src/{redmic/modules => component}/form/form/UploadInput.js (100%) rename client-app/src/{redmic/modules => component}/form/form/nls/UploadInput.js (100%) rename client-app/src/{redmic/modules => component}/form/form/nls/es/UploadInput.js (100%) rename client-app/src/{redmic/modules => component}/form/form/templates/Select.html (100%) rename client-app/src/{redmic/modules => component}/form/form/templates/UploadInput.html (100%) rename client-app/src/{redmic/modules => component}/form/input/AnnotationImpl.js (94%) rename client-app/src/{redmic/modules => component}/form/input/ButtonImpl.js (91%) rename client-app/src/{redmic/modules => component}/form/input/CheckBoxGroupImpl.js (99%) rename client-app/src/{redmic/modules => component}/form/input/CheckBoxImpl.js (96%) rename client-app/src/{redmic/modules => component}/form/input/ColorImpl.js (90%) rename client-app/src/{redmic/modules => component}/form/input/ColorPickerImpl.js (95%) rename client-app/src/{redmic/modules => component}/form/input/ColorPickerTextBoxImpl.js (91%) rename client-app/src/{redmic/modules => component}/form/input/ColorsRampImpl.js (98%) rename client-app/src/{redmic/modules => component}/form/input/DateRangeComplexImpl.js (98%) rename client-app/src/{redmic/modules => component}/form/input/DateRangeImpl.js (93%) rename client-app/src/{redmic/modules => component}/form/input/DateRangeTextBoxImpl.js (94%) rename client-app/src/{redmic/modules => component}/form/input/DateTextBoxImpl.js (93%) rename client-app/src/{redmic/modules => component}/form/input/DateTimeImpl.js (97%) rename client-app/src/{redmic/modules => component}/form/input/DateTimeTextBoxImpl.js (96%) rename client-app/src/{redmic/modules => component}/form/input/FilteringSelectImpl.js (99%) rename client-app/src/{redmic/modules => component}/form/input/GeographicCoordinatesComponentImpl.js (99%) rename client-app/src/{redmic/modules => component}/form/input/GeometryImpl.js (97%) rename client-app/src/{redmic/modules => component}/form/input/Input.js (99%) rename client-app/src/{redmic/modules => component}/form/input/KeywordsImpl.js (95%) rename client-app/src/{redmic/modules => component}/form/input/MapSearchImpl.js (93%) rename client-app/src/{redmic/modules => component}/form/input/MultiSelectImpl.js (96%) rename client-app/src/{redmic/modules => component}/form/input/NumberSpinnerImpl.js (95%) rename client-app/src/{redmic/modules => component}/form/input/NumberTextBoxImpl.js (96%) rename client-app/src/{redmic/modules => component}/form/input/PointImpl.js (98%) rename client-app/src/{redmic/modules => component}/form/input/RadioButtonGroupImpl.js (98%) rename client-app/src/{redmic/modules => component}/form/input/RadioButtonImpl.js (94%) rename client-app/src/{redmic/modules => component}/form/input/RangeImpl.js (88%) rename client-app/src/{redmic/modules => component}/form/input/RangeSliderImpl.js (96%) rename client-app/src/{redmic/modules => component}/form/input/SelectImpl.js (98%) rename client-app/src/{redmic/modules => component}/form/input/SelectOnListPopupImpl.js (94%) rename client-app/src/{redmic/modules => component}/form/input/SliderImpl.js (95%) rename client-app/src/{redmic/modules => component}/form/input/TextAreaImpl.js (92%) rename client-app/src/{redmic/modules => component}/form/input/TextBoxImpl.js (92%) rename client-app/src/{redmic/modules => component}/form/input/UploadFileImpl.js (98%) rename client-app/src/{redmic/modules => component}/form/input/ValueAndUnitSelectorImpl.js (96%) rename client-app/src/{redmic/modules => component}/form/input/_BaseDateTime.js (100%) rename client-app/src/{redmic/modules => component}/form/input/_BaseMultiSelectImpl.js (97%) rename client-app/src/{redmic/modules => component}/form/input/_BaseRange.js (97%) rename client-app/src/{redmic/modules => component}/form/input/_BaseTextBoxWidthExpandTooltipImpl.js (89%) rename client-app/src/{redmic/modules => component}/form/input/_BaseWidthExpandTooltipImpl.js (98%) rename client-app/src/{redmic/modules => component}/form/input/_DeleteOnClear.js (100%) rename client-app/src/{redmic/modules => component}/form/input/_Dependence.js (100%) rename client-app/src/{redmic/modules => component}/form/input/_DisableInput.js (100%) rename client-app/src/{redmic/modules => component}/form/input/_IgnoreNonexistentProperty.js (100%) rename client-app/src/{redmic/modules => component}/form/input/_InputItfc.js (95%) rename client-app/src/{redmic/modules => component}/form/input/_NodesCreation.js (96%) rename client-app/src/{redmic/modules => component}/form/input/_SelectOnPopupImpl.js (98%) rename client-app/src/{redmic/modules => component}/gateway/AddItemGatewayImpl.js (96%) rename client-app/src/{redmic/modules => component}/gateway/Gateway.js (99%) rename client-app/src/{redmic/modules => component}/gateway/LocalSelectorGatewayImpl.js (97%) rename client-app/src/{redmic/modules => component}/gateway/MapCenteringGatewayImpl.js (100%) rename client-app/src/{redmic/modules => component}/gateway/_GatewayItfc.js (91%) rename client-app/src/{redmic/modules => component}/layout/TabsDisplayer.js (98%) rename client-app/src/{redmic/modules => component}/layout/dataDisplayer/DataDisplayer.js (94%) rename client-app/src/{redmic/modules => component}/layout/genericDisplayer/GenericDisplayer.js (97%) rename client-app/src/{redmic/modules => component}/layout/genericDisplayer/GenericWithTopbarDisplayerImpl.js (100%) rename client-app/src/{redmic/modules => component}/layout/listMenu/ListMenu.js (99%) rename client-app/src/{redmic/modules => component}/layout/nestedContent/NestedBrowsersImpl.js (96%) rename client-app/src/{redmic/modules => component}/layout/nestedContent/NestedContent.js (94%) rename client-app/src/{redmic/modules => component}/layout/templateDisplayer/TemplateDisplayer.js (97%) rename client-app/src/{redmic/modules => component}/layout/wizard/Wizard.js (99%) rename client-app/src/{redmic/modules => component}/layout/wizard/_CompleteBySelection.js (98%) rename client-app/src/{redmic/modules => component}/layout/wizard/_StepBreadcrumbs.js (100%) rename client-app/src/{redmic/modules => component}/layout/wizard/_StepNavigation.js (98%) rename client-app/src/{redmic/modules => component}/layout/wizard/_WizardStep.js (99%) rename client-app/src/{redmic/modules => component}/layout/wizard/_WizardStepItfc.js (96%) rename client-app/src/{redmic/modules => component}/map/LeafletImpl.js (100%) rename client-app/src/{redmic/modules => component}/map/Map.js (99%) rename client-app/src/{redmic/modules => component}/map/MapButton.js (100%) rename client-app/src/{redmic/modules => component}/map/StaticLayersDefinition.js (100%) rename client-app/src/{redmic/modules => component}/map/_ImportWkt.js (100%) rename client-app/src/{redmic/modules => component}/map/_LeafletDraw.js (100%) rename client-app/src/{redmic/modules => component}/map/_LeafletImplItfc.js (93%) rename client-app/src/{redmic/modules => component}/map/_LeafletWidgetsManagement.js (100%) rename client-app/src/{redmic/modules => component}/map/_ListenContainers.js (100%) rename client-app/src/{redmic/modules => component}/map/_MapItfc.js (96%) rename client-app/src/{redmic/modules => component}/map/_OverlayLayersManagement.js (100%) rename client-app/src/{redmic/modules => component}/map/_PlaceNamesButton.js (96%) rename client-app/src/{redmic/modules => component}/map/_StaticLayersManagement.js (98%) rename client-app/src/{redmic/modules => component}/map/layer/DrawingLayerImpl.js (100%) rename client-app/src/{redmic/modules => component}/map/layer/GeoJsonLayerImpl.js (100%) rename client-app/src/{redmic/modules => component}/map/layer/GridLayerImpl.js (99%) rename client-app/src/{redmic/modules => component}/map/layer/MapLayer.js (99%) rename client-app/src/{redmic/modules => component}/map/layer/PruneClusterLayerImpl.js (100%) rename client-app/src/{redmic/modules => component}/map/layer/TrackingLayerImpl.js (99%) rename client-app/src/{redmic/modules => component}/map/layer/TrackingLine.js (99%) rename client-app/src/{redmic/modules => component}/map/layer/WmsLayerImpl.js (99%) rename client-app/src/{redmic/modules => component}/map/layer/_AddFilter.js (98%) rename client-app/src/{redmic/modules => component}/map/layer/_AnimateMarker.js (100%) rename client-app/src/{redmic/modules => component}/map/layer/_D3Expansion.js (100%) rename client-app/src/{redmic/modules => component}/map/layer/_Editable.js (99%) rename client-app/src/{redmic/modules => component}/map/layer/_GeoJsonLayerItfc.js (92%) rename client-app/src/{redmic/modules => component}/map/layer/_Highlightable.js (100%) rename client-app/src/{redmic/modules => component}/map/layer/_LayerProtocols.js (100%) rename client-app/src/{redmic/modules => component}/map/layer/_ListenBounds.js (100%) rename client-app/src/{redmic/modules => component}/map/layer/_ListenZoom.js (100%) rename client-app/src/{redmic/modules => component}/map/layer/_MapLayerItfc.js (95%) rename client-app/src/{redmic/modules => component}/map/layer/_PruneClusterLayerItfc.js (93%) rename client-app/src/{redmic/modules => component}/map/layer/_PublishInfo.js (100%) rename client-app/src/{redmic/modules => component}/map/layer/_PublishInfoItfc.js (93%) rename client-app/src/{redmic/modules => component}/map/layer/_RadiusCommons.js (100%) rename client-app/src/{redmic/modules => component}/map/layer/_RadiusOnClick.js (98%) rename client-app/src/{redmic/modules => component}/map/layer/_RadiusOnSelect.js (96%) rename client-app/src/{redmic/modules => component}/map/layer/_SelectOnClick.js (100%) rename client-app/src/{redmic/modules => component}/map/layer/_Selectable.js (99%) rename client-app/src/{redmic/modules => component}/map/layer/_SelectableItfc.js (93%) rename client-app/src/{redmic/modules => component}/map/layer/_TrackingDataManagement.js (100%) rename client-app/src/{redmic/modules => component}/map/layer/_TrackingMarkersManagement.js (100%) rename client-app/src/{redmic/modules => component}/mapQuery/QueryOnMap.js (99%) rename client-app/src/{redmic/modules => component}/mapQuery/_ContentManagement.js (100%) rename client-app/src/{redmic/modules => component}/mapQuery/_ResultsBrowser.js (94%) rename client-app/src/{redmic/modules => component}/metaTags/MetaTags.js (99%) rename client-app/src/{redmic/modules => component}/metaTags/metaTagsContent.js (100%) rename client-app/src/{redmic/modules => component}/model/Model.js (98%) rename client-app/src/{redmic/modules => component}/model/ModelImpl.js (100%) rename client-app/src/{redmic/modules => component}/model/_ModelItfc.js (96%) rename client-app/src/{redmic/modules => component}/notification/Alert.js (97%) rename client-app/src/{redmic/modules => component}/notification/CommunicationCenter.js (98%) rename client-app/src/{redmic/modules => component}/notification/Notification.js (97%) rename client-app/src/{redmic/modules => component}/notification/NotificationSidebar.js (98%) rename client-app/src/{redmic/modules => component}/notification/TaskNotification.js (94%) rename client-app/src/{redmic/modules => component}/search/CompositeImpl.js (100%) rename client-app/src/{redmic/modules => component}/search/DateRangeImpl.js (100%) rename client-app/src/{redmic/modules => component}/search/FacetsImpl.js (100%) rename client-app/src/{redmic/modules => component}/search/GeographicImpl.js (100%) rename client-app/src/{redmic/modules => component}/search/MultiSelectImpl.js (96%) rename client-app/src/{redmic/modules => component}/search/RangeImpl.js (97%) rename client-app/src/{redmic/modules => component}/search/Search.js (97%) rename client-app/src/{redmic/modules => component}/search/TextImpl.js (99%) rename client-app/src/{redmic/modules => component}/search/_HideFormByAction.js (100%) rename client-app/src/{redmic/modules => component}/search/_SearchItfc.js (92%) rename client-app/src/{redmic/modules => component}/selection/SelectionBox.js (94%) rename client-app/src/{redmic/modules => component}/selection/SelectionManager.js (98%) rename client-app/src/{redmic/modules => component}/selection/Selector.js (99%) rename client-app/src/{redmic/modules => component}/selection/_SelectorItfc.js (93%) rename client-app/src/{redmic/modules => component}/selection/_SelectorPersistence.js (99%) rename client-app/src/{redmic/modules => component}/socket/Socket.js (99%) rename client-app/src/{redmic/modules => component}/socket/Task.js (98%) rename client-app/src/{redmic/modules => component}/socket/_IngestData.js (100%) rename client-app/src/{redmic/modules => component}/socket/_Report.js (100%) rename client-app/src/{redmic/modules => component}/socket/_Worms.js (100%) rename client-app/src/{redmic/modules => component}/store/RequestJoiner/AtlasDataImpl.js (100%) rename client-app/src/{redmic/modules => component}/store/RequestJoiner/RequestJoiner.js (98%) rename client-app/src/{redmic/modules => component}/store/RequestJoiner/_RequestJoinerItfc.js (95%) rename client-app/src/{redmic/modules => component}/store/RestManager.js (99%) rename client-app/src/{redmic/modules => component}/store/RestManagerImpl.js (100%) rename client-app/src/{redmic/modules => component}/store/_RestManagerItfc.js (94%) rename client-app/src/{redmic/modules => component}/tree/CbtreeImpl.js (100%) rename client-app/src/{redmic/modules => component}/tree/Tree.js (98%) rename client-app/src/{redmic/modules => component}/tree/_HierarchicalFilter.js (100%) rename client-app/src/{redmic/modules => component}/tree/_LazyLoad.js (97%) rename client-app/src/{redmic/modules => component}/tree/_LeafSelection.js (100%) rename client-app/src/{redmic/modules => component}/tree/_SelectionBox.js (98%) rename client-app/src/{redmic/modules => component}/tree/_TreeItfc.js (95%) rename client-app/src/{redmic/modules => component}/user/FullscreenToggle.js (97%) rename client-app/src/{redmic/modules => component}/user/LanguageSelector.js (93%) rename client-app/src/{redmic/modules => component}/user/UserArea.js (95%) diff --git a/README.md b/README.md index e4ec15af..1aa18841 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,7 @@ Como ejemplo de ejecución de tests locales (unitarios y funcionales), veamos lo ```sh grunt test-unit-local \ - --suites=tests/unit/redmic/modules/model/testModelImpl \ + --suites=tests/unit/src/component/model/testModelImpl \ --browser=chrome \ --headless \ --coverage=false @@ -137,7 +137,7 @@ Como ejemplo de ejecución de tests remotos (unitarios y funcionales), pero apun ```sh grunt test-unit-remote \ - --suites=tests/unit/redmic/modules/model/testModelImpl \ + --suites=tests/unit/src/component/model/testModelImpl \ --browser=firefox \ --headless \ --coverage=false diff --git a/client-app/app.profile.js b/client-app/app.profile.js index fecabe50..8de00c13 100644 --- a/client-app/app.profile.js +++ b/client-app/app.profile.js @@ -391,10 +391,10 @@ var profileObj = { , 'dojo/dnd/autoscroll' ] }, - 'redmic/modules/base/_Module': { + 'src/component/base/_Module': { discard: true, dependencies: [ - 'redmic/modules/base/_Show' + 'src/component/base/_Show' ] } } @@ -572,7 +572,7 @@ var viewLayers = { var viewLayerDefaultConfig = { includeLocales: includeLocales, - layerDependencies: ['redmic/modules/base/_Module'] + layerDependencies: ['src/component/base/_Module'] }; var profile = (function() { diff --git a/client-app/src/app/App.js b/client-app/src/app/App.js index d0d5152d..f4a6febb 100644 --- a/client-app/src/app/App.js +++ b/client-app/src/app/App.js @@ -11,16 +11,16 @@ define([ , 'src/app/ModuleStore' , 'src/app/outerApp' , 'src/app/Router' - , 'redmic/modules/notification/CommunicationCenter' - , 'redmic/modules/notification/Alert' - , 'redmic/modules/base/Credentials' - , 'redmic/modules/base/Analytics' - , 'redmic/modules/metaTags/MetaTags' - , 'redmic/modules/base/_Module' - , 'redmic/modules/base/_Store' - , 'redmic/modules/base/Loading' - , 'redmic/modules/components/ExternalConfig' - , 'redmic/modules/store/RestManagerImpl' + , 'src/component/notification/CommunicationCenter' + , 'src/component/notification/Alert' + , 'src/component/base/Credentials' + , 'src/component/base/Analytics' + , 'src/component/metaTags/MetaTags' + , 'src/component/base/_Module' + , 'src/component/base/_Store' + , 'src/component/base/Loading' + , 'src/component/components/ExternalConfig' + , 'src/component/store/RestManagerImpl' , 'templates/LoadingCustom' ], function( CookieLoader diff --git a/client-app/src/app/ModuleStore.js b/client-app/src/app/ModuleStore.js index 8abc7b63..62e48d90 100644 --- a/client-app/src/app/ModuleStore.js +++ b/client-app/src/app/ModuleStore.js @@ -6,7 +6,7 @@ define([ , "dojo/Deferred" , "dojo/promise/all" , "dojo/store/Memory" - , "redmic/modules/base/_Module" + , "src/component/base/_Module" ], function( _View , redmicConfig diff --git a/client-app/src/app/Router.js b/client-app/src/app/Router.js index 2782b6ed..11efee44 100644 --- a/client-app/src/app/Router.js +++ b/client-app/src/app/Router.js @@ -4,8 +4,8 @@ define([ , 'dojo/dom-attr' , 'dojo/io-query' , 'dojo/mouse' - , 'redmic/modules/base/_Module' - , 'redmic/modules/base/_Store' + , 'src/component/base/_Module' + , 'src/component/base/_Store' ], function( declare , lang diff --git a/client-app/src/app/_app.js b/client-app/src/app/_app.js index b80967d3..bcb3cdd5 100644 --- a/client-app/src/app/_app.js +++ b/client-app/src/app/_app.js @@ -1,6 +1,6 @@ define([ - 'redmic/modules/base/_Module' - , 'redmic/modules/base/_Show' + 'src/component/base/_Module' + , 'src/component/base/_Show' , 'dojo/_base/declare' , 'dojo/_base/lang' , './_appItfc' diff --git a/client-app/src/app/_appItfc.js b/client-app/src/app/_appItfc.js index 00ddb1a7..b702b4ee 100644 --- a/client-app/src/app/_appItfc.js +++ b/client-app/src/app/_appItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/client-app/src/app/innerApp.js b/client-app/src/app/innerApp.js index 04883011..b6b7e97f 100644 --- a/client-app/src/app/innerApp.js +++ b/client-app/src/app/innerApp.js @@ -6,15 +6,15 @@ define([ , 'put-selector/put' , 'src/utils/Credentials' , 'src/app/_app' - , 'redmic/modules/components/Sidebar/MainSidebarImpl' - , 'redmic/modules/components/Topbar' - , 'redmic/modules/notification/Notification' - , 'redmic/modules/selection/Selector' - , 'redmic/modules/socket/_IngestData' - , 'redmic/modules/socket/_Report' - , 'redmic/modules/socket/_Worms' - , 'redmic/modules/socket/Socket' - , 'redmic/modules/socket/Task' + , 'src/component/components/Sidebar/MainSidebarImpl' + , 'src/component/components/Topbar' + , 'src/component/notification/Notification' + , 'src/component/selection/Selector' + , 'src/component/socket/_IngestData' + , 'src/component/socket/_Report' + , 'src/component/socket/_Worms' + , 'src/component/socket/Socket' + , 'src/component/socket/Task' ], function( declare , lang diff --git a/client-app/src/catalog/detail/_WidgetDefinition.js b/client-app/src/catalog/detail/_WidgetDefinition.js index 76e4df23..b93ce2ae 100644 --- a/client-app/src/catalog/detail/_WidgetDefinition.js +++ b/client-app/src/catalog/detail/_WidgetDefinition.js @@ -10,16 +10,16 @@ define([ , 'dojo/_base/declare' , 'dojo/_base/lang' , 'src/utils/Credentials' - , 'redmic/modules/base/_Filter' - , 'redmic/modules/browser/_ButtonsInRow' - , 'redmic/modules/browser/_Framework' - , 'redmic/modules/browser/ListImpl' - , 'redmic/modules/browser/bars/Pagination' - , 'redmic/modules/browser/bars/Total' - , 'redmic/modules/layout/genericDisplayer/GenericDisplayer' - , 'redmic/modules/layout/templateDisplayer/TemplateDisplayer' - , 'redmic/modules/map/_ImportWkt' - , 'redmic/modules/map/LeafletImpl' + , 'src/component/base/_Filter' + , 'src/component/browser/_ButtonsInRow' + , 'src/component/browser/_Framework' + , 'src/component/browser/ListImpl' + , 'src/component/browser/bars/Pagination' + , 'src/component/browser/bars/Total' + , 'src/component/layout/genericDisplayer/GenericDisplayer' + , 'src/component/layout/templateDisplayer/TemplateDisplayer' + , 'src/component/map/_ImportWkt' + , 'src/component/map/LeafletImpl' , 'templates/ContactSet' , 'templates/DocumentList' , 'templates/OrganisationSet' diff --git a/client-app/src/catalog/detail/activity/ActivityDetail.js b/client-app/src/catalog/detail/activity/ActivityDetail.js index 4d775c48..789fa308 100644 --- a/client-app/src/catalog/detail/activity/ActivityDetail.js +++ b/client-app/src/catalog/detail/activity/ActivityDetail.js @@ -3,7 +3,7 @@ define([ , 'app/designs/details/main/_ActivityBase' , 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/modules/base/_ExternalConfig' + , 'src/component/base/_ExternalConfig' , 'src/catalog/detail/activity/_ActivityLayoutWidget' , 'templates/ActivityInfo' ], function( diff --git a/client-app/src/redmic/modules/atlas/Atlas.js b/client-app/src/component/atlas/Atlas.js similarity index 97% rename from client-app/src/redmic/modules/atlas/Atlas.js rename to client-app/src/component/atlas/Atlas.js index d2bb73f3..d0985556 100644 --- a/client-app/src/redmic/modules/atlas/Atlas.js +++ b/client-app/src/component/atlas/Atlas.js @@ -7,16 +7,16 @@ define([ , 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/Deferred' - , 'redmic/modules/base/_Module' - , 'redmic/modules/base/_Selection' - , 'redmic/modules/base/_Show' - , 'redmic/modules/base/_ShowInTooltip' - , 'redmic/modules/base/_Store' - , 'redmic/modules/browser/_DragAndDrop' - , 'redmic/modules/browser/_HierarchicalSelect' - , 'redmic/modules/browser/bars/SelectionBox' - , 'redmic/modules/browser/bars/Total' - , 'redmic/modules/layout/templateDisplayer/TemplateDisplayer' + , 'src/component/base/_Module' + , 'src/component/base/_Selection' + , 'src/component/base/_Show' + , 'src/component/base/_ShowInTooltip' + , 'src/component/base/_Store' + , 'src/component/browser/_DragAndDrop' + , 'src/component/browser/_HierarchicalSelect' + , 'src/component/browser/bars/SelectionBox' + , 'src/component/browser/bars/Total' + , 'src/component/layout/templateDisplayer/TemplateDisplayer' , 'templates/AtlasList' , 'templates/LoadingCustom' , 'templates/ServiceOGCAtlasList' diff --git a/client-app/src/redmic/modules/atlas/_AtlasLayersManagement.js b/client-app/src/component/atlas/_AtlasLayersManagement.js similarity index 98% rename from client-app/src/redmic/modules/atlas/_AtlasLayersManagement.js rename to client-app/src/component/atlas/_AtlasLayersManagement.js index d1ed978b..3f9df50a 100644 --- a/client-app/src/redmic/modules/atlas/_AtlasLayersManagement.js +++ b/client-app/src/component/atlas/_AtlasLayersManagement.js @@ -1,8 +1,8 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/modules/map/layer/_PublishInfo' - , 'redmic/modules/map/layer/WmsLayerImpl' + , 'src/component/map/layer/_PublishInfo' + , 'src/component/map/layer/WmsLayerImpl' ], function( declare , lang diff --git a/client-app/src/redmic/modules/atlas/_AtlasLegendManagement.js b/client-app/src/component/atlas/_AtlasLegendManagement.js similarity index 100% rename from client-app/src/redmic/modules/atlas/_AtlasLegendManagement.js rename to client-app/src/component/atlas/_AtlasLegendManagement.js diff --git a/client-app/src/redmic/modules/base/Analytics.js b/client-app/src/component/base/Analytics.js similarity index 99% rename from client-app/src/redmic/modules/base/Analytics.js rename to client-app/src/component/base/Analytics.js index b1e5727c..7de1e157 100644 --- a/client-app/src/redmic/modules/base/Analytics.js +++ b/client-app/src/component/base/Analytics.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Module" + , "src/component/base/_Module" ], function( declare , lang diff --git a/client-app/src/redmic/modules/base/Credentials.js b/client-app/src/component/base/Credentials.js similarity index 98% rename from client-app/src/redmic/modules/base/Credentials.js rename to client-app/src/component/base/Credentials.js index c734cee6..6017039f 100644 --- a/client-app/src/redmic/modules/base/Credentials.js +++ b/client-app/src/component/base/Credentials.js @@ -2,8 +2,8 @@ define([ 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/modules/base/_Module' - , 'redmic/modules/base/_Store' + , 'src/component/base/_Module' + , 'src/component/base/_Store' , 'src/utils/Credentials' ], function( redmicConfig diff --git a/client-app/src/redmic/modules/base/Loading.js b/client-app/src/component/base/Loading.js similarity index 99% rename from client-app/src/redmic/modules/base/Loading.js rename to client-app/src/component/base/Loading.js index a4f2e3d8..bb158f66 100644 --- a/client-app/src/redmic/modules/base/Loading.js +++ b/client-app/src/component/base/Loading.js @@ -3,7 +3,7 @@ define([ , 'dojo/_base/lang' , 'dojo/query' , 'put-selector/put' - , 'redmic/modules/base/_Module' + , 'src/component/base/_Module' , 'templates/LoadingArrows' ], function( declare diff --git a/client-app/src/redmic/modules/base/Manager.js b/client-app/src/component/base/Manager.js similarity index 99% rename from client-app/src/redmic/modules/base/Manager.js rename to client-app/src/component/base/Manager.js index a8f94d5d..75ffafd6 100644 --- a/client-app/src/redmic/modules/base/Manager.js +++ b/client-app/src/component/base/Manager.js @@ -6,8 +6,8 @@ define([ , 'dojo/topic' , 'put-selector/put' , 'src/utils/Credentials' - , 'redmic/modules/base/_Module' - , 'redmic/modules/base/_Show' + , 'src/component/base/_Module' + , 'src/component/base/_Show' ], function( redmicConfig diff --git a/client-app/src/redmic/modules/base/_AuthFirewall.js b/client-app/src/component/base/_AuthFirewall.js similarity index 100% rename from client-app/src/redmic/modules/base/_AuthFirewall.js rename to client-app/src/component/base/_AuthFirewall.js diff --git a/client-app/src/redmic/modules/base/_ChkCollection.js b/client-app/src/component/base/_ChkCollection.js similarity index 100% rename from client-app/src/redmic/modules/base/_ChkCollection.js rename to client-app/src/component/base/_ChkCollection.js diff --git a/client-app/src/redmic/modules/base/_CommunicationCenter.js b/client-app/src/component/base/_CommunicationCenter.js similarity index 100% rename from client-app/src/redmic/modules/base/_CommunicationCenter.js rename to client-app/src/component/base/_CommunicationCenter.js diff --git a/client-app/src/redmic/modules/base/_ExternalConfig.js b/client-app/src/component/base/_ExternalConfig.js similarity index 100% rename from client-app/src/redmic/modules/base/_ExternalConfig.js rename to client-app/src/component/base/_ExternalConfig.js diff --git a/client-app/src/redmic/modules/base/_Filter.js b/client-app/src/component/base/_Filter.js similarity index 99% rename from client-app/src/redmic/modules/base/_Filter.js rename to client-app/src/component/base/_Filter.js index d611a1bf..9f5c7dc1 100644 --- a/client-app/src/redmic/modules/base/_Filter.js +++ b/client-app/src/component/base/_Filter.js @@ -2,7 +2,7 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/aspect' - , 'redmic/modules/filter/Filter' + , 'src/component/filter/Filter' , './_FilterItfc' ], function( declare diff --git a/client-app/src/redmic/modules/base/_FilterItfc.js b/client-app/src/component/base/_FilterItfc.js similarity index 93% rename from client-app/src/redmic/modules/base/_FilterItfc.js rename to client-app/src/component/base/_FilterItfc.js index 30c8936d..b52707be 100644 --- a/client-app/src/redmic/modules/base/_FilterItfc.js +++ b/client-app/src/component/base/_FilterItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/client-app/src/redmic/modules/base/_Itfc.js b/client-app/src/component/base/_Itfc.js similarity index 100% rename from client-app/src/redmic/modules/base/_Itfc.js rename to client-app/src/component/base/_Itfc.js diff --git a/client-app/src/redmic/modules/base/_ListenQueryParams.js b/client-app/src/component/base/_ListenQueryParams.js similarity index 100% rename from client-app/src/redmic/modules/base/_ListenQueryParams.js rename to client-app/src/component/base/_ListenQueryParams.js diff --git a/client-app/src/redmic/modules/base/_ListenQueryParamsItfc.js b/client-app/src/component/base/_ListenQueryParamsItfc.js similarity index 93% rename from client-app/src/redmic/modules/base/_ListenQueryParamsItfc.js rename to client-app/src/component/base/_ListenQueryParamsItfc.js index 8d7b35ca..a3b5de14 100644 --- a/client-app/src/redmic/modules/base/_ListenQueryParamsItfc.js +++ b/client-app/src/component/base/_ListenQueryParamsItfc.js @@ -1,7 +1,7 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/modules/base/_Itfc' + , 'src/component/base/_Itfc' ], function( declare , lang diff --git a/client-app/src/redmic/modules/base/_ListenWindowResize.js b/client-app/src/component/base/_ListenWindowResize.js similarity index 100% rename from client-app/src/redmic/modules/base/_ListenWindowResize.js rename to client-app/src/component/base/_ListenWindowResize.js diff --git a/client-app/src/redmic/modules/base/_ManageClickEvent.js b/client-app/src/component/base/_ManageClickEvent.js similarity index 100% rename from client-app/src/redmic/modules/base/_ManageClickEvent.js rename to client-app/src/component/base/_ManageClickEvent.js diff --git a/client-app/src/redmic/modules/base/_Module.js b/client-app/src/component/base/_Module.js similarity index 100% rename from client-app/src/redmic/modules/base/_Module.js rename to client-app/src/component/base/_Module.js diff --git a/client-app/src/redmic/modules/base/_ModuleItfc.js b/client-app/src/component/base/_ModuleItfc.js similarity index 95% rename from client-app/src/redmic/modules/base/_ModuleItfc.js rename to client-app/src/component/base/_ModuleItfc.js index cf046347..d5fc6ea4 100644 --- a/client-app/src/redmic/modules/base/_ModuleItfc.js +++ b/client-app/src/component/base/_ModuleItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/client-app/src/redmic/modules/base/_Persistence.js b/client-app/src/component/base/_Persistence.js similarity index 100% rename from client-app/src/redmic/modules/base/_Persistence.js rename to client-app/src/component/base/_Persistence.js diff --git a/client-app/src/redmic/modules/base/_PersistenceItfc.js b/client-app/src/component/base/_PersistenceItfc.js similarity index 94% rename from client-app/src/redmic/modules/base/_PersistenceItfc.js rename to client-app/src/component/base/_PersistenceItfc.js index 2d68a0e5..2f566042 100644 --- a/client-app/src/redmic/modules/base/_PersistenceItfc.js +++ b/client-app/src/component/base/_PersistenceItfc.js @@ -1,7 +1,7 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/modules/base/_Itfc' + , 'src/component/base/_Itfc' ], function( declare , lang diff --git a/client-app/src/redmic/modules/base/_Selection.js b/client-app/src/component/base/_Selection.js similarity index 99% rename from client-app/src/redmic/modules/base/_Selection.js rename to client-app/src/component/base/_Selection.js index 04484309..4438ca9e 100644 --- a/client-app/src/redmic/modules/base/_Selection.js +++ b/client-app/src/component/base/_Selection.js @@ -2,8 +2,8 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/base/_SelectionBase" - , "redmic/modules/base/_SelectionItfc" + , "src/component/base/_SelectionBase" + , "src/component/base/_SelectionItfc" ], function( declare , lang diff --git a/client-app/src/redmic/modules/base/_SelectionBase.js b/client-app/src/component/base/_SelectionBase.js similarity index 100% rename from client-app/src/redmic/modules/base/_SelectionBase.js rename to client-app/src/component/base/_SelectionBase.js diff --git a/client-app/src/redmic/modules/base/_SelectionItfc.js b/client-app/src/component/base/_SelectionItfc.js similarity index 94% rename from client-app/src/redmic/modules/base/_SelectionItfc.js rename to client-app/src/component/base/_SelectionItfc.js index 48698433..38d33f98 100644 --- a/client-app/src/redmic/modules/base/_SelectionItfc.js +++ b/client-app/src/component/base/_SelectionItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/client-app/src/redmic/modules/base/_Show.js b/client-app/src/component/base/_Show.js similarity index 99% rename from client-app/src/redmic/modules/base/_Show.js rename to client-app/src/component/base/_Show.js index 67ff20ba..9e251cf3 100644 --- a/client-app/src/redmic/modules/base/_Show.js +++ b/client-app/src/component/base/_Show.js @@ -5,8 +5,8 @@ define([ , "dojo/Deferred" , "dojo/query" , "put-selector/put" - , "redmic/modules/base/_ListenWindowResize" - , "redmic/modules/base/_ShowItfc" + , "src/component/base/_ListenWindowResize" + , "src/component/base/_ShowItfc" ], function( declare , lang diff --git a/client-app/src/redmic/modules/base/_ShowInPopup.js b/client-app/src/component/base/_ShowInPopup.js similarity index 100% rename from client-app/src/redmic/modules/base/_ShowInPopup.js rename to client-app/src/component/base/_ShowInPopup.js diff --git a/client-app/src/redmic/modules/base/_ShowInTooltip.js b/client-app/src/component/base/_ShowInTooltip.js similarity index 100% rename from client-app/src/redmic/modules/base/_ShowInTooltip.js rename to client-app/src/component/base/_ShowInTooltip.js diff --git a/client-app/src/redmic/modules/base/_ShowItfc.js b/client-app/src/component/base/_ShowItfc.js similarity index 95% rename from client-app/src/redmic/modules/base/_ShowItfc.js rename to client-app/src/component/base/_ShowItfc.js index 79d9feaa..9f41b9b1 100644 --- a/client-app/src/redmic/modules/base/_ShowItfc.js +++ b/client-app/src/component/base/_ShowItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/client-app/src/redmic/modules/base/_ShowOnEvt.js b/client-app/src/component/base/_ShowOnEvt.js similarity index 100% rename from client-app/src/redmic/modules/base/_ShowOnEvt.js rename to client-app/src/component/base/_ShowOnEvt.js diff --git a/client-app/src/redmic/modules/base/_Store.js b/client-app/src/component/base/_Store.js similarity index 99% rename from client-app/src/redmic/modules/base/_Store.js rename to client-app/src/component/base/_Store.js index 78310e2c..b3b77013 100644 --- a/client-app/src/redmic/modules/base/_Store.js +++ b/client-app/src/component/base/_Store.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/base/_StoreItfc" + , "src/component/base/_StoreItfc" ], function( declare , lang diff --git a/client-app/src/redmic/modules/base/_StoreItfc.js b/client-app/src/component/base/_StoreItfc.js similarity index 95% rename from client-app/src/redmic/modules/base/_StoreItfc.js rename to client-app/src/component/base/_StoreItfc.js index 48ac38f4..7e1fa26f 100644 --- a/client-app/src/redmic/modules/base/_StoreItfc.js +++ b/client-app/src/component/base/_StoreItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/client-app/src/redmic/modules/base/_Window.js b/client-app/src/component/base/_Window.js similarity index 100% rename from client-app/src/redmic/modules/base/_Window.js rename to client-app/src/component/base/_Window.js diff --git a/client-app/src/redmic/modules/browser/Browser.js b/client-app/src/component/browser/Browser.js similarity index 99% rename from client-app/src/redmic/modules/browser/Browser.js rename to client-app/src/component/browser/Browser.js index 20a75d66..1099b172 100644 --- a/client-app/src/redmic/modules/browser/Browser.js +++ b/client-app/src/component/browser/Browser.js @@ -2,9 +2,9 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" - , "redmic/modules/base/_Store" + , "src/component/base/_Module" + , "src/component/base/_Show" + , "src/component/base/_Store" , "put-selector/put" , "./_BrowserItfc" , "./_NoDataTemplate" diff --git a/client-app/src/redmic/modules/browser/HierarchicalImpl.js b/client-app/src/component/browser/HierarchicalImpl.js similarity index 100% rename from client-app/src/redmic/modules/browser/HierarchicalImpl.js rename to client-app/src/component/browser/HierarchicalImpl.js diff --git a/client-app/src/redmic/modules/browser/ListImpl.js b/client-app/src/component/browser/ListImpl.js similarity index 100% rename from client-app/src/redmic/modules/browser/ListImpl.js rename to client-app/src/component/browser/ListImpl.js diff --git a/client-app/src/redmic/modules/browser/_BrowserItfc.js b/client-app/src/component/browser/_BrowserItfc.js similarity index 92% rename from client-app/src/redmic/modules/browser/_BrowserItfc.js rename to client-app/src/component/browser/_BrowserItfc.js index f1e14b44..d963d254 100644 --- a/client-app/src/redmic/modules/browser/_BrowserItfc.js +++ b/client-app/src/component/browser/_BrowserItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/client-app/src/redmic/modules/browser/_ButtonsInRow.js b/client-app/src/component/browser/_ButtonsInRow.js similarity index 100% rename from client-app/src/redmic/modules/browser/_ButtonsInRow.js rename to client-app/src/component/browser/_ButtonsInRow.js diff --git a/client-app/src/redmic/modules/browser/_DataTypeParser.js b/client-app/src/component/browser/_DataTypeParser.js similarity index 100% rename from client-app/src/redmic/modules/browser/_DataTypeParser.js rename to client-app/src/component/browser/_DataTypeParser.js diff --git a/client-app/src/redmic/modules/browser/_DragAndDrop.js b/client-app/src/component/browser/_DragAndDrop.js similarity index 100% rename from client-app/src/redmic/modules/browser/_DragAndDrop.js rename to client-app/src/component/browser/_DragAndDrop.js diff --git a/client-app/src/redmic/modules/browser/_EditionTable.js b/client-app/src/component/browser/_EditionTable.js similarity index 96% rename from client-app/src/redmic/modules/browser/_EditionTable.js rename to client-app/src/component/browser/_EditionTable.js index d98057f8..6373a038 100644 --- a/client-app/src/redmic/modules/browser/_EditionTable.js +++ b/client-app/src/component/browser/_EditionTable.js @@ -3,10 +3,10 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/base/_Persistence" - , "redmic/modules/form/_ShowInTableList" - , "redmic/modules/form/FormContainerImpl" - , "redmic/modules/form/_ListenModelHasChanged" + , "src/component/base/_Persistence" + , "src/component/form/_ShowInTableList" + , "src/component/form/FormContainerImpl" + , "src/component/form/_ListenModelHasChanged" , "app/base/views/extensions/_Edition" , "RWidgets/Button" , "put-selector/put" diff --git a/client-app/src/redmic/modules/browser/_Framework.js b/client-app/src/component/browser/_Framework.js similarity index 100% rename from client-app/src/redmic/modules/browser/_Framework.js rename to client-app/src/component/browser/_Framework.js diff --git a/client-app/src/redmic/modules/browser/_GeoJsonParser.js b/client-app/src/component/browser/_GeoJsonParser.js similarity index 100% rename from client-app/src/redmic/modules/browser/_GeoJsonParser.js rename to client-app/src/component/browser/_GeoJsonParser.js diff --git a/client-app/src/redmic/modules/browser/_HierarchicalDragAndDrop.js b/client-app/src/component/browser/_HierarchicalDragAndDrop.js similarity index 100% rename from client-app/src/redmic/modules/browser/_HierarchicalDragAndDrop.js rename to client-app/src/component/browser/_HierarchicalDragAndDrop.js diff --git a/client-app/src/redmic/modules/browser/_HierarchicalLazyLoad.js b/client-app/src/component/browser/_HierarchicalLazyLoad.js similarity index 100% rename from client-app/src/redmic/modules/browser/_HierarchicalLazyLoad.js rename to client-app/src/component/browser/_HierarchicalLazyLoad.js diff --git a/client-app/src/redmic/modules/browser/_HierarchicalSelect.js b/client-app/src/component/browser/_HierarchicalSelect.js similarity index 100% rename from client-app/src/redmic/modules/browser/_HierarchicalSelect.js rename to client-app/src/component/browser/_HierarchicalSelect.js diff --git a/client-app/src/redmic/modules/browser/_HierarchicalTable.js b/client-app/src/component/browser/_HierarchicalTable.js similarity index 100% rename from client-app/src/redmic/modules/browser/_HierarchicalTable.js rename to client-app/src/component/browser/_HierarchicalTable.js diff --git a/client-app/src/redmic/modules/browser/_MultiTemplate.js b/client-app/src/component/browser/_MultiTemplate.js similarity index 100% rename from client-app/src/redmic/modules/browser/_MultiTemplate.js rename to client-app/src/component/browser/_MultiTemplate.js diff --git a/client-app/src/redmic/modules/browser/_NoDataTemplate.js b/client-app/src/component/browser/_NoDataTemplate.js similarity index 100% rename from client-app/src/redmic/modules/browser/_NoDataTemplate.js rename to client-app/src/component/browser/_NoDataTemplate.js diff --git a/client-app/src/redmic/modules/browser/_Select.js b/client-app/src/component/browser/_Select.js similarity index 99% rename from client-app/src/redmic/modules/browser/_Select.js rename to client-app/src/component/browser/_Select.js index 98dac949..4ba80578 100644 --- a/client-app/src/redmic/modules/browser/_Select.js +++ b/client-app/src/component/browser/_Select.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/base/_Selection" + , "src/component/base/_Selection" , "./row/_Select" ], function( declare diff --git a/client-app/src/redmic/modules/browser/_Table.js b/client-app/src/component/browser/_Table.js similarity index 98% rename from client-app/src/redmic/modules/browser/_Table.js rename to client-app/src/component/browser/_Table.js index d239be3b..a1402bdb 100644 --- a/client-app/src/redmic/modules/browser/_Table.js +++ b/client-app/src/component/browser/_Table.js @@ -2,9 +2,9 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/base/_ShowInTooltip" - , "redmic/modules/base/_ShowOnEvt" - , "redmic/modules/layout/listMenu/ListMenu" + , "src/component/base/_ShowInTooltip" + , "src/component/base/_ShowOnEvt" + , "src/component/layout/listMenu/ListMenu" , "put-selector/put" , "./row/_Table" ], function( diff --git a/client-app/src/redmic/modules/browser/bars/Order.js b/client-app/src/component/browser/bars/Order.js similarity index 98% rename from client-app/src/redmic/modules/browser/bars/Order.js rename to client-app/src/component/browser/bars/Order.js index 9d44992c..c72ca9ff 100644 --- a/client-app/src/redmic/modules/browser/bars/Order.js +++ b/client-app/src/component/browser/bars/Order.js @@ -3,8 +3,8 @@ define([ , "dojo/_base/lang" , "dojo/aspect" , "put-selector/put" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" + , "src/component/base/_Module" + , "src/component/base/_Show" ], function( declare , lang diff --git a/client-app/src/redmic/modules/browser/bars/Pagination.js b/client-app/src/component/browser/bars/Pagination.js similarity index 98% rename from client-app/src/redmic/modules/browser/bars/Pagination.js rename to client-app/src/component/browser/bars/Pagination.js index 0928bb87..73fc3b2a 100644 --- a/client-app/src/redmic/modules/browser/bars/Pagination.js +++ b/client-app/src/component/browser/bars/Pagination.js @@ -3,9 +3,9 @@ define([ , "dojo/_base/lang" , "dojo/aspect" , "put-selector/put" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" - , "redmic/modules/base/_Store" + , "src/component/base/_Module" + , "src/component/base/_Show" + , "src/component/base/_Store" ], function( declare , lang diff --git a/client-app/src/redmic/modules/browser/bars/SelectionBox.js b/client-app/src/component/browser/bars/SelectionBox.js similarity index 96% rename from client-app/src/redmic/modules/browser/bars/SelectionBox.js rename to client-app/src/component/browser/bars/SelectionBox.js index 6d7bb277..8efd924e 100644 --- a/client-app/src/redmic/modules/browser/bars/SelectionBox.js +++ b/client-app/src/component/browser/bars/SelectionBox.js @@ -3,10 +3,10 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "src/utils/Credentials" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" - , "redmic/modules/selection/SelectionBox" - , "redmic/modules/browser/bars/_SelectBox" + , "src/component/base/_Module" + , "src/component/base/_Show" + , "src/component/selection/SelectionBox" + , "src/component/browser/bars/_SelectBox" , "put-selector/put" ], function( alertify diff --git a/client-app/src/redmic/modules/browser/bars/Total.js b/client-app/src/component/browser/bars/Total.js similarity index 95% rename from client-app/src/redmic/modules/browser/bars/Total.js rename to client-app/src/component/browser/bars/Total.js index 202839f7..a7685fa4 100644 --- a/client-app/src/redmic/modules/browser/bars/Total.js +++ b/client-app/src/component/browser/bars/Total.js @@ -3,9 +3,9 @@ define([ , "dojo/_base/lang" , "dojo/aspect" , "put-selector/put" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" - , "redmic/modules/base/_Store" + , "src/component/base/_Module" + , "src/component/base/_Show" + , "src/component/base/_Store" ], function( declare , lang diff --git a/client-app/src/redmic/modules/browser/bars/_SelectBox.js b/client-app/src/component/browser/bars/_SelectBox.js similarity index 100% rename from client-app/src/redmic/modules/browser/bars/_SelectBox.js rename to client-app/src/component/browser/bars/_SelectBox.js diff --git a/client-app/src/redmic/modules/browser/buttons/Buttons.js b/client-app/src/component/browser/buttons/Buttons.js similarity index 99% rename from client-app/src/redmic/modules/browser/buttons/Buttons.js rename to client-app/src/component/browser/buttons/Buttons.js index 512b016b..3f6d8a9e 100644 --- a/client-app/src/redmic/modules/browser/buttons/Buttons.js +++ b/client-app/src/component/browser/buttons/Buttons.js @@ -2,8 +2,8 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/dom-class" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" + , "src/component/base/_Module" + , "src/component/base/_Show" , 'RWidgets/Utilities' , "put-selector/put" , "./_ButtonsItfc" diff --git a/client-app/src/redmic/modules/browser/buttons/_ButtonsItfc.js b/client-app/src/component/browser/buttons/_ButtonsItfc.js similarity index 91% rename from client-app/src/redmic/modules/browser/buttons/_ButtonsItfc.js rename to client-app/src/component/browser/buttons/_ButtonsItfc.js index d8acd2b8..370a97a1 100644 --- a/client-app/src/redmic/modules/browser/buttons/_ButtonsItfc.js +++ b/client-app/src/component/browser/buttons/_ButtonsItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/client-app/src/redmic/modules/browser/buttons/_GroupButtons.js b/client-app/src/component/browser/buttons/_GroupButtons.js similarity index 100% rename from client-app/src/redmic/modules/browser/buttons/_GroupButtons.js rename to client-app/src/component/browser/buttons/_GroupButtons.js diff --git a/client-app/src/redmic/modules/browser/row/Row.js b/client-app/src/component/browser/row/Row.js similarity index 98% rename from client-app/src/redmic/modules/browser/row/Row.js rename to client-app/src/component/browser/row/Row.js index 14c3d057..33d4a076 100644 --- a/client-app/src/redmic/modules/browser/row/Row.js +++ b/client-app/src/component/browser/row/Row.js @@ -1,8 +1,8 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" + , "src/component/base/_Module" + , "src/component/base/_Show" , "RWidgets/Utilities" , "put-selector/put" , "./_RowItfc" diff --git a/client-app/src/redmic/modules/browser/row/_Buttons.js b/client-app/src/component/browser/row/_Buttons.js similarity index 95% rename from client-app/src/redmic/modules/browser/row/_Buttons.js rename to client-app/src/component/browser/row/_Buttons.js index 17b7323e..62ff8d46 100644 --- a/client-app/src/redmic/modules/browser/row/_Buttons.js +++ b/client-app/src/component/browser/row/_Buttons.js @@ -2,8 +2,8 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/browser/buttons/Buttons" - , "redmic/modules/browser/buttons/_GroupButtons" + , "src/component/browser/buttons/Buttons" + , "src/component/browser/buttons/_GroupButtons" ], function( declare , lang diff --git a/client-app/src/redmic/modules/browser/row/_Hierarchical.js b/client-app/src/component/browser/row/_Hierarchical.js similarity index 100% rename from client-app/src/redmic/modules/browser/row/_Hierarchical.js rename to client-app/src/component/browser/row/_Hierarchical.js diff --git a/client-app/src/redmic/modules/browser/row/_HierarchicalSelect.js b/client-app/src/component/browser/row/_HierarchicalSelect.js similarity index 100% rename from client-app/src/redmic/modules/browser/row/_HierarchicalSelect.js rename to client-app/src/component/browser/row/_HierarchicalSelect.js diff --git a/client-app/src/redmic/modules/browser/row/_HierarchicalTable.js b/client-app/src/component/browser/row/_HierarchicalTable.js similarity index 100% rename from client-app/src/redmic/modules/browser/row/_HierarchicalTable.js rename to client-app/src/component/browser/row/_HierarchicalTable.js diff --git a/client-app/src/redmic/modules/browser/row/_RowItfc.js b/client-app/src/component/browser/row/_RowItfc.js similarity index 91% rename from client-app/src/redmic/modules/browser/row/_RowItfc.js rename to client-app/src/component/browser/row/_RowItfc.js index d8acd2b8..370a97a1 100644 --- a/client-app/src/redmic/modules/browser/row/_RowItfc.js +++ b/client-app/src/component/browser/row/_RowItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/client-app/src/redmic/modules/browser/row/_Select.js b/client-app/src/component/browser/row/_Select.js similarity index 100% rename from client-app/src/redmic/modules/browser/row/_Select.js rename to client-app/src/component/browser/row/_Select.js diff --git a/client-app/src/redmic/modules/browser/row/_Table.js b/client-app/src/component/browser/row/_Table.js similarity index 100% rename from client-app/src/redmic/modules/browser/row/_Table.js rename to client-app/src/component/browser/row/_Table.js diff --git a/client-app/src/redmic/modules/chart/ChartsContainer/ChartsContainer.js b/client-app/src/component/chart/ChartsContainer/ChartsContainer.js similarity index 99% rename from client-app/src/redmic/modules/chart/ChartsContainer/ChartsContainer.js rename to client-app/src/component/chart/ChartsContainer/ChartsContainer.js index 0f09a6bc..b180edff 100644 --- a/client-app/src/redmic/modules/chart/ChartsContainer/ChartsContainer.js +++ b/client-app/src/component/chart/ChartsContainer/ChartsContainer.js @@ -5,8 +5,8 @@ define([ , "dojo/Deferred" , "put-selector/put" , "RWidgets/Utilities" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" + , "src/component/base/_Module" + , "src/component/base/_Show" , "./_ChartsContainerItfc" ], function( d3 diff --git a/client-app/src/redmic/modules/chart/ChartsContainer/InfoChartsContainerImpl.js b/client-app/src/component/chart/ChartsContainer/InfoChartsContainerImpl.js similarity index 100% rename from client-app/src/redmic/modules/chart/ChartsContainer/InfoChartsContainerImpl.js rename to client-app/src/component/chart/ChartsContainer/InfoChartsContainerImpl.js diff --git a/client-app/src/redmic/modules/chart/ChartsContainer/SliderChartsContainerImpl.js b/client-app/src/component/chart/ChartsContainer/SliderChartsContainerImpl.js similarity index 99% rename from client-app/src/redmic/modules/chart/ChartsContainer/SliderChartsContainerImpl.js rename to client-app/src/component/chart/ChartsContainer/SliderChartsContainerImpl.js index a9c1b4e9..312c94ec 100644 --- a/client-app/src/redmic/modules/chart/ChartsContainer/SliderChartsContainerImpl.js +++ b/client-app/src/component/chart/ChartsContainer/SliderChartsContainerImpl.js @@ -7,7 +7,7 @@ define([ , 'dojo/aspect' , 'dojo/Deferred' , 'moment/moment.min' - , 'redmic/modules/chart/ChartsContainer/_TemporalAxisDrawing' + , 'src/component/chart/ChartsContainer/_TemporalAxisDrawing' , './ChartsContainer' ], function( d3 diff --git a/client-app/src/redmic/modules/chart/ChartsContainer/_AngularAxisDrawing.js b/client-app/src/component/chart/ChartsContainer/_AngularAxisDrawing.js similarity index 98% rename from client-app/src/redmic/modules/chart/ChartsContainer/_AngularAxisDrawing.js rename to client-app/src/component/chart/ChartsContainer/_AngularAxisDrawing.js index b2ca19a4..9c490682 100644 --- a/client-app/src/redmic/modules/chart/ChartsContainer/_AngularAxisDrawing.js +++ b/client-app/src/component/chart/ChartsContainer/_AngularAxisDrawing.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/chart/layer/Axis/AngularAxisImpl" + , "src/component/chart/layer/Axis/AngularAxisImpl" , "./_AxesDrawing" ], function( declare diff --git a/client-app/src/redmic/modules/chart/ChartsContainer/_AngularAxisWithGridDrawing.js b/client-app/src/component/chart/ChartsContainer/_AngularAxisWithGridDrawing.js similarity index 96% rename from client-app/src/redmic/modules/chart/ChartsContainer/_AngularAxisWithGridDrawing.js rename to client-app/src/component/chart/ChartsContainer/_AngularAxisWithGridDrawing.js index 5c0e9c19..3856e222 100644 --- a/client-app/src/redmic/modules/chart/ChartsContainer/_AngularAxisWithGridDrawing.js +++ b/client-app/src/component/chart/ChartsContainer/_AngularAxisWithGridDrawing.js @@ -1,8 +1,8 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/chart/ChartsContainer/_AngularAxisDrawing" - , "redmic/modules/chart/layer/Axis/RadialGridAxisImpl" + , "src/component/chart/ChartsContainer/_AngularAxisDrawing" + , "src/component/chart/layer/Axis/RadialGridAxisImpl" ], function( declare , lang diff --git a/client-app/src/redmic/modules/chart/ChartsContainer/_AxesDrawing.js b/client-app/src/component/chart/ChartsContainer/_AxesDrawing.js similarity index 100% rename from client-app/src/redmic/modules/chart/ChartsContainer/_AxesDrawing.js rename to client-app/src/component/chart/ChartsContainer/_AxesDrawing.js diff --git a/client-app/src/redmic/modules/chart/ChartsContainer/_AxesDrawingItfc.js b/client-app/src/component/chart/ChartsContainer/_AxesDrawingItfc.js similarity index 95% rename from client-app/src/redmic/modules/chart/ChartsContainer/_AxesDrawingItfc.js rename to client-app/src/component/chart/ChartsContainer/_AxesDrawingItfc.js index 3750911e..95d6cab7 100644 --- a/client-app/src/redmic/modules/chart/ChartsContainer/_AxesDrawingItfc.js +++ b/client-app/src/component/chart/ChartsContainer/_AxesDrawingItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/client-app/src/redmic/modules/chart/ChartsContainer/_BreadcrumbsBar.js b/client-app/src/component/chart/ChartsContainer/_BreadcrumbsBar.js similarity index 100% rename from client-app/src/redmic/modules/chart/ChartsContainer/_BreadcrumbsBar.js rename to client-app/src/component/chart/ChartsContainer/_BreadcrumbsBar.js diff --git a/client-app/src/redmic/modules/chart/ChartsContainer/_ChartsContainerItfc.js b/client-app/src/component/chart/ChartsContainer/_ChartsContainerItfc.js similarity index 96% rename from client-app/src/redmic/modules/chart/ChartsContainer/_ChartsContainerItfc.js rename to client-app/src/component/chart/ChartsContainer/_ChartsContainerItfc.js index 098cde3a..82c31638 100644 --- a/client-app/src/redmic/modules/chart/ChartsContainer/_ChartsContainerItfc.js +++ b/client-app/src/component/chart/ChartsContainer/_ChartsContainerItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/client-app/src/redmic/modules/chart/ChartsContainer/_ColorSelection.js b/client-app/src/component/chart/ChartsContainer/_ColorSelection.js similarity index 100% rename from client-app/src/redmic/modules/chart/ChartsContainer/_ColorSelection.js rename to client-app/src/component/chart/ChartsContainer/_ColorSelection.js diff --git a/client-app/src/redmic/modules/chart/ChartsContainer/_ColorSelectionItfc.js b/client-app/src/component/chart/ChartsContainer/_ColorSelectionItfc.js similarity index 92% rename from client-app/src/redmic/modules/chart/ChartsContainer/_ColorSelectionItfc.js rename to client-app/src/component/chart/ChartsContainer/_ColorSelectionItfc.js index 8b1246e1..53f878de 100644 --- a/client-app/src/redmic/modules/chart/ChartsContainer/_ColorSelectionItfc.js +++ b/client-app/src/component/chart/ChartsContainer/_ColorSelectionItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/client-app/src/redmic/modules/chart/ChartsContainer/_DomainHistoryNavigation.js b/client-app/src/component/chart/ChartsContainer/_DomainHistoryNavigation.js similarity index 100% rename from client-app/src/redmic/modules/chart/ChartsContainer/_DomainHistoryNavigation.js rename to client-app/src/component/chart/ChartsContainer/_DomainHistoryNavigation.js diff --git a/client-app/src/redmic/modules/chart/ChartsContainer/_GroupedLegendBar.js b/client-app/src/component/chart/ChartsContainer/_GroupedLegendBar.js similarity index 100% rename from client-app/src/redmic/modules/chart/ChartsContainer/_GroupedLegendBar.js rename to client-app/src/component/chart/ChartsContainer/_GroupedLegendBar.js diff --git a/client-app/src/redmic/modules/chart/ChartsContainer/_InfoOnEmptyData.js b/client-app/src/component/chart/ChartsContainer/_InfoOnEmptyData.js similarity index 100% rename from client-app/src/redmic/modules/chart/ChartsContainer/_InfoOnEmptyData.js rename to client-app/src/component/chart/ChartsContainer/_InfoOnEmptyData.js diff --git a/client-app/src/redmic/modules/chart/ChartsContainer/_InfoOnLayerEvent.js b/client-app/src/component/chart/ChartsContainer/_InfoOnLayerEvent.js similarity index 100% rename from client-app/src/redmic/modules/chart/ChartsContainer/_InfoOnLayerEvent.js rename to client-app/src/component/chart/ChartsContainer/_InfoOnLayerEvent.js diff --git a/client-app/src/redmic/modules/chart/ChartsContainer/_InfoOnLayerEventItfc.js b/client-app/src/component/chart/ChartsContainer/_InfoOnLayerEventItfc.js similarity index 92% rename from client-app/src/redmic/modules/chart/ChartsContainer/_InfoOnLayerEventItfc.js rename to client-app/src/component/chart/ChartsContainer/_InfoOnLayerEventItfc.js index e3f33050..106d749f 100644 --- a/client-app/src/redmic/modules/chart/ChartsContainer/_InfoOnLayerEventItfc.js +++ b/client-app/src/component/chart/ChartsContainer/_InfoOnLayerEventItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/client-app/src/redmic/modules/chart/ChartsContainer/_InfoOnMouseOver.js b/client-app/src/component/chart/ChartsContainer/_InfoOnMouseOver.js similarity index 100% rename from client-app/src/redmic/modules/chart/ChartsContainer/_InfoOnMouseOver.js rename to client-app/src/component/chart/ChartsContainer/_InfoOnMouseOver.js diff --git a/client-app/src/redmic/modules/chart/ChartsContainer/_InfoOnZeroValueData.js b/client-app/src/component/chart/ChartsContainer/_InfoOnZeroValueData.js similarity index 100% rename from client-app/src/redmic/modules/chart/ChartsContainer/_InfoOnZeroValueData.js rename to client-app/src/component/chart/ChartsContainer/_InfoOnZeroValueData.js diff --git a/client-app/src/redmic/modules/chart/ChartsContainer/_InfoTooltipManagement.js b/client-app/src/component/chart/ChartsContainer/_InfoTooltipManagement.js similarity index 100% rename from client-app/src/redmic/modules/chart/ChartsContainer/_InfoTooltipManagement.js rename to client-app/src/component/chart/ChartsContainer/_InfoTooltipManagement.js diff --git a/client-app/src/redmic/modules/chart/ChartsContainer/_LayerColorSelection.js b/client-app/src/component/chart/ChartsContainer/_LayerColorSelection.js similarity index 98% rename from client-app/src/redmic/modules/chart/ChartsContainer/_LayerColorSelection.js rename to client-app/src/component/chart/ChartsContainer/_LayerColorSelection.js index e548d6f9..c31d3c49 100644 --- a/client-app/src/redmic/modules/chart/ChartsContainer/_LayerColorSelection.js +++ b/client-app/src/component/chart/ChartsContainer/_LayerColorSelection.js @@ -3,7 +3,7 @@ define([ , "dojo/_base/lang" , "dojo/aspect" , "RWidgets/Utilities" - , "redmic/modules/chart/ChartsContainer/_ColorSelection" + , "src/component/chart/ChartsContainer/_ColorSelection" ], function( declare , lang diff --git a/client-app/src/redmic/modules/chart/ChartsContainer/_LegendBar.js b/client-app/src/component/chart/ChartsContainer/_LegendBar.js similarity index 100% rename from client-app/src/redmic/modules/chart/ChartsContainer/_LegendBar.js rename to client-app/src/component/chart/ChartsContainer/_LegendBar.js diff --git a/client-app/src/redmic/modules/chart/ChartsContainer/_LegendBarCommons.js b/client-app/src/component/chart/ChartsContainer/_LegendBarCommons.js similarity index 100% rename from client-app/src/redmic/modules/chart/ChartsContainer/_LegendBarCommons.js rename to client-app/src/component/chart/ChartsContainer/_LegendBarCommons.js diff --git a/client-app/src/redmic/modules/chart/ChartsContainer/_LegendBarCommonsItfc.js b/client-app/src/component/chart/ChartsContainer/_LegendBarCommonsItfc.js similarity index 93% rename from client-app/src/redmic/modules/chart/ChartsContainer/_LegendBarCommonsItfc.js rename to client-app/src/component/chart/ChartsContainer/_LegendBarCommonsItfc.js index dcfc5984..803fc90d 100644 --- a/client-app/src/redmic/modules/chart/ChartsContainer/_LegendBarCommonsItfc.js +++ b/client-app/src/component/chart/ChartsContainer/_LegendBarCommonsItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/client-app/src/redmic/modules/chart/ChartsContainer/_RadialAxisDrawing.js b/client-app/src/component/chart/ChartsContainer/_RadialAxisDrawing.js similarity index 99% rename from client-app/src/redmic/modules/chart/ChartsContainer/_RadialAxisDrawing.js rename to client-app/src/component/chart/ChartsContainer/_RadialAxisDrawing.js index cf7d3cc3..4a090282 100644 --- a/client-app/src/redmic/modules/chart/ChartsContainer/_RadialAxisDrawing.js +++ b/client-app/src/component/chart/ChartsContainer/_RadialAxisDrawing.js @@ -2,7 +2,7 @@ define([ 'd3/d3.min' , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/chart/layer/Axis/RadialAxisImpl" + , "src/component/chart/layer/Axis/RadialAxisImpl" , "./_AxesDrawing" ], function( d3 diff --git a/client-app/src/redmic/modules/chart/ChartsContainer/_RadialAxisWithGridDrawing.js b/client-app/src/component/chart/ChartsContainer/_RadialAxisWithGridDrawing.js similarity index 96% rename from client-app/src/redmic/modules/chart/ChartsContainer/_RadialAxisWithGridDrawing.js rename to client-app/src/component/chart/ChartsContainer/_RadialAxisWithGridDrawing.js index b9bd8648..f668cbd3 100644 --- a/client-app/src/redmic/modules/chart/ChartsContainer/_RadialAxisWithGridDrawing.js +++ b/client-app/src/component/chart/ChartsContainer/_RadialAxisWithGridDrawing.js @@ -1,8 +1,8 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/chart/ChartsContainer/_RadialAxisDrawing" - , "redmic/modules/chart/layer/Axis/AngularGridAxisImpl" + , "src/component/chart/ChartsContainer/_RadialAxisDrawing" + , "src/component/chart/layer/Axis/AngularGridAxisImpl" ], function( declare , lang diff --git a/client-app/src/redmic/modules/chart/ChartsContainer/_SummaryBox.js b/client-app/src/component/chart/ChartsContainer/_SummaryBox.js similarity index 100% rename from client-app/src/redmic/modules/chart/ChartsContainer/_SummaryBox.js rename to client-app/src/component/chart/ChartsContainer/_SummaryBox.js diff --git a/client-app/src/redmic/modules/chart/ChartsContainer/_TemporalAxisDrawing.js b/client-app/src/component/chart/ChartsContainer/_TemporalAxisDrawing.js similarity index 98% rename from client-app/src/redmic/modules/chart/ChartsContainer/_TemporalAxisDrawing.js rename to client-app/src/component/chart/ChartsContainer/_TemporalAxisDrawing.js index 56a5b245..0b06f082 100644 --- a/client-app/src/redmic/modules/chart/ChartsContainer/_TemporalAxisDrawing.js +++ b/client-app/src/component/chart/ChartsContainer/_TemporalAxisDrawing.js @@ -3,8 +3,8 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , 'moment/moment.min' - , "redmic/modules/chart/ChartsContainer/_DomainHistoryNavigation" - , "redmic/modules/chart/layer/Axis/TemporalAxisImpl" + , "src/component/chart/ChartsContainer/_DomainHistoryNavigation" + , "src/component/chart/layer/Axis/TemporalAxisImpl" , "./_AxesDrawing" ], function( d3 diff --git a/client-app/src/redmic/modules/chart/ChartsContainer/_TemporalAxisWithGridDrawing.js b/client-app/src/component/chart/ChartsContainer/_TemporalAxisWithGridDrawing.js similarity index 96% rename from client-app/src/redmic/modules/chart/ChartsContainer/_TemporalAxisWithGridDrawing.js rename to client-app/src/component/chart/ChartsContainer/_TemporalAxisWithGridDrawing.js index 826b2f0b..deb20bc0 100644 --- a/client-app/src/redmic/modules/chart/ChartsContainer/_TemporalAxisWithGridDrawing.js +++ b/client-app/src/component/chart/ChartsContainer/_TemporalAxisWithGridDrawing.js @@ -1,8 +1,8 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/chart/ChartsContainer/_TemporalAxisDrawing" - , "redmic/modules/chart/layer/Axis/VerticalGridAxisImpl" + , "src/component/chart/ChartsContainer/_TemporalAxisDrawing" + , "src/component/chart/layer/Axis/VerticalGridAxisImpl" ], function( declare , lang diff --git a/client-app/src/redmic/modules/chart/ChartsContainer/_VerticalAxesDrawing.js b/client-app/src/component/chart/ChartsContainer/_VerticalAxesDrawing.js similarity index 99% rename from client-app/src/redmic/modules/chart/ChartsContainer/_VerticalAxesDrawing.js rename to client-app/src/component/chart/ChartsContainer/_VerticalAxesDrawing.js index 24b54f0b..986322b9 100644 --- a/client-app/src/redmic/modules/chart/ChartsContainer/_VerticalAxesDrawing.js +++ b/client-app/src/component/chart/ChartsContainer/_VerticalAxesDrawing.js @@ -2,7 +2,7 @@ define([ 'd3/d3.min' , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/chart/layer/Axis/VerticalAxisImpl" + , "src/component/chart/layer/Axis/VerticalAxisImpl" , "./_AxesDrawing" ], function( d3 diff --git a/client-app/src/redmic/modules/chart/ChartsContainer/_VerticalAxesWithGridDrawing.js b/client-app/src/component/chart/ChartsContainer/_VerticalAxesWithGridDrawing.js similarity index 96% rename from client-app/src/redmic/modules/chart/ChartsContainer/_VerticalAxesWithGridDrawing.js rename to client-app/src/component/chart/ChartsContainer/_VerticalAxesWithGridDrawing.js index e6cc13ae..d7f9a800 100644 --- a/client-app/src/redmic/modules/chart/ChartsContainer/_VerticalAxesWithGridDrawing.js +++ b/client-app/src/component/chart/ChartsContainer/_VerticalAxesWithGridDrawing.js @@ -1,8 +1,8 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/chart/ChartsContainer/_VerticalAxesDrawing" - , "redmic/modules/chart/layer/Axis/HorizontalGridAxisImpl" + , "src/component/chart/ChartsContainer/_VerticalAxesDrawing" + , "src/component/chart/layer/Axis/HorizontalGridAxisImpl" ], function( declare , lang diff --git a/client-app/src/redmic/modules/chart/ChartsContainer/_ZoomByDragging.js b/client-app/src/component/chart/ChartsContainer/_ZoomByDragging.js similarity index 100% rename from client-app/src/redmic/modules/chart/ChartsContainer/_ZoomByDragging.js rename to client-app/src/component/chart/ChartsContainer/_ZoomByDragging.js diff --git a/client-app/src/redmic/modules/chart/SmartLegend/SmartLegend.js b/client-app/src/component/chart/SmartLegend/SmartLegend.js similarity index 98% rename from client-app/src/redmic/modules/chart/SmartLegend/SmartLegend.js rename to client-app/src/component/chart/SmartLegend/SmartLegend.js index 542f1190..ec884cce 100644 --- a/client-app/src/redmic/modules/chart/SmartLegend/SmartLegend.js +++ b/client-app/src/component/chart/SmartLegend/SmartLegend.js @@ -6,15 +6,15 @@ define([ , "dojo/query" , 'put-selector/put' , "RWidgets/Utilities" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" - , "redmic/modules/base/_Store" - , "redmic/modules/base/_ShowInTooltip" - , "redmic/modules/browser/_ButtonsInRow" - , "redmic/modules/browser/_Framework" - , "redmic/modules/browser/HierarchicalImpl" - , "redmic/modules/layout/listMenu/ListMenu" - , "redmic/modules/form/input/ColorPickerImpl" + , "src/component/base/_Module" + , "src/component/base/_Show" + , "src/component/base/_Store" + , "src/component/base/_ShowInTooltip" + , "src/component/browser/_ButtonsInRow" + , "src/component/browser/_Framework" + , "src/component/browser/HierarchicalImpl" + , "src/component/layout/listMenu/ListMenu" + , "src/component/form/input/ColorPickerImpl" , "./_SmartLegendItfc" ], function( ListController diff --git a/client-app/src/redmic/modules/chart/SmartLegend/TimeSeriesSmartLegendImpl.js b/client-app/src/component/chart/SmartLegend/TimeSeriesSmartLegendImpl.js similarity index 97% rename from client-app/src/redmic/modules/chart/SmartLegend/TimeSeriesSmartLegendImpl.js rename to client-app/src/component/chart/SmartLegend/TimeSeriesSmartLegendImpl.js index 434d0c2c..81410b47 100644 --- a/client-app/src/redmic/modules/chart/SmartLegend/TimeSeriesSmartLegendImpl.js +++ b/client-app/src/component/chart/SmartLegend/TimeSeriesSmartLegendImpl.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/chart/SmartLegend/SmartLegend" + , "src/component/chart/SmartLegend/SmartLegend" , "RWidgets/Utilities" , "templates/ChartListHierarchical" , "templates/ChartList" diff --git a/client-app/src/redmic/modules/chart/SmartLegend/_SmartLegendItfc.js b/client-app/src/component/chart/SmartLegend/_SmartLegendItfc.js similarity index 94% rename from client-app/src/redmic/modules/chart/SmartLegend/_SmartLegendItfc.js rename to client-app/src/component/chart/SmartLegend/_SmartLegendItfc.js index 8e4628da..aea7816b 100644 --- a/client-app/src/redmic/modules/chart/SmartLegend/_SmartLegendItfc.js +++ b/client-app/src/component/chart/SmartLegend/_SmartLegendItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/client-app/src/redmic/modules/chart/Toolbar/AggregationToolImpl.js b/client-app/src/component/chart/Toolbar/AggregationToolImpl.js similarity index 98% rename from client-app/src/redmic/modules/chart/Toolbar/AggregationToolImpl.js rename to client-app/src/component/chart/Toolbar/AggregationToolImpl.js index 746f16b9..f071d5cf 100644 --- a/client-app/src/redmic/modules/chart/Toolbar/AggregationToolImpl.js +++ b/client-app/src/component/chart/Toolbar/AggregationToolImpl.js @@ -4,9 +4,9 @@ define([ , "dojo/_base/lang" , "dojo/aspect" , "RWidgets/Utilities" - , "redmic/modules/base/_ShowInTooltip" - , "redmic/modules/base/_ShowOnEvt" - , "redmic/modules/layout/listMenu/ListMenu" + , "src/component/base/_ShowInTooltip" + , "src/component/base/_ShowOnEvt" + , "src/component/layout/listMenu/ListMenu" , "put-selector/put" , "./Toolbar" ], function( diff --git a/client-app/src/redmic/modules/chart/Toolbar/DataSelectorImpl.js b/client-app/src/component/chart/Toolbar/DataSelectorImpl.js similarity index 95% rename from client-app/src/redmic/modules/chart/Toolbar/DataSelectorImpl.js rename to client-app/src/component/chart/Toolbar/DataSelectorImpl.js index 47ea30dd..7c14e1a1 100644 --- a/client-app/src/redmic/modules/chart/Toolbar/DataSelectorImpl.js +++ b/client-app/src/component/chart/Toolbar/DataSelectorImpl.js @@ -3,9 +3,9 @@ define([ , "dojo/_base/lang" , "dojo/aspect" , "RWidgets/Utilities" - , "redmic/modules/base/_ShowInTooltip" - , "redmic/modules/base/_ShowOnEvt" - , "redmic/modules/layout/listMenu/ListMenu" + , "src/component/base/_ShowInTooltip" + , "src/component/base/_ShowOnEvt" + , "src/component/layout/listMenu/ListMenu" , "put-selector/put" , "./Toolbar" ], function( diff --git a/client-app/src/redmic/modules/chart/Toolbar/DateFilterImpl.js b/client-app/src/component/chart/Toolbar/DateFilterImpl.js similarity index 94% rename from client-app/src/redmic/modules/chart/Toolbar/DateFilterImpl.js rename to client-app/src/component/chart/Toolbar/DateFilterImpl.js index 63cb9de5..a32b94f8 100644 --- a/client-app/src/redmic/modules/chart/Toolbar/DateFilterImpl.js +++ b/client-app/src/component/chart/Toolbar/DateFilterImpl.js @@ -3,9 +3,9 @@ define([ , "dojo/_base/lang" , "dojo/aspect" , "RWidgets/Utilities" - , "redmic/modules/base/_ShowInTooltip" - , "redmic/modules/base/_ShowOnEvt" - , "redmic/modules/form/input/DateRangeComplexImpl" + , "src/component/base/_ShowInTooltip" + , "src/component/base/_ShowOnEvt" + , "src/component/form/input/DateRangeComplexImpl" , "put-selector/put" , "./Toolbar" ], function( diff --git a/client-app/src/redmic/modules/chart/Toolbar/GridManagementImpl.js b/client-app/src/component/chart/Toolbar/GridManagementImpl.js similarity index 98% rename from client-app/src/redmic/modules/chart/Toolbar/GridManagementImpl.js rename to client-app/src/component/chart/Toolbar/GridManagementImpl.js index 5fa55990..15a0388a 100644 --- a/client-app/src/redmic/modules/chart/Toolbar/GridManagementImpl.js +++ b/client-app/src/component/chart/Toolbar/GridManagementImpl.js @@ -3,9 +3,9 @@ define([ , "dojo/_base/lang" , "dojo/aspect" , "RWidgets/Utilities" - , "redmic/modules/base/_ShowInTooltip" - , "redmic/modules/base/_ShowOnEvt" - , "redmic/modules/layout/listMenu/ListMenu" + , "src/component/base/_ShowInTooltip" + , "src/component/base/_ShowOnEvt" + , "src/component/layout/listMenu/ListMenu" , "put-selector/put" , "./Toolbar" ], function( diff --git a/client-app/src/redmic/modules/chart/Toolbar/SliderSelectorImpl.js b/client-app/src/component/chart/Toolbar/SliderSelectorImpl.js similarity index 95% rename from client-app/src/redmic/modules/chart/Toolbar/SliderSelectorImpl.js rename to client-app/src/component/chart/Toolbar/SliderSelectorImpl.js index bbae70c7..87295815 100644 --- a/client-app/src/redmic/modules/chart/Toolbar/SliderSelectorImpl.js +++ b/client-app/src/component/chart/Toolbar/SliderSelectorImpl.js @@ -3,9 +3,9 @@ define([ , "dojo/_base/lang" , "dojo/aspect" , "RWidgets/Utilities" - , "redmic/modules/base/_ShowInTooltip" - , "redmic/modules/base/_ShowOnEvt" - , "redmic/modules/form/input/SliderImpl" + , "src/component/base/_ShowInTooltip" + , "src/component/base/_ShowOnEvt" + , "src/component/form/input/SliderImpl" , "put-selector/put" , "./Toolbar" ], function( diff --git a/client-app/src/redmic/modules/chart/Toolbar/Toolbar.js b/client-app/src/component/chart/Toolbar/Toolbar.js similarity index 92% rename from client-app/src/redmic/modules/chart/Toolbar/Toolbar.js rename to client-app/src/component/chart/Toolbar/Toolbar.js index 2d1121ed..be4eb91b 100644 --- a/client-app/src/redmic/modules/chart/Toolbar/Toolbar.js +++ b/client-app/src/component/chart/Toolbar/Toolbar.js @@ -1,8 +1,8 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" + , "src/component/base/_Module" + , "src/component/base/_Show" , "./_ToolbarItfc" ], function( declare diff --git a/client-app/src/redmic/modules/chart/Toolbar/_ToolbarItfc.js b/client-app/src/component/chart/Toolbar/_ToolbarItfc.js similarity index 92% rename from client-app/src/redmic/modules/chart/Toolbar/_ToolbarItfc.js rename to client-app/src/component/chart/Toolbar/_ToolbarItfc.js index 2c449800..ed419ac9 100644 --- a/client-app/src/redmic/modules/chart/Toolbar/_ToolbarItfc.js +++ b/client-app/src/component/chart/Toolbar/_ToolbarItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/client-app/src/redmic/modules/chart/layer/Axis/AngularAxisImpl.js b/client-app/src/component/chart/layer/Axis/AngularAxisImpl.js similarity index 98% rename from client-app/src/redmic/modules/chart/layer/Axis/AngularAxisImpl.js rename to client-app/src/component/chart/layer/Axis/AngularAxisImpl.js index 53b167f7..01ad1530 100644 --- a/client-app/src/redmic/modules/chart/layer/Axis/AngularAxisImpl.js +++ b/client-app/src/component/chart/layer/Axis/AngularAxisImpl.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/chart/layer/_PolarLayerCommons" + , "src/component/chart/layer/_PolarLayerCommons" , "./Axis" ], function( declare diff --git a/client-app/src/redmic/modules/chart/layer/Axis/AngularGridAxisImpl.js b/client-app/src/component/chart/layer/Axis/AngularGridAxisImpl.js similarity index 100% rename from client-app/src/redmic/modules/chart/layer/Axis/AngularGridAxisImpl.js rename to client-app/src/component/chart/layer/Axis/AngularGridAxisImpl.js diff --git a/client-app/src/redmic/modules/chart/layer/Axis/Axis.js b/client-app/src/component/chart/layer/Axis/Axis.js similarity index 96% rename from client-app/src/redmic/modules/chart/layer/Axis/Axis.js rename to client-app/src/component/chart/layer/Axis/Axis.js index 027f5633..d9900168 100644 --- a/client-app/src/redmic/modules/chart/layer/Axis/Axis.js +++ b/client-app/src/component/chart/layer/Axis/Axis.js @@ -3,8 +3,8 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/Deferred" - , "redmic/modules/base/_Module" - , "redmic/modules/chart/layer/_LayerCommons" + , "src/component/base/_Module" + , "src/component/chart/layer/_LayerCommons" , "./_AxisItfc" ], function( d3 diff --git a/client-app/src/redmic/modules/chart/layer/Axis/HorizontalGridAxisImpl.js b/client-app/src/component/chart/layer/Axis/HorizontalGridAxisImpl.js similarity index 100% rename from client-app/src/redmic/modules/chart/layer/Axis/HorizontalGridAxisImpl.js rename to client-app/src/component/chart/layer/Axis/HorizontalGridAxisImpl.js diff --git a/client-app/src/redmic/modules/chart/layer/Axis/RadialAxisImpl.js b/client-app/src/component/chart/layer/Axis/RadialAxisImpl.js similarity index 100% rename from client-app/src/redmic/modules/chart/layer/Axis/RadialAxisImpl.js rename to client-app/src/component/chart/layer/Axis/RadialAxisImpl.js diff --git a/client-app/src/redmic/modules/chart/layer/Axis/RadialGridAxisImpl.js b/client-app/src/component/chart/layer/Axis/RadialGridAxisImpl.js similarity index 100% rename from client-app/src/redmic/modules/chart/layer/Axis/RadialGridAxisImpl.js rename to client-app/src/component/chart/layer/Axis/RadialGridAxisImpl.js diff --git a/client-app/src/redmic/modules/chart/layer/Axis/TemporalAxisImpl.js b/client-app/src/component/chart/layer/Axis/TemporalAxisImpl.js similarity index 100% rename from client-app/src/redmic/modules/chart/layer/Axis/TemporalAxisImpl.js rename to client-app/src/component/chart/layer/Axis/TemporalAxisImpl.js diff --git a/client-app/src/redmic/modules/chart/layer/Axis/VerticalAxisImpl.js b/client-app/src/component/chart/layer/Axis/VerticalAxisImpl.js similarity index 100% rename from client-app/src/redmic/modules/chart/layer/Axis/VerticalAxisImpl.js rename to client-app/src/component/chart/layer/Axis/VerticalAxisImpl.js diff --git a/client-app/src/redmic/modules/chart/layer/Axis/VerticalGridAxisImpl.js b/client-app/src/component/chart/layer/Axis/VerticalGridAxisImpl.js similarity index 100% rename from client-app/src/redmic/modules/chart/layer/Axis/VerticalGridAxisImpl.js rename to client-app/src/component/chart/layer/Axis/VerticalGridAxisImpl.js diff --git a/client-app/src/redmic/modules/chart/layer/Axis/_AxisItfc.js b/client-app/src/component/chart/layer/Axis/_AxisItfc.js similarity index 93% rename from client-app/src/redmic/modules/chart/layer/Axis/_AxisItfc.js rename to client-app/src/component/chart/layer/Axis/_AxisItfc.js index b9850e72..740fed6b 100644 --- a/client-app/src/redmic/modules/chart/layer/Axis/_AxisItfc.js +++ b/client-app/src/component/chart/layer/Axis/_AxisItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/client-app/src/redmic/modules/chart/layer/Axis/_HorizontalCommons.js b/client-app/src/component/chart/layer/Axis/_HorizontalCommons.js similarity index 100% rename from client-app/src/redmic/modules/chart/layer/Axis/_HorizontalCommons.js rename to client-app/src/component/chart/layer/Axis/_HorizontalCommons.js diff --git a/client-app/src/redmic/modules/chart/layer/Axis/_VerticalCommons.js b/client-app/src/component/chart/layer/Axis/_VerticalCommons.js similarity index 100% rename from client-app/src/redmic/modules/chart/layer/Axis/_VerticalCommons.js rename to client-app/src/component/chart/layer/Axis/_VerticalCommons.js diff --git a/client-app/src/redmic/modules/chart/layer/Axis/_VerticalCommonsItfc.js b/client-app/src/component/chart/layer/Axis/_VerticalCommonsItfc.js similarity index 93% rename from client-app/src/redmic/modules/chart/layer/Axis/_VerticalCommonsItfc.js rename to client-app/src/component/chart/layer/Axis/_VerticalCommonsItfc.js index d82bc806..47f90d98 100644 --- a/client-app/src/redmic/modules/chart/layer/Axis/_VerticalCommonsItfc.js +++ b/client-app/src/component/chart/layer/Axis/_VerticalCommonsItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/client-app/src/redmic/modules/chart/layer/ChartLayer/ChartLayer.js b/client-app/src/component/chart/layer/ChartLayer/ChartLayer.js similarity index 98% rename from client-app/src/redmic/modules/chart/layer/ChartLayer/ChartLayer.js rename to client-app/src/component/chart/layer/ChartLayer/ChartLayer.js index b0e2087c..1e0a5d22 100644 --- a/client-app/src/redmic/modules/chart/layer/ChartLayer/ChartLayer.js +++ b/client-app/src/component/chart/layer/ChartLayer/ChartLayer.js @@ -4,8 +4,8 @@ define([ , "dojo/aspect" , "put-selector/put" , "RWidgets/Utilities" - , "redmic/modules/base/_Module" - , "redmic/modules/chart/layer/_LayerCommons" + , "src/component/base/_Module" + , "src/component/chart/layer/_LayerCommons" , "./_ChartLayerItfc" ], function( declare diff --git a/client-app/src/redmic/modules/chart/layer/ChartLayer/LinearChartImpl.js b/client-app/src/component/chart/layer/ChartLayer/LinearChartImpl.js similarity index 100% rename from client-app/src/redmic/modules/chart/layer/ChartLayer/LinearChartImpl.js rename to client-app/src/component/chart/layer/ChartLayer/LinearChartImpl.js diff --git a/client-app/src/redmic/modules/chart/layer/ChartLayer/MultiPieChartImpl.js b/client-app/src/component/chart/layer/ChartLayer/MultiPieChartImpl.js similarity index 100% rename from client-app/src/redmic/modules/chart/layer/ChartLayer/MultiPieChartImpl.js rename to client-app/src/component/chart/layer/ChartLayer/MultiPieChartImpl.js diff --git a/client-app/src/redmic/modules/chart/layer/ChartLayer/PieChartImpl.js b/client-app/src/component/chart/layer/ChartLayer/PieChartImpl.js similarity index 100% rename from client-app/src/redmic/modules/chart/layer/ChartLayer/PieChartImpl.js rename to client-app/src/component/chart/layer/ChartLayer/PieChartImpl.js diff --git a/client-app/src/redmic/modules/chart/layer/ChartLayer/WindRoseChartImpl.js b/client-app/src/component/chart/layer/ChartLayer/WindRoseChartImpl.js similarity index 99% rename from client-app/src/redmic/modules/chart/layer/ChartLayer/WindRoseChartImpl.js rename to client-app/src/component/chart/layer/ChartLayer/WindRoseChartImpl.js index 03386b16..a1dbe431 100644 --- a/client-app/src/redmic/modules/chart/layer/ChartLayer/WindRoseChartImpl.js +++ b/client-app/src/component/chart/layer/ChartLayer/WindRoseChartImpl.js @@ -3,7 +3,7 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/chart/layer/_PolarLayerCommons" + , "src/component/chart/layer/_PolarLayerCommons" , "./_CategoryLayerCommons" , "./_CircularLayerCommons" , "./_MultipleWindRose" diff --git a/client-app/src/redmic/modules/chart/layer/ChartLayer/_CategoryLayerCommons.js b/client-app/src/component/chart/layer/ChartLayer/_CategoryLayerCommons.js similarity index 100% rename from client-app/src/redmic/modules/chart/layer/ChartLayer/_CategoryLayerCommons.js rename to client-app/src/component/chart/layer/ChartLayer/_CategoryLayerCommons.js diff --git a/client-app/src/redmic/modules/chart/layer/ChartLayer/_CategoryLayerCommonsItfc.js b/client-app/src/component/chart/layer/ChartLayer/_CategoryLayerCommonsItfc.js similarity index 94% rename from client-app/src/redmic/modules/chart/layer/ChartLayer/_CategoryLayerCommonsItfc.js rename to client-app/src/component/chart/layer/ChartLayer/_CategoryLayerCommonsItfc.js index 6c4efd42..ecc1bb68 100644 --- a/client-app/src/redmic/modules/chart/layer/ChartLayer/_CategoryLayerCommonsItfc.js +++ b/client-app/src/component/chart/layer/ChartLayer/_CategoryLayerCommonsItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/client-app/src/redmic/modules/chart/layer/ChartLayer/_ChartHoleManagement.js b/client-app/src/component/chart/layer/ChartLayer/_ChartHoleManagement.js similarity index 100% rename from client-app/src/redmic/modules/chart/layer/ChartLayer/_ChartHoleManagement.js rename to client-app/src/component/chart/layer/ChartLayer/_ChartHoleManagement.js diff --git a/client-app/src/redmic/modules/chart/layer/ChartLayer/_ChartLayerItfc.js b/client-app/src/component/chart/layer/ChartLayer/_ChartLayerItfc.js similarity index 95% rename from client-app/src/redmic/modules/chart/layer/ChartLayer/_ChartLayerItfc.js rename to client-app/src/component/chart/layer/ChartLayer/_ChartLayerItfc.js index 88171f2e..eb80d2a1 100644 --- a/client-app/src/redmic/modules/chart/layer/ChartLayer/_ChartLayerItfc.js +++ b/client-app/src/component/chart/layer/ChartLayer/_ChartLayerItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/client-app/src/redmic/modules/chart/layer/ChartLayer/_CircularLayerCommons.js b/client-app/src/component/chart/layer/ChartLayer/_CircularLayerCommons.js similarity index 100% rename from client-app/src/redmic/modules/chart/layer/ChartLayer/_CircularLayerCommons.js rename to client-app/src/component/chart/layer/ChartLayer/_CircularLayerCommons.js diff --git a/client-app/src/redmic/modules/chart/layer/ChartLayer/_CircularLayerCommonsItfc.js b/client-app/src/component/chart/layer/ChartLayer/_CircularLayerCommonsItfc.js similarity index 94% rename from client-app/src/redmic/modules/chart/layer/ChartLayer/_CircularLayerCommonsItfc.js rename to client-app/src/component/chart/layer/ChartLayer/_CircularLayerCommonsItfc.js index d1e256da..fba20b90 100644 --- a/client-app/src/redmic/modules/chart/layer/ChartLayer/_CircularLayerCommonsItfc.js +++ b/client-app/src/component/chart/layer/ChartLayer/_CircularLayerCommonsItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/client-app/src/redmic/modules/chart/layer/ChartLayer/_ColorHierarchyGeneration.js b/client-app/src/component/chart/layer/ChartLayer/_ColorHierarchyGeneration.js similarity index 100% rename from client-app/src/redmic/modules/chart/layer/ChartLayer/_ColorHierarchyGeneration.js rename to client-app/src/component/chart/layer/ChartLayer/_ColorHierarchyGeneration.js diff --git a/client-app/src/redmic/modules/chart/layer/ChartLayer/_LevelNavigation.js b/client-app/src/component/chart/layer/ChartLayer/_LevelNavigation.js similarity index 98% rename from client-app/src/redmic/modules/chart/layer/ChartLayer/_LevelNavigation.js rename to client-app/src/component/chart/layer/ChartLayer/_LevelNavigation.js index 5fb840e4..ff42aa91 100644 --- a/client-app/src/redmic/modules/chart/layer/ChartLayer/_LevelNavigation.js +++ b/client-app/src/component/chart/layer/ChartLayer/_LevelNavigation.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/chart/layer/ChartLayer/_PutButtonInHole" + , "src/component/chart/layer/ChartLayer/_PutButtonInHole" ], function( declare , lang diff --git a/client-app/src/redmic/modules/chart/layer/ChartLayer/_MultipleWindRose.js b/client-app/src/component/chart/layer/ChartLayer/_MultipleWindRose.js similarity index 100% rename from client-app/src/redmic/modules/chart/layer/ChartLayer/_MultipleWindRose.js rename to client-app/src/component/chart/layer/ChartLayer/_MultipleWindRose.js diff --git a/client-app/src/redmic/modules/chart/layer/ChartLayer/_ObtainableValue.js b/client-app/src/component/chart/layer/ChartLayer/_ObtainableValue.js similarity index 100% rename from client-app/src/redmic/modules/chart/layer/ChartLayer/_ObtainableValue.js rename to client-app/src/component/chart/layer/ChartLayer/_ObtainableValue.js diff --git a/client-app/src/redmic/modules/chart/layer/ChartLayer/_ObtainableValueItfc.js b/client-app/src/component/chart/layer/ChartLayer/_ObtainableValueItfc.js similarity index 92% rename from client-app/src/redmic/modules/chart/layer/ChartLayer/_ObtainableValueItfc.js rename to client-app/src/component/chart/layer/ChartLayer/_ObtainableValueItfc.js index bdfc3eca..7c5bc73b 100644 --- a/client-app/src/redmic/modules/chart/layer/ChartLayer/_ObtainableValueItfc.js +++ b/client-app/src/component/chart/layer/ChartLayer/_ObtainableValueItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/client-app/src/redmic/modules/chart/layer/ChartLayer/_PieCommons.js b/client-app/src/component/chart/layer/ChartLayer/_PieCommons.js similarity index 100% rename from client-app/src/redmic/modules/chart/layer/ChartLayer/_PieCommons.js rename to client-app/src/component/chart/layer/ChartLayer/_PieCommons.js diff --git a/client-app/src/redmic/modules/chart/layer/ChartLayer/_PutButtonInHole.js b/client-app/src/component/chart/layer/ChartLayer/_PutButtonInHole.js similarity index 98% rename from client-app/src/redmic/modules/chart/layer/ChartLayer/_PutButtonInHole.js rename to client-app/src/component/chart/layer/ChartLayer/_PutButtonInHole.js index 195d84ea..372405f7 100644 --- a/client-app/src/redmic/modules/chart/layer/ChartLayer/_PutButtonInHole.js +++ b/client-app/src/component/chart/layer/ChartLayer/_PutButtonInHole.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/chart/layer/ChartLayer/_ChartHoleManagement" + , "src/component/chart/layer/ChartLayer/_ChartHoleManagement" , "./_PutButtonInHoleItfc" ], function( declare diff --git a/client-app/src/redmic/modules/chart/layer/ChartLayer/_PutButtonInHoleItfc.js b/client-app/src/component/chart/layer/ChartLayer/_PutButtonInHoleItfc.js similarity index 92% rename from client-app/src/redmic/modules/chart/layer/ChartLayer/_PutButtonInHoleItfc.js rename to client-app/src/component/chart/layer/ChartLayer/_PutButtonInHoleItfc.js index 67351a98..5e30dd91 100644 --- a/client-app/src/redmic/modules/chart/layer/ChartLayer/_PutButtonInHoleItfc.js +++ b/client-app/src/component/chart/layer/ChartLayer/_PutButtonInHoleItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/client-app/src/redmic/modules/chart/layer/ChartLayer/_QueryableValue.js b/client-app/src/component/chart/layer/ChartLayer/_QueryableValue.js similarity index 100% rename from client-app/src/redmic/modules/chart/layer/ChartLayer/_QueryableValue.js rename to client-app/src/component/chart/layer/ChartLayer/_QueryableValue.js diff --git a/client-app/src/redmic/modules/chart/layer/ChartLayer/_ShowInfoInHole.js b/client-app/src/component/chart/layer/ChartLayer/_ShowInfoInHole.js similarity index 97% rename from client-app/src/redmic/modules/chart/layer/ChartLayer/_ShowInfoInHole.js rename to client-app/src/component/chart/layer/ChartLayer/_ShowInfoInHole.js index b37d4b6c..c97c93e1 100644 --- a/client-app/src/redmic/modules/chart/layer/ChartLayer/_ShowInfoInHole.js +++ b/client-app/src/component/chart/layer/ChartLayer/_ShowInfoInHole.js @@ -2,8 +2,8 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/chart/layer/ChartLayer/_ChartHoleManagement" - , "redmic/modules/chart/layer/ChartLayer/_ObtainableValue" + , "src/component/chart/layer/ChartLayer/_ChartHoleManagement" + , "src/component/chart/layer/ChartLayer/_ObtainableValue" ], function( declare , lang diff --git a/client-app/src/redmic/modules/chart/layer/ChartLayer/_SimplePieCommons.js b/client-app/src/component/chart/layer/ChartLayer/_SimplePieCommons.js similarity index 100% rename from client-app/src/redmic/modules/chart/layer/ChartLayer/_SimplePieCommons.js rename to client-app/src/component/chart/layer/ChartLayer/_SimplePieCommons.js diff --git a/client-app/src/redmic/modules/chart/layer/ChartLayer/_SimpleWindRose.js b/client-app/src/component/chart/layer/ChartLayer/_SimpleWindRose.js similarity index 100% rename from client-app/src/redmic/modules/chart/layer/ChartLayer/_SimpleWindRose.js rename to client-app/src/component/chart/layer/ChartLayer/_SimpleWindRose.js diff --git a/client-app/src/redmic/modules/chart/layer/ChartLayer/_VariableRadiusByDepth.js b/client-app/src/component/chart/layer/ChartLayer/_VariableRadiusByDepth.js similarity index 100% rename from client-app/src/redmic/modules/chart/layer/ChartLayer/_VariableRadiusByDepth.js rename to client-app/src/component/chart/layer/ChartLayer/_VariableRadiusByDepth.js diff --git a/client-app/src/redmic/modules/chart/layer/_LayerCommons.js b/client-app/src/component/chart/layer/_LayerCommons.js similarity index 100% rename from client-app/src/redmic/modules/chart/layer/_LayerCommons.js rename to client-app/src/component/chart/layer/_LayerCommons.js diff --git a/client-app/src/redmic/modules/chart/layer/_LayerCommonsItfc.js b/client-app/src/component/chart/layer/_LayerCommonsItfc.js similarity index 94% rename from client-app/src/redmic/modules/chart/layer/_LayerCommonsItfc.js rename to client-app/src/component/chart/layer/_LayerCommonsItfc.js index a4fafdb7..127df271 100644 --- a/client-app/src/redmic/modules/chart/layer/_LayerCommonsItfc.js +++ b/client-app/src/component/chart/layer/_LayerCommonsItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/client-app/src/redmic/modules/chart/layer/_PolarLayerCommons.js b/client-app/src/component/chart/layer/_PolarLayerCommons.js similarity index 100% rename from client-app/src/redmic/modules/chart/layer/_PolarLayerCommons.js rename to client-app/src/component/chart/layer/_PolarLayerCommons.js diff --git a/client-app/src/redmic/modules/chart/layer/_PolarLayerCommonsItfc.js b/client-app/src/component/chart/layer/_PolarLayerCommonsItfc.js similarity index 92% rename from client-app/src/redmic/modules/chart/layer/_PolarLayerCommonsItfc.js rename to client-app/src/component/chart/layer/_PolarLayerCommonsItfc.js index c4580e9b..e9617c03 100644 --- a/client-app/src/redmic/modules/chart/layer/_PolarLayerCommonsItfc.js +++ b/client-app/src/component/chart/layer/_PolarLayerCommonsItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/client-app/src/redmic/modules/components/ExternalConfig.js b/client-app/src/component/components/ExternalConfig.js similarity index 98% rename from client-app/src/redmic/modules/components/ExternalConfig.js rename to client-app/src/component/components/ExternalConfig.js index 16510604..61925f6a 100644 --- a/client-app/src/redmic/modules/components/ExternalConfig.js +++ b/client-app/src/component/components/ExternalConfig.js @@ -2,8 +2,8 @@ define([ 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/modules/base/_Module' - , 'redmic/modules/base/_Store' + , 'src/component/base/_Module' + , 'src/component/base/_Store' , 'src/utils/Credentials' ], function( redmicConfig diff --git a/client-app/src/redmic/modules/components/Keypad/IconKeypadImpl.js b/client-app/src/component/components/Keypad/IconKeypadImpl.js similarity index 100% rename from client-app/src/redmic/modules/components/Keypad/IconKeypadImpl.js rename to client-app/src/component/components/Keypad/IconKeypadImpl.js diff --git a/client-app/src/redmic/modules/components/Keypad/Keypad.js b/client-app/src/component/components/Keypad/Keypad.js similarity index 97% rename from client-app/src/redmic/modules/components/Keypad/Keypad.js rename to client-app/src/component/components/Keypad/Keypad.js index 3d97fc8d..179a5971 100644 --- a/client-app/src/redmic/modules/components/Keypad/Keypad.js +++ b/client-app/src/component/components/Keypad/Keypad.js @@ -1,8 +1,8 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" + , "src/component/base/_Module" + , "src/component/base/_Show" , "./_KeypadItfc" ], function( declare diff --git a/client-app/src/redmic/modules/components/Keypad/TrizoneKeypadImpl.js b/client-app/src/component/components/Keypad/TrizoneKeypadImpl.js similarity index 100% rename from client-app/src/redmic/modules/components/Keypad/TrizoneKeypadImpl.js rename to client-app/src/component/components/Keypad/TrizoneKeypadImpl.js diff --git a/client-app/src/redmic/modules/components/Keypad/_KeypadItfc.js b/client-app/src/component/components/Keypad/_KeypadItfc.js similarity index 94% rename from client-app/src/redmic/modules/components/Keypad/_KeypadItfc.js rename to client-app/src/component/components/Keypad/_KeypadItfc.js index 2b7a7224..a3390369 100644 --- a/client-app/src/redmic/modules/components/Keypad/_KeypadItfc.js +++ b/client-app/src/component/components/Keypad/_KeypadItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/client-app/src/redmic/modules/components/PDFViewer/PDFViewer.js b/client-app/src/component/components/PDFViewer/PDFViewer.js similarity index 97% rename from client-app/src/redmic/modules/components/PDFViewer/PDFViewer.js rename to client-app/src/component/components/PDFViewer/PDFViewer.js index 7acf9d57..abf58e05 100644 --- a/client-app/src/redmic/modules/components/PDFViewer/PDFViewer.js +++ b/client-app/src/component/components/PDFViewer/PDFViewer.js @@ -2,9 +2,9 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "src/utils/Credentials" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" - , "redmic/modules/layout/templateDisplayer/TemplateDisplayer" + , "src/component/base/_Module" + , "src/component/base/_Show" + , "src/component/layout/templateDisplayer/TemplateDisplayer" , "put-selector/put" , "templates/DocumentAuthFailed" , "templates/DocumentNotAvailable" diff --git a/client-app/src/redmic/modules/components/ProgressSlider/ProgressSlider.js b/client-app/src/component/components/ProgressSlider/ProgressSlider.js similarity index 97% rename from client-app/src/redmic/modules/components/ProgressSlider/ProgressSlider.js rename to client-app/src/component/components/ProgressSlider/ProgressSlider.js index 8798b41b..72dd0dcc 100644 --- a/client-app/src/redmic/modules/components/ProgressSlider/ProgressSlider.js +++ b/client-app/src/component/components/ProgressSlider/ProgressSlider.js @@ -1,8 +1,8 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" + , "src/component/base/_Module" + , "src/component/base/_Show" , "RWidgets/ProgressSlider" , "RWidgets/extensions/_ShowValue" ], function( @@ -151,4 +151,4 @@ define([ return this.progressSlider.domNode; } }); -}); \ No newline at end of file +}); diff --git a/client-app/src/redmic/modules/components/ProgressSlider/StepAndRateEditor.js b/client-app/src/component/components/ProgressSlider/StepAndRateEditor.js similarity index 98% rename from client-app/src/redmic/modules/components/ProgressSlider/StepAndRateEditor.js rename to client-app/src/component/components/ProgressSlider/StepAndRateEditor.js index c4eb8d2d..462db23a 100644 --- a/client-app/src/redmic/modules/components/ProgressSlider/StepAndRateEditor.js +++ b/client-app/src/component/components/ProgressSlider/StepAndRateEditor.js @@ -2,8 +2,8 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dijit/form/NumberSpinner" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" + , "src/component/base/_Module" + , "src/component/base/_Show" , "RWidgets/ValueAndUnitSelector" , "put-selector/put" ], function( @@ -148,4 +148,4 @@ define([ this.valueAndUnitSelector.emit(this.valueAndUnitSelector.events.GET_VALUE); } }); -}); \ No newline at end of file +}); diff --git a/client-app/src/redmic/modules/components/Sidebar/MainSidebarImpl.js b/client-app/src/component/components/Sidebar/MainSidebarImpl.js similarity index 93% rename from client-app/src/redmic/modules/components/Sidebar/MainSidebarImpl.js rename to client-app/src/component/components/Sidebar/MainSidebarImpl.js index 95c0e86e..e84f0e63 100644 --- a/client-app/src/redmic/modules/components/Sidebar/MainSidebarImpl.js +++ b/client-app/src/component/components/Sidebar/MainSidebarImpl.js @@ -2,8 +2,8 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/components/Sidebar/_Secondary" - , "redmic/modules/components/Sidebar/Sidebar" + , "src/component/components/Sidebar/_Secondary" + , "src/component/components/Sidebar/Sidebar" ], function( declare , lang diff --git a/client-app/src/redmic/modules/components/Sidebar/Sidebar.js b/client-app/src/component/components/Sidebar/Sidebar.js similarity index 99% rename from client-app/src/redmic/modules/components/Sidebar/Sidebar.js rename to client-app/src/component/components/Sidebar/Sidebar.js index 51e1a6ca..0b63c392 100644 --- a/client-app/src/redmic/modules/components/Sidebar/Sidebar.js +++ b/client-app/src/component/components/Sidebar/Sidebar.js @@ -5,8 +5,8 @@ define([ , "dojo/on" , "dojo/query" , "put-selector/put" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" + , "src/component/base/_Module" + , "src/component/base/_Show" , "dojo/NodeList-dom" , "dojo/NodeList-traverse" diff --git a/client-app/src/redmic/modules/components/Sidebar/_Secondary.js b/client-app/src/component/components/Sidebar/_Secondary.js similarity index 100% rename from client-app/src/redmic/modules/components/Sidebar/_Secondary.js rename to client-app/src/component/components/Sidebar/_Secondary.js diff --git a/client-app/src/redmic/modules/components/Topbar.js b/client-app/src/component/components/Topbar.js similarity index 93% rename from client-app/src/redmic/modules/components/Topbar.js rename to client-app/src/component/components/Topbar.js index 2fcf3ebe..b63c86a0 100644 --- a/client-app/src/redmic/modules/components/Topbar.js +++ b/client-app/src/component/components/Topbar.js @@ -2,12 +2,12 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' , 'put-selector/put' - , 'redmic/modules/base/_Module' - , 'redmic/modules/base/_Show' - , 'redmic/modules/base/Manager' - , 'redmic/modules/user/FullscreenToggle' - , 'redmic/modules/user/LanguageSelector' - , 'redmic/modules/user/UserArea' + , 'src/component/base/_Module' + , 'src/component/base/_Show' + , 'src/component/base/Manager' + , 'src/component/user/FullscreenToggle' + , 'src/component/user/LanguageSelector' + , 'src/component/user/UserArea' ], function( declare , lang diff --git a/client-app/src/redmic/modules/filter/Filter.js b/client-app/src/component/filter/Filter.js similarity index 98% rename from client-app/src/redmic/modules/filter/Filter.js rename to client-app/src/component/filter/Filter.js index 98bb4cd6..0633fb6d 100644 --- a/client-app/src/redmic/modules/filter/Filter.js +++ b/client-app/src/component/filter/Filter.js @@ -1,9 +1,9 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Module" - , "redmic/modules/model/ModelImpl" - , "redmic/modules/base/_Store" + , "src/component/base/_Module" + , "src/component/model/ModelImpl" + , "src/component/base/_Store" ], function( declare , lang diff --git a/client-app/src/redmic/modules/form/Form.js b/client-app/src/component/form/Form.js similarity index 98% rename from client-app/src/redmic/modules/form/Form.js rename to client-app/src/component/form/Form.js index 685bd74d..93a4be91 100644 --- a/client-app/src/redmic/modules/form/Form.js +++ b/client-app/src/component/form/Form.js @@ -1,9 +1,9 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" - , "redmic/modules/model/ModelImpl" + , "src/component/base/_Module" + , "src/component/base/_Show" + , "src/component/model/ModelImpl" , "./_FormItfc" ], function( declare diff --git a/client-app/src/redmic/modules/form/FormContainerImpl.js b/client-app/src/component/form/FormContainerImpl.js similarity index 99% rename from client-app/src/redmic/modules/form/FormContainerImpl.js rename to client-app/src/component/form/FormContainerImpl.js index 87df42ba..808adaf3 100644 --- a/client-app/src/redmic/modules/form/FormContainerImpl.js +++ b/client-app/src/component/form/FormContainerImpl.js @@ -4,7 +4,7 @@ define([ , "dojo/aspect" , "dojo/Deferred" , "dojo/promise/all" - , "redmic/modules/form/form/FormContainer" + , "src/component/form/form/FormContainer" , "./Form" ], function( declare diff --git a/client-app/src/redmic/modules/form/_BaseCreateKeypad.js b/client-app/src/component/form/_BaseCreateKeypad.js similarity index 100% rename from client-app/src/redmic/modules/form/_BaseCreateKeypad.js rename to client-app/src/component/form/_BaseCreateKeypad.js diff --git a/client-app/src/redmic/modules/form/_CreateInternalKeypad.js b/client-app/src/component/form/_CreateInternalKeypad.js similarity index 95% rename from client-app/src/redmic/modules/form/_CreateInternalKeypad.js rename to client-app/src/component/form/_CreateInternalKeypad.js index 97f93481..cc2a5548 100644 --- a/client-app/src/redmic/modules/form/_CreateInternalKeypad.js +++ b/client-app/src/component/form/_CreateInternalKeypad.js @@ -3,7 +3,7 @@ define([ , "dojo/_base/lang" , "dojo/aspect" , "put-selector/put" - , "redmic/modules/form/_CreateKeypad" + , "src/component/form/_CreateKeypad" ], function( declare , lang diff --git a/client-app/src/redmic/modules/form/_CreateKeypad.js b/client-app/src/component/form/_CreateKeypad.js similarity index 97% rename from client-app/src/redmic/modules/form/_CreateKeypad.js rename to client-app/src/component/form/_CreateKeypad.js index 34ab0496..748eca95 100644 --- a/client-app/src/redmic/modules/form/_CreateKeypad.js +++ b/client-app/src/component/form/_CreateKeypad.js @@ -3,8 +3,8 @@ define([ , "dojo/_base/lang" , "dojo/aspect" , 'put-selector/put' - , "redmic/modules/components/Keypad/TrizoneKeypadImpl" - , "redmic/modules/form/_BaseCreateKeypad" + , "src/component/components/Keypad/TrizoneKeypadImpl" + , "src/component/form/_BaseCreateKeypad" ], function( declare , lang diff --git a/client-app/src/redmic/modules/form/_FormItfc.js b/client-app/src/component/form/_FormItfc.js similarity index 95% rename from client-app/src/redmic/modules/form/_FormItfc.js rename to client-app/src/component/form/_FormItfc.js index 634b2abe..e580ef92 100644 --- a/client-app/src/redmic/modules/form/_FormItfc.js +++ b/client-app/src/component/form/_FormItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/client-app/src/redmic/modules/form/_ListenModelHasChanged.js b/client-app/src/component/form/_ListenModelHasChanged.js similarity index 100% rename from client-app/src/redmic/modules/form/_ListenModelHasChanged.js rename to client-app/src/component/form/_ListenModelHasChanged.js diff --git a/client-app/src/redmic/modules/form/_PublicateChanges.js b/client-app/src/component/form/_PublicateChanges.js similarity index 100% rename from client-app/src/redmic/modules/form/_PublicateChanges.js rename to client-app/src/component/form/_PublicateChanges.js diff --git a/client-app/src/redmic/modules/form/_ShowInDialog.js b/client-app/src/component/form/_ShowInDialog.js similarity index 97% rename from client-app/src/redmic/modules/form/_ShowInDialog.js rename to client-app/src/component/form/_ShowInDialog.js index ceabac29..c2661c61 100644 --- a/client-app/src/redmic/modules/form/_ShowInDialog.js +++ b/client-app/src/component/form/_ShowInDialog.js @@ -5,7 +5,7 @@ define([ , "dojo/aspect" , 'put-selector/put' , "RWidgets/layout/DialogComplex" - , "redmic/modules/form/_CreateKeypad" + , "src/component/form/_CreateKeypad" ], function( ContentPane , declare diff --git a/client-app/src/redmic/modules/form/_ShowInTableList.js b/client-app/src/component/form/_ShowInTableList.js similarity index 98% rename from client-app/src/redmic/modules/form/_ShowInTableList.js rename to client-app/src/component/form/_ShowInTableList.js index 7ec46347..6807ecb7 100644 --- a/client-app/src/redmic/modules/form/_ShowInTableList.js +++ b/client-app/src/component/form/_ShowInTableList.js @@ -4,7 +4,7 @@ define([ , "dojo/aspect" , "dojo/dom-class" , "dojo/query" - , "redmic/modules/form/_BaseCreateKeypad" + , "src/component/form/_BaseCreateKeypad" , "put-selector/put" ], function( lang diff --git a/client-app/src/redmic/modules/form/form/FormContainer.js b/client-app/src/component/form/form/FormContainer.js similarity index 89% rename from client-app/src/redmic/modules/form/form/FormContainer.js rename to client-app/src/component/form/form/FormContainer.js index 05ae5f4e..70bf973e 100644 --- a/client-app/src/redmic/modules/form/form/FormContainer.js +++ b/client-app/src/component/form/form/FormContainer.js @@ -11,43 +11,43 @@ define([ , 'dojo/Evented' , 'dojo/query' , 'put-selector/put' - , 'redmic/modules/form/input/_IgnoreNonexistentProperty' - , 'redmic/modules/form/input/_Dependence' - , 'redmic/modules/form/input/_DeleteOnClear' - , 'redmic/modules/form/input/_DisableInput' - - , 'redmic/modules/form/input/DateRangeTextBoxImpl' - , 'redmic/modules/form/input/MultiSelectImpl' - , 'redmic/modules/form/input/RangeImpl' - , 'redmic/modules/form/input/RadioButtonGroupImpl' - , 'redmic/modules/form/input/ValueAndUnitSelectorImpl' - , 'redmic/modules/form/input/CheckBoxImpl' - , 'redmic/modules/form/input/CheckBoxGroupImpl' - , 'redmic/modules/form/input/RadioButtonImpl' - , 'redmic/modules/form/input/TextBoxImpl' - , 'redmic/modules/form/input/NumberSpinnerImpl' - , 'redmic/modules/form/input/NumberTextBoxImpl' - , 'redmic/modules/form/input/SelectImpl' - , 'redmic/modules/form/input/RangeSliderImpl' - , 'redmic/modules/form/input/SliderImpl' - , 'redmic/modules/form/input/KeywordsImpl' - , 'redmic/modules/form/input/ColorPickerImpl' - , 'redmic/modules/form/input/ColorPickerTextBoxImpl' - , 'redmic/modules/form/input/FilteringSelectImpl' - , 'redmic/modules/form/input/DateTextBoxImpl' - , 'redmic/modules/form/input/DateTimeImpl' - , 'redmic/modules/form/input/DateTimeTextBoxImpl' - , 'redmic/modules/form/input/DateRangeImpl' - , 'redmic/modules/form/input/AnnotationImpl' - , 'redmic/modules/form/input/ColorsRampImpl' - , 'redmic/modules/form/input/ColorImpl' - , 'redmic/modules/form/input/SelectOnListPopupImpl' - , 'redmic/modules/form/input/ButtonImpl' - , 'redmic/modules/form/input/PointImpl' - , 'redmic/modules/form/input/UploadFileImpl' - , 'redmic/modules/form/input/TextAreaImpl' - , 'redmic/modules/form/input/GeometryImpl' - , 'redmic/modules/form/input/MapSearchImpl' + , 'src/component/form/input/_IgnoreNonexistentProperty' + , 'src/component/form/input/_Dependence' + , 'src/component/form/input/_DeleteOnClear' + , 'src/component/form/input/_DisableInput' + + , 'src/component/form/input/DateRangeTextBoxImpl' + , 'src/component/form/input/MultiSelectImpl' + , 'src/component/form/input/RangeImpl' + , 'src/component/form/input/RadioButtonGroupImpl' + , 'src/component/form/input/ValueAndUnitSelectorImpl' + , 'src/component/form/input/CheckBoxImpl' + , 'src/component/form/input/CheckBoxGroupImpl' + , 'src/component/form/input/RadioButtonImpl' + , 'src/component/form/input/TextBoxImpl' + , 'src/component/form/input/NumberSpinnerImpl' + , 'src/component/form/input/NumberTextBoxImpl' + , 'src/component/form/input/SelectImpl' + , 'src/component/form/input/RangeSliderImpl' + , 'src/component/form/input/SliderImpl' + , 'src/component/form/input/KeywordsImpl' + , 'src/component/form/input/ColorPickerImpl' + , 'src/component/form/input/ColorPickerTextBoxImpl' + , 'src/component/form/input/FilteringSelectImpl' + , 'src/component/form/input/DateTextBoxImpl' + , 'src/component/form/input/DateTimeImpl' + , 'src/component/form/input/DateTimeTextBoxImpl' + , 'src/component/form/input/DateRangeImpl' + , 'src/component/form/input/AnnotationImpl' + , 'src/component/form/input/ColorsRampImpl' + , 'src/component/form/input/ColorImpl' + , 'src/component/form/input/SelectOnListPopupImpl' + , 'src/component/form/input/ButtonImpl' + , 'src/component/form/input/PointImpl' + , 'src/component/form/input/UploadFileImpl' + , 'src/component/form/input/TextAreaImpl' + , 'src/component/form/input/GeometryImpl' + , 'src/component/form/input/MapSearchImpl' , 'templates/SpeciesFilter' , 'templates/ProjectFilter' diff --git a/client-app/src/redmic/modules/form/form/Select.js b/client-app/src/component/form/form/Select.js similarity index 100% rename from client-app/src/redmic/modules/form/form/Select.js rename to client-app/src/component/form/form/Select.js diff --git a/client-app/src/redmic/modules/form/form/UploadInput.js b/client-app/src/component/form/form/UploadInput.js similarity index 100% rename from client-app/src/redmic/modules/form/form/UploadInput.js rename to client-app/src/component/form/form/UploadInput.js diff --git a/client-app/src/redmic/modules/form/form/nls/UploadInput.js b/client-app/src/component/form/form/nls/UploadInput.js similarity index 100% rename from client-app/src/redmic/modules/form/form/nls/UploadInput.js rename to client-app/src/component/form/form/nls/UploadInput.js diff --git a/client-app/src/redmic/modules/form/form/nls/es/UploadInput.js b/client-app/src/component/form/form/nls/es/UploadInput.js similarity index 100% rename from client-app/src/redmic/modules/form/form/nls/es/UploadInput.js rename to client-app/src/component/form/form/nls/es/UploadInput.js diff --git a/client-app/src/redmic/modules/form/form/templates/Select.html b/client-app/src/component/form/form/templates/Select.html similarity index 100% rename from client-app/src/redmic/modules/form/form/templates/Select.html rename to client-app/src/component/form/form/templates/Select.html diff --git a/client-app/src/redmic/modules/form/form/templates/UploadInput.html b/client-app/src/component/form/form/templates/UploadInput.html similarity index 100% rename from client-app/src/redmic/modules/form/form/templates/UploadInput.html rename to client-app/src/component/form/form/templates/UploadInput.html diff --git a/client-app/src/redmic/modules/form/input/AnnotationImpl.js b/client-app/src/component/form/input/AnnotationImpl.js similarity index 94% rename from client-app/src/redmic/modules/form/input/AnnotationImpl.js rename to client-app/src/component/form/input/AnnotationImpl.js index 1f81b46a..f2c62121 100644 --- a/client-app/src/redmic/modules/form/input/AnnotationImpl.js +++ b/client-app/src/component/form/input/AnnotationImpl.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "put-selector/put" - , "redmic/modules/form/input/Input" + , "src/component/form/input/Input" ], function( declare , lang @@ -47,4 +47,4 @@ define([ } }); -}); \ No newline at end of file +}); diff --git a/client-app/src/redmic/modules/form/input/ButtonImpl.js b/client-app/src/component/form/input/ButtonImpl.js similarity index 91% rename from client-app/src/redmic/modules/form/input/ButtonImpl.js rename to client-app/src/component/form/input/ButtonImpl.js index a1bb4899..8c228492 100644 --- a/client-app/src/redmic/modules/form/input/ButtonImpl.js +++ b/client-app/src/component/form/input/ButtonImpl.js @@ -2,7 +2,7 @@ define([ "dijit/form/Button" , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/form/input/Input" + , "src/component/form/input/Input" ], function( Button , declare @@ -27,4 +27,4 @@ define([ return new Button(this._inputProps).placeAt(this.containerInput); } }); -}); \ No newline at end of file +}); diff --git a/client-app/src/redmic/modules/form/input/CheckBoxGroupImpl.js b/client-app/src/component/form/input/CheckBoxGroupImpl.js similarity index 99% rename from client-app/src/redmic/modules/form/input/CheckBoxGroupImpl.js rename to client-app/src/component/form/input/CheckBoxGroupImpl.js index c6cb718f..0f470ea5 100644 --- a/client-app/src/redmic/modules/form/input/CheckBoxGroupImpl.js +++ b/client-app/src/component/form/input/CheckBoxGroupImpl.js @@ -3,7 +3,7 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "put-selector/put" - , "redmic/modules/form/input/Input" + , "src/component/form/input/Input" , "RWidgets/Utilities" ], function( CheckBox @@ -211,4 +211,4 @@ define([ } } }); -}); \ No newline at end of file +}); diff --git a/client-app/src/redmic/modules/form/input/CheckBoxImpl.js b/client-app/src/component/form/input/CheckBoxImpl.js similarity index 96% rename from client-app/src/redmic/modules/form/input/CheckBoxImpl.js rename to client-app/src/component/form/input/CheckBoxImpl.js index 773bfbb3..6e163d34 100644 --- a/client-app/src/redmic/modules/form/input/CheckBoxImpl.js +++ b/client-app/src/component/form/input/CheckBoxImpl.js @@ -3,7 +3,7 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "put-selector/put" - , "redmic/modules/form/input/Input" + , "src/component/form/input/Input" ], function( CheckBox , declare diff --git a/client-app/src/redmic/modules/form/input/ColorImpl.js b/client-app/src/component/form/input/ColorImpl.js similarity index 90% rename from client-app/src/redmic/modules/form/input/ColorImpl.js rename to client-app/src/component/form/input/ColorImpl.js index 445a5b88..25c0093f 100644 --- a/client-app/src/redmic/modules/form/input/ColorImpl.js +++ b/client-app/src/component/form/input/ColorImpl.js @@ -2,8 +2,8 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "put-selector/put" - , "redmic/modules/form/input/ColorPickerImpl" - , "redmic/modules/form/input/_BaseTextBoxWidthExpandTooltipImpl" + , "src/component/form/input/ColorPickerImpl" + , "src/component/form/input/_BaseTextBoxWidthExpandTooltipImpl" ], function( declare , lang diff --git a/client-app/src/redmic/modules/form/input/ColorPickerImpl.js b/client-app/src/component/form/input/ColorPickerImpl.js similarity index 95% rename from client-app/src/redmic/modules/form/input/ColorPickerImpl.js rename to client-app/src/component/form/input/ColorPickerImpl.js index ab1d475b..92c37298 100644 --- a/client-app/src/redmic/modules/form/input/ColorPickerImpl.js +++ b/client-app/src/component/form/input/ColorPickerImpl.js @@ -3,7 +3,7 @@ define([ , "dojo/_base/lang" , "dojo/aspect" , "dojox/widget/ColorPicker" - , "redmic/modules/form/input/Input" + , "src/component/form/input/Input" ], function( declare , lang @@ -45,4 +45,4 @@ define([ this._inputInstance.setColor(obj[this.propertyName]); } }); -}); \ No newline at end of file +}); diff --git a/client-app/src/redmic/modules/form/input/ColorPickerTextBoxImpl.js b/client-app/src/component/form/input/ColorPickerTextBoxImpl.js similarity index 91% rename from client-app/src/redmic/modules/form/input/ColorPickerTextBoxImpl.js rename to client-app/src/component/form/input/ColorPickerTextBoxImpl.js index 2a656d75..478a74bf 100644 --- a/client-app/src/redmic/modules/form/input/ColorPickerTextBoxImpl.js +++ b/client-app/src/component/form/input/ColorPickerTextBoxImpl.js @@ -2,8 +2,8 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "put-selector/put" - , "redmic/modules/form/input/ColorPickerImpl" - , "redmic/modules/form/input/_BaseTextBoxWidthExpandTooltipImpl" + , "src/component/form/input/ColorPickerImpl" + , "src/component/form/input/_BaseTextBoxWidthExpandTooltipImpl" ], function( declare , lang diff --git a/client-app/src/redmic/modules/form/input/ColorsRampImpl.js b/client-app/src/component/form/input/ColorsRampImpl.js similarity index 98% rename from client-app/src/redmic/modules/form/input/ColorsRampImpl.js rename to client-app/src/component/form/input/ColorsRampImpl.js index fd0c1418..620bcb4b 100644 --- a/client-app/src/redmic/modules/form/input/ColorsRampImpl.js +++ b/client-app/src/component/form/input/ColorsRampImpl.js @@ -3,7 +3,7 @@ define([ , "dojo/_base/lang" , "dojo/aspect" , "put-selector/put" - , "redmic/modules/form/input/_BaseMultiSelectImpl" + , "src/component/form/input/_BaseMultiSelectImpl" , "templates/FilterColorRamp" , 'colorjs/color' ], function( @@ -188,4 +188,4 @@ define([ this._setValue(value); } }); -}); \ No newline at end of file +}); diff --git a/client-app/src/redmic/modules/form/input/DateRangeComplexImpl.js b/client-app/src/component/form/input/DateRangeComplexImpl.js similarity index 98% rename from client-app/src/redmic/modules/form/input/DateRangeComplexImpl.js rename to client-app/src/component/form/input/DateRangeComplexImpl.js index 7cf5f731..68de1a0c 100644 --- a/client-app/src/redmic/modules/form/input/DateRangeComplexImpl.js +++ b/client-app/src/component/form/input/DateRangeComplexImpl.js @@ -4,11 +4,11 @@ define([ , "dojo/aspect" , 'moment/moment.min' , "put-selector/put" - , "redmic/modules/components/Keypad/TrizoneKeypadImpl" - , "redmic/modules/form/input/_Dependence" - , "redmic/modules/form/input/DateTimeImpl" - , "redmic/modules/form/input/Input" - , "redmic/modules/form/input/TextBoxImpl" + , "src/component/components/Keypad/TrizoneKeypadImpl" + , "src/component/form/input/_Dependence" + , "src/component/form/input/DateTimeImpl" + , "src/component/form/input/Input" + , "src/component/form/input/TextBoxImpl" ], function( declare , lang diff --git a/client-app/src/redmic/modules/form/input/DateRangeImpl.js b/client-app/src/component/form/input/DateRangeImpl.js similarity index 93% rename from client-app/src/redmic/modules/form/input/DateRangeImpl.js rename to client-app/src/component/form/input/DateRangeImpl.js index d0b1ca69..88c5f246 100644 --- a/client-app/src/redmic/modules/form/input/DateRangeImpl.js +++ b/client-app/src/component/form/input/DateRangeImpl.js @@ -1,8 +1,8 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/form/input/DateTimeTextBoxImpl" - , "redmic/modules/form/input/_BaseRange" + , "src/component/form/input/DateTimeTextBoxImpl" + , "src/component/form/input/_BaseRange" ], function( declare , lang diff --git a/client-app/src/redmic/modules/form/input/DateRangeTextBoxImpl.js b/client-app/src/component/form/input/DateRangeTextBoxImpl.js similarity index 94% rename from client-app/src/redmic/modules/form/input/DateRangeTextBoxImpl.js rename to client-app/src/component/form/input/DateRangeTextBoxImpl.js index edbf4587..cd131529 100644 --- a/client-app/src/redmic/modules/form/input/DateRangeTextBoxImpl.js +++ b/client-app/src/component/form/input/DateRangeTextBoxImpl.js @@ -2,8 +2,8 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , 'moment/moment.min' - , "redmic/modules/form/input/DateRangeComplexImpl" - , "redmic/modules/form/input/_BaseTextBoxWidthExpandTooltipImpl" + , "src/component/form/input/DateRangeComplexImpl" + , "src/component/form/input/_BaseTextBoxWidthExpandTooltipImpl" , "RWidgets/Utilities" ], function( declare diff --git a/client-app/src/redmic/modules/form/input/DateTextBoxImpl.js b/client-app/src/component/form/input/DateTextBoxImpl.js similarity index 93% rename from client-app/src/redmic/modules/form/input/DateTextBoxImpl.js rename to client-app/src/component/form/input/DateTextBoxImpl.js index e29c3c2d..2a4e6bfc 100644 --- a/client-app/src/redmic/modules/form/input/DateTextBoxImpl.js +++ b/client-app/src/component/form/input/DateTextBoxImpl.js @@ -2,7 +2,7 @@ define([ "dijit/form/DateTextBox" , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/form/input/Input" + , "src/component/form/input/Input" ], function( DateTextBox , declare @@ -31,4 +31,4 @@ define([ return new DateTextBox(this._inputProps).placeAt(this.containerInput); } }); -}); \ No newline at end of file +}); diff --git a/client-app/src/redmic/modules/form/input/DateTimeImpl.js b/client-app/src/component/form/input/DateTimeImpl.js similarity index 97% rename from client-app/src/redmic/modules/form/input/DateTimeImpl.js rename to client-app/src/component/form/input/DateTimeImpl.js index bef94f73..9e6a6f6d 100644 --- a/client-app/src/redmic/modules/form/input/DateTimeImpl.js +++ b/client-app/src/component/form/input/DateTimeImpl.js @@ -5,8 +5,8 @@ define([ , "dojo/aspect" , 'moment/moment.min' , "put-selector/put" - , "redmic/modules/form/input/_BaseDateTime" - , "redmic/modules/form/input/Input" + , "src/component/form/input/_BaseDateTime" + , "src/component/form/input/Input" , "RWidgets/TimeSelect" ], function( Calendar diff --git a/client-app/src/redmic/modules/form/input/DateTimeTextBoxImpl.js b/client-app/src/component/form/input/DateTimeTextBoxImpl.js similarity index 96% rename from client-app/src/redmic/modules/form/input/DateTimeTextBoxImpl.js rename to client-app/src/component/form/input/DateTimeTextBoxImpl.js index b20fe614..7ed3b7de 100644 --- a/client-app/src/redmic/modules/form/input/DateTimeTextBoxImpl.js +++ b/client-app/src/component/form/input/DateTimeTextBoxImpl.js @@ -3,9 +3,9 @@ define([ , "dojo/_base/lang" , "dojo/aspect" , 'moment/moment.min' - , "redmic/modules/form/input/DateTimeImpl" - , "redmic/modules/form/input/_BaseDateTime" - , "redmic/modules/form/input/_BaseTextBoxWidthExpandTooltipImpl" + , "src/component/form/input/DateTimeImpl" + , "src/component/form/input/_BaseDateTime" + , "src/component/form/input/_BaseTextBoxWidthExpandTooltipImpl" ], function( declare , lang diff --git a/client-app/src/redmic/modules/form/input/FilteringSelectImpl.js b/client-app/src/component/form/input/FilteringSelectImpl.js similarity index 99% rename from client-app/src/redmic/modules/form/input/FilteringSelectImpl.js rename to client-app/src/component/form/input/FilteringSelectImpl.js index 7ba4897a..84a6354f 100644 --- a/client-app/src/redmic/modules/form/input/FilteringSelectImpl.js +++ b/client-app/src/component/form/input/FilteringSelectImpl.js @@ -1,8 +1,8 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Store" - , "redmic/modules/form/input/Input" + , "src/component/base/_Store" + , "src/component/form/input/Input" , "RWidgets/FilteringSelect" ], function( declare diff --git a/client-app/src/redmic/modules/form/input/GeographicCoordinatesComponentImpl.js b/client-app/src/component/form/input/GeographicCoordinatesComponentImpl.js similarity index 99% rename from client-app/src/redmic/modules/form/input/GeographicCoordinatesComponentImpl.js rename to client-app/src/component/form/input/GeographicCoordinatesComponentImpl.js index 969fef1a..30acebec 100644 --- a/client-app/src/redmic/modules/form/input/GeographicCoordinatesComponentImpl.js +++ b/client-app/src/component/form/input/GeographicCoordinatesComponentImpl.js @@ -3,7 +3,7 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "RWidgets/Utilities" - , "redmic/modules/form/input/Input" + , "src/component/form/input/Input" , "RWidgets/Converter" ], function( NumberTextBox diff --git a/client-app/src/redmic/modules/form/input/GeometryImpl.js b/client-app/src/component/form/input/GeometryImpl.js similarity index 97% rename from client-app/src/redmic/modules/form/input/GeometryImpl.js rename to client-app/src/component/form/input/GeometryImpl.js index 133fa5d9..35d79fb5 100644 --- a/client-app/src/redmic/modules/form/input/GeometryImpl.js +++ b/client-app/src/component/form/input/GeometryImpl.js @@ -4,8 +4,8 @@ define([ , 'dojo/_base/declare' , 'dojo/_base/lang' , 'put-selector/put' - , 'redmic/modules/form/form/UploadInput' - , 'redmic/modules/form/input/Input' + , 'src/component/form/form/UploadInput' + , 'src/component/form/input/Input' ], function( redmicConfig , Textarea diff --git a/client-app/src/redmic/modules/form/input/Input.js b/client-app/src/component/form/input/Input.js similarity index 99% rename from client-app/src/redmic/modules/form/input/Input.js rename to client-app/src/component/form/input/Input.js index 6fbb0a19..06d2beb2 100644 --- a/client-app/src/redmic/modules/form/input/Input.js +++ b/client-app/src/component/form/input/Input.js @@ -4,8 +4,8 @@ define([ , "dojo/_base/lang" , "dojo/aspect" , "dojo/Deferred" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" + , "src/component/base/_Module" + , "src/component/base/_Show" , "./_NodesCreation" , "./_InputItfc" ], function( diff --git a/client-app/src/redmic/modules/form/input/KeywordsImpl.js b/client-app/src/component/form/input/KeywordsImpl.js similarity index 95% rename from client-app/src/redmic/modules/form/input/KeywordsImpl.js rename to client-app/src/component/form/input/KeywordsImpl.js index 0d9b26ab..eb925dce 100644 --- a/client-app/src/redmic/modules/form/input/KeywordsImpl.js +++ b/client-app/src/component/form/input/KeywordsImpl.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/form/input/Input" + , "src/component/form/input/Input" , "RWidgets/KeywordsInput" ], function( declare @@ -48,4 +48,4 @@ define([ this._enable(); } }); -}); \ No newline at end of file +}); diff --git a/client-app/src/redmic/modules/form/input/MapSearchImpl.js b/client-app/src/component/form/input/MapSearchImpl.js similarity index 93% rename from client-app/src/redmic/modules/form/input/MapSearchImpl.js rename to client-app/src/component/form/input/MapSearchImpl.js index fb6fdb0d..a8b1daca 100644 --- a/client-app/src/redmic/modules/form/input/MapSearchImpl.js +++ b/client-app/src/component/form/input/MapSearchImpl.js @@ -1,8 +1,8 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/form/input/Input" - , "redmic/modules/search/GeographicImpl" + , "src/component/form/input/Input" + , "src/component/search/GeographicImpl" ], function( declare , lang diff --git a/client-app/src/redmic/modules/form/input/MultiSelectImpl.js b/client-app/src/component/form/input/MultiSelectImpl.js similarity index 96% rename from client-app/src/redmic/modules/form/input/MultiSelectImpl.js rename to client-app/src/component/form/input/MultiSelectImpl.js index ba488961..5d891210 100644 --- a/client-app/src/redmic/modules/form/input/MultiSelectImpl.js +++ b/client-app/src/component/form/input/MultiSelectImpl.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "RWidgets/Utilities" - , "redmic/modules/form/input/_BaseMultiSelectImpl" + , "src/component/form/input/_BaseMultiSelectImpl" ], function( declare , lang @@ -78,4 +78,4 @@ define([ this._status(obj); } }); -}); \ No newline at end of file +}); diff --git a/client-app/src/redmic/modules/form/input/NumberSpinnerImpl.js b/client-app/src/component/form/input/NumberSpinnerImpl.js similarity index 95% rename from client-app/src/redmic/modules/form/input/NumberSpinnerImpl.js rename to client-app/src/component/form/input/NumberSpinnerImpl.js index be704bba..31b89af8 100644 --- a/client-app/src/redmic/modules/form/input/NumberSpinnerImpl.js +++ b/client-app/src/component/form/input/NumberSpinnerImpl.js @@ -2,7 +2,7 @@ define([ "dijit/form/NumberSpinner" , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/form/input/Input" + , "src/component/form/input/Input" ], function( NumberSpinner , declare diff --git a/client-app/src/redmic/modules/form/input/NumberTextBoxImpl.js b/client-app/src/component/form/input/NumberTextBoxImpl.js similarity index 96% rename from client-app/src/redmic/modules/form/input/NumberTextBoxImpl.js rename to client-app/src/component/form/input/NumberTextBoxImpl.js index 463d6f7e..8b4c574f 100644 --- a/client-app/src/redmic/modules/form/input/NumberTextBoxImpl.js +++ b/client-app/src/component/form/input/NumberTextBoxImpl.js @@ -2,7 +2,7 @@ define([ "dijit/form/NumberTextBox" , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/form/input/Input" + , "src/component/form/input/Input" ], function( NumberTextBox , declare diff --git a/client-app/src/redmic/modules/form/input/PointImpl.js b/client-app/src/component/form/input/PointImpl.js similarity index 98% rename from client-app/src/redmic/modules/form/input/PointImpl.js rename to client-app/src/component/form/input/PointImpl.js index 44851255..7630babc 100644 --- a/client-app/src/redmic/modules/form/input/PointImpl.js +++ b/client-app/src/component/form/input/PointImpl.js @@ -7,10 +7,10 @@ define([ , "dojo/store/Memory" , "put-selector/put" , "RWidgets/Utilities" - , "redmic/modules/form/input/GeographicCoordinatesComponentImpl" - , "redmic/modules/form/input/Input" - , "redmic/modules/form/input/NumberSpinnerImpl" - , "redmic/modules/model/ModelImpl" + , "src/component/form/input/GeographicCoordinatesComponentImpl" + , "src/component/form/input/Input" + , "src/component/form/input/NumberSpinnerImpl" + , "src/component/model/ModelImpl" , "RWidgets/Converter" ], function( Button diff --git a/client-app/src/redmic/modules/form/input/RadioButtonGroupImpl.js b/client-app/src/component/form/input/RadioButtonGroupImpl.js similarity index 98% rename from client-app/src/redmic/modules/form/input/RadioButtonGroupImpl.js rename to client-app/src/component/form/input/RadioButtonGroupImpl.js index c010aa29..ec58b839 100644 --- a/client-app/src/redmic/modules/form/input/RadioButtonGroupImpl.js +++ b/client-app/src/component/form/input/RadioButtonGroupImpl.js @@ -3,7 +3,7 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "put-selector/put" - , "redmic/modules/form/input/Input" + , "src/component/form/input/Input" ], function( RadioButton , declare @@ -165,4 +165,4 @@ define([ } } }); -}); \ No newline at end of file +}); diff --git a/client-app/src/redmic/modules/form/input/RadioButtonImpl.js b/client-app/src/component/form/input/RadioButtonImpl.js similarity index 94% rename from client-app/src/redmic/modules/form/input/RadioButtonImpl.js rename to client-app/src/component/form/input/RadioButtonImpl.js index 9a8818f7..f7026011 100644 --- a/client-app/src/redmic/modules/form/input/RadioButtonImpl.js +++ b/client-app/src/component/form/input/RadioButtonImpl.js @@ -3,7 +3,7 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "put-selector/put" - , "redmic/modules/form/input/Input" + , "src/component/form/input/Input" ], function( RadioButton , declare @@ -40,4 +40,4 @@ define([ return widget; } }); -}); \ No newline at end of file +}); diff --git a/client-app/src/redmic/modules/form/input/RangeImpl.js b/client-app/src/component/form/input/RangeImpl.js similarity index 88% rename from client-app/src/redmic/modules/form/input/RangeImpl.js rename to client-app/src/component/form/input/RangeImpl.js index 5db5ea9b..8af0a88a 100644 --- a/client-app/src/redmic/modules/form/input/RangeImpl.js +++ b/client-app/src/component/form/input/RangeImpl.js @@ -1,9 +1,9 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/form/input/NumberSpinnerImpl" - , "redmic/modules/form/input/NumberTextBoxImpl" - , "redmic/modules/form/input/_BaseRange" + , "src/component/form/input/NumberSpinnerImpl" + , "src/component/form/input/NumberTextBoxImpl" + , "src/component/form/input/_BaseRange" ], function( declare , lang diff --git a/client-app/src/redmic/modules/form/input/RangeSliderImpl.js b/client-app/src/component/form/input/RangeSliderImpl.js similarity index 96% rename from client-app/src/redmic/modules/form/input/RangeSliderImpl.js rename to client-app/src/component/form/input/RangeSliderImpl.js index 9cab500f..e2afb596 100644 --- a/client-app/src/redmic/modules/form/input/RangeSliderImpl.js +++ b/client-app/src/component/form/input/RangeSliderImpl.js @@ -2,7 +2,7 @@ define([ "RWidgets/RangeSlider" , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/form/input/Input" + , "src/component/form/input/Input" ], function( RangeSlider , declare @@ -56,4 +56,4 @@ define([ this._emitChanged(value); } }); -}); \ No newline at end of file +}); diff --git a/client-app/src/redmic/modules/form/input/SelectImpl.js b/client-app/src/component/form/input/SelectImpl.js similarity index 98% rename from client-app/src/redmic/modules/form/input/SelectImpl.js rename to client-app/src/component/form/input/SelectImpl.js index 207c0301..ed403117 100644 --- a/client-app/src/redmic/modules/form/input/SelectImpl.js +++ b/client-app/src/component/form/input/SelectImpl.js @@ -4,9 +4,9 @@ define([ , "dojo/_base/lang" , "dojo/aspect" , "RWidgets/Utilities" - , "redmic/modules/form/form/Select" - , "redmic/modules/base/_Store" - , "redmic/modules/form/input/Input" + , "src/component/form/form/Select" + , "src/component/base/_Store" + , "src/component/form/input/Input" ], function( redmicConfig , declare diff --git a/client-app/src/redmic/modules/form/input/SelectOnListPopupImpl.js b/client-app/src/component/form/input/SelectOnListPopupImpl.js similarity index 94% rename from client-app/src/redmic/modules/form/input/SelectOnListPopupImpl.js rename to client-app/src/component/form/input/SelectOnListPopupImpl.js index 7c4c43f6..223f4f64 100644 --- a/client-app/src/redmic/modules/form/input/SelectOnListPopupImpl.js +++ b/client-app/src/component/form/input/SelectOnListPopupImpl.js @@ -4,11 +4,11 @@ define([ , "app/designs/textSearchList/layout/BasicTopZone" , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_ShowInPopup" - , "redmic/modules/form/input/_SelectOnPopupImpl" - , "redmic/modules/browser/_ButtonsInRow" - , "redmic/modules/browser/_HierarchicalSelect" - , "redmic/modules/browser/HierarchicalImpl" + , "src/component/base/_ShowInPopup" + , "src/component/form/input/_SelectOnPopupImpl" + , "src/component/browser/_ButtonsInRow" + , "src/component/browser/_HierarchicalSelect" + , "src/component/browser/HierarchicalImpl" ], function( _LocalSelectionView , Controller diff --git a/client-app/src/redmic/modules/form/input/SliderImpl.js b/client-app/src/component/form/input/SliderImpl.js similarity index 95% rename from client-app/src/redmic/modules/form/input/SliderImpl.js rename to client-app/src/component/form/input/SliderImpl.js index 05d23aa5..21e5f3eb 100644 --- a/client-app/src/redmic/modules/form/input/SliderImpl.js +++ b/client-app/src/component/form/input/SliderImpl.js @@ -2,7 +2,7 @@ define([ "RWidgets/Slider" , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/form/input/Input" + , "src/component/form/input/Input" ], function( Slider , declare @@ -45,4 +45,4 @@ define([ this._emitChanged(value); } }); -}); \ No newline at end of file +}); diff --git a/client-app/src/redmic/modules/form/input/TextAreaImpl.js b/client-app/src/component/form/input/TextAreaImpl.js similarity index 92% rename from client-app/src/redmic/modules/form/input/TextAreaImpl.js rename to client-app/src/component/form/input/TextAreaImpl.js index c34a063e..8f003d65 100644 --- a/client-app/src/redmic/modules/form/input/TextAreaImpl.js +++ b/client-app/src/component/form/input/TextAreaImpl.js @@ -2,7 +2,7 @@ define([ "dijit/form/Textarea" , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/form/input/Input" + , "src/component/form/input/Input" ], function( Textarea , declare @@ -28,4 +28,4 @@ define([ return new Textarea(this._inputProps).placeAt(this.containerInput); } }); -}); \ No newline at end of file +}); diff --git a/client-app/src/redmic/modules/form/input/TextBoxImpl.js b/client-app/src/component/form/input/TextBoxImpl.js similarity index 92% rename from client-app/src/redmic/modules/form/input/TextBoxImpl.js rename to client-app/src/component/form/input/TextBoxImpl.js index 42ace791..f9b5f9fd 100644 --- a/client-app/src/redmic/modules/form/input/TextBoxImpl.js +++ b/client-app/src/component/form/input/TextBoxImpl.js @@ -2,7 +2,7 @@ define([ "dijit/form/ValidationTextBox" , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/form/input/Input" + , "src/component/form/input/Input" ], function( ValidationTextBox , declare @@ -28,4 +28,4 @@ define([ return new ValidationTextBox(this._inputProps).placeAt(this.containerInput); } }); -}); \ No newline at end of file +}); diff --git a/client-app/src/redmic/modules/form/input/UploadFileImpl.js b/client-app/src/component/form/input/UploadFileImpl.js similarity index 98% rename from client-app/src/redmic/modules/form/input/UploadFileImpl.js rename to client-app/src/component/form/input/UploadFileImpl.js index ab975821..39d17dda 100644 --- a/client-app/src/redmic/modules/form/input/UploadFileImpl.js +++ b/client-app/src/component/form/input/UploadFileImpl.js @@ -4,8 +4,8 @@ define([ , 'dojo/Deferred' , 'dojo/on' , 'src/utils/Credentials' - , 'redmic/modules/form/form/UploadInput' - , 'redmic/modules/form/input/Input' + , 'src/component/form/form/UploadInput' + , 'src/component/form/input/Input' , 'src/utils/stringFormats' , 'RWidgets/Utilities' ], function( diff --git a/client-app/src/redmic/modules/form/input/ValueAndUnitSelectorImpl.js b/client-app/src/component/form/input/ValueAndUnitSelectorImpl.js similarity index 96% rename from client-app/src/redmic/modules/form/input/ValueAndUnitSelectorImpl.js rename to client-app/src/component/form/input/ValueAndUnitSelectorImpl.js index eeccd6b0..7ea54429 100644 --- a/client-app/src/redmic/modules/form/input/ValueAndUnitSelectorImpl.js +++ b/client-app/src/component/form/input/ValueAndUnitSelectorImpl.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/form/input/Input" + , "src/component/form/input/Input" , "RWidgets/ValueAndUnitSelector" ], function( declare @@ -60,4 +60,4 @@ define([ this._enable(); } }); -}); \ No newline at end of file +}); diff --git a/client-app/src/redmic/modules/form/input/_BaseDateTime.js b/client-app/src/component/form/input/_BaseDateTime.js similarity index 100% rename from client-app/src/redmic/modules/form/input/_BaseDateTime.js rename to client-app/src/component/form/input/_BaseDateTime.js diff --git a/client-app/src/redmic/modules/form/input/_BaseMultiSelectImpl.js b/client-app/src/component/form/input/_BaseMultiSelectImpl.js similarity index 97% rename from client-app/src/redmic/modules/form/input/_BaseMultiSelectImpl.js rename to client-app/src/component/form/input/_BaseMultiSelectImpl.js index 10d43841..0d837c31 100644 --- a/client-app/src/redmic/modules/form/input/_BaseMultiSelectImpl.js +++ b/client-app/src/component/form/input/_BaseMultiSelectImpl.js @@ -4,11 +4,11 @@ define([ , "dojo/_base/lang" , "dojo/aspect" , "put-selector/put" - , "redmic/modules/base/_Store" - , "redmic/modules/base/_ShowInTooltip" - , "redmic/modules/base/_ShowOnEvt" - , "redmic/modules/form/input/Input" - , "redmic/modules/layout/listMenu/ListMenu" + , "src/component/base/_Store" + , "src/component/base/_ShowInTooltip" + , "src/component/base/_ShowOnEvt" + , "src/component/form/input/Input" + , "src/component/layout/listMenu/ListMenu" ], function( redmicConfig , declare diff --git a/client-app/src/redmic/modules/form/input/_BaseRange.js b/client-app/src/component/form/input/_BaseRange.js similarity index 97% rename from client-app/src/redmic/modules/form/input/_BaseRange.js rename to client-app/src/component/form/input/_BaseRange.js index f6f48241..4b67866f 100644 --- a/client-app/src/redmic/modules/form/input/_BaseRange.js +++ b/client-app/src/component/form/input/_BaseRange.js @@ -1,9 +1,9 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/form/input/Input" - , "redmic/modules/form/input/_Dependence" - , "redmic/modules/form/input/_DisableInput" + , "src/component/form/input/Input" + , "src/component/form/input/_Dependence" + , "src/component/form/input/_DisableInput" ], function( declare , lang diff --git a/client-app/src/redmic/modules/form/input/_BaseTextBoxWidthExpandTooltipImpl.js b/client-app/src/component/form/input/_BaseTextBoxWidthExpandTooltipImpl.js similarity index 89% rename from client-app/src/redmic/modules/form/input/_BaseTextBoxWidthExpandTooltipImpl.js rename to client-app/src/component/form/input/_BaseTextBoxWidthExpandTooltipImpl.js index 3a2955f4..0a38528c 100644 --- a/client-app/src/redmic/modules/form/input/_BaseTextBoxWidthExpandTooltipImpl.js +++ b/client-app/src/component/form/input/_BaseTextBoxWidthExpandTooltipImpl.js @@ -2,7 +2,7 @@ define([ "dijit/form/ValidationTextBox" , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/form/input/_BaseWidthExpandTooltipImpl" + , "src/component/form/input/_BaseWidthExpandTooltipImpl" ], function( ValidationTextBox , declare @@ -27,4 +27,4 @@ define([ return new ValidationTextBox(this._inputProps).placeAt(this.containerInput); } }); -}); \ No newline at end of file +}); diff --git a/client-app/src/redmic/modules/form/input/_BaseWidthExpandTooltipImpl.js b/client-app/src/component/form/input/_BaseWidthExpandTooltipImpl.js similarity index 98% rename from client-app/src/redmic/modules/form/input/_BaseWidthExpandTooltipImpl.js rename to client-app/src/component/form/input/_BaseWidthExpandTooltipImpl.js index de305226..2329c56b 100644 --- a/client-app/src/redmic/modules/form/input/_BaseWidthExpandTooltipImpl.js +++ b/client-app/src/component/form/input/_BaseWidthExpandTooltipImpl.js @@ -3,8 +3,8 @@ define([ , "dojo/_base/lang" , "dojo/aspect" , "put-selector/put" - , "redmic/modules/base/_ShowInTooltip" - , "redmic/modules/form/input/Input" + , "src/component/base/_ShowInTooltip" + , "src/component/form/input/Input" ], function( declare , lang diff --git a/client-app/src/redmic/modules/form/input/_DeleteOnClear.js b/client-app/src/component/form/input/_DeleteOnClear.js similarity index 100% rename from client-app/src/redmic/modules/form/input/_DeleteOnClear.js rename to client-app/src/component/form/input/_DeleteOnClear.js diff --git a/client-app/src/redmic/modules/form/input/_Dependence.js b/client-app/src/component/form/input/_Dependence.js similarity index 100% rename from client-app/src/redmic/modules/form/input/_Dependence.js rename to client-app/src/component/form/input/_Dependence.js diff --git a/client-app/src/redmic/modules/form/input/_DisableInput.js b/client-app/src/component/form/input/_DisableInput.js similarity index 100% rename from client-app/src/redmic/modules/form/input/_DisableInput.js rename to client-app/src/component/form/input/_DisableInput.js diff --git a/client-app/src/redmic/modules/form/input/_IgnoreNonexistentProperty.js b/client-app/src/component/form/input/_IgnoreNonexistentProperty.js similarity index 100% rename from client-app/src/redmic/modules/form/input/_IgnoreNonexistentProperty.js rename to client-app/src/component/form/input/_IgnoreNonexistentProperty.js diff --git a/client-app/src/redmic/modules/form/input/_InputItfc.js b/client-app/src/component/form/input/_InputItfc.js similarity index 95% rename from client-app/src/redmic/modules/form/input/_InputItfc.js rename to client-app/src/component/form/input/_InputItfc.js index 562ff3a7..231c930a 100644 --- a/client-app/src/redmic/modules/form/input/_InputItfc.js +++ b/client-app/src/component/form/input/_InputItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/client-app/src/redmic/modules/form/input/_NodesCreation.js b/client-app/src/component/form/input/_NodesCreation.js similarity index 96% rename from client-app/src/redmic/modules/form/input/_NodesCreation.js rename to client-app/src/component/form/input/_NodesCreation.js index d49742dd..33bd2053 100644 --- a/client-app/src/redmic/modules/form/input/_NodesCreation.js +++ b/client-app/src/component/form/input/_NodesCreation.js @@ -3,9 +3,9 @@ define([ , 'dojo/_base/lang' , 'dojo/aspect' , 'dojo/dom-class' - , 'redmic/modules/base/_ShowInTooltip' - , 'redmic/modules/base/_ShowOnEvt' - , 'redmic/modules/layout/dataDisplayer/DataDisplayer' + , 'src/component/base/_ShowInTooltip' + , 'src/component/base/_ShowOnEvt' + , 'src/component/layout/dataDisplayer/DataDisplayer' , 'put-selector/put' ], function( declare diff --git a/client-app/src/redmic/modules/form/input/_SelectOnPopupImpl.js b/client-app/src/component/form/input/_SelectOnPopupImpl.js similarity index 98% rename from client-app/src/redmic/modules/form/input/_SelectOnPopupImpl.js rename to client-app/src/component/form/input/_SelectOnPopupImpl.js index a15e68b0..379ad8fc 100644 --- a/client-app/src/redmic/modules/form/input/_SelectOnPopupImpl.js +++ b/client-app/src/component/form/input/_SelectOnPopupImpl.js @@ -4,7 +4,7 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "put-selector/put" - , "redmic/modules/form/input/Input" + , "src/component/form/input/Input" ], function( redmicConfig , ValidationTextBox diff --git a/client-app/src/redmic/modules/gateway/AddItemGatewayImpl.js b/client-app/src/component/gateway/AddItemGatewayImpl.js similarity index 96% rename from client-app/src/redmic/modules/gateway/AddItemGatewayImpl.js rename to client-app/src/component/gateway/AddItemGatewayImpl.js index ca8c54f6..87e67eac 100644 --- a/client-app/src/redmic/modules/gateway/AddItemGatewayImpl.js +++ b/client-app/src/component/gateway/AddItemGatewayImpl.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Store" + , "src/component/base/_Store" , "./Gateway" ], function( declare diff --git a/client-app/src/redmic/modules/gateway/Gateway.js b/client-app/src/component/gateway/Gateway.js similarity index 99% rename from client-app/src/redmic/modules/gateway/Gateway.js rename to client-app/src/component/gateway/Gateway.js index 2d233932..5c5ce314 100644 --- a/client-app/src/redmic/modules/gateway/Gateway.js +++ b/client-app/src/component/gateway/Gateway.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "RWidgets/Utilities" - , "redmic/modules/base/_Module" + , "src/component/base/_Module" , "./_GatewayItfc" ], function( declare diff --git a/client-app/src/redmic/modules/gateway/LocalSelectorGatewayImpl.js b/client-app/src/component/gateway/LocalSelectorGatewayImpl.js similarity index 97% rename from client-app/src/redmic/modules/gateway/LocalSelectorGatewayImpl.js rename to client-app/src/component/gateway/LocalSelectorGatewayImpl.js index 1f3a350b..44aca435 100644 --- a/client-app/src/redmic/modules/gateway/LocalSelectorGatewayImpl.js +++ b/client-app/src/component/gateway/LocalSelectorGatewayImpl.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Store" + , "src/component/base/_Store" , "./Gateway" ], function( declare diff --git a/client-app/src/redmic/modules/gateway/MapCenteringGatewayImpl.js b/client-app/src/component/gateway/MapCenteringGatewayImpl.js similarity index 100% rename from client-app/src/redmic/modules/gateway/MapCenteringGatewayImpl.js rename to client-app/src/component/gateway/MapCenteringGatewayImpl.js diff --git a/client-app/src/redmic/modules/gateway/_GatewayItfc.js b/client-app/src/component/gateway/_GatewayItfc.js similarity index 91% rename from client-app/src/redmic/modules/gateway/_GatewayItfc.js rename to client-app/src/component/gateway/_GatewayItfc.js index d8aae830..db729374 100644 --- a/client-app/src/redmic/modules/gateway/_GatewayItfc.js +++ b/client-app/src/component/gateway/_GatewayItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/client-app/src/redmic/modules/layout/TabsDisplayer.js b/client-app/src/component/layout/TabsDisplayer.js similarity index 98% rename from client-app/src/redmic/modules/layout/TabsDisplayer.js rename to client-app/src/component/layout/TabsDisplayer.js index e700ffd3..19fc5bf1 100644 --- a/client-app/src/redmic/modules/layout/TabsDisplayer.js +++ b/client-app/src/component/layout/TabsDisplayer.js @@ -4,8 +4,8 @@ define([ , 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/query' - , 'redmic/modules/base/_Module' - , 'redmic/modules/base/_Show' + , 'src/component/base/_Module' + , 'src/component/base/_Show' ], function( ContentPane , TabContainer diff --git a/client-app/src/redmic/modules/layout/dataDisplayer/DataDisplayer.js b/client-app/src/component/layout/dataDisplayer/DataDisplayer.js similarity index 94% rename from client-app/src/redmic/modules/layout/dataDisplayer/DataDisplayer.js rename to client-app/src/component/layout/dataDisplayer/DataDisplayer.js index f92598f6..4f5550a4 100644 --- a/client-app/src/redmic/modules/layout/dataDisplayer/DataDisplayer.js +++ b/client-app/src/component/layout/dataDisplayer/DataDisplayer.js @@ -2,8 +2,8 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' , 'put-selector/put' - , 'redmic/modules/base/_Module' - , 'redmic/modules/base/_Show' + , 'src/component/base/_Module' + , 'src/component/base/_Show' ], function( declare , lang diff --git a/client-app/src/redmic/modules/layout/genericDisplayer/GenericDisplayer.js b/client-app/src/component/layout/genericDisplayer/GenericDisplayer.js similarity index 97% rename from client-app/src/redmic/modules/layout/genericDisplayer/GenericDisplayer.js rename to client-app/src/component/layout/genericDisplayer/GenericDisplayer.js index 954fa170..d12e512d 100644 --- a/client-app/src/redmic/modules/layout/genericDisplayer/GenericDisplayer.js +++ b/client-app/src/component/layout/genericDisplayer/GenericDisplayer.js @@ -2,8 +2,8 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' , 'put-selector/put' - , 'redmic/modules/base/_Module' - , 'redmic/modules/base/_Show' + , 'src/component/base/_Module' + , 'src/component/base/_Show' ], function ( declare , lang diff --git a/client-app/src/redmic/modules/layout/genericDisplayer/GenericWithTopbarDisplayerImpl.js b/client-app/src/component/layout/genericDisplayer/GenericWithTopbarDisplayerImpl.js similarity index 100% rename from client-app/src/redmic/modules/layout/genericDisplayer/GenericWithTopbarDisplayerImpl.js rename to client-app/src/component/layout/genericDisplayer/GenericWithTopbarDisplayerImpl.js diff --git a/client-app/src/redmic/modules/layout/listMenu/ListMenu.js b/client-app/src/component/layout/listMenu/ListMenu.js similarity index 99% rename from client-app/src/redmic/modules/layout/listMenu/ListMenu.js rename to client-app/src/component/layout/listMenu/ListMenu.js index 9675bbbb..0345d3fa 100644 --- a/client-app/src/redmic/modules/layout/listMenu/ListMenu.js +++ b/client-app/src/component/layout/listMenu/ListMenu.js @@ -4,8 +4,8 @@ define([ , "dojo/dom-class" , "put-selector/put" , "RWidgets/Utilities" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" + , "src/component/base/_Module" + , "src/component/base/_Show" ], function( declare , lang diff --git a/client-app/src/redmic/modules/layout/nestedContent/NestedBrowsersImpl.js b/client-app/src/component/layout/nestedContent/NestedBrowsersImpl.js similarity index 96% rename from client-app/src/redmic/modules/layout/nestedContent/NestedBrowsersImpl.js rename to client-app/src/component/layout/nestedContent/NestedBrowsersImpl.js index a0acfee4..95aa7342 100644 --- a/client-app/src/redmic/modules/layout/nestedContent/NestedBrowsersImpl.js +++ b/client-app/src/component/layout/nestedContent/NestedBrowsersImpl.js @@ -1,11 +1,11 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/modules/browser/bars/Total' - , 'redmic/modules/browser/_ButtonsInRow' - , 'redmic/modules/browser/_Framework' - , 'redmic/modules/browser/_MultiTemplate' - , 'redmic/modules/browser/ListImpl' + , 'src/component/browser/bars/Total' + , 'src/component/browser/_ButtonsInRow' + , 'src/component/browser/_Framework' + , 'src/component/browser/_MultiTemplate' + , 'src/component/browser/ListImpl' , 'templates/DefaultList' , 'RWidgets/Utilities' , './NestedContent' diff --git a/client-app/src/redmic/modules/layout/nestedContent/NestedContent.js b/client-app/src/component/layout/nestedContent/NestedContent.js similarity index 94% rename from client-app/src/redmic/modules/layout/nestedContent/NestedContent.js rename to client-app/src/component/layout/nestedContent/NestedContent.js index 0800a0fd..31eefc42 100644 --- a/client-app/src/redmic/modules/layout/nestedContent/NestedContent.js +++ b/client-app/src/component/layout/nestedContent/NestedContent.js @@ -1,10 +1,10 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/modules/base/_Module' - , 'redmic/modules/base/_Show' - , 'redmic/modules/base/_Store' - , 'redmic/modules/layout/genericDisplayer/GenericWithTopbarDisplayerImpl' + , 'src/component/base/_Module' + , 'src/component/base/_Show' + , 'src/component/base/_Store' + , 'src/component/layout/genericDisplayer/GenericWithTopbarDisplayerImpl' , 'RWidgets/Button' ], function ( declare diff --git a/client-app/src/redmic/modules/layout/templateDisplayer/TemplateDisplayer.js b/client-app/src/component/layout/templateDisplayer/TemplateDisplayer.js similarity index 97% rename from client-app/src/redmic/modules/layout/templateDisplayer/TemplateDisplayer.js rename to client-app/src/component/layout/templateDisplayer/TemplateDisplayer.js index 4f11533e..aad4a631 100644 --- a/client-app/src/redmic/modules/layout/templateDisplayer/TemplateDisplayer.js +++ b/client-app/src/component/layout/templateDisplayer/TemplateDisplayer.js @@ -2,9 +2,9 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' , 'put-selector/put' - , 'redmic/modules/base/_Module' - , 'redmic/modules/base/_Show' - , 'redmic/modules/base/_Store' + , 'src/component/base/_Module' + , 'src/component/base/_Show' + , 'src/component/base/_Store' , 'templates/LoadingEmpty' ], function( declare diff --git a/client-app/src/redmic/modules/layout/wizard/Wizard.js b/client-app/src/component/layout/wizard/Wizard.js similarity index 99% rename from client-app/src/redmic/modules/layout/wizard/Wizard.js rename to client-app/src/component/layout/wizard/Wizard.js index 909e91ba..00d44f35 100644 --- a/client-app/src/redmic/modules/layout/wizard/Wizard.js +++ b/client-app/src/component/layout/wizard/Wizard.js @@ -5,9 +5,9 @@ define([ , "dojo/keys" , "dojo/Deferred" , "put-selector/put" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" - , "redmic/modules/model/ModelImpl" + , "src/component/base/_Module" + , "src/component/base/_Show" + , "src/component/model/ModelImpl" , "./_WizardStep" ], function( BorderContainer diff --git a/client-app/src/redmic/modules/layout/wizard/_CompleteBySelection.js b/client-app/src/component/layout/wizard/_CompleteBySelection.js similarity index 98% rename from client-app/src/redmic/modules/layout/wizard/_CompleteBySelection.js rename to client-app/src/component/layout/wizard/_CompleteBySelection.js index 49668495..7089031b 100644 --- a/client-app/src/redmic/modules/layout/wizard/_CompleteBySelection.js +++ b/client-app/src/component/layout/wizard/_CompleteBySelection.js @@ -3,7 +3,7 @@ define([ , 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/aspect' - , 'redmic/modules/browser/_Select' + , 'src/component/browser/_Select' ], function ( _LocalSelectionView , declare diff --git a/client-app/src/redmic/modules/layout/wizard/_StepBreadcrumbs.js b/client-app/src/component/layout/wizard/_StepBreadcrumbs.js similarity index 100% rename from client-app/src/redmic/modules/layout/wizard/_StepBreadcrumbs.js rename to client-app/src/component/layout/wizard/_StepBreadcrumbs.js diff --git a/client-app/src/redmic/modules/layout/wizard/_StepNavigation.js b/client-app/src/component/layout/wizard/_StepNavigation.js similarity index 98% rename from client-app/src/redmic/modules/layout/wizard/_StepNavigation.js rename to client-app/src/component/layout/wizard/_StepNavigation.js index aef6ac24..2198ee1c 100644 --- a/client-app/src/redmic/modules/layout/wizard/_StepNavigation.js +++ b/client-app/src/component/layout/wizard/_StepNavigation.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "put-selector/put" - , "redmic/modules/components/Keypad/TrizoneKeypadImpl" + , "src/component/components/Keypad/TrizoneKeypadImpl" ], function( declare , lang diff --git a/client-app/src/redmic/modules/layout/wizard/_WizardStep.js b/client-app/src/component/layout/wizard/_WizardStep.js similarity index 99% rename from client-app/src/redmic/modules/layout/wizard/_WizardStep.js rename to client-app/src/component/layout/wizard/_WizardStep.js index 6f18c3a6..1146a7e3 100644 --- a/client-app/src/redmic/modules/layout/wizard/_WizardStep.js +++ b/client-app/src/component/layout/wizard/_WizardStep.js @@ -4,7 +4,7 @@ define([ , "dojo/_base/lang" , "dojo/aspect" , "dojo/Deferred" - , "redmic/modules/model/ModelImpl" + , "src/component/model/ModelImpl" , "./_WizardStepItfc" ], function( redmicConfig diff --git a/client-app/src/redmic/modules/layout/wizard/_WizardStepItfc.js b/client-app/src/component/layout/wizard/_WizardStepItfc.js similarity index 96% rename from client-app/src/redmic/modules/layout/wizard/_WizardStepItfc.js rename to client-app/src/component/layout/wizard/_WizardStepItfc.js index 80560d1f..d31f9e55 100644 --- a/client-app/src/redmic/modules/layout/wizard/_WizardStepItfc.js +++ b/client-app/src/component/layout/wizard/_WizardStepItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/client-app/src/redmic/modules/map/LeafletImpl.js b/client-app/src/component/map/LeafletImpl.js similarity index 100% rename from client-app/src/redmic/modules/map/LeafletImpl.js rename to client-app/src/component/map/LeafletImpl.js diff --git a/client-app/src/redmic/modules/map/Map.js b/client-app/src/component/map/Map.js similarity index 99% rename from client-app/src/redmic/modules/map/Map.js rename to client-app/src/component/map/Map.js index c503e681..f3e5b3cb 100644 --- a/client-app/src/redmic/modules/map/Map.js +++ b/client-app/src/component/map/Map.js @@ -2,8 +2,8 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , 'uuid/uuidv4.min' - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" + , "src/component/base/_Module" + , "src/component/base/_Show" , './_StaticLayersManagement' , "./_MapItfc" ], function( diff --git a/client-app/src/redmic/modules/map/MapButton.js b/client-app/src/component/map/MapButton.js similarity index 100% rename from client-app/src/redmic/modules/map/MapButton.js rename to client-app/src/component/map/MapButton.js diff --git a/client-app/src/redmic/modules/map/StaticLayersDefinition.js b/client-app/src/component/map/StaticLayersDefinition.js similarity index 100% rename from client-app/src/redmic/modules/map/StaticLayersDefinition.js rename to client-app/src/component/map/StaticLayersDefinition.js diff --git a/client-app/src/redmic/modules/map/_ImportWkt.js b/client-app/src/component/map/_ImportWkt.js similarity index 100% rename from client-app/src/redmic/modules/map/_ImportWkt.js rename to client-app/src/component/map/_ImportWkt.js diff --git a/client-app/src/redmic/modules/map/_LeafletDraw.js b/client-app/src/component/map/_LeafletDraw.js similarity index 100% rename from client-app/src/redmic/modules/map/_LeafletDraw.js rename to client-app/src/component/map/_LeafletDraw.js diff --git a/client-app/src/redmic/modules/map/_LeafletImplItfc.js b/client-app/src/component/map/_LeafletImplItfc.js similarity index 93% rename from client-app/src/redmic/modules/map/_LeafletImplItfc.js rename to client-app/src/component/map/_LeafletImplItfc.js index cd11d716..21fea60b 100644 --- a/client-app/src/redmic/modules/map/_LeafletImplItfc.js +++ b/client-app/src/component/map/_LeafletImplItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/client-app/src/redmic/modules/map/_LeafletWidgetsManagement.js b/client-app/src/component/map/_LeafletWidgetsManagement.js similarity index 100% rename from client-app/src/redmic/modules/map/_LeafletWidgetsManagement.js rename to client-app/src/component/map/_LeafletWidgetsManagement.js diff --git a/client-app/src/redmic/modules/map/_ListenContainers.js b/client-app/src/component/map/_ListenContainers.js similarity index 100% rename from client-app/src/redmic/modules/map/_ListenContainers.js rename to client-app/src/component/map/_ListenContainers.js diff --git a/client-app/src/redmic/modules/map/_MapItfc.js b/client-app/src/component/map/_MapItfc.js similarity index 96% rename from client-app/src/redmic/modules/map/_MapItfc.js rename to client-app/src/component/map/_MapItfc.js index b625ff06..fb8517c3 100644 --- a/client-app/src/redmic/modules/map/_MapItfc.js +++ b/client-app/src/component/map/_MapItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/client-app/src/redmic/modules/map/_OverlayLayersManagement.js b/client-app/src/component/map/_OverlayLayersManagement.js similarity index 100% rename from client-app/src/redmic/modules/map/_OverlayLayersManagement.js rename to client-app/src/component/map/_OverlayLayersManagement.js diff --git a/client-app/src/redmic/modules/map/_PlaceNamesButton.js b/client-app/src/component/map/_PlaceNamesButton.js similarity index 96% rename from client-app/src/redmic/modules/map/_PlaceNamesButton.js rename to client-app/src/component/map/_PlaceNamesButton.js index 8070c2c8..4689bde9 100644 --- a/client-app/src/redmic/modules/map/_PlaceNamesButton.js +++ b/client-app/src/component/map/_PlaceNamesButton.js @@ -3,8 +3,8 @@ define([ ,"dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/map/MapButton" - , "redmic/modules/base/_ShowInPopup" + , "src/component/map/MapButton" + , "src/component/base/_ShowInPopup" ], function( PlaceNames , declare diff --git a/client-app/src/redmic/modules/map/_StaticLayersManagement.js b/client-app/src/component/map/_StaticLayersManagement.js similarity index 98% rename from client-app/src/redmic/modules/map/_StaticLayersManagement.js rename to client-app/src/component/map/_StaticLayersManagement.js index 1f69f2d6..a751fbc0 100644 --- a/client-app/src/redmic/modules/map/_StaticLayersManagement.js +++ b/client-app/src/component/map/_StaticLayersManagement.js @@ -2,7 +2,7 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' , 'put-selector/put' - , 'redmic/modules/map/layer/_LayerProtocols' + , 'src/component/map/layer/_LayerProtocols' , './StaticLayersDefinition' ], function( declare diff --git a/client-app/src/redmic/modules/map/layer/DrawingLayerImpl.js b/client-app/src/component/map/layer/DrawingLayerImpl.js similarity index 100% rename from client-app/src/redmic/modules/map/layer/DrawingLayerImpl.js rename to client-app/src/component/map/layer/DrawingLayerImpl.js diff --git a/client-app/src/redmic/modules/map/layer/GeoJsonLayerImpl.js b/client-app/src/component/map/layer/GeoJsonLayerImpl.js similarity index 100% rename from client-app/src/redmic/modules/map/layer/GeoJsonLayerImpl.js rename to client-app/src/component/map/layer/GeoJsonLayerImpl.js diff --git a/client-app/src/redmic/modules/map/layer/GridLayerImpl.js b/client-app/src/component/map/layer/GridLayerImpl.js similarity index 99% rename from client-app/src/redmic/modules/map/layer/GridLayerImpl.js rename to client-app/src/component/map/layer/GridLayerImpl.js index 5d44f5e5..9ce9c41a 100644 --- a/client-app/src/redmic/modules/map/layer/GridLayerImpl.js +++ b/client-app/src/component/map/layer/GridLayerImpl.js @@ -5,7 +5,7 @@ define([ , "dojo/aspect" , 'leaflet/leaflet' , "src/utils/Credentials" - , "redmic/modules/filter/Filter" + , "src/component/filter/Filter" , "./MapLayer" ], function( d3 diff --git a/client-app/src/redmic/modules/map/layer/MapLayer.js b/client-app/src/component/map/layer/MapLayer.js similarity index 99% rename from client-app/src/redmic/modules/map/layer/MapLayer.js rename to client-app/src/component/map/layer/MapLayer.js index 004c61ca..37edd4e6 100644 --- a/client-app/src/redmic/modules/map/layer/MapLayer.js +++ b/client-app/src/component/map/layer/MapLayer.js @@ -1,8 +1,8 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Store" + , "src/component/base/_Module" + , "src/component/base/_Store" , "./_MapLayerItfc" ], function( declare diff --git a/client-app/src/redmic/modules/map/layer/PruneClusterLayerImpl.js b/client-app/src/component/map/layer/PruneClusterLayerImpl.js similarity index 100% rename from client-app/src/redmic/modules/map/layer/PruneClusterLayerImpl.js rename to client-app/src/component/map/layer/PruneClusterLayerImpl.js diff --git a/client-app/src/redmic/modules/map/layer/TrackingLayerImpl.js b/client-app/src/component/map/layer/TrackingLayerImpl.js similarity index 99% rename from client-app/src/redmic/modules/map/layer/TrackingLayerImpl.js rename to client-app/src/component/map/layer/TrackingLayerImpl.js index c572b150..40a67312 100644 --- a/client-app/src/redmic/modules/map/layer/TrackingLayerImpl.js +++ b/client-app/src/component/map/layer/TrackingLayerImpl.js @@ -8,7 +8,7 @@ define([ , 'dojo/mouse' , 'dojo/on' , 'dojo/promise/all' - , 'redmic/modules/map/layer/TrackingLine' + , 'src/component/map/layer/TrackingLine' , 'RWidgets/Utilities' , './_D3Expansion' , './MapLayer' diff --git a/client-app/src/redmic/modules/map/layer/TrackingLine.js b/client-app/src/component/map/layer/TrackingLine.js similarity index 99% rename from client-app/src/redmic/modules/map/layer/TrackingLine.js rename to client-app/src/component/map/layer/TrackingLine.js index d3e683e0..725cc924 100644 --- a/client-app/src/redmic/modules/map/layer/TrackingLine.js +++ b/client-app/src/component/map/layer/TrackingLine.js @@ -6,7 +6,7 @@ define([ , 'dojo/mouse' , 'dojo/on' , 'leaflet/leaflet' - , 'redmic/modules/base/_Module' + , 'src/component/base/_Module' , 'RWidgets/Utilities' , './_TrackingDataManagement' , './_TrackingMarkersManagement' diff --git a/client-app/src/redmic/modules/map/layer/WmsLayerImpl.js b/client-app/src/component/map/layer/WmsLayerImpl.js similarity index 99% rename from client-app/src/redmic/modules/map/layer/WmsLayerImpl.js rename to client-app/src/component/map/layer/WmsLayerImpl.js index 482bc0b8..f457a605 100644 --- a/client-app/src/redmic/modules/map/layer/WmsLayerImpl.js +++ b/client-app/src/component/map/layer/WmsLayerImpl.js @@ -2,7 +2,7 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' , 'leaflet/leaflet' - , 'redmic/modules/map/StaticLayersDefinition' + , 'src/component/map/StaticLayersDefinition' , 'templates/ServiceOGCImage' , './_LayerProtocols' , './MapLayer' diff --git a/client-app/src/redmic/modules/map/layer/_AddFilter.js b/client-app/src/component/map/layer/_AddFilter.js similarity index 98% rename from client-app/src/redmic/modules/map/layer/_AddFilter.js rename to client-app/src/component/map/layer/_AddFilter.js index 285d6701..dae7160a 100644 --- a/client-app/src/redmic/modules/map/layer/_AddFilter.js +++ b/client-app/src/component/map/layer/_AddFilter.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/base/_Filter" + , "src/component/base/_Filter" ], function( declare , lang diff --git a/client-app/src/redmic/modules/map/layer/_AnimateMarker.js b/client-app/src/component/map/layer/_AnimateMarker.js similarity index 100% rename from client-app/src/redmic/modules/map/layer/_AnimateMarker.js rename to client-app/src/component/map/layer/_AnimateMarker.js diff --git a/client-app/src/redmic/modules/map/layer/_D3Expansion.js b/client-app/src/component/map/layer/_D3Expansion.js similarity index 100% rename from client-app/src/redmic/modules/map/layer/_D3Expansion.js rename to client-app/src/component/map/layer/_D3Expansion.js diff --git a/client-app/src/redmic/modules/map/layer/_Editable.js b/client-app/src/component/map/layer/_Editable.js similarity index 99% rename from client-app/src/redmic/modules/map/layer/_Editable.js rename to client-app/src/component/map/layer/_Editable.js index 86041430..e1ef2968 100644 --- a/client-app/src/redmic/modules/map/layer/_Editable.js +++ b/client-app/src/component/map/layer/_Editable.js @@ -4,7 +4,7 @@ define([ , "dojo/aspect" , "dojo/query" , "RWidgets/Utilities" - , "redmic/modules/map/layer/_RadiusCommons" + , "src/component/map/layer/_RadiusCommons" ], function( declare , lang diff --git a/client-app/src/redmic/modules/map/layer/_GeoJsonLayerItfc.js b/client-app/src/component/map/layer/_GeoJsonLayerItfc.js similarity index 92% rename from client-app/src/redmic/modules/map/layer/_GeoJsonLayerItfc.js rename to client-app/src/component/map/layer/_GeoJsonLayerItfc.js index f6652229..13995df7 100644 --- a/client-app/src/redmic/modules/map/layer/_GeoJsonLayerItfc.js +++ b/client-app/src/component/map/layer/_GeoJsonLayerItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/client-app/src/redmic/modules/map/layer/_Highlightable.js b/client-app/src/component/map/layer/_Highlightable.js similarity index 100% rename from client-app/src/redmic/modules/map/layer/_Highlightable.js rename to client-app/src/component/map/layer/_Highlightable.js diff --git a/client-app/src/redmic/modules/map/layer/_LayerProtocols.js b/client-app/src/component/map/layer/_LayerProtocols.js similarity index 100% rename from client-app/src/redmic/modules/map/layer/_LayerProtocols.js rename to client-app/src/component/map/layer/_LayerProtocols.js diff --git a/client-app/src/redmic/modules/map/layer/_ListenBounds.js b/client-app/src/component/map/layer/_ListenBounds.js similarity index 100% rename from client-app/src/redmic/modules/map/layer/_ListenBounds.js rename to client-app/src/component/map/layer/_ListenBounds.js diff --git a/client-app/src/redmic/modules/map/layer/_ListenZoom.js b/client-app/src/component/map/layer/_ListenZoom.js similarity index 100% rename from client-app/src/redmic/modules/map/layer/_ListenZoom.js rename to client-app/src/component/map/layer/_ListenZoom.js diff --git a/client-app/src/redmic/modules/map/layer/_MapLayerItfc.js b/client-app/src/component/map/layer/_MapLayerItfc.js similarity index 95% rename from client-app/src/redmic/modules/map/layer/_MapLayerItfc.js rename to client-app/src/component/map/layer/_MapLayerItfc.js index 298507f6..11e00f53 100644 --- a/client-app/src/redmic/modules/map/layer/_MapLayerItfc.js +++ b/client-app/src/component/map/layer/_MapLayerItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/client-app/src/redmic/modules/map/layer/_PruneClusterLayerItfc.js b/client-app/src/component/map/layer/_PruneClusterLayerItfc.js similarity index 93% rename from client-app/src/redmic/modules/map/layer/_PruneClusterLayerItfc.js rename to client-app/src/component/map/layer/_PruneClusterLayerItfc.js index 9d48c41b..b99df1bc 100644 --- a/client-app/src/redmic/modules/map/layer/_PruneClusterLayerItfc.js +++ b/client-app/src/component/map/layer/_PruneClusterLayerItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/client-app/src/redmic/modules/map/layer/_PublishInfo.js b/client-app/src/component/map/layer/_PublishInfo.js similarity index 100% rename from client-app/src/redmic/modules/map/layer/_PublishInfo.js rename to client-app/src/component/map/layer/_PublishInfo.js diff --git a/client-app/src/redmic/modules/map/layer/_PublishInfoItfc.js b/client-app/src/component/map/layer/_PublishInfoItfc.js similarity index 93% rename from client-app/src/redmic/modules/map/layer/_PublishInfoItfc.js rename to client-app/src/component/map/layer/_PublishInfoItfc.js index 108ea1bf..c0e73e62 100644 --- a/client-app/src/redmic/modules/map/layer/_PublishInfoItfc.js +++ b/client-app/src/component/map/layer/_PublishInfoItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/client-app/src/redmic/modules/map/layer/_RadiusCommons.js b/client-app/src/component/map/layer/_RadiusCommons.js similarity index 100% rename from client-app/src/redmic/modules/map/layer/_RadiusCommons.js rename to client-app/src/component/map/layer/_RadiusCommons.js diff --git a/client-app/src/redmic/modules/map/layer/_RadiusOnClick.js b/client-app/src/component/map/layer/_RadiusOnClick.js similarity index 98% rename from client-app/src/redmic/modules/map/layer/_RadiusOnClick.js rename to client-app/src/component/map/layer/_RadiusOnClick.js index 8b5cef28..09a8ed1d 100644 --- a/client-app/src/redmic/modules/map/layer/_RadiusOnClick.js +++ b/client-app/src/component/map/layer/_RadiusOnClick.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/map/layer/_RadiusCommons" + , "src/component/map/layer/_RadiusCommons" ], function( declare , lang diff --git a/client-app/src/redmic/modules/map/layer/_RadiusOnSelect.js b/client-app/src/component/map/layer/_RadiusOnSelect.js similarity index 96% rename from client-app/src/redmic/modules/map/layer/_RadiusOnSelect.js rename to client-app/src/component/map/layer/_RadiusOnSelect.js index 62cf141c..cd4c55ef 100644 --- a/client-app/src/redmic/modules/map/layer/_RadiusOnSelect.js +++ b/client-app/src/component/map/layer/_RadiusOnSelect.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/map/layer/_RadiusCommons" + , "src/component/map/layer/_RadiusCommons" ], function( declare , lang diff --git a/client-app/src/redmic/modules/map/layer/_SelectOnClick.js b/client-app/src/component/map/layer/_SelectOnClick.js similarity index 100% rename from client-app/src/redmic/modules/map/layer/_SelectOnClick.js rename to client-app/src/component/map/layer/_SelectOnClick.js diff --git a/client-app/src/redmic/modules/map/layer/_Selectable.js b/client-app/src/component/map/layer/_Selectable.js similarity index 99% rename from client-app/src/redmic/modules/map/layer/_Selectable.js rename to client-app/src/component/map/layer/_Selectable.js index 5a6ec4ca..74f35b75 100644 --- a/client-app/src/redmic/modules/map/layer/_Selectable.js +++ b/client-app/src/component/map/layer/_Selectable.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/base/_Selection" + , "src/component/base/_Selection" , "./_SelectableItfc" ], function( declare diff --git a/client-app/src/redmic/modules/map/layer/_SelectableItfc.js b/client-app/src/component/map/layer/_SelectableItfc.js similarity index 93% rename from client-app/src/redmic/modules/map/layer/_SelectableItfc.js rename to client-app/src/component/map/layer/_SelectableItfc.js index 34da5c4f..a868007b 100644 --- a/client-app/src/redmic/modules/map/layer/_SelectableItfc.js +++ b/client-app/src/component/map/layer/_SelectableItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/client-app/src/redmic/modules/map/layer/_TrackingDataManagement.js b/client-app/src/component/map/layer/_TrackingDataManagement.js similarity index 100% rename from client-app/src/redmic/modules/map/layer/_TrackingDataManagement.js rename to client-app/src/component/map/layer/_TrackingDataManagement.js diff --git a/client-app/src/redmic/modules/map/layer/_TrackingMarkersManagement.js b/client-app/src/component/map/layer/_TrackingMarkersManagement.js similarity index 100% rename from client-app/src/redmic/modules/map/layer/_TrackingMarkersManagement.js rename to client-app/src/component/map/layer/_TrackingMarkersManagement.js diff --git a/client-app/src/redmic/modules/mapQuery/QueryOnMap.js b/client-app/src/component/mapQuery/QueryOnMap.js similarity index 99% rename from client-app/src/redmic/modules/mapQuery/QueryOnMap.js rename to client-app/src/component/mapQuery/QueryOnMap.js index 69f1033b..c9745e13 100644 --- a/client-app/src/redmic/modules/mapQuery/QueryOnMap.js +++ b/client-app/src/component/mapQuery/QueryOnMap.js @@ -1,7 +1,7 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/modules/base/_Module' + , 'src/component/base/_Module' , './_ContentManagement' , './_ResultsBrowser' ], function( diff --git a/client-app/src/redmic/modules/mapQuery/_ContentManagement.js b/client-app/src/component/mapQuery/_ContentManagement.js similarity index 100% rename from client-app/src/redmic/modules/mapQuery/_ContentManagement.js rename to client-app/src/component/mapQuery/_ContentManagement.js diff --git a/client-app/src/redmic/modules/mapQuery/_ResultsBrowser.js b/client-app/src/component/mapQuery/_ResultsBrowser.js similarity index 94% rename from client-app/src/redmic/modules/mapQuery/_ResultsBrowser.js rename to client-app/src/component/mapQuery/_ResultsBrowser.js index 90683274..f97625fb 100644 --- a/client-app/src/redmic/modules/mapQuery/_ResultsBrowser.js +++ b/client-app/src/component/mapQuery/_ResultsBrowser.js @@ -2,9 +2,9 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/aspect' - , 'redmic/modules/base/_Show' - , 'redmic/modules/layout/nestedContent/NestedBrowsersImpl' - , 'redmic/modules/layout/dataDisplayer/DataDisplayer' + , 'src/component/base/_Show' + , 'src/component/layout/nestedContent/NestedBrowsersImpl' + , 'src/component/layout/dataDisplayer/DataDisplayer' , 'templates/LoadingCustom' ], function( declare diff --git a/client-app/src/redmic/modules/metaTags/MetaTags.js b/client-app/src/component/metaTags/MetaTags.js similarity index 99% rename from client-app/src/redmic/modules/metaTags/MetaTags.js rename to client-app/src/component/metaTags/MetaTags.js index a9e9d97e..c830481b 100644 --- a/client-app/src/redmic/modules/metaTags/MetaTags.js +++ b/client-app/src/component/metaTags/MetaTags.js @@ -2,7 +2,7 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/query' - , 'redmic/modules/base/_Module' + , 'src/component/base/_Module' , './metaTagsContent' ], function( declare diff --git a/client-app/src/redmic/modules/metaTags/metaTagsContent.js b/client-app/src/component/metaTags/metaTagsContent.js similarity index 100% rename from client-app/src/redmic/modules/metaTags/metaTagsContent.js rename to client-app/src/component/metaTags/metaTagsContent.js diff --git a/client-app/src/redmic/modules/model/Model.js b/client-app/src/component/model/Model.js similarity index 98% rename from client-app/src/redmic/modules/model/Model.js rename to client-app/src/component/model/Model.js index 6c60966b..f9adb84d 100644 --- a/client-app/src/redmic/modules/model/Model.js +++ b/client-app/src/component/model/Model.js @@ -2,9 +2,9 @@ define([ 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/modules/base/_Module' - , 'redmic/modules/base/_Persistence' - , 'redmic/modules/base/_Store' + , 'src/component/base/_Module' + , 'src/component/base/_Persistence' + , 'src/component/base/_Store' , './_ModelItfc' ], function( redmicConfig diff --git a/client-app/src/redmic/modules/model/ModelImpl.js b/client-app/src/component/model/ModelImpl.js similarity index 100% rename from client-app/src/redmic/modules/model/ModelImpl.js rename to client-app/src/component/model/ModelImpl.js diff --git a/client-app/src/redmic/modules/model/_ModelItfc.js b/client-app/src/component/model/_ModelItfc.js similarity index 96% rename from client-app/src/redmic/modules/model/_ModelItfc.js rename to client-app/src/component/model/_ModelItfc.js index 80f00054..1a7e9d37 100644 --- a/client-app/src/redmic/modules/model/_ModelItfc.js +++ b/client-app/src/component/model/_ModelItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/client-app/src/redmic/modules/notification/Alert.js b/client-app/src/component/notification/Alert.js similarity index 97% rename from client-app/src/redmic/modules/notification/Alert.js rename to client-app/src/component/notification/Alert.js index b25d9171..3ad5bd51 100644 --- a/client-app/src/redmic/modules/notification/Alert.js +++ b/client-app/src/component/notification/Alert.js @@ -2,7 +2,7 @@ define([ 'alertify/alertify.min' , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Module" + , "src/component/base/_Module" ], function( alertify , declare diff --git a/client-app/src/redmic/modules/notification/CommunicationCenter.js b/client-app/src/component/notification/CommunicationCenter.js similarity index 98% rename from client-app/src/redmic/modules/notification/CommunicationCenter.js rename to client-app/src/component/notification/CommunicationCenter.js index f1aeccbc..e8e183ab 100644 --- a/client-app/src/redmic/modules/notification/CommunicationCenter.js +++ b/client-app/src/component/notification/CommunicationCenter.js @@ -2,7 +2,7 @@ define([ 'alertify/alertify.min' , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Module" + , "src/component/base/_Module" ], function( alertify , declare diff --git a/client-app/src/redmic/modules/notification/Notification.js b/client-app/src/component/notification/Notification.js similarity index 97% rename from client-app/src/redmic/modules/notification/Notification.js rename to client-app/src/component/notification/Notification.js index af1a0722..e8f037f6 100644 --- a/client-app/src/redmic/modules/notification/Notification.js +++ b/client-app/src/component/notification/Notification.js @@ -1,11 +1,11 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" - , "redmic/modules/base/_Store" - , "redmic/modules/notification/NotificationSidebar" - , "redmic/modules/notification/TaskNotification" + , "src/component/base/_Module" + , "src/component/base/_Show" + , "src/component/base/_Store" + , "src/component/notification/NotificationSidebar" + , "src/component/notification/TaskNotification" , "put-selector/put" ], function( declare diff --git a/client-app/src/redmic/modules/notification/NotificationSidebar.js b/client-app/src/component/notification/NotificationSidebar.js similarity index 98% rename from client-app/src/redmic/modules/notification/NotificationSidebar.js rename to client-app/src/component/notification/NotificationSidebar.js index 2a31b305..484b124e 100644 --- a/client-app/src/redmic/modules/notification/NotificationSidebar.js +++ b/client-app/src/component/notification/NotificationSidebar.js @@ -1,9 +1,9 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" - , "redmic/modules/base/_Store" + , "src/component/base/_Module" + , "src/component/base/_Show" + , "src/component/base/_Store" , "put-selector/put" ], function( declare diff --git a/client-app/src/redmic/modules/notification/TaskNotification.js b/client-app/src/component/notification/TaskNotification.js similarity index 94% rename from client-app/src/redmic/modules/notification/TaskNotification.js rename to client-app/src/component/notification/TaskNotification.js index 147a2b47..88392937 100644 --- a/client-app/src/redmic/modules/notification/TaskNotification.js +++ b/client-app/src/component/notification/TaskNotification.js @@ -3,14 +3,14 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/query" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" - , "redmic/modules/base/_Store" - , "redmic/modules/components/Keypad/IconKeypadImpl" - , "redmic/modules/browser/_ButtonsInRow" - , "redmic/modules/browser/_Framework" - , "redmic/modules/browser/ListImpl" - , "redmic/modules/browser/bars/Total" + , "src/component/base/_Module" + , "src/component/base/_Show" + , "src/component/base/_Store" + , "src/component/components/Keypad/IconKeypadImpl" + , "src/component/browser/_ButtonsInRow" + , "src/component/browser/_Framework" + , "src/component/browser/ListImpl" + , "src/component/browser/bars/Total" , "put-selector/put" , "templates/NotificationList" , "dijit/ProgressBar" diff --git a/client-app/src/redmic/modules/search/CompositeImpl.js b/client-app/src/component/search/CompositeImpl.js similarity index 100% rename from client-app/src/redmic/modules/search/CompositeImpl.js rename to client-app/src/component/search/CompositeImpl.js diff --git a/client-app/src/redmic/modules/search/DateRangeImpl.js b/client-app/src/component/search/DateRangeImpl.js similarity index 100% rename from client-app/src/redmic/modules/search/DateRangeImpl.js rename to client-app/src/component/search/DateRangeImpl.js diff --git a/client-app/src/redmic/modules/search/FacetsImpl.js b/client-app/src/component/search/FacetsImpl.js similarity index 100% rename from client-app/src/redmic/modules/search/FacetsImpl.js rename to client-app/src/component/search/FacetsImpl.js diff --git a/client-app/src/redmic/modules/search/GeographicImpl.js b/client-app/src/component/search/GeographicImpl.js similarity index 100% rename from client-app/src/redmic/modules/search/GeographicImpl.js rename to client-app/src/component/search/GeographicImpl.js diff --git a/client-app/src/redmic/modules/search/MultiSelectImpl.js b/client-app/src/component/search/MultiSelectImpl.js similarity index 96% rename from client-app/src/redmic/modules/search/MultiSelectImpl.js rename to client-app/src/component/search/MultiSelectImpl.js index 50d2f7d1..fd92f73a 100644 --- a/client-app/src/redmic/modules/search/MultiSelectImpl.js +++ b/client-app/src/component/search/MultiSelectImpl.js @@ -3,10 +3,10 @@ define([ , "dojo/_base/lang" , "dojo/aspect" , "put-selector/put" - , "redmic/modules/base/_ShowInTooltip" - , "redmic/modules/base/_ShowOnEvt" - , "redmic/modules/base/_Store" - , "redmic/modules/layout/listMenu/ListMenu" + , "src/component/base/_ShowInTooltip" + , "src/component/base/_ShowOnEvt" + , "src/component/base/_Store" + , "src/component/layout/listMenu/ListMenu" , "./Search" ], function( declare diff --git a/client-app/src/redmic/modules/search/RangeImpl.js b/client-app/src/component/search/RangeImpl.js similarity index 97% rename from client-app/src/redmic/modules/search/RangeImpl.js rename to client-app/src/component/search/RangeImpl.js index 59109c79..3130132e 100644 --- a/client-app/src/redmic/modules/search/RangeImpl.js +++ b/client-app/src/component/search/RangeImpl.js @@ -3,7 +3,7 @@ define([ , "dojo/_base/lang" , "dojo/aspect" , "put-selector/put" - , "redmic/modules/form/input/NumberTextBoxImpl" + , "src/component/form/input/NumberTextBoxImpl" , "./Search" ], function( declare diff --git a/client-app/src/redmic/modules/search/Search.js b/client-app/src/component/search/Search.js similarity index 97% rename from client-app/src/redmic/modules/search/Search.js rename to client-app/src/component/search/Search.js index dde870be..ec7df334 100644 --- a/client-app/src/redmic/modules/search/Search.js +++ b/client-app/src/component/search/Search.js @@ -1,8 +1,8 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" + , "src/component/base/_Module" + , "src/component/base/_Show" , "./_SearchItfc" ], function( declare diff --git a/client-app/src/redmic/modules/search/TextImpl.js b/client-app/src/component/search/TextImpl.js similarity index 99% rename from client-app/src/redmic/modules/search/TextImpl.js rename to client-app/src/component/search/TextImpl.js index 5c6f8be8..852dea80 100644 --- a/client-app/src/redmic/modules/search/TextImpl.js +++ b/client-app/src/component/search/TextImpl.js @@ -3,7 +3,7 @@ define([ , "dojo/_base/lang" , "dojo/aspect" , 'dojo/query' - , "redmic/modules/base/_Store" + , "src/component/base/_Store" , "RWidgets/TextSearch" , "./Search" ], function( diff --git a/client-app/src/redmic/modules/search/_HideFormByAction.js b/client-app/src/component/search/_HideFormByAction.js similarity index 100% rename from client-app/src/redmic/modules/search/_HideFormByAction.js rename to client-app/src/component/search/_HideFormByAction.js diff --git a/client-app/src/redmic/modules/search/_SearchItfc.js b/client-app/src/component/search/_SearchItfc.js similarity index 92% rename from client-app/src/redmic/modules/search/_SearchItfc.js rename to client-app/src/component/search/_SearchItfc.js index 5479fa28..d20d1e72 100644 --- a/client-app/src/redmic/modules/search/_SearchItfc.js +++ b/client-app/src/component/search/_SearchItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/client-app/src/redmic/modules/selection/SelectionBox.js b/client-app/src/component/selection/SelectionBox.js similarity index 94% rename from client-app/src/redmic/modules/selection/SelectionBox.js rename to client-app/src/component/selection/SelectionBox.js index f9d1d4e9..ac67ea4b 100644 --- a/client-app/src/redmic/modules/selection/SelectionBox.js +++ b/client-app/src/component/selection/SelectionBox.js @@ -4,14 +4,14 @@ define([ , 'dojo/Deferred' , 'put-selector/put' , 'src/utils/Credentials' - , 'redmic/modules/base/_ListenQueryParams' - , 'redmic/modules/base/_Module' - , 'redmic/modules/base/_Show' - , 'redmic/modules/base/_Selection' - , 'redmic/modules/base/_ShowInTooltip' - , 'redmic/modules/base/_ShowOnEvt' - , 'redmic/modules/layout/listMenu/ListMenu' - , 'redmic/modules/selection/SelectionManager' + , 'src/component/base/_ListenQueryParams' + , 'src/component/base/_Module' + , 'src/component/base/_Show' + , 'src/component/base/_Selection' + , 'src/component/base/_ShowInTooltip' + , 'src/component/base/_ShowOnEvt' + , 'src/component/layout/listMenu/ListMenu' + , 'src/component/selection/SelectionManager' ], function( declare , lang diff --git a/client-app/src/redmic/modules/selection/SelectionManager.js b/client-app/src/component/selection/SelectionManager.js similarity index 98% rename from client-app/src/redmic/modules/selection/SelectionManager.js rename to client-app/src/component/selection/SelectionManager.js index 5c481835..f7b352e3 100644 --- a/client-app/src/redmic/modules/selection/SelectionManager.js +++ b/client-app/src/component/selection/SelectionManager.js @@ -6,10 +6,10 @@ define([ , 'dojo/Deferred' , 'put-selector/put' , 'src/utils/Credentials' - , 'redmic/modules/base/_Module' - , 'redmic/modules/base/_Selection' - , 'redmic/modules/base/_Show' - , 'redmic/modules/base/_ShowInPopup' + , 'src/component/base/_Module' + , 'src/component/base/_Selection' + , 'src/component/base/_Show' + , 'src/component/base/_ShowInPopup' ], function( alertify , Selection diff --git a/client-app/src/redmic/modules/selection/Selector.js b/client-app/src/component/selection/Selector.js similarity index 99% rename from client-app/src/redmic/modules/selection/Selector.js rename to client-app/src/component/selection/Selector.js index 8d1e2b82..6e28737e 100644 --- a/client-app/src/redmic/modules/selection/Selector.js +++ b/client-app/src/component/selection/Selector.js @@ -4,8 +4,8 @@ define([ , 'dojo/_base/lang' , 'dojo/Deferred' , 'dojo/promise/all' - , 'redmic/modules/base/_Module' - , 'redmic/modules/base/_SelectionBase' + , 'src/component/base/_Module' + , 'src/component/base/_SelectionBase' , 'RWidgets/Utilities' , './_SelectorItfc' , './_SelectorPersistence' diff --git a/client-app/src/redmic/modules/selection/_SelectorItfc.js b/client-app/src/component/selection/_SelectorItfc.js similarity index 93% rename from client-app/src/redmic/modules/selection/_SelectorItfc.js rename to client-app/src/component/selection/_SelectorItfc.js index 45f8c540..fafcb210 100644 --- a/client-app/src/redmic/modules/selection/_SelectorItfc.js +++ b/client-app/src/component/selection/_SelectorItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/client-app/src/redmic/modules/selection/_SelectorPersistence.js b/client-app/src/component/selection/_SelectorPersistence.js similarity index 99% rename from client-app/src/redmic/modules/selection/_SelectorPersistence.js rename to client-app/src/component/selection/_SelectorPersistence.js index ceb041c9..799c3148 100644 --- a/client-app/src/redmic/modules/selection/_SelectorPersistence.js +++ b/client-app/src/component/selection/_SelectorPersistence.js @@ -1,8 +1,8 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/modules/base/_Persistence' - , 'redmic/modules/base/_Store' + , 'src/component/base/_Persistence' + , 'src/component/base/_Store' , 'src/utils/Credentials' ], function( declare diff --git a/client-app/src/redmic/modules/socket/Socket.js b/client-app/src/component/socket/Socket.js similarity index 99% rename from client-app/src/redmic/modules/socket/Socket.js rename to client-app/src/component/socket/Socket.js index ed7b60b3..ffa64959 100644 --- a/client-app/src/redmic/modules/socket/Socket.js +++ b/client-app/src/component/socket/Socket.js @@ -2,7 +2,7 @@ define([ 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Module" + , "src/component/base/_Module" , "src/utils/Credentials" , 'sockjs/sockjs.min' diff --git a/client-app/src/redmic/modules/socket/Task.js b/client-app/src/component/socket/Task.js similarity index 98% rename from client-app/src/redmic/modules/socket/Task.js rename to client-app/src/component/socket/Task.js index 0fde6486..f019e2d4 100644 --- a/client-app/src/redmic/modules/socket/Task.js +++ b/client-app/src/component/socket/Task.js @@ -1,10 +1,10 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_AuthFirewall" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Store" - , "redmic/modules/base/_Selection" + , "src/component/base/_AuthFirewall" + , "src/component/base/_Module" + , "src/component/base/_Store" + , "src/component/base/_Selection" , "src/utils/Credentials" ], function( declare diff --git a/client-app/src/redmic/modules/socket/_IngestData.js b/client-app/src/component/socket/_IngestData.js similarity index 100% rename from client-app/src/redmic/modules/socket/_IngestData.js rename to client-app/src/component/socket/_IngestData.js diff --git a/client-app/src/redmic/modules/socket/_Report.js b/client-app/src/component/socket/_Report.js similarity index 100% rename from client-app/src/redmic/modules/socket/_Report.js rename to client-app/src/component/socket/_Report.js diff --git a/client-app/src/redmic/modules/socket/_Worms.js b/client-app/src/component/socket/_Worms.js similarity index 100% rename from client-app/src/redmic/modules/socket/_Worms.js rename to client-app/src/component/socket/_Worms.js diff --git a/client-app/src/redmic/modules/store/RequestJoiner/AtlasDataImpl.js b/client-app/src/component/store/RequestJoiner/AtlasDataImpl.js similarity index 100% rename from client-app/src/redmic/modules/store/RequestJoiner/AtlasDataImpl.js rename to client-app/src/component/store/RequestJoiner/AtlasDataImpl.js diff --git a/client-app/src/redmic/modules/store/RequestJoiner/RequestJoiner.js b/client-app/src/component/store/RequestJoiner/RequestJoiner.js similarity index 98% rename from client-app/src/redmic/modules/store/RequestJoiner/RequestJoiner.js rename to client-app/src/component/store/RequestJoiner/RequestJoiner.js index d464dba4..4e2caedc 100644 --- a/client-app/src/redmic/modules/store/RequestJoiner/RequestJoiner.js +++ b/client-app/src/component/store/RequestJoiner/RequestJoiner.js @@ -3,8 +3,8 @@ define([ , 'dojo/_base/lang' , 'dojo/Deferred' , 'dojo/promise/all' - , 'redmic/modules/base/_Module' - , 'redmic/modules/base/_Store' + , 'src/component/base/_Module' + , 'src/component/base/_Store' , './_RequestJoinerItfc' ], function( declare diff --git a/client-app/src/redmic/modules/store/RequestJoiner/_RequestJoinerItfc.js b/client-app/src/component/store/RequestJoiner/_RequestJoinerItfc.js similarity index 95% rename from client-app/src/redmic/modules/store/RequestJoiner/_RequestJoinerItfc.js rename to client-app/src/component/store/RequestJoiner/_RequestJoinerItfc.js index 59b83adb..1b380287 100644 --- a/client-app/src/redmic/modules/store/RequestJoiner/_RequestJoinerItfc.js +++ b/client-app/src/component/store/RequestJoiner/_RequestJoinerItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/client-app/src/redmic/modules/store/RestManager.js b/client-app/src/component/store/RestManager.js similarity index 99% rename from client-app/src/redmic/modules/store/RestManager.js rename to client-app/src/component/store/RestManager.js index 949b4282..3e10a943 100644 --- a/client-app/src/redmic/modules/store/RestManager.js +++ b/client-app/src/component/store/RestManager.js @@ -2,7 +2,7 @@ define([ 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/modules/base/_Module' + , 'src/component/base/_Module' , './_RestManagerItfc' ], function( redmicConfig diff --git a/client-app/src/redmic/modules/store/RestManagerImpl.js b/client-app/src/component/store/RestManagerImpl.js similarity index 100% rename from client-app/src/redmic/modules/store/RestManagerImpl.js rename to client-app/src/component/store/RestManagerImpl.js diff --git a/client-app/src/redmic/modules/store/_RestManagerItfc.js b/client-app/src/component/store/_RestManagerItfc.js similarity index 94% rename from client-app/src/redmic/modules/store/_RestManagerItfc.js rename to client-app/src/component/store/_RestManagerItfc.js index 458086a2..67ea0e91 100644 --- a/client-app/src/redmic/modules/store/_RestManagerItfc.js +++ b/client-app/src/component/store/_RestManagerItfc.js @@ -1,7 +1,7 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/modules/base/_Itfc' + , 'src/component/base/_Itfc' ], function( declare , lang diff --git a/client-app/src/redmic/modules/tree/CbtreeImpl.js b/client-app/src/component/tree/CbtreeImpl.js similarity index 100% rename from client-app/src/redmic/modules/tree/CbtreeImpl.js rename to client-app/src/component/tree/CbtreeImpl.js diff --git a/client-app/src/redmic/modules/tree/Tree.js b/client-app/src/component/tree/Tree.js similarity index 98% rename from client-app/src/redmic/modules/tree/Tree.js rename to client-app/src/component/tree/Tree.js index c32c30a3..b978c0ef 100644 --- a/client-app/src/redmic/modules/tree/Tree.js +++ b/client-app/src/component/tree/Tree.js @@ -1,9 +1,9 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Selection" - , "redmic/modules/base/_Show" + , "src/component/base/_Module" + , "src/component/base/_Selection" + , "src/component/base/_Show" , "./_TreeItfc" ], function( declare diff --git a/client-app/src/redmic/modules/tree/_HierarchicalFilter.js b/client-app/src/component/tree/_HierarchicalFilter.js similarity index 100% rename from client-app/src/redmic/modules/tree/_HierarchicalFilter.js rename to client-app/src/component/tree/_HierarchicalFilter.js diff --git a/client-app/src/redmic/modules/tree/_LazyLoad.js b/client-app/src/component/tree/_LazyLoad.js similarity index 97% rename from client-app/src/redmic/modules/tree/_LazyLoad.js rename to client-app/src/component/tree/_LazyLoad.js index b00ef940..480da948 100644 --- a/client-app/src/redmic/modules/tree/_LazyLoad.js +++ b/client-app/src/component/tree/_LazyLoad.js @@ -2,8 +2,8 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/base/_Filter" - , "redmic/modules/base/_Store" + , "src/component/base/_Filter" + , "src/component/base/_Store" ], function( declare , lang diff --git a/client-app/src/redmic/modules/tree/_LeafSelection.js b/client-app/src/component/tree/_LeafSelection.js similarity index 100% rename from client-app/src/redmic/modules/tree/_LeafSelection.js rename to client-app/src/component/tree/_LeafSelection.js diff --git a/client-app/src/redmic/modules/tree/_SelectionBox.js b/client-app/src/component/tree/_SelectionBox.js similarity index 98% rename from client-app/src/redmic/modules/tree/_SelectionBox.js rename to client-app/src/component/tree/_SelectionBox.js index 8a6a14d7..8d383935 100644 --- a/client-app/src/redmic/modules/tree/_SelectionBox.js +++ b/client-app/src/component/tree/_SelectionBox.js @@ -4,7 +4,7 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/selection/SelectionBox" + , "src/component/selection/SelectionBox" , "put-selector/put" ], function( LayoutContainer diff --git a/client-app/src/redmic/modules/tree/_TreeItfc.js b/client-app/src/component/tree/_TreeItfc.js similarity index 95% rename from client-app/src/redmic/modules/tree/_TreeItfc.js rename to client-app/src/component/tree/_TreeItfc.js index 80d3c29d..310269d8 100644 --- a/client-app/src/redmic/modules/tree/_TreeItfc.js +++ b/client-app/src/component/tree/_TreeItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/client-app/src/redmic/modules/user/FullscreenToggle.js b/client-app/src/component/user/FullscreenToggle.js similarity index 97% rename from client-app/src/redmic/modules/user/FullscreenToggle.js rename to client-app/src/component/user/FullscreenToggle.js index 74bd396c..40f39937 100644 --- a/client-app/src/redmic/modules/user/FullscreenToggle.js +++ b/client-app/src/component/user/FullscreenToggle.js @@ -3,8 +3,8 @@ define([ , 'dojo/_base/lang' , 'dojo/on' , 'put-selector/put' - , 'redmic/modules/base/_Module' - , 'redmic/modules/base/_Show' + , 'src/component/base/_Module' + , 'src/component/base/_Show' ], function( declare , lang diff --git a/client-app/src/redmic/modules/user/LanguageSelector.js b/client-app/src/component/user/LanguageSelector.js similarity index 93% rename from client-app/src/redmic/modules/user/LanguageSelector.js rename to client-app/src/component/user/LanguageSelector.js index e649d1bc..2cb92bae 100644 --- a/client-app/src/redmic/modules/user/LanguageSelector.js +++ b/client-app/src/component/user/LanguageSelector.js @@ -4,11 +4,11 @@ define([ , 'dojo/_base/kernel' , 'dojo/_base/lang' , 'put-selector/put' - , 'redmic/modules/base/_Module' - , 'redmic/modules/base/_Show' - , 'redmic/modules/base/_ShowInTooltip' - , 'redmic/modules/base/_ShowOnEvt' - , 'redmic/modules/layout/listMenu/ListMenu' + , 'src/component/base/_Module' + , 'src/component/base/_Show' + , 'src/component/base/_ShowInTooltip' + , 'src/component/base/_ShowOnEvt' + , 'src/component/layout/listMenu/ListMenu' ], function( redmicConfig , declare diff --git a/client-app/src/redmic/modules/user/UserArea.js b/client-app/src/component/user/UserArea.js similarity index 95% rename from client-app/src/redmic/modules/user/UserArea.js rename to client-app/src/component/user/UserArea.js index e8021afc..9080f452 100644 --- a/client-app/src/redmic/modules/user/UserArea.js +++ b/client-app/src/component/user/UserArea.js @@ -3,13 +3,13 @@ define([ , 'dojo/_base/declare' , 'dojo/_base/lang' , 'put-selector/put' - , 'redmic/modules/base/_Module' - , 'redmic/modules/base/_Show' - , 'redmic/modules/base/_ShowInTooltip' - , 'redmic/modules/base/_ShowOnEvt' - , 'redmic/modules/base/_Store' - , 'redmic/modules/layout/listMenu/ListMenu' - , 'redmic/modules/layout/templateDisplayer/TemplateDisplayer' + , 'src/component/base/_Module' + , 'src/component/base/_Show' + , 'src/component/base/_ShowInTooltip' + , 'src/component/base/_ShowOnEvt' + , 'src/component/base/_Store' + , 'src/component/layout/listMenu/ListMenu' + , 'src/component/layout/templateDisplayer/TemplateDisplayer' , 'src/utils/Credentials' , 'templates/UserTopbarImage' , 'templates/UserTopbarMenu' diff --git a/client-app/src/oldapp/administrative/taxonomy/views/MisIdentificationView.js b/client-app/src/oldapp/administrative/taxonomy/views/MisIdentificationView.js index a5bb30a0..daeb310e 100644 --- a/client-app/src/oldapp/administrative/taxonomy/views/MisIdentificationView.js +++ b/client-app/src/oldapp/administrative/taxonomy/views/MisIdentificationView.js @@ -7,10 +7,10 @@ define([ , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/browser/_Select" - , "redmic/modules/browser/bars/SelectionBox" - , "redmic/modules/browser/bars/Pagination" - , "redmic/modules/browser/bars/Total" + , "src/component/browser/_Select" + , "src/component/browser/bars/SelectionBox" + , "src/component/browser/bars/Pagination" + , "src/component/browser/bars/Total" , "templates/MisidentificationList" ], function( _EditionWizardView diff --git a/client-app/src/oldapp/base/views/EditorLayerWithVariableForm.js b/client-app/src/oldapp/base/views/EditorLayerWithVariableForm.js index 03a3e252..0505b88d 100644 --- a/client-app/src/oldapp/base/views/EditorLayerWithVariableForm.js +++ b/client-app/src/oldapp/base/views/EditorLayerWithVariableForm.js @@ -5,8 +5,8 @@ define([ , "dojo/_base/lang" , "dojo/dom-class" , 'put-selector/put' - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" + , "src/component/base/_Module" + , "src/component/base/_Show" ], function ( _AddForm , _AddSelectInput diff --git a/client-app/src/oldapp/base/views/_SettingsHandler.js b/client-app/src/oldapp/base/views/_SettingsHandler.js index 6eba6e49..271fa292 100644 --- a/client-app/src/oldapp/base/views/_SettingsHandler.js +++ b/client-app/src/oldapp/base/views/_SettingsHandler.js @@ -2,8 +2,8 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/aspect' - , 'redmic/modules/base/_ListenQueryParams' - , 'redmic/modules/base/_Selection' + , 'src/component/base/_ListenQueryParams' + , 'src/component/base/_Selection' ], function( declare , lang diff --git a/client-app/src/oldapp/base/views/_ViewListBase.js b/client-app/src/oldapp/base/views/_ViewListBase.js index 7de9f74b..97aba624 100644 --- a/client-app/src/oldapp/base/views/_ViewListBase.js +++ b/client-app/src/oldapp/base/views/_ViewListBase.js @@ -1,6 +1,6 @@ define([ - "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" + "src/component/base/_Module" + , "src/component/base/_Show" , "app/base/views/Module" , "dojo/_base/declare" , "dojo/_base/lang" diff --git a/client-app/src/oldapp/base/views/extensions/_ActivityClosed.js b/client-app/src/oldapp/base/views/extensions/_ActivityClosed.js index f59ef78f..362456ec 100644 --- a/client-app/src/oldapp/base/views/extensions/_ActivityClosed.js +++ b/client-app/src/oldapp/base/views/extensions/_ActivityClosed.js @@ -4,7 +4,7 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/model/ModelImpl" + , "src/component/model/ModelImpl" , "RWidgets/Button" ], function( alertify diff --git a/client-app/src/oldapp/base/views/extensions/_AddAtlasCategory.js b/client-app/src/oldapp/base/views/extensions/_AddAtlasCategory.js index 78527586..d239feb6 100644 --- a/client-app/src/oldapp/base/views/extensions/_AddAtlasCategory.js +++ b/client-app/src/oldapp/base/views/extensions/_AddAtlasCategory.js @@ -2,11 +2,11 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/aspect' - , "redmic/modules/base/_Persistence" - , 'redmic/modules/form/FormContainerImpl' - , "redmic/modules/form/_ListenModelHasChanged" - , 'redmic/modules/form/_PublicateChanges' - , "redmic/modules/form/_ShowInDialog" + , "src/component/base/_Persistence" + , 'src/component/form/FormContainerImpl' + , "src/component/form/_ListenModelHasChanged" + , 'src/component/form/_PublicateChanges' + , "src/component/form/_ShowInDialog" ], function( declare , lang diff --git a/client-app/src/oldapp/base/views/extensions/_AddForm.js b/client-app/src/oldapp/base/views/extensions/_AddForm.js index 4b5ab010..98d91d2e 100644 --- a/client-app/src/oldapp/base/views/extensions/_AddForm.js +++ b/client-app/src/oldapp/base/views/extensions/_AddForm.js @@ -2,9 +2,9 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/form/_CreateKeypad" - , "redmic/modules/form/FormContainerImpl" - , "redmic/modules/form/_ListenModelHasChanged" + , "src/component/form/_CreateKeypad" + , "src/component/form/FormContainerImpl" + , "src/component/form/_ListenModelHasChanged" , "./_AddFormItfc" ], function ( diff --git a/client-app/src/oldapp/base/views/extensions/_AddFormItfc.js b/client-app/src/oldapp/base/views/extensions/_AddFormItfc.js index 5bd5405c..fddd6a3a 100644 --- a/client-app/src/oldapp/base/views/extensions/_AddFormItfc.js +++ b/client-app/src/oldapp/base/views/extensions/_AddFormItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/client-app/src/oldapp/base/views/extensions/_AddSelectInput.js b/client-app/src/oldapp/base/views/extensions/_AddSelectInput.js index bd889db3..30a42938 100644 --- a/client-app/src/oldapp/base/views/extensions/_AddSelectInput.js +++ b/client-app/src/oldapp/base/views/extensions/_AddSelectInput.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/form/input/SelectImpl" + , "src/component/form/input/SelectImpl" , "./_AddSelectInputItfc" ], function( diff --git a/client-app/src/oldapp/base/views/extensions/_AddSelectInputItfc.js b/client-app/src/oldapp/base/views/extensions/_AddSelectInputItfc.js index 71b5e965..c6ad0c5a 100644 --- a/client-app/src/oldapp/base/views/extensions/_AddSelectInputItfc.js +++ b/client-app/src/oldapp/base/views/extensions/_AddSelectInputItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang @@ -20,4 +20,4 @@ define([ }); } }); -}); \ No newline at end of file +}); diff --git a/client-app/src/oldapp/base/views/extensions/_AddSelectionHandlerKeypad.js b/client-app/src/oldapp/base/views/extensions/_AddSelectionHandlerKeypad.js index 7eb416a9..742e0b57 100644 --- a/client-app/src/oldapp/base/views/extensions/_AddSelectionHandlerKeypad.js +++ b/client-app/src/oldapp/base/views/extensions/_AddSelectionHandlerKeypad.js @@ -4,7 +4,7 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/components/Keypad/TrizoneKeypadImpl" + , "src/component/components/Keypad/TrizoneKeypadImpl" ], function( LayoutContainer , ContentPane @@ -186,4 +186,4 @@ define([ this.inherited(arguments); } }); -}); \ No newline at end of file +}); diff --git a/client-app/src/oldapp/base/views/extensions/_AddTextSearchInput.js b/client-app/src/oldapp/base/views/extensions/_AddTextSearchInput.js index 38e7f0d0..b68ad1d2 100644 --- a/client-app/src/oldapp/base/views/extensions/_AddTextSearchInput.js +++ b/client-app/src/oldapp/base/views/extensions/_AddTextSearchInput.js @@ -2,8 +2,8 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/aspect' - , 'redmic/modules/form/FormContainerImpl' - , 'redmic/modules/form/_PublicateChanges' + , 'src/component/form/FormContainerImpl' + , 'src/component/form/_PublicateChanges' , './_AddTextSearchInputItfc' ], function( declare diff --git a/client-app/src/oldapp/base/views/extensions/_AddTextSearchInputItfc.js b/client-app/src/oldapp/base/views/extensions/_AddTextSearchInputItfc.js index 1a0ba977..56ce1961 100644 --- a/client-app/src/oldapp/base/views/extensions/_AddTextSearchInputItfc.js +++ b/client-app/src/oldapp/base/views/extensions/_AddTextSearchInputItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang @@ -20,4 +20,4 @@ define([ }); } }); -}); \ No newline at end of file +}); diff --git a/client-app/src/oldapp/base/views/extensions/_CompositeInTooltipFromIconKeypad.js b/client-app/src/oldapp/base/views/extensions/_CompositeInTooltipFromIconKeypad.js index e23bdca4..01a79222 100644 --- a/client-app/src/oldapp/base/views/extensions/_CompositeInTooltipFromIconKeypad.js +++ b/client-app/src/oldapp/base/views/extensions/_CompositeInTooltipFromIconKeypad.js @@ -4,7 +4,7 @@ define([ , 'dojo/_base/lang' , 'dojo/aspect' , 'put-selector/put' - , 'redmic/modules/components/Keypad/IconKeypadImpl' + , 'src/component/components/Keypad/IconKeypadImpl' ], function( _CompositeSearchInTooltip , declare diff --git a/client-app/src/oldapp/base/views/extensions/_CompositeSearchInTooltip.js b/client-app/src/oldapp/base/views/extensions/_CompositeSearchInTooltip.js index f548f522..d324f3d0 100644 --- a/client-app/src/oldapp/base/views/extensions/_CompositeSearchInTooltip.js +++ b/client-app/src/oldapp/base/views/extensions/_CompositeSearchInTooltip.js @@ -2,10 +2,10 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/aspect' - , 'redmic/modules/base/_ShowInTooltip' - , 'redmic/modules/base/_ShowOnEvt' - , 'redmic/modules/search/CompositeImpl' - , 'redmic/modules/search/_HideFormByAction' + , 'src/component/base/_ShowInTooltip' + , 'src/component/base/_ShowOnEvt' + , 'src/component/search/CompositeImpl' + , 'src/component/search/_HideFormByAction' ], function( declare , lang diff --git a/client-app/src/oldapp/base/views/extensions/_EditionFormList.js b/client-app/src/oldapp/base/views/extensions/_EditionFormList.js index f12f711e..f5a333c9 100644 --- a/client-app/src/oldapp/base/views/extensions/_EditionFormList.js +++ b/client-app/src/oldapp/base/views/extensions/_EditionFormList.js @@ -3,7 +3,7 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/base/_Store" + , "src/component/base/_Store" ], function( _Edition , declare diff --git a/client-app/src/oldapp/base/views/extensions/_EditionView.js b/client-app/src/oldapp/base/views/extensions/_EditionView.js index b0bb0e99..6fab52ac 100644 --- a/client-app/src/oldapp/base/views/extensions/_EditionView.js +++ b/client-app/src/oldapp/base/views/extensions/_EditionView.js @@ -2,8 +2,8 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/base/_Store" - , "redmic/modules/base/_Persistence" + , "src/component/base/_Store" + , "src/component/base/_Persistence" , "app/base/views/extensions/_Edition" , "RWidgets/Button" ], function( diff --git a/client-app/src/oldapp/base/views/extensions/_EditionWizardView.js b/client-app/src/oldapp/base/views/extensions/_EditionWizardView.js index bc580da5..d559f8a1 100644 --- a/client-app/src/oldapp/base/views/extensions/_EditionWizardView.js +++ b/client-app/src/oldapp/base/views/extensions/_EditionWizardView.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/base/_Persistence" + , "src/component/base/_Persistence" , "app/base/views/extensions/_Edition" , "RWidgets/Button" ], function( diff --git a/client-app/src/oldapp/base/views/extensions/_FormInDialogView.js b/client-app/src/oldapp/base/views/extensions/_FormInDialogView.js index c97739b1..ffe457db 100644 --- a/client-app/src/oldapp/base/views/extensions/_FormInDialogView.js +++ b/client-app/src/oldapp/base/views/extensions/_FormInDialogView.js @@ -2,9 +2,9 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/form/FormContainerImpl" - , "redmic/modules/form/_ListenModelHasChanged" - , "redmic/modules/form/_ShowInDialog" + , "src/component/form/FormContainerImpl" + , "src/component/form/_ListenModelHasChanged" + , "src/component/form/_ShowInDialog" ], function( declare , lang diff --git a/client-app/src/oldapp/base/views/extensions/_GetActivityDataItfc.js b/client-app/src/oldapp/base/views/extensions/_GetActivityDataItfc.js index af8d04c6..e3bc3335 100644 --- a/client-app/src/oldapp/base/views/extensions/_GetActivityDataItfc.js +++ b/client-app/src/oldapp/base/views/extensions/_GetActivityDataItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/client-app/src/oldapp/base/views/extensions/_LocalSelectionView.js b/client-app/src/oldapp/base/views/extensions/_LocalSelectionView.js index 499eca25..618534f6 100644 --- a/client-app/src/oldapp/base/views/extensions/_LocalSelectionView.js +++ b/client-app/src/oldapp/base/views/extensions/_LocalSelectionView.js @@ -3,8 +3,8 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/base/_SelectionBase" - , "redmic/modules/gateway/LocalSelectorGatewayImpl" + , "src/component/base/_SelectionBase" + , "src/component/gateway/LocalSelectorGatewayImpl" ], function ( _LocalSelectionViewItfc , declare diff --git a/client-app/src/oldapp/base/views/extensions/_LocalSelectionViewItfc.js b/client-app/src/oldapp/base/views/extensions/_LocalSelectionViewItfc.js index 280dcf27..414c0d93 100644 --- a/client-app/src/oldapp/base/views/extensions/_LocalSelectionViewItfc.js +++ b/client-app/src/oldapp/base/views/extensions/_LocalSelectionViewItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/client-app/src/oldapp/base/views/extensions/_SelectInDoubleList.js b/client-app/src/oldapp/base/views/extensions/_SelectInDoubleList.js index cda72a87..c247c411 100644 --- a/client-app/src/oldapp/base/views/extensions/_SelectInDoubleList.js +++ b/client-app/src/oldapp/base/views/extensions/_SelectInDoubleList.js @@ -3,7 +3,7 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/browser/_Select" + , "src/component/browser/_Select" ], function( _LocalSelectionView , declare diff --git a/client-app/src/oldapp/components/steps/AddGeomSiteStep.js b/client-app/src/oldapp/components/steps/AddGeomSiteStep.js index 035f0282..445fcd06 100644 --- a/client-app/src/oldapp/components/steps/AddGeomSiteStep.js +++ b/client-app/src/oldapp/components/steps/AddGeomSiteStep.js @@ -3,7 +3,7 @@ define([ , "app/designs/mapWithSideContent/layout/MapAndContent" , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/map/_LeafletDraw" + , "src/component/map/_LeafletDraw" ], function( Controller , Layout diff --git a/client-app/src/oldapp/components/steps/CitationStep.js b/client-app/src/oldapp/components/steps/CitationStep.js index ce260cec..c6dbd157 100644 --- a/client-app/src/oldapp/components/steps/CitationStep.js +++ b/client-app/src/oldapp/components/steps/CitationStep.js @@ -4,11 +4,11 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "templates/SpeciesDistributionPopup" - , "redmic/modules/base/_Store" - , "redmic/modules/browser/_Select" - , "redmic/modules/map/layer/GeoJsonLayerImpl" - , "redmic/modules/map/layer/_Selectable" - , "redmic/modules/map/layer/_SelectOnClick" + , "src/component/base/_Store" + , "src/component/browser/_Select" + , "src/component/map/layer/GeoJsonLayerImpl" + , "src/component/map/layer/_Selectable" + , "src/component/map/layer/_SelectOnClick" ], function ( Geographic , redmicConfig diff --git a/client-app/src/oldapp/components/steps/ClassificationsStep.js b/client-app/src/oldapp/components/steps/ClassificationsStep.js index 8f43caa7..a34db348 100644 --- a/client-app/src/oldapp/components/steps/ClassificationsStep.js +++ b/client-app/src/oldapp/components/steps/ClassificationsStep.js @@ -5,9 +5,9 @@ define([ , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/browser/_Select" - , "redmic/modules/browser/bars/Pagination" - , "redmic/modules/layout/wizard/_CompleteBySelection" + , "src/component/browser/_Select" + , "src/component/browser/bars/Pagination" + , "src/component/layout/wizard/_CompleteBySelection" , "templates/DomainList" ], function( _AddFilter diff --git a/client-app/src/oldapp/components/steps/DataDefinitionSetStep.js b/client-app/src/oldapp/components/steps/DataDefinitionSetStep.js index 31903639..1b262927 100644 --- a/client-app/src/oldapp/components/steps/DataDefinitionSetStep.js +++ b/client-app/src/oldapp/components/steps/DataDefinitionSetStep.js @@ -7,7 +7,7 @@ define([ , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_ShowInPopup" + , "src/component/base/_ShowInPopup" , "templates/DataDefinitionList" ], function ( _EditionFormList diff --git a/client-app/src/oldapp/components/steps/DescribeSiteStep.js b/client-app/src/oldapp/components/steps/DescribeSiteStep.js index 78ff147d..7b9370a3 100644 --- a/client-app/src/oldapp/components/steps/DescribeSiteStep.js +++ b/client-app/src/oldapp/components/steps/DescribeSiteStep.js @@ -6,10 +6,10 @@ define([ , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_ShowInPopup" - , "redmic/modules/base/_Store" - , "redmic/modules/components/Keypad/TrizoneKeypadImpl" - , "redmic/modules/form/FormContainerImpl" + , "src/component/base/_ShowInPopup" + , "src/component/base/_Store" + , "src/component/components/Keypad/TrizoneKeypadImpl" + , "src/component/form/FormContainerImpl" , "RWidgets/Utilities" , "put-selector/put" ], function ( diff --git a/client-app/src/oldapp/components/steps/DocumentStepFiltered.js b/client-app/src/oldapp/components/steps/DocumentStepFiltered.js index 6efe3f3b..b3bdb342 100644 --- a/client-app/src/oldapp/components/steps/DocumentStepFiltered.js +++ b/client-app/src/oldapp/components/steps/DocumentStepFiltered.js @@ -8,7 +8,7 @@ define([ , "dojo/_base/lang" , "templates/DocumentList" , "templates/SpeciesFilter" - , "redmic/modules/form/input/FilteringSelectImpl" + , "src/component/form/input/FilteringSelectImpl" , "templates/LoadingCustom" ], function ( _SelectInDoubleList diff --git a/client-app/src/oldapp/components/steps/MainDataStep.js b/client-app/src/oldapp/components/steps/MainDataStep.js index 4702be17..c28d9c8f 100644 --- a/client-app/src/oldapp/components/steps/MainDataStep.js +++ b/client-app/src/oldapp/components/steps/MainDataStep.js @@ -2,8 +2,8 @@ define([ "app/components/steps/_MainData" , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/form/FormContainerImpl" - , "redmic/modules/form/_PublicateChanges" + , "src/component/form/FormContainerImpl" + , "src/component/form/_PublicateChanges" ], function ( _MainData , declare diff --git a/client-app/src/oldapp/components/steps/MapSelectAreaStep.js b/client-app/src/oldapp/components/steps/MapSelectAreaStep.js index 6df79ef8..23b5c758 100644 --- a/client-app/src/oldapp/components/steps/MapSelectAreaStep.js +++ b/client-app/src/oldapp/components/steps/MapSelectAreaStep.js @@ -5,8 +5,8 @@ define([ , "dojo/aspect" , 'leaflet/leaflet' , "put-selector/put" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" + , "src/component/base/_Module" + , "src/component/base/_Show" , "RWidgets/Button" , "RWidgets/Map" ], function ( @@ -235,4 +235,4 @@ define([ this._instanceDataToResult(this._defaultData); } }); -}); \ No newline at end of file +}); diff --git a/client-app/src/oldapp/components/steps/RelationDataSetStep.js b/client-app/src/oldapp/components/steps/RelationDataSetStep.js index 319fd3f3..69c75149 100644 --- a/client-app/src/oldapp/components/steps/RelationDataSetStep.js +++ b/client-app/src/oldapp/components/steps/RelationDataSetStep.js @@ -6,10 +6,10 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , 'moment/moment.min' - , "redmic/modules/browser/_ButtonsInRow" - , "redmic/modules/browser/_Framework" - , "redmic/modules/browser/_MultiTemplate" - , "redmic/modules/browser/HierarchicalImpl" + , "src/component/browser/_ButtonsInRow" + , "src/component/browser/_Framework" + , "src/component/browser/_MultiTemplate" + , "src/component/browser/HierarchicalImpl" , "RWidgets/Utilities" , "templates/RelationDataParentList" , "templates/RelationDataChildList" diff --git a/client-app/src/oldapp/components/steps/SelectLayerStep.js b/client-app/src/oldapp/components/steps/SelectLayerStep.js index b5bb2243..bbe8455f 100644 --- a/client-app/src/oldapp/components/steps/SelectLayerStep.js +++ b/client-app/src/oldapp/components/steps/SelectLayerStep.js @@ -6,9 +6,9 @@ define([ , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Store" - , "redmic/modules/browser/ListImpl" - , "redmic/modules/browser/_Select" + , "src/component/base/_Store" + , "src/component/browser/ListImpl" + , "src/component/browser/_Select" , "templates/ServiceOGCAtlasList" ], function( _AddTextSearchInput diff --git a/client-app/src/oldapp/components/steps/SpeciesMainDataStep.js b/client-app/src/oldapp/components/steps/SpeciesMainDataStep.js index ccd6bd0c..232001f7 100644 --- a/client-app/src/oldapp/components/steps/SpeciesMainDataStep.js +++ b/client-app/src/oldapp/components/steps/SpeciesMainDataStep.js @@ -5,7 +5,7 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/base/_ShowInPopup" + , "src/component/base/_ShowInPopup" ], function( MainDataStep , Worms diff --git a/client-app/src/oldapp/components/steps/_DataListAndSaveRelationData.js b/client-app/src/oldapp/components/steps/_DataListAndSaveRelationData.js index 2f89b44a..d840a74a 100644 --- a/client-app/src/oldapp/components/steps/_DataListAndSaveRelationData.js +++ b/client-app/src/oldapp/components/steps/_DataListAndSaveRelationData.js @@ -1,9 +1,9 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_ShowInPopup" - , "redmic/modules/browser/ListImpl" - , "redmic/modules/browser/_Table" + , "src/component/base/_ShowInPopup" + , "src/component/browser/ListImpl" + , "src/component/browser/_Table" , "RWidgets/Button" ], function ( declare diff --git a/client-app/src/oldapp/components/steps/_MainData.js b/client-app/src/oldapp/components/steps/_MainData.js index ec38bca7..caab869b 100644 --- a/client-app/src/oldapp/components/steps/_MainData.js +++ b/client-app/src/oldapp/components/steps/_MainData.js @@ -4,8 +4,8 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" + , "src/component/base/_Module" + , "src/component/base/_Show" ], function ( _AddForm , ContentPane diff --git a/client-app/src/oldapp/components/steps/_SelectOptionBox.js b/client-app/src/oldapp/components/steps/_SelectOptionBox.js index f8b30e15..d86d1f0f 100644 --- a/client-app/src/oldapp/components/steps/_SelectOptionBox.js +++ b/client-app/src/oldapp/components/steps/_SelectOptionBox.js @@ -2,8 +2,8 @@ define([ "dijit/layout/ContentPane" , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" + , "src/component/base/_Module" + , "src/component/base/_Show" , "put-selector/put" ], function ( ContentPane diff --git a/client-app/src/oldapp/components/viewCustomization/addGeomSite/views/Line.js b/client-app/src/oldapp/components/viewCustomization/addGeomSite/views/Line.js index 67c8db37..22e23d0c 100644 --- a/client-app/src/oldapp/components/viewCustomization/addGeomSite/views/Line.js +++ b/client-app/src/oldapp/components/viewCustomization/addGeomSite/views/Line.js @@ -2,7 +2,7 @@ define([ "app/components/viewCustomization/addGeomSite/views/_BaseGeometryForm" , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/map/layer/DrawingLayerImpl" + , "src/component/map/layer/DrawingLayerImpl" ], function ( _BaseGeometryForm , declare diff --git a/client-app/src/oldapp/components/viewCustomization/addGeomSite/views/MultiPolygon.js b/client-app/src/oldapp/components/viewCustomization/addGeomSite/views/MultiPolygon.js index e93512b4..5f139baa 100644 --- a/client-app/src/oldapp/components/viewCustomization/addGeomSite/views/MultiPolygon.js +++ b/client-app/src/oldapp/components/viewCustomization/addGeomSite/views/MultiPolygon.js @@ -2,7 +2,7 @@ define([ "app/components/viewCustomization/addGeomSite/views/_BaseGeometryForm" , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/map/layer/DrawingLayerImpl" + , "src/component/map/layer/DrawingLayerImpl" ], function ( _BaseGeometryForm , declare @@ -110,4 +110,4 @@ define([ }); }*/ }); -}); \ No newline at end of file +}); diff --git a/client-app/src/oldapp/components/viewCustomization/addGeomSite/views/Point.js b/client-app/src/oldapp/components/viewCustomization/addGeomSite/views/Point.js index bcbecbd7..e1122c6f 100644 --- a/client-app/src/oldapp/components/viewCustomization/addGeomSite/views/Point.js +++ b/client-app/src/oldapp/components/viewCustomization/addGeomSite/views/Point.js @@ -3,8 +3,8 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/map/layer/GeoJsonLayerImpl" - , "redmic/modules/map/layer/_Editable" + , "src/component/map/layer/GeoJsonLayerImpl" + , "src/component/map/layer/_Editable" ], function ( _BaseGeometryForm , declare diff --git a/client-app/src/oldapp/dataLoader/base/_GeographicBase.js b/client-app/src/oldapp/dataLoader/base/_GeographicBase.js index b102089f..9e3aca83 100644 --- a/client-app/src/oldapp/dataLoader/base/_GeographicBase.js +++ b/client-app/src/oldapp/dataLoader/base/_GeographicBase.js @@ -9,12 +9,12 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/browser/_Select" - , "redmic/modules/browser/bars/Pagination" - , "redmic/modules/layout/dataDisplayer/DataDisplayer" - , "redmic/modules/map/layer/_Selectable" - , "redmic/modules/map/layer/_SelectOnClick" - , "redmic/modules/map/layer/GeoJsonLayerImpl" + , "src/component/browser/_Select" + , "src/component/browser/bars/Pagination" + , "src/component/layout/dataDisplayer/DataDisplayer" + , "src/component/map/layer/_Selectable" + , "src/component/map/layer/_SelectOnClick" + , "src/component/map/layer/GeoJsonLayerImpl" //, "RWidgets/Utilities" ], function( _CompositeInTooltipFromIconKeypad diff --git a/client-app/src/oldapp/dataLoader/citation/views/CitationView.js b/client-app/src/oldapp/dataLoader/citation/views/CitationView.js index 8d1b4c4a..55f2c7d7 100644 --- a/client-app/src/oldapp/dataLoader/citation/views/CitationView.js +++ b/client-app/src/oldapp/dataLoader/citation/views/CitationView.js @@ -5,7 +5,7 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/Deferred" - , "redmic/modules/browser/bars/Pagination" + , "src/component/browser/bars/Pagination" , "put-selector/put" ], function( _ActivityClosed diff --git a/client-app/src/oldapp/dataLoader/surveyParameters/views/ObjectCollectingSeriesDataView.js b/client-app/src/oldapp/dataLoader/surveyParameters/views/ObjectCollectingSeriesDataView.js index 514924e1..02df0307 100644 --- a/client-app/src/oldapp/dataLoader/surveyParameters/views/ObjectCollectingSeriesDataView.js +++ b/client-app/src/oldapp/dataLoader/surveyParameters/views/ObjectCollectingSeriesDataView.js @@ -4,11 +4,11 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , 'moment/moment.min' - , "redmic/modules/chart/ChartsContainer/_InfoOnMouseOver" - , "redmic/modules/chart/ChartsContainer/_LegendBar" - , "redmic/modules/chart/ChartsContainer/_TemporalAxisWithGridDrawing" - , "redmic/modules/chart/ChartsContainer/_VerticalAxesWithGridDrawing" - , "redmic/modules/chart/ChartsContainer/_ZoomByDragging" + , "src/component/chart/ChartsContainer/_InfoOnMouseOver" + , "src/component/chart/ChartsContainer/_LegendBar" + , "src/component/chart/ChartsContainer/_TemporalAxisWithGridDrawing" + , "src/component/chart/ChartsContainer/_VerticalAxesWithGridDrawing" + , "src/component/chart/ChartsContainer/_ZoomByDragging" , "templates/DataDefinitionObjectCollectingLabelColumn" ], function( _SeriesDataView diff --git a/client-app/src/oldapp/dataLoader/surveyParameters/views/SurveyStationSeriesDataView.js b/client-app/src/oldapp/dataLoader/surveyParameters/views/SurveyStationSeriesDataView.js index 96b93d4f..fd31e5f4 100644 --- a/client-app/src/oldapp/dataLoader/surveyParameters/views/SurveyStationSeriesDataView.js +++ b/client-app/src/oldapp/dataLoader/surveyParameters/views/SurveyStationSeriesDataView.js @@ -4,11 +4,11 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , 'moment/moment.min' - , "redmic/modules/chart/ChartsContainer/_InfoOnMouseOver" - , "redmic/modules/chart/ChartsContainer/_LegendBar" - , "redmic/modules/chart/ChartsContainer/_TemporalAxisWithGridDrawing" - , "redmic/modules/chart/ChartsContainer/_VerticalAxesWithGridDrawing" - , "redmic/modules/chart/ChartsContainer/_ZoomByDragging" + , "src/component/chart/ChartsContainer/_InfoOnMouseOver" + , "src/component/chart/ChartsContainer/_LegendBar" + , "src/component/chart/ChartsContainer/_TemporalAxisWithGridDrawing" + , "src/component/chart/ChartsContainer/_VerticalAxesWithGridDrawing" + , "src/component/chart/ChartsContainer/_ZoomByDragging" ], function( _SeriesDataView , redmicConfig diff --git a/client-app/src/oldapp/dataLoader/surveyParameters/views/_SeriesDataView.js b/client-app/src/oldapp/dataLoader/surveyParameters/views/_SeriesDataView.js index 0ac1765b..853efe56 100644 --- a/client-app/src/oldapp/dataLoader/surveyParameters/views/_SeriesDataView.js +++ b/client-app/src/oldapp/dataLoader/surveyParameters/views/_SeriesDataView.js @@ -15,12 +15,12 @@ define([ , "dojo/aspect" , "dojo/Deferred" , "dojo/promise/all" - , "redmic/modules/base/_Store" - , "redmic/modules/base/_Filter" - , "redmic/modules/browser/_Select" - , "redmic/modules/browser/_EditionTable" - , "redmic/modules/browser/bars/Pagination" - , "redmic/modules/browser/bars/Total" + , "src/component/base/_Store" + , "src/component/base/_Filter" + , "src/component/browser/_Select" + , "src/component/browser/_EditionTable" + , "src/component/browser/bars/Pagination" + , "src/component/browser/bars/Total" , "templates/DataDefinitionList" , "templates/LoadingEmpty" ], function( diff --git a/client-app/src/oldapp/dataLoader/tracking/views/TrackingDataView.js b/client-app/src/oldapp/dataLoader/tracking/views/TrackingDataView.js index bb956381..22ee976d 100644 --- a/client-app/src/oldapp/dataLoader/tracking/views/TrackingDataView.js +++ b/client-app/src/oldapp/dataLoader/tracking/views/TrackingDataView.js @@ -7,10 +7,10 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , 'moment/moment.min' - , "redmic/modules/base/_Store" - , "redmic/modules/browser/_EditionTable" - , "redmic/modules/browser/bars/Pagination" - , "redmic/modules/browser/bars/Total" + , "src/component/base/_Store" + , "src/component/browser/_EditionTable" + , "src/component/browser/bars/Pagination" + , "src/component/browser/bars/Total" ], function( _CompositeInTooltipFromIconKeypad , _AddFilter diff --git a/client-app/src/oldapp/designs/base/_Browser.js b/client-app/src/oldapp/designs/base/_Browser.js index 8f958948..4e2811a2 100644 --- a/client-app/src/oldapp/designs/base/_Browser.js +++ b/client-app/src/oldapp/designs/base/_Browser.js @@ -2,10 +2,10 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/components/Keypad/IconKeypadImpl" - , "redmic/modules/browser/_ButtonsInRow" - , "redmic/modules/browser/_Framework" - , "redmic/modules/browser/ListImpl" + , "src/component/components/Keypad/IconKeypadImpl" + , "src/component/browser/_ButtonsInRow" + , "src/component/browser/_Framework" + , "src/component/browser/ListImpl" ], function ( declare , lang diff --git a/client-app/src/oldapp/designs/base/_Controller.js b/client-app/src/oldapp/designs/base/_Controller.js index 9b62852b..2644727f 100644 --- a/client-app/src/oldapp/designs/base/_Controller.js +++ b/client-app/src/oldapp/designs/base/_Controller.js @@ -2,8 +2,8 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" + , "src/component/base/_Module" + , "src/component/base/_Show" , "./_ControllerItfc" ], function ( declare diff --git a/client-app/src/oldapp/designs/base/_ControllerItfc.js b/client-app/src/oldapp/designs/base/_ControllerItfc.js index 72b135d3..eb1d6bab 100644 --- a/client-app/src/oldapp/designs/base/_ControllerItfc.js +++ b/client-app/src/oldapp/designs/base/_ControllerItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/client-app/src/oldapp/designs/base/_LayoutItfc.js b/client-app/src/oldapp/designs/base/_LayoutItfc.js index 5cce8295..83a83d91 100644 --- a/client-app/src/oldapp/designs/base/_LayoutItfc.js +++ b/client-app/src/oldapp/designs/base/_LayoutItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/client-app/src/oldapp/designs/base/_MainItfc.js b/client-app/src/oldapp/designs/base/_MainItfc.js index 5627bf78..c99ba5a3 100644 --- a/client-app/src/oldapp/designs/base/_MainItfc.js +++ b/client-app/src/oldapp/designs/base/_MainItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/client-app/src/oldapp/designs/base/_ServiceOGC.js b/client-app/src/oldapp/designs/base/_ServiceOGC.js index c6605794..6f36eb93 100644 --- a/client-app/src/oldapp/designs/base/_ServiceOGC.js +++ b/client-app/src/oldapp/designs/base/_ServiceOGC.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/store/RequestJoiner/AtlasDataImpl" + , "src/component/store/RequestJoiner/AtlasDataImpl" , 'templates/FilterServiceOGCForm' ], function( declare diff --git a/client-app/src/oldapp/designs/chart/Controller.js b/client-app/src/oldapp/designs/chart/Controller.js index a3376567..34a20234 100644 --- a/client-app/src/oldapp/designs/chart/Controller.js +++ b/client-app/src/oldapp/designs/chart/Controller.js @@ -2,7 +2,7 @@ define([ "app/designs/base/_Controller" , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/chart/ChartsContainer/InfoChartsContainerImpl" + , "src/component/chart/ChartsContainer/InfoChartsContainerImpl" ], function ( _Controller , declare diff --git a/client-app/src/oldapp/designs/chart/main/ChartsWithLegendAndToolbarsAndSlider.js b/client-app/src/oldapp/designs/chart/main/ChartsWithLegendAndToolbarsAndSlider.js index f12532f0..e087c55a 100644 --- a/client-app/src/oldapp/designs/chart/main/ChartsWithLegendAndToolbarsAndSlider.js +++ b/client-app/src/oldapp/designs/chart/main/ChartsWithLegendAndToolbarsAndSlider.js @@ -4,7 +4,7 @@ define([ , 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/Deferred' - , 'redmic/modules/chart/SmartLegend/TimeSeriesSmartLegendImpl' + , 'src/component/chart/SmartLegend/TimeSeriesSmartLegendImpl' ], function ( SideAndTopAndBottomContent , _ChartsWithToolbarsAndSlider diff --git a/client-app/src/oldapp/designs/chart/main/MultiPieChartWithToolbar.js b/client-app/src/oldapp/designs/chart/main/MultiPieChartWithToolbar.js index 6b69372e..74399b0d 100644 --- a/client-app/src/oldapp/designs/chart/main/MultiPieChartWithToolbar.js +++ b/client-app/src/oldapp/designs/chart/main/MultiPieChartWithToolbar.js @@ -4,13 +4,13 @@ define([ , "app/designs/chart/layout/TopContent" , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/chart/ChartsContainer/_InfoOnZeroValueData" - , "redmic/modules/chart/ChartsContainer/_LayerColorSelection" - , "redmic/modules/chart/layer/ChartLayer/MultiPieChartImpl" - , "redmic/modules/chart/layer/ChartLayer/_ObtainableValue" - , "redmic/modules/chart/layer/ChartLayer/_LevelNavigation" - , "redmic/modules/chart/layer/ChartLayer/_VariableRadiusByDepth" - , "redmic/modules/chart/Toolbar/DataSelectorImpl" + , "src/component/chart/ChartsContainer/_InfoOnZeroValueData" + , "src/component/chart/ChartsContainer/_LayerColorSelection" + , "src/component/chart/layer/ChartLayer/MultiPieChartImpl" + , "src/component/chart/layer/ChartLayer/_ObtainableValue" + , "src/component/chart/layer/ChartLayer/_LevelNavigation" + , "src/component/chart/layer/ChartLayer/_VariableRadiusByDepth" + , "src/component/chart/Toolbar/DataSelectorImpl" , "RWidgets/Utilities" ], function ( _Main @@ -223,4 +223,4 @@ define([ return layerInstance; } }); -}); \ No newline at end of file +}); diff --git a/client-app/src/oldapp/designs/chart/main/MultiWindRoseChartWithToolbar.js b/client-app/src/oldapp/designs/chart/main/MultiWindRoseChartWithToolbar.js index cf62a4ee..46ba33c0 100644 --- a/client-app/src/oldapp/designs/chart/main/MultiWindRoseChartWithToolbar.js +++ b/client-app/src/oldapp/designs/chart/main/MultiWindRoseChartWithToolbar.js @@ -7,12 +7,12 @@ define([ , 'dojo/_base/declare' , 'dojo/_base/lang' , 'moment/moment.min' - , 'redmic/modules/base/_Store' - , 'redmic/modules/chart/layer/ChartLayer/WindRoseChartImpl' - , 'redmic/modules/chart/layer/ChartLayer/_ObtainableValue' - , 'redmic/modules/chart/Toolbar/DateFilterImpl' - , 'redmic/modules/chart/Toolbar/GridManagementImpl' - , 'redmic/modules/chart/Toolbar/SliderSelectorImpl' + , 'src/component/base/_Store' + , 'src/component/chart/layer/ChartLayer/WindRoseChartImpl' + , 'src/component/chart/layer/ChartLayer/_ObtainableValue' + , 'src/component/chart/Toolbar/DateFilterImpl' + , 'src/component/chart/Toolbar/GridManagementImpl' + , 'src/component/chart/Toolbar/SliderSelectorImpl' ], function ( _Main , Controller diff --git a/client-app/src/oldapp/designs/chart/main/WindRoseChartWithToolbar.js b/client-app/src/oldapp/designs/chart/main/WindRoseChartWithToolbar.js index 711ab532..61bd9384 100644 --- a/client-app/src/oldapp/designs/chart/main/WindRoseChartWithToolbar.js +++ b/client-app/src/oldapp/designs/chart/main/WindRoseChartWithToolbar.js @@ -4,10 +4,10 @@ define([ , "app/designs/chart/layout/TopContent" , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/chart/layer/ChartLayer/WindRoseChartImpl" - , "redmic/modules/chart/layer/ChartLayer/_ObtainableValue" - , "redmic/modules/chart/Toolbar/DataSelectorImpl" - , "redmic/modules/chart/Toolbar/GridManagementImpl" + , "src/component/chart/layer/ChartLayer/WindRoseChartImpl" + , "src/component/chart/layer/ChartLayer/_ObtainableValue" + , "src/component/chart/Toolbar/DataSelectorImpl" + , "src/component/chart/Toolbar/GridManagementImpl" , "RWidgets/Utilities" ], function ( _Main @@ -294,4 +294,4 @@ define([ return layerInstance; } }); -}); \ No newline at end of file +}); diff --git a/client-app/src/oldapp/designs/chart/main/_ChartsWithToolbarsAndSlider.js b/client-app/src/oldapp/designs/chart/main/_ChartsWithToolbarsAndSlider.js index 6e1fb768..3b78f17b 100644 --- a/client-app/src/oldapp/designs/chart/main/_ChartsWithToolbarsAndSlider.js +++ b/client-app/src/oldapp/designs/chart/main/_ChartsWithToolbarsAndSlider.js @@ -4,13 +4,13 @@ define([ , 'app/designs/chart/main/_ChartsWithToolbarsAndSliderItfc' , 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/modules/chart/ChartsContainer/_InfoOnEmptyData' - , 'redmic/modules/chart/ChartsContainer/_LayerColorSelection' - , 'redmic/modules/chart/ChartsContainer/SliderChartsContainerImpl' - , 'redmic/modules/chart/layer/ChartLayer/_QueryableValue' - , 'redmic/modules/chart/layer/ChartLayer/LinearChartImpl' - , 'redmic/modules/chart/Toolbar/AggregationToolImpl' - , 'redmic/modules/chart/Toolbar/GridManagementImpl' + , 'src/component/chart/ChartsContainer/_InfoOnEmptyData' + , 'src/component/chart/ChartsContainer/_LayerColorSelection' + , 'src/component/chart/ChartsContainer/SliderChartsContainerImpl' + , 'src/component/chart/layer/ChartLayer/_QueryableValue' + , 'src/component/chart/layer/ChartLayer/LinearChartImpl' + , 'src/component/chart/Toolbar/AggregationToolImpl' + , 'src/component/chart/Toolbar/GridManagementImpl' ], function( _Main , Controller diff --git a/client-app/src/oldapp/designs/chart/main/_ChartsWithToolbarsAndSliderItfc.js b/client-app/src/oldapp/designs/chart/main/_ChartsWithToolbarsAndSliderItfc.js index a66af705..3fd028f9 100644 --- a/client-app/src/oldapp/designs/chart/main/_ChartsWithToolbarsAndSliderItfc.js +++ b/client-app/src/oldapp/designs/chart/main/_ChartsWithToolbarsAndSliderItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/client-app/src/oldapp/designs/chart/main/_ProcessDataDefinitionAndGetTimeSeries.js b/client-app/src/oldapp/designs/chart/main/_ProcessDataDefinitionAndGetTimeSeries.js index d504d1b3..4e4861ed 100644 --- a/client-app/src/oldapp/designs/chart/main/_ProcessDataDefinitionAndGetTimeSeries.js +++ b/client-app/src/oldapp/designs/chart/main/_ProcessDataDefinitionAndGetTimeSeries.js @@ -4,8 +4,8 @@ define([ , "dojo/_base/lang" , "dojo/aspect" , "dojo/Deferred" - , "redmic/modules/base/_Filter" - , "redmic/modules/base/_Store" + , "src/component/base/_Filter" + , "src/component/base/_Store" ], function( redmicConfig , declare diff --git a/client-app/src/oldapp/designs/details/Controller.js b/client-app/src/oldapp/designs/details/Controller.js index 111afa91..7d953bff 100644 --- a/client-app/src/oldapp/designs/details/Controller.js +++ b/client-app/src/oldapp/designs/details/Controller.js @@ -8,8 +8,8 @@ define([ , 'draggabilly/draggabilly.pkgd.min' , 'packery/packery.pkgd.min' , "put-selector/put" - , "redmic/modules/base/_Store" - , "redmic/modules/base/_Window" + , "src/component/base/_Store" + , "src/component/base/_Window" , "./_ControllerItfc" ], function( _Controller diff --git a/client-app/src/oldapp/designs/details/_AddTitle.js b/client-app/src/oldapp/designs/details/_AddTitle.js index ec3981ee..8cd594bb 100644 --- a/client-app/src/oldapp/designs/details/_AddTitle.js +++ b/client-app/src/oldapp/designs/details/_AddTitle.js @@ -4,7 +4,7 @@ define([ , "dojo/aspect" , "dojo/query" , "put-selector/put" - , "redmic/modules/layout/templateDisplayer/TemplateDisplayer" + , "src/component/layout/templateDisplayer/TemplateDisplayer" , "templates/DefaultDetailsTitle" ], function ( declare diff --git a/client-app/src/oldapp/designs/details/_ControllerItfc.js b/client-app/src/oldapp/designs/details/_ControllerItfc.js index 6548f63e..e44835f6 100644 --- a/client-app/src/oldapp/designs/details/_ControllerItfc.js +++ b/client-app/src/oldapp/designs/details/_ControllerItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/client-app/src/oldapp/designs/details/main/ActivityMap.js b/client-app/src/oldapp/designs/details/main/ActivityMap.js index 0d465549..1c5c6e6d 100644 --- a/client-app/src/oldapp/designs/details/main/ActivityMap.js +++ b/client-app/src/oldapp/designs/details/main/ActivityMap.js @@ -5,8 +5,8 @@ define([ , "app/designs/details/Layout" , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/map/layer/PruneClusterLayerImpl" - , "redmic/modules/map/layer/_RadiusOnClick" + , "src/component/map/layer/PruneClusterLayerImpl" + , "src/component/map/layer/_RadiusOnClick" , "app/designs/mapWithSideContent/main/Geographic" ], function( _ListenActivityDataAndAccessByActivityCategory diff --git a/client-app/src/oldapp/designs/details/main/DocumentPDF.js b/client-app/src/oldapp/designs/details/main/DocumentPDF.js index fa41c02e..43b5271a 100644 --- a/client-app/src/oldapp/designs/details/main/DocumentPDF.js +++ b/client-app/src/oldapp/designs/details/main/DocumentPDF.js @@ -5,7 +5,7 @@ define([ , 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/modules/components/PDFViewer/PDFViewer' + , 'src/component/components/PDFViewer/PDFViewer' ], function( _Main , Controller diff --git a/client-app/src/oldapp/designs/details/main/Platform.js b/client-app/src/oldapp/designs/details/main/Platform.js index fe69703a..954fa53f 100644 --- a/client-app/src/oldapp/designs/details/main/Platform.js +++ b/client-app/src/oldapp/designs/details/main/Platform.js @@ -2,9 +2,9 @@ define([ 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/browser/_Framework" - , "redmic/modules/browser/ListImpl" - , "redmic/modules/browser/bars/Total" + , "src/component/browser/_Framework" + , "src/component/browser/ListImpl" + , "src/component/browser/bars/Total" , "templates/ContactSet" , "templates/PlatformInfo" , "./_DetailsBase" diff --git a/client-app/src/oldapp/designs/details/main/ServiceOGC.js b/client-app/src/oldapp/designs/details/main/ServiceOGC.js index b254ef2f..bb46c9de 100644 --- a/client-app/src/oldapp/designs/details/main/ServiceOGC.js +++ b/client-app/src/oldapp/designs/details/main/ServiceOGC.js @@ -3,10 +3,10 @@ define([ , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" - , 'redmic/modules/layout/templateDisplayer/TemplateDisplayer' - , 'redmic/modules/atlas/_AtlasLayersManagement' - , "redmic/modules/map/LeafletImpl" - , "redmic/modules/map/layer/WmsLayerImpl" + , 'src/component/layout/templateDisplayer/TemplateDisplayer' + , 'src/component/atlas/_AtlasLayersManagement' + , "src/component/map/LeafletImpl" + , "src/component/map/layer/WmsLayerImpl" , "RWidgets/RedmicUtilities" , "templates/ServiceOGCTitle" , "templates/ServiceOGCInfo" diff --git a/client-app/src/oldapp/designs/details/main/Species.js b/client-app/src/oldapp/designs/details/main/Species.js index c1521fcc..8d6c71be 100644 --- a/client-app/src/oldapp/designs/details/main/Species.js +++ b/client-app/src/oldapp/designs/details/main/Species.js @@ -2,8 +2,8 @@ define([ 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/browser/_ButtonsInRow" - , "redmic/modules/browser/_Framework" + , "src/component/browser/_ButtonsInRow" + , "src/component/browser/_Framework" , "templates/LoadingCustom" , "templates/SpeciesInfo" , "templates/SpeciesTitle" diff --git a/client-app/src/oldapp/designs/details/main/SpeciesLocation.js b/client-app/src/oldapp/designs/details/main/SpeciesLocation.js index 5fd6b122..85df4c12 100644 --- a/client-app/src/oldapp/designs/details/main/SpeciesLocation.js +++ b/client-app/src/oldapp/designs/details/main/SpeciesLocation.js @@ -7,13 +7,13 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/Deferred" - , "redmic/modules/map/layer/PruneClusterLayerImpl" - , "redmic/modules/map/layer/_AddFilter" - , "redmic/modules/map/layer/_ListenBounds" - , "redmic/modules/map/layer/_ListenZoom" - , "redmic/modules/map/layer/_RadiusOnClick" - , "redmic/modules/map/LeafletImpl" - , "redmic/modules/map/_PlaceNamesButton" + , "src/component/map/layer/PruneClusterLayerImpl" + , "src/component/map/layer/_AddFilter" + , "src/component/map/layer/_ListenBounds" + , "src/component/map/layer/_ListenZoom" + , "src/component/map/layer/_RadiusOnClick" + , "src/component/map/LeafletImpl" + , "src/component/map/_PlaceNamesButton" , "templates/SpeciesTitle" , "templates/SpeciesDistributionPopup" , "templates/TrackingSecondaryList" diff --git a/client-app/src/oldapp/designs/details/main/Statistics.js b/client-app/src/oldapp/designs/details/main/Statistics.js index e7c455f8..2ad89cb8 100644 --- a/client-app/src/oldapp/designs/details/main/Statistics.js +++ b/client-app/src/oldapp/designs/details/main/Statistics.js @@ -6,8 +6,8 @@ define([ , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/browser/_ButtonsInRow" - , "redmic/modules/browser/ListImpl" + , "src/component/browser/_ButtonsInRow" + , "src/component/browser/ListImpl" //, "templates/AdministrativeStatisticsList" , "templates/StatisticsTitle" ], function( diff --git a/client-app/src/oldapp/designs/doubleList/Controller.js b/client-app/src/oldapp/designs/doubleList/Controller.js index 5d9c8392..edc0e8ce 100644 --- a/client-app/src/oldapp/designs/doubleList/Controller.js +++ b/client-app/src/oldapp/designs/doubleList/Controller.js @@ -4,10 +4,10 @@ define([ , "app/designs/list/layout/Layout" , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Store" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" - , "redmic/modules/browser/bars/Total" + , "src/component/base/_Store" + , "src/component/base/_Module" + , "src/component/base/_Show" + , "src/component/browser/bars/Total" , "app/base/views/extensions/_LocalSelectionView" ], function ( _Controller diff --git a/client-app/src/oldapp/designs/doubleList/main/textSearchAndDoubleList.js b/client-app/src/oldapp/designs/doubleList/main/textSearchAndDoubleList.js index 598ddb65..dd3f4132 100644 --- a/client-app/src/oldapp/designs/doubleList/main/textSearchAndDoubleList.js +++ b/client-app/src/oldapp/designs/doubleList/main/textSearchAndDoubleList.js @@ -7,9 +7,9 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "RWidgets/Utilities" - , "redmic/modules/base/_Filter" - , "redmic/modules/browser/bars/Pagination" - , "redmic/modules/search/TextImpl" + , "src/component/base/_Filter" + , "src/component/browser/bars/Pagination" + , "src/component/search/TextImpl" ], function ( _SelectInDoubleList , _RememberDeleteItems diff --git a/client-app/src/oldapp/designs/edition/Controller.js b/client-app/src/oldapp/designs/edition/Controller.js index 1f997aed..e4877489 100644 --- a/client-app/src/oldapp/designs/edition/Controller.js +++ b/client-app/src/oldapp/designs/edition/Controller.js @@ -6,12 +6,12 @@ define([ , "dojo/aspect" , "dojo/Deferred" , "RWidgets/Utilities" - , 'redmic/modules/base/_ListenQueryParams' - , "redmic/modules/base/_Store" - , "redmic/modules/base/_Persistence" - , "redmic/modules/layout/wizard/Wizard" - , "redmic/modules/layout/wizard/_StepNavigation" - , "redmic/modules/layout/wizard/_StepBreadcrumbs" + , 'src/component/base/_ListenQueryParams' + , "src/component/base/_Store" + , "src/component/base/_Persistence" + , "src/component/layout/wizard/Wizard" + , "src/component/layout/wizard/_StepNavigation" + , "src/component/layout/wizard/_StepBreadcrumbs" ], function( _EditionCommons , _Controller diff --git a/client-app/src/oldapp/designs/embeddedContent/Controller.js b/client-app/src/oldapp/designs/embeddedContent/Controller.js index bd2e2096..e1700b78 100644 --- a/client-app/src/oldapp/designs/embeddedContent/Controller.js +++ b/client-app/src/oldapp/designs/embeddedContent/Controller.js @@ -2,8 +2,8 @@ define([ 'app/designs/base/_Controller' , 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/modules/base/_Store' - , 'redmic/modules/layout/templateDisplayer/TemplateDisplayer' + , 'src/component/base/_Store' + , 'src/component/layout/templateDisplayer/TemplateDisplayer' , 'templates/DefaultEmbeddedContent' ], function ( _Controller diff --git a/client-app/src/oldapp/designs/embeddedContentWithTopbar/Controller.js b/client-app/src/oldapp/designs/embeddedContentWithTopbar/Controller.js index d00bb7d9..f337ec83 100644 --- a/client-app/src/oldapp/designs/embeddedContentWithTopbar/Controller.js +++ b/client-app/src/oldapp/designs/embeddedContentWithTopbar/Controller.js @@ -3,7 +3,7 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/Deferred" - , "redmic/modules/components/Keypad/IconKeypadImpl" + , "src/component/components/Keypad/IconKeypadImpl" ], function ( _Controller , declare diff --git a/client-app/src/oldapp/designs/externalTextSearchList/Controller.js b/client-app/src/oldapp/designs/externalTextSearchList/Controller.js index 4561669f..df84b5ea 100644 --- a/client-app/src/oldapp/designs/externalTextSearchList/Controller.js +++ b/client-app/src/oldapp/designs/externalTextSearchList/Controller.js @@ -3,8 +3,8 @@ define([ , "app/designs/base/_Controller" , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Store" - , "redmic/modules/search/TextImpl" + , "src/component/base/_Store" + , "src/component/search/TextImpl" ], function ( _Browser , _Controller diff --git a/client-app/src/oldapp/designs/externalTextSearchList/main/PlaceNames.js b/client-app/src/oldapp/designs/externalTextSearchList/main/PlaceNames.js index a8ed895d..dd3c7378 100644 --- a/client-app/src/oldapp/designs/externalTextSearchList/main/PlaceNames.js +++ b/client-app/src/oldapp/designs/externalTextSearchList/main/PlaceNames.js @@ -7,9 +7,9 @@ define([ , "dojo/_base/lang" , "put-selector/put" , "templates/PlaceNamesList" - , "redmic/modules/browser/bars/Pagination" - , "redmic/modules/browser/bars/Total" - , "redmic/modules/map/layer/GeoJsonLayerImpl" + , "src/component/browser/bars/Pagination" + , "src/component/browser/bars/Total" + , "src/component/map/layer/GeoJsonLayerImpl" , "RWidgets/Button" ], function( _Main diff --git a/client-app/src/oldapp/designs/externalTextSearchList/main/Worms.js b/client-app/src/oldapp/designs/externalTextSearchList/main/Worms.js index ae85f1fb..4d495b09 100644 --- a/client-app/src/oldapp/designs/externalTextSearchList/main/Worms.js +++ b/client-app/src/oldapp/designs/externalTextSearchList/main/Worms.js @@ -6,8 +6,8 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/browser/bars/Total" - , "redmic/modules/base/_Persistence" + , "src/component/browser/bars/Total" + , "src/component/base/_Persistence" , "templates/WormsList" ], function ( _Main diff --git a/client-app/src/oldapp/designs/formList/Controller.js b/client-app/src/oldapp/designs/formList/Controller.js index 2abacb29..6c1d85d1 100644 --- a/client-app/src/oldapp/designs/formList/Controller.js +++ b/client-app/src/oldapp/designs/formList/Controller.js @@ -6,8 +6,8 @@ define([ , "app/designs/list/layout/Layout" , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Show" - , "redmic/modules/base/_Store" + , "src/component/base/_Show" + , "src/component/base/_Store" ], function ( _AddForm , _Controller diff --git a/client-app/src/oldapp/designs/formList/_ControllerItfc.js b/client-app/src/oldapp/designs/formList/_ControllerItfc.js index 8735a619..54d299b6 100644 --- a/client-app/src/oldapp/designs/formList/_ControllerItfc.js +++ b/client-app/src/oldapp/designs/formList/_ControllerItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/client-app/src/oldapp/designs/list/_AddFilter.js b/client-app/src/oldapp/designs/list/_AddFilter.js index 3093db99..1d29028f 100644 --- a/client-app/src/oldapp/designs/list/_AddFilter.js +++ b/client-app/src/oldapp/designs/list/_AddFilter.js @@ -1,6 +1,6 @@ define([ 'dojo/_base/declare' - , 'redmic/modules/base/_Filter' + , 'src/component/base/_Filter' ], function ( declare , _Filter diff --git a/client-app/src/oldapp/designs/mapWithSideContent/Controller.js b/client-app/src/oldapp/designs/mapWithSideContent/Controller.js index dc3b343c..db5e454e 100644 --- a/client-app/src/oldapp/designs/mapWithSideContent/Controller.js +++ b/client-app/src/oldapp/designs/mapWithSideContent/Controller.js @@ -2,8 +2,8 @@ define([ "app/designs/base/_Controller" , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/map/LeafletImpl" - , "redmic/modules/map/_PlaceNamesButton" + , "src/component/map/LeafletImpl" + , "src/component/map/_PlaceNamesButton" ], function ( _Controller , declare diff --git a/client-app/src/oldapp/designs/mapWithSideContent/main/FilterAndGeographic.js b/client-app/src/oldapp/designs/mapWithSideContent/main/FilterAndGeographic.js index 8b0fef72..e2aa0070 100644 --- a/client-app/src/oldapp/designs/mapWithSideContent/main/FilterAndGeographic.js +++ b/client-app/src/oldapp/designs/mapWithSideContent/main/FilterAndGeographic.js @@ -4,15 +4,15 @@ define([ , "app/designs/mapWithSideContent/layout/MapAndContentAndTopbar" , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Filter" - , "redmic/modules/browser/ListImpl" - , "redmic/modules/browser/_ButtonsInRow" - , "redmic/modules/browser/_Select" - , "redmic/modules/browser/_GeoJsonParser" - , "redmic/modules/form/input/FilteringSelectImpl" - , "redmic/modules/map/layer/GeoJsonLayerImpl" - , "redmic/modules/map/layer/_Selectable" - , "redmic/modules/map/layer/_SelectOnClick" + , "src/component/base/_Filter" + , "src/component/browser/ListImpl" + , "src/component/browser/_ButtonsInRow" + , "src/component/browser/_Select" + , "src/component/browser/_GeoJsonParser" + , "src/component/form/input/FilteringSelectImpl" + , "src/component/map/layer/GeoJsonLayerImpl" + , "src/component/map/layer/_Selectable" + , "src/component/map/layer/_SelectOnClick" ], function( _Main , Controller diff --git a/client-app/src/oldapp/designs/mapWithSideContent/main/Geographic.js b/client-app/src/oldapp/designs/mapWithSideContent/main/Geographic.js index 65c6c736..d7153cb0 100644 --- a/client-app/src/oldapp/designs/mapWithSideContent/main/Geographic.js +++ b/client-app/src/oldapp/designs/mapWithSideContent/main/Geographic.js @@ -6,19 +6,19 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/atlas/Atlas" - , "redmic/modules/base/_Filter" - , "redmic/modules/base/_Store" - , "redmic/modules/browser/bars/Total" - , "redmic/modules/browser/_ButtonsInRow" - , "redmic/modules/browser/_Framework" - , "redmic/modules/browser/_GeoJsonParser" - , "redmic/modules/browser/ListImpl" - , "redmic/modules/gateway/MapCenteringGatewayImpl" - , 'redmic/modules/layout/genericDisplayer/GenericWithTopbarDisplayerImpl' - , 'redmic/modules/layout/TabsDisplayer' - , "redmic/modules/mapQuery/QueryOnMap" - , "redmic/modules/search/TextImpl" + , "src/component/atlas/Atlas" + , "src/component/base/_Filter" + , "src/component/base/_Store" + , "src/component/browser/bars/Total" + , "src/component/browser/_ButtonsInRow" + , "src/component/browser/_Framework" + , "src/component/browser/_GeoJsonParser" + , "src/component/browser/ListImpl" + , "src/component/gateway/MapCenteringGatewayImpl" + , 'src/component/layout/genericDisplayer/GenericWithTopbarDisplayerImpl' + , 'src/component/layout/TabsDisplayer' + , "src/component/mapQuery/QueryOnMap" + , "src/component/search/TextImpl" , "templates/CitationList" ], function( _LocalSelectionView diff --git a/client-app/src/oldapp/designs/mapWithSideContent/main/GeographicEditor.js b/client-app/src/oldapp/designs/mapWithSideContent/main/GeographicEditor.js index 4fa24efa..bb5ab1d2 100644 --- a/client-app/src/oldapp/designs/mapWithSideContent/main/GeographicEditor.js +++ b/client-app/src/oldapp/designs/mapWithSideContent/main/GeographicEditor.js @@ -9,30 +9,30 @@ define([ , "dojo/_base/lang" , "dojo/aspect" , "RWidgets/Utilities" - , "redmic/modules/atlas/Atlas" - , "redmic/modules/base/_Filter" - , "redmic/modules/browser/_ButtonsInRow" - , "redmic/modules/browser/_Framework" - , "redmic/modules/browser/_Select" - , "redmic/modules/browser/_GeoJsonParser" - , "redmic/modules/browser/ListImpl" - , "redmic/modules/browser/bars/Order" - , "redmic/modules/browser/bars/Total" - , "redmic/modules/form/FormContainerImpl" - , "redmic/modules/form/_ListenModelHasChanged" - , "redmic/modules/form/_PublicateChanges" - , "redmic/modules/form/_CreateKeypad" - , "redmic/modules/gateway/MapCenteringGatewayImpl" - , "redmic/modules/layout/dataDisplayer/DataDisplayer" - , 'redmic/modules/layout/TabsDisplayer' - , 'redmic/modules/layout/genericDisplayer/GenericWithTopbarDisplayerImpl' - , "redmic/modules/map/layer/GeoJsonLayerImpl" - , "redmic/modules/map/layer/_Editable" - , "redmic/modules/map/layer/_RadiusOnSelect" - , "redmic/modules/map/layer/_Selectable" - , "redmic/modules/map/layer/_SelectOnClick" - , "redmic/modules/mapQuery/QueryOnMap" - , "redmic/modules/search/TextImpl" + , "src/component/atlas/Atlas" + , "src/component/base/_Filter" + , "src/component/browser/_ButtonsInRow" + , "src/component/browser/_Framework" + , "src/component/browser/_Select" + , "src/component/browser/_GeoJsonParser" + , "src/component/browser/ListImpl" + , "src/component/browser/bars/Order" + , "src/component/browser/bars/Total" + , "src/component/form/FormContainerImpl" + , "src/component/form/_ListenModelHasChanged" + , "src/component/form/_PublicateChanges" + , "src/component/form/_CreateKeypad" + , "src/component/gateway/MapCenteringGatewayImpl" + , "src/component/layout/dataDisplayer/DataDisplayer" + , 'src/component/layout/TabsDisplayer' + , 'src/component/layout/genericDisplayer/GenericWithTopbarDisplayerImpl' + , "src/component/map/layer/GeoJsonLayerImpl" + , "src/component/map/layer/_Editable" + , "src/component/map/layer/_RadiusOnSelect" + , "src/component/map/layer/_Selectable" + , "src/component/map/layer/_SelectOnClick" + , "src/component/mapQuery/QueryOnMap" + , "src/component/search/TextImpl" , "templates/CitationPopup" , "templates/TaxonList" ], function( diff --git a/client-app/src/oldapp/designs/mapWithSideContent/main/Tracking.js b/client-app/src/oldapp/designs/mapWithSideContent/main/Tracking.js index c1a3f69d..df024da8 100644 --- a/client-app/src/oldapp/designs/mapWithSideContent/main/Tracking.js +++ b/client-app/src/oldapp/designs/mapWithSideContent/main/Tracking.js @@ -11,16 +11,16 @@ define([ , 'moment/moment.min' , "put-selector/put" , "RWidgets/Utilities" - , "redmic/modules/base/_Store" - , "redmic/modules/components/ProgressSlider/ProgressSlider" - , "redmic/modules/atlas/Atlas" - , 'redmic/modules/form/FormContainerImpl' - , 'redmic/modules/layout/genericDisplayer/GenericWithTopbarDisplayerImpl' - , 'redmic/modules/layout/TabsDisplayer' - , "redmic/modules/map/layer/_AddFilter" - , "redmic/modules/map/layer/_PublishInfo" - , "redmic/modules/map/layer/TrackingLayerImpl" - , "redmic/modules/mapQuery/QueryOnMap" + , "src/component/base/_Store" + , "src/component/components/ProgressSlider/ProgressSlider" + , "src/component/atlas/Atlas" + , 'src/component/form/FormContainerImpl' + , 'src/component/layout/genericDisplayer/GenericWithTopbarDisplayerImpl' + , 'src/component/layout/TabsDisplayer' + , "src/component/map/layer/_AddFilter" + , "src/component/map/layer/_PublishInfo" + , "src/component/map/layer/TrackingLayerImpl" + , "src/component/mapQuery/QueryOnMap" ], function( alertify , _Main diff --git a/client-app/src/oldapp/designs/mapWithSideContent/main/_TrackingByFilter.js b/client-app/src/oldapp/designs/mapWithSideContent/main/_TrackingByFilter.js index ff3233c4..118a1753 100644 --- a/client-app/src/oldapp/designs/mapWithSideContent/main/_TrackingByFilter.js +++ b/client-app/src/oldapp/designs/mapWithSideContent/main/_TrackingByFilter.js @@ -3,7 +3,7 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/base/_Filter" + , "src/component/base/_Filter" ], function( _CompositeInTooltipFromIconKeypad , declare diff --git a/client-app/src/oldapp/designs/mapWithSideContent/main/_TrackingWithList.js b/client-app/src/oldapp/designs/mapWithSideContent/main/_TrackingWithList.js index 413e0288..554925ad 100644 --- a/client-app/src/oldapp/designs/mapWithSideContent/main/_TrackingWithList.js +++ b/client-app/src/oldapp/designs/mapWithSideContent/main/_TrackingWithList.js @@ -3,14 +3,14 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/base/_SelectionBase" - , "redmic/modules/browser/bars/Total" - , "redmic/modules/browser/ListImpl" - , "redmic/modules/browser/_ButtonsInRow" - , "redmic/modules/browser/_Framework" - , "redmic/modules/browser/_MultiTemplate" - , "redmic/modules/browser/_Select" - , 'redmic/modules/layout/genericDisplayer/GenericWithTopbarDisplayerImpl' + , "src/component/base/_SelectionBase" + , "src/component/browser/bars/Total" + , "src/component/browser/ListImpl" + , "src/component/browser/_ButtonsInRow" + , "src/component/browser/_Framework" + , "src/component/browser/_MultiTemplate" + , "src/component/browser/_Select" + , 'src/component/layout/genericDisplayer/GenericWithTopbarDisplayerImpl' , "templates/ActivityList" , "templates/AnimalList" , "templates/TrackingPlatformList" diff --git a/client-app/src/oldapp/designs/textSearchFacetsList/Controller.js b/client-app/src/oldapp/designs/textSearchFacetsList/Controller.js index 1b5f01f3..976f331a 100644 --- a/client-app/src/oldapp/designs/textSearchFacetsList/Controller.js +++ b/client-app/src/oldapp/designs/textSearchFacetsList/Controller.js @@ -5,10 +5,10 @@ define([ , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Store" - , "redmic/modules/browser/bars/Pagination" - , "redmic/modules/search/FacetsImpl" - , "redmic/modules/search/TextImpl" + , "src/component/base/_Store" + , "src/component/browser/bars/Pagination" + , "src/component/search/FacetsImpl" + , "src/component/search/TextImpl" , "./_AddFilter" ], function ( _OnShownAndRefresh diff --git a/client-app/src/oldapp/designs/textSearchFacetsList/main/Activity.js b/client-app/src/oldapp/designs/textSearchFacetsList/main/Activity.js index 7fd242c4..82b147ef 100644 --- a/client-app/src/oldapp/designs/textSearchFacetsList/main/Activity.js +++ b/client-app/src/oldapp/designs/textSearchFacetsList/main/Activity.js @@ -7,10 +7,10 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "templates/ActivityList" - , "redmic/modules/browser/_Select" - , "redmic/modules/browser/bars/SelectionBox" - , "redmic/modules/browser/bars/Order" - , "redmic/modules/browser/bars/Total" + , "src/component/browser/_Select" + , "src/component/browser/bars/SelectionBox" + , "src/component/browser/bars/Order" + , "src/component/browser/bars/Total" ], function( _Main , _AddComposite diff --git a/client-app/src/oldapp/designs/textSearchFacetsList/main/Administrative.js b/client-app/src/oldapp/designs/textSearchFacetsList/main/Administrative.js index 62327275..0774fe28 100644 --- a/client-app/src/oldapp/designs/textSearchFacetsList/main/Administrative.js +++ b/client-app/src/oldapp/designs/textSearchFacetsList/main/Administrative.js @@ -5,10 +5,10 @@ define([ , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/browser/_Select" - , "redmic/modules/browser/bars/SelectionBox" - , "redmic/modules/browser/bars/Order" - , "redmic/modules/browser/bars/Total" + , "src/component/browser/_Select" + , "src/component/browser/bars/SelectionBox" + , "src/component/browser/bars/Order" + , "src/component/browser/bars/Total" ], function( _Main , Controller diff --git a/client-app/src/oldapp/designs/textSearchFacetsList/main/Bibliography.js b/client-app/src/oldapp/designs/textSearchFacetsList/main/Bibliography.js index 593b3581..e77b0639 100644 --- a/client-app/src/oldapp/designs/textSearchFacetsList/main/Bibliography.js +++ b/client-app/src/oldapp/designs/textSearchFacetsList/main/Bibliography.js @@ -5,10 +5,10 @@ define([ , 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/modules/browser/_Select' - , 'redmic/modules/browser/bars/SelectionBox' - , 'redmic/modules/browser/bars/Order' - , 'redmic/modules/browser/bars/Total' + , 'src/component/browser/_Select' + , 'src/component/browser/bars/SelectionBox' + , 'src/component/browser/bars/Order' + , 'src/component/browser/bars/Total' , 'templates/DocumentList' ], function ( _Main diff --git a/client-app/src/oldapp/designs/textSearchFacetsList/main/Domain.js b/client-app/src/oldapp/designs/textSearchFacetsList/main/Domain.js index 37a79a2d..71dc444d 100644 --- a/client-app/src/oldapp/designs/textSearchFacetsList/main/Domain.js +++ b/client-app/src/oldapp/designs/textSearchFacetsList/main/Domain.js @@ -5,8 +5,8 @@ define([ , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/browser/bars/Order" - , "redmic/modules/browser/bars/Total" + , "src/component/browser/bars/Order" + , "src/component/browser/bars/Total" ], function( _Main , Controller diff --git a/client-app/src/oldapp/designs/textSearchFacetsList/main/Organisation.js b/client-app/src/oldapp/designs/textSearchFacetsList/main/Organisation.js index ca8d8f30..bb982504 100644 --- a/client-app/src/oldapp/designs/textSearchFacetsList/main/Organisation.js +++ b/client-app/src/oldapp/designs/textSearchFacetsList/main/Organisation.js @@ -6,10 +6,10 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "templates/OrganisationList" - , "redmic/modules/browser/_Select" - , "redmic/modules/browser/bars/SelectionBox" - , "redmic/modules/browser/bars/Order" - , "redmic/modules/browser/bars/Total" + , "src/component/browser/_Select" + , "src/component/browser/bars/SelectionBox" + , "src/component/browser/bars/Order" + , "src/component/browser/bars/Total" ], function( _Main , Controller diff --git a/client-app/src/oldapp/designs/textSearchFacetsList/main/Platform.js b/client-app/src/oldapp/designs/textSearchFacetsList/main/Platform.js index e8b0c258..d6ef248e 100644 --- a/client-app/src/oldapp/designs/textSearchFacetsList/main/Platform.js +++ b/client-app/src/oldapp/designs/textSearchFacetsList/main/Platform.js @@ -6,10 +6,10 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "templates/PlatformList" - , "redmic/modules/browser/_Select" - , "redmic/modules/browser/bars/SelectionBox" - , "redmic/modules/browser/bars/Order" - , "redmic/modules/browser/bars/Total" + , "src/component/browser/_Select" + , "src/component/browser/bars/SelectionBox" + , "src/component/browser/bars/Order" + , "src/component/browser/bars/Total" ], function( _Main , Controller diff --git a/client-app/src/oldapp/designs/textSearchFacetsList/main/Program.js b/client-app/src/oldapp/designs/textSearchFacetsList/main/Program.js index d4eb75ba..264feddb 100644 --- a/client-app/src/oldapp/designs/textSearchFacetsList/main/Program.js +++ b/client-app/src/oldapp/designs/textSearchFacetsList/main/Program.js @@ -6,10 +6,10 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "templates/ProgramList" - , "redmic/modules/browser/_Select" - , "redmic/modules/browser/bars/SelectionBox" - , "redmic/modules/browser/bars/Order" - , "redmic/modules/browser/bars/Total" + , "src/component/browser/_Select" + , "src/component/browser/bars/SelectionBox" + , "src/component/browser/bars/Order" + , "src/component/browser/bars/Total" ], function( _Main , Controller diff --git a/client-app/src/oldapp/designs/textSearchFacetsList/main/Project.js b/client-app/src/oldapp/designs/textSearchFacetsList/main/Project.js index cc11b0d9..3a9271e8 100644 --- a/client-app/src/oldapp/designs/textSearchFacetsList/main/Project.js +++ b/client-app/src/oldapp/designs/textSearchFacetsList/main/Project.js @@ -6,10 +6,10 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "templates/ProjectList" - , "redmic/modules/browser/_Select" - , "redmic/modules/browser/bars/SelectionBox" - , "redmic/modules/browser/bars/Order" - , "redmic/modules/browser/bars/Total" + , "src/component/browser/_Select" + , "src/component/browser/bars/SelectionBox" + , "src/component/browser/bars/Order" + , "src/component/browser/bars/Total" ], function( _Main , Controller diff --git a/client-app/src/oldapp/designs/textSearchFacetsList/main/ServiceOGC.js b/client-app/src/oldapp/designs/textSearchFacetsList/main/ServiceOGC.js index 34e581d7..84d9053f 100644 --- a/client-app/src/oldapp/designs/textSearchFacetsList/main/ServiceOGC.js +++ b/client-app/src/oldapp/designs/textSearchFacetsList/main/ServiceOGC.js @@ -7,8 +7,8 @@ define([ , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/browser/HierarchicalImpl" - , "redmic/modules/browser/bars/Order" + , "src/component/browser/HierarchicalImpl" + , "src/component/browser/bars/Order" , "templates/ServiceOGCList" ], function( _Main diff --git a/client-app/src/oldapp/designs/textSearchFacetsList/main/Species.js b/client-app/src/oldapp/designs/textSearchFacetsList/main/Species.js index 0dddc358..d90bcdad 100644 --- a/client-app/src/oldapp/designs/textSearchFacetsList/main/Species.js +++ b/client-app/src/oldapp/designs/textSearchFacetsList/main/Species.js @@ -6,13 +6,13 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "templates/SpeciesList" - , "redmic/modules/browser/_Select" - , "redmic/modules/browser/bars/SelectionBox" - , "redmic/modules/browser/bars/Order" - , "redmic/modules/browser/bars/Total" - , "redmic/modules/tree/_HierarchicalFilter" - , "redmic/modules/tree/_LazyLoad" - , "redmic/modules/tree/CbtreeImpl" + , "src/component/browser/_Select" + , "src/component/browser/bars/SelectionBox" + , "src/component/browser/bars/Order" + , "src/component/browser/bars/Total" + , "src/component/tree/_HierarchicalFilter" + , "src/component/tree/_LazyLoad" + , "src/component/tree/CbtreeImpl" ], function( _Main , Controller diff --git a/client-app/src/oldapp/designs/textSearchFacetsList/main/Taxon.js b/client-app/src/oldapp/designs/textSearchFacetsList/main/Taxon.js index a9399a08..65995823 100644 --- a/client-app/src/oldapp/designs/textSearchFacetsList/main/Taxon.js +++ b/client-app/src/oldapp/designs/textSearchFacetsList/main/Taxon.js @@ -8,11 +8,11 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "templates/SpeciesList" - , "redmic/modules/base/_Persistence" - , "redmic/modules/browser/_Select" - , "redmic/modules/browser/bars/SelectionBox" - , "redmic/modules/browser/bars/Order" - , "redmic/modules/browser/bars/Total" + , "src/component/base/_Persistence" + , "src/component/browser/_Select" + , "src/component/browser/bars/SelectionBox" + , "src/component/browser/bars/Order" + , "src/component/browser/bars/Total" ], function( _Main , Controller diff --git a/client-app/src/oldapp/designs/textSearchList/Controller.js b/client-app/src/oldapp/designs/textSearchList/Controller.js index f65f06f7..3263d369 100644 --- a/client-app/src/oldapp/designs/textSearchList/Controller.js +++ b/client-app/src/oldapp/designs/textSearchList/Controller.js @@ -4,8 +4,8 @@ define([ , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/browser/bars/Pagination" - , "redmic/modules/search/TextImpl" + , "src/component/browser/bars/Pagination" + , "src/component/search/TextImpl" , "./_AddFilter" ], function ( _Browser diff --git a/client-app/src/oldapp/designs/textSearchList/main/Domain.js b/client-app/src/oldapp/designs/textSearchList/main/Domain.js index f4ab72f2..ee47cdb4 100644 --- a/client-app/src/oldapp/designs/textSearchList/main/Domain.js +++ b/client-app/src/oldapp/designs/textSearchList/main/Domain.js @@ -8,9 +8,9 @@ define([ , 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' - , "redmic/modules/browser/bars/Order" - , "redmic/modules/browser/bars/Pagination" - , "redmic/modules/browser/bars/Total" + , "src/component/browser/bars/Order" + , "src/component/browser/bars/Pagination" + , "src/component/browser/bars/Total" , 'templates/DomainList' ], function( _EditionView diff --git a/client-app/src/oldapp/designs/textSearchList/main/Selection.js b/client-app/src/oldapp/designs/textSearchList/main/Selection.js index fe57d538..91373e2e 100644 --- a/client-app/src/oldapp/designs/textSearchList/main/Selection.js +++ b/client-app/src/oldapp/designs/textSearchList/main/Selection.js @@ -6,8 +6,8 @@ define([ , "app/designs/textSearchList/layout/BasicTopZone" , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Store" - , "redmic/modules/base/_Persistence" + , "src/component/base/_Store" + , "src/component/base/_Persistence" , "templates/SelectionList" ], function( alertify diff --git a/client-app/src/oldapp/designs/textSearchList/main/ServiceOGC.js b/client-app/src/oldapp/designs/textSearchList/main/ServiceOGC.js index b8af15d0..a47c6b10 100644 --- a/client-app/src/oldapp/designs/textSearchList/main/ServiceOGC.js +++ b/client-app/src/oldapp/designs/textSearchList/main/ServiceOGC.js @@ -6,7 +6,7 @@ define([ , "app/designs/textSearchList/layout/BasicTopZone" , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/browser/HierarchicalImpl" + , "src/component/browser/HierarchicalImpl" , "templates/ServiceOGCList" ], function( _OnShownAndRefresh diff --git a/client-app/src/oldapp/details/views/ActivityAreaMapBase.js b/client-app/src/oldapp/details/views/ActivityAreaMapBase.js index c406eefc..28501421 100644 --- a/client-app/src/oldapp/details/views/ActivityAreaMapBase.js +++ b/client-app/src/oldapp/details/views/ActivityAreaMapBase.js @@ -4,7 +4,7 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/map/layer/GeoJsonLayerImpl" + , "src/component/map/layer/GeoJsonLayerImpl" , "templates/AreaPopup" , "templates/AreaList" ], function( diff --git a/client-app/src/oldapp/details/views/ActivityChart.js b/client-app/src/oldapp/details/views/ActivityChart.js index 111e78ab..421a12c4 100644 --- a/client-app/src/oldapp/details/views/ActivityChart.js +++ b/client-app/src/oldapp/details/views/ActivityChart.js @@ -7,10 +7,10 @@ define([ , 'app/details/views/_ActivityTimeSeriesDataManagement' , 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/modules/chart/ChartsContainer/_InfoOnMouseOver' - , 'redmic/modules/chart/ChartsContainer/_TemporalAxisWithGridDrawing' - , 'redmic/modules/chart/ChartsContainer/_VerticalAxesWithGridDrawing' - , 'redmic/modules/chart/ChartsContainer/_ZoomByDragging' + , 'src/component/chart/ChartsContainer/_InfoOnMouseOver' + , 'src/component/chart/ChartsContainer/_TemporalAxisWithGridDrawing' + , 'src/component/chart/ChartsContainer/_VerticalAxesWithGridDrawing' + , 'src/component/chart/ChartsContainer/_ZoomByDragging' ], function( _Main , _ProcessDataDefinitionAndGetTimeSeries diff --git a/client-app/src/oldapp/details/views/ActivityLayerMapBase.js b/client-app/src/oldapp/details/views/ActivityLayerMapBase.js index 4c817390..ebca9b22 100644 --- a/client-app/src/oldapp/details/views/ActivityLayerMapBase.js +++ b/client-app/src/oldapp/details/views/ActivityLayerMapBase.js @@ -3,7 +3,7 @@ define([ , 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/modules/atlas/_AtlasLayersManagement' + , 'src/component/atlas/_AtlasLayersManagement' ], function( ActivityLayerMap , redmicConfig diff --git a/client-app/src/oldapp/edition/views/ActivityEditionView.js b/client-app/src/oldapp/edition/views/ActivityEditionView.js index ad24ff60..d9e133b9 100644 --- a/client-app/src/oldapp/edition/views/ActivityEditionView.js +++ b/client-app/src/oldapp/edition/views/ActivityEditionView.js @@ -12,7 +12,7 @@ define([ , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/layout/wizard/_CompleteBySelection" + , "src/component/layout/wizard/_CompleteBySelection" ], function( ActivityType , ContactSetStep diff --git a/client-app/src/oldapp/edition/views/ConditionEditionView.js b/client-app/src/oldapp/edition/views/ConditionEditionView.js index 3acba284..055d7e3b 100644 --- a/client-app/src/oldapp/edition/views/ConditionEditionView.js +++ b/client-app/src/oldapp/edition/views/ConditionEditionView.js @@ -6,7 +6,7 @@ define([ , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/layout/wizard/_CompleteBySelection" + , "src/component/layout/wizard/_CompleteBySelection" ], function( AttributeType , MainDataStep diff --git a/client-app/src/oldapp/edition/views/DeviceEditionView.js b/client-app/src/oldapp/edition/views/DeviceEditionView.js index 83d9ecc3..e153ce4e 100644 --- a/client-app/src/oldapp/edition/views/DeviceEditionView.js +++ b/client-app/src/oldapp/edition/views/DeviceEditionView.js @@ -7,7 +7,7 @@ define([ , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/layout/wizard/_CompleteBySelection" + , "src/component/layout/wizard/_CompleteBySelection" ], function( DeviceType , CalibrationSetStep diff --git a/client-app/src/oldapp/edition/views/LoadDataToActivityEditionView.js b/client-app/src/oldapp/edition/views/LoadDataToActivityEditionView.js index 53d8fb77..9d8cdde2 100644 --- a/client-app/src/oldapp/edition/views/LoadDataToActivityEditionView.js +++ b/client-app/src/oldapp/edition/views/LoadDataToActivityEditionView.js @@ -14,7 +14,7 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/Deferred" - , "redmic/modules/layout/templateDisplayer/TemplateDisplayer" + , "src/component/layout/templateDisplayer/TemplateDisplayer" , "templates/ActivityCategoriesNoExist" ], function( SelectActivityCategoryStep diff --git a/client-app/src/oldapp/edition/views/MetricsDefinitionEditionView.js b/client-app/src/oldapp/edition/views/MetricsDefinitionEditionView.js index 11d12f13..8ae63240 100644 --- a/client-app/src/oldapp/edition/views/MetricsDefinitionEditionView.js +++ b/client-app/src/oldapp/edition/views/MetricsDefinitionEditionView.js @@ -7,7 +7,7 @@ define([ , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/layout/wizard/_CompleteBySelection" + , "src/component/layout/wizard/_CompleteBySelection" ], function( MetricGroup , DeviceView diff --git a/client-app/src/oldapp/edition/views/MisIdentificationEditionView.js b/client-app/src/oldapp/edition/views/MisIdentificationEditionView.js index 85e2f57e..54ef8547 100644 --- a/client-app/src/oldapp/edition/views/MisIdentificationEditionView.js +++ b/client-app/src/oldapp/edition/views/MisIdentificationEditionView.js @@ -9,7 +9,7 @@ define([ , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/layout/wizard/_CompleteBySelection" + , "src/component/layout/wizard/_CompleteBySelection" ], function( DocumentView , SpeciesView diff --git a/client-app/src/oldapp/edition/views/ParameterEditionView.js b/client-app/src/oldapp/edition/views/ParameterEditionView.js index 72b53e9d..f42cd5c4 100644 --- a/client-app/src/oldapp/edition/views/ParameterEditionView.js +++ b/client-app/src/oldapp/edition/views/ParameterEditionView.js @@ -7,7 +7,7 @@ define([ , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/layout/wizard/_CompleteBySelection" + , "src/component/layout/wizard/_CompleteBySelection" ], function( ParameterType , ParameterMainDataStep diff --git a/client-app/src/oldapp/edition/views/UnitEditionView.js b/client-app/src/oldapp/edition/views/UnitEditionView.js index 95e15f3d..7aecd050 100644 --- a/client-app/src/oldapp/edition/views/UnitEditionView.js +++ b/client-app/src/oldapp/edition/views/UnitEditionView.js @@ -6,7 +6,7 @@ define([ , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/layout/wizard/_CompleteBySelection" + , "src/component/layout/wizard/_CompleteBySelection" ], function( MainDataStep , UnitType diff --git a/client-app/src/oldapp/edition/views/dataLoader/LoadDataOC.js b/client-app/src/oldapp/edition/views/dataLoader/LoadDataOC.js index 5b71db49..e6c22338 100644 --- a/client-app/src/oldapp/edition/views/dataLoader/LoadDataOC.js +++ b/client-app/src/oldapp/edition/views/dataLoader/LoadDataOC.js @@ -14,8 +14,8 @@ define([ , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/browser/_Select" - , "redmic/modules/layout/wizard/_CompleteBySelection" + , "src/component/browser/_Select" + , "src/component/layout/wizard/_CompleteBySelection" , "templates/DomainList" ], function( _LocalSelectionView diff --git a/client-app/src/oldapp/edition/views/dataLoader/LoadDataTR.js b/client-app/src/oldapp/edition/views/dataLoader/LoadDataTR.js index f9315849..24ec1e26 100644 --- a/client-app/src/oldapp/edition/views/dataLoader/LoadDataTR.js +++ b/client-app/src/oldapp/edition/views/dataLoader/LoadDataTR.js @@ -10,9 +10,9 @@ define([ , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/browser/_Select" - , "redmic/modules/browser/bars/Pagination" - , "redmic/modules/layout/wizard/_CompleteBySelection" + , "src/component/browser/_Select" + , "src/component/browser/bars/Pagination" + , "src/component/layout/wizard/_CompleteBySelection" , "templates/AnimalList" , "templates/PlatformList" ], function( diff --git a/client-app/src/oldapp/edition/views/dataLoader/_BaseDataToActivityEditionItfc.js b/client-app/src/oldapp/edition/views/dataLoader/_BaseDataToActivityEditionItfc.js index 76a88f1b..0975648a 100644 --- a/client-app/src/oldapp/edition/views/dataLoader/_BaseDataToActivityEditionItfc.js +++ b/client-app/src/oldapp/edition/views/dataLoader/_BaseDataToActivityEditionItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/client-app/src/oldapp/edition/views/dataLoader/_BaseLoadDataToActivityEditionItfc.js b/client-app/src/oldapp/edition/views/dataLoader/_BaseLoadDataToActivityEditionItfc.js index 9c15cb18..2d25d928 100644 --- a/client-app/src/oldapp/edition/views/dataLoader/_BaseLoadDataToActivityEditionItfc.js +++ b/client-app/src/oldapp/edition/views/dataLoader/_BaseLoadDataToActivityEditionItfc.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Itfc" + , "src/component/base/_Itfc" ], function( declare , lang diff --git a/client-app/src/oldapp/home/views/HomeView.js b/client-app/src/oldapp/home/views/HomeView.js index ecc5307a..960038a3 100644 --- a/client-app/src/oldapp/home/views/HomeView.js +++ b/client-app/src/oldapp/home/views/HomeView.js @@ -12,8 +12,8 @@ define([ , 'dojo/_base/declare' , 'dojo/_base/lang' , 'src/utils/Credentials' - , 'redmic/modules/base/_Filter' - , 'redmic/modules/layout/templateDisplayer/TemplateDisplayer' + , 'src/component/base/_Filter' + , 'src/component/layout/templateDisplayer/TemplateDisplayer' , 'templates/InitialInfo' ], function( Controller diff --git a/client-app/src/oldapp/home/views/ProductWidget.js b/client-app/src/oldapp/home/views/ProductWidget.js index 60e35287..aa29b1b5 100644 --- a/client-app/src/oldapp/home/views/ProductWidget.js +++ b/client-app/src/oldapp/home/views/ProductWidget.js @@ -1,11 +1,11 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/modules/base/_Module' - , 'redmic/modules/base/_Show' - , 'redmic/modules/base/_Store' - , 'redmic/modules/browser/_ButtonsInRow' - , 'redmic/modules/browser/ListImpl' + , 'src/component/base/_Module' + , 'src/component/base/_Show' + , 'src/component/base/_Store' + , 'src/component/browser/_ButtonsInRow' + , 'src/component/browser/ListImpl' , 'templates/ProductList' ], function( declare diff --git a/client-app/src/oldapp/home/views/SearchBarWidget.js b/client-app/src/oldapp/home/views/SearchBarWidget.js index 611d2e1c..ddaaba1a 100644 --- a/client-app/src/oldapp/home/views/SearchBarWidget.js +++ b/client-app/src/oldapp/home/views/SearchBarWidget.js @@ -2,11 +2,11 @@ define([ 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/modules/base/_Filter' - , 'redmic/modules/base/_Module' - , 'redmic/modules/base/_Show' - , 'redmic/modules/layout/dataDisplayer/DataDisplayer' - , 'redmic/modules/search/TextImpl' + , 'src/component/base/_Filter' + , 'src/component/base/_Module' + , 'src/component/base/_Show' + , 'src/component/layout/dataDisplayer/DataDisplayer' + , 'src/component/search/TextImpl' ], function( redmicConfig , declare diff --git a/client-app/src/oldapp/home/views/SearchFastFilterWidget.js b/client-app/src/oldapp/home/views/SearchFastFilterWidget.js index 80488a0f..27d3cc6f 100644 --- a/client-app/src/oldapp/home/views/SearchFastFilterWidget.js +++ b/client-app/src/oldapp/home/views/SearchFastFilterWidget.js @@ -2,9 +2,9 @@ define([ 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/modules/base/_Module' - , 'redmic/modules/base/_Show' - , 'redmic/modules/search/FacetsImpl' + , 'src/component/base/_Module' + , 'src/component/base/_Show' + , 'src/component/search/FacetsImpl' ], function( redmicConfig , declare diff --git a/client-app/src/oldapp/home/views/SearchFilterWidget.js b/client-app/src/oldapp/home/views/SearchFilterWidget.js index b11125d5..ca1ecff6 100644 --- a/client-app/src/oldapp/home/views/SearchFilterWidget.js +++ b/client-app/src/oldapp/home/views/SearchFilterWidget.js @@ -1,9 +1,9 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/modules/base/_Module' - , 'redmic/modules/base/_Show' - , 'redmic/modules/search/CompositeImpl' + , 'src/component/base/_Module' + , 'src/component/base/_Show' + , 'src/component/search/CompositeImpl' ], function( declare , lang diff --git a/client-app/src/oldapp/home/views/SearchResultsWidget.js b/client-app/src/oldapp/home/views/SearchResultsWidget.js index 3237b1b8..e8241677 100644 --- a/client-app/src/oldapp/home/views/SearchResultsWidget.js +++ b/client-app/src/oldapp/home/views/SearchResultsWidget.js @@ -2,15 +2,15 @@ define([ 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/modules/base/_Filter' - , 'redmic/modules/base/_Module' - , 'redmic/modules/base/_Show' - , 'redmic/modules/browser/bars/Order' - , 'redmic/modules/browser/bars/Pagination' - , 'redmic/modules/browser/bars/Total' - , 'redmic/modules/browser/_ButtonsInRow' - , 'redmic/modules/browser/_Framework' - , 'redmic/modules/browser/ListImpl' + , 'src/component/base/_Filter' + , 'src/component/base/_Module' + , 'src/component/base/_Show' + , 'src/component/browser/bars/Order' + , 'src/component/browser/bars/Pagination' + , 'src/component/browser/bars/Total' + , 'src/component/browser/_ButtonsInRow' + , 'src/component/browser/_Framework' + , 'src/component/browser/ListImpl' , 'templates/ActivityList' ], function( redmicConfig diff --git a/client-app/src/oldapp/home/views/StatsWidget.js b/client-app/src/oldapp/home/views/StatsWidget.js index b76c6562..e1d711a1 100644 --- a/client-app/src/oldapp/home/views/StatsWidget.js +++ b/client-app/src/oldapp/home/views/StatsWidget.js @@ -2,13 +2,13 @@ define([ 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/modules/base/_Module' - , 'redmic/modules/base/_Show' - , 'redmic/modules/base/_ShowInTooltip' - , 'redmic/modules/base/_Store' - , 'redmic/modules/browser/_ButtonsInRow' - , 'redmic/modules/browser/ListImpl' - , 'redmic/modules/layout/dataDisplayer/DataDisplayer' + , 'src/component/base/_Module' + , 'src/component/base/_Show' + , 'src/component/base/_ShowInTooltip' + , 'src/component/base/_Store' + , 'src/component/browser/_ButtonsInRow' + , 'src/component/browser/ListImpl' + , 'src/component/layout/dataDisplayer/DataDisplayer' , 'templates/StatisticsList' ], function( redmicConfig diff --git a/client-app/src/oldapp/home/views/_DashboardItem.js b/client-app/src/oldapp/home/views/_DashboardItem.js index 0ec75258..58c1119d 100644 --- a/client-app/src/oldapp/home/views/_DashboardItem.js +++ b/client-app/src/oldapp/home/views/_DashboardItem.js @@ -2,8 +2,8 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "put-selector/put" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" + , "src/component/base/_Module" + , "src/component/base/_Show" ], function( declare , lang diff --git a/client-app/src/oldapp/maintenance/domains/_HierarchicalDomain.js b/client-app/src/oldapp/maintenance/domains/_HierarchicalDomain.js index 2b579488..ad15b766 100644 --- a/client-app/src/oldapp/maintenance/domains/_HierarchicalDomain.js +++ b/client-app/src/oldapp/maintenance/domains/_HierarchicalDomain.js @@ -3,7 +3,7 @@ define([ , 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/aspect' - , "redmic/modules/browser/HierarchicalImpl" + , "src/component/browser/HierarchicalImpl" ], function( DomainMain , declare diff --git a/client-app/src/oldapp/maintenance/views/PermissionsView.js b/client-app/src/oldapp/maintenance/views/PermissionsView.js index 229ecf8e..0a646134 100644 --- a/client-app/src/oldapp/maintenance/views/PermissionsView.js +++ b/client-app/src/oldapp/maintenance/views/PermissionsView.js @@ -5,10 +5,10 @@ define([ , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_Store" - , "redmic/modules/browser/_Select" - //, "redmic/modules/browser/bars/Pagination" - , "redmic/modules/browser/bars/Total" + , "src/component/base/_Store" + , "src/component/browser/_Select" + //, "src/component/browser/bars/Pagination" + , "src/component/browser/bars/Total" , "templates/PermissionsList" ], function( _EditionWizardView diff --git a/client-app/src/oldapp/products/views/OpenMapView.js b/client-app/src/oldapp/products/views/OpenMapView.js index eda5a6fb..5c93a7d7 100644 --- a/client-app/src/oldapp/products/views/OpenMapView.js +++ b/client-app/src/oldapp/products/views/OpenMapView.js @@ -5,9 +5,9 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , 'put-selector/put' - , "redmic/modules/atlas/Atlas" - , 'redmic/modules/layout/TabsDisplayer' - , "redmic/modules/mapQuery/QueryOnMap" + , "src/component/atlas/Atlas" + , 'src/component/layout/TabsDisplayer' + , "src/component/mapQuery/QueryOnMap" ], function( Controller , Layout diff --git a/client-app/src/oldapp/user/views/ConfirmResettingView.js b/client-app/src/oldapp/user/views/ConfirmResettingView.js index aa189334..11ff5967 100644 --- a/client-app/src/oldapp/user/views/ConfirmResettingView.js +++ b/client-app/src/oldapp/user/views/ConfirmResettingView.js @@ -5,8 +5,8 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/text!./templates/ConfirmResetting.html" - , 'redmic/modules/base/_ListenQueryParams' - , 'redmic/modules/base/_Store' + , 'src/component/base/_ListenQueryParams' + , 'src/component/base/_Store' ], function( alertify , _ExternalUserBaseView diff --git a/client-app/src/oldapp/user/views/FeedbackView.js b/client-app/src/oldapp/user/views/FeedbackView.js index 29591164..2318d8be 100644 --- a/client-app/src/oldapp/user/views/FeedbackView.js +++ b/client-app/src/oldapp/user/views/FeedbackView.js @@ -9,9 +9,9 @@ define([ , "dojo/query" , "dojo/text!./templates/Feedback.html" , "src/utils/Credentials" - , "redmic/modules/form/FormContainerImpl" - , "redmic/modules/form/_ListenModelHasChanged" - , "redmic/modules/model/ModelImpl" + , "src/component/form/FormContainerImpl" + , "src/component/form/_ListenModelHasChanged" + , "src/component/model/ModelImpl" ], function( alertify , ReCaptcha diff --git a/client-app/src/oldapp/user/views/InnerWhatIsRedmicView.js b/client-app/src/oldapp/user/views/InnerWhatIsRedmicView.js index 63e6e869..356f24a4 100644 --- a/client-app/src/oldapp/user/views/InnerWhatIsRedmicView.js +++ b/client-app/src/oldapp/user/views/InnerWhatIsRedmicView.js @@ -4,9 +4,9 @@ define([ , 'app/designs/details/_AddBasicTitle' , 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/modules/components/PDFViewer/PDFViewer' - , 'redmic/modules/layout/TabsDisplayer' - , 'redmic/modules/layout/templateDisplayer/TemplateDisplayer' + , 'src/component/components/PDFViewer/PDFViewer' + , 'src/component/layout/TabsDisplayer' + , 'src/component/layout/templateDisplayer/TemplateDisplayer' , 'templates/WhatIsRedmicLongTermChallenge' , 'templates/WhatIsRedmicInfoType' , 'templates/WhatIsRedmicUserType' diff --git a/client-app/src/oldapp/user/views/LoginView.js b/client-app/src/oldapp/user/views/LoginView.js index 137f172d..34ca5d8b 100644 --- a/client-app/src/oldapp/user/views/LoginView.js +++ b/client-app/src/oldapp/user/views/LoginView.js @@ -6,7 +6,7 @@ define([ , "dojo/_base/lang" , "dojo/text!./templates/Login.html" , "src/utils/Credentials" - , 'redmic/modules/base/_Store' + , 'src/component/base/_Store' ], function( alertify , _ExternalUserBaseView diff --git a/client-app/src/oldapp/user/views/RegisterView.js b/client-app/src/oldapp/user/views/RegisterView.js index a785d957..3952264b 100644 --- a/client-app/src/oldapp/user/views/RegisterView.js +++ b/client-app/src/oldapp/user/views/RegisterView.js @@ -8,10 +8,10 @@ define([ , "dojo/_base/lang" , "dojo/query" , "dojo/text!./templates/Register.html" - , "redmic/modules/form/FormContainerImpl" - , "redmic/modules/form/_ListenModelHasChanged" - , "redmic/modules/form/_PublicateChanges" - , "redmic/modules/model/ModelImpl" + , "src/component/form/FormContainerImpl" + , "src/component/form/_ListenModelHasChanged" + , "src/component/form/_PublicateChanges" + , "src/component/model/ModelImpl" ], function( alertify , ReCaptcha diff --git a/client-app/src/oldapp/user/views/ResettingView.js b/client-app/src/oldapp/user/views/ResettingView.js index 26045a60..6ebaeaba 100644 --- a/client-app/src/oldapp/user/views/ResettingView.js +++ b/client-app/src/oldapp/user/views/ResettingView.js @@ -5,7 +5,7 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/text!./templates/Resetting.html" - , 'redmic/modules/base/_Store' + , 'src/component/base/_Store' ], function( alertify , _ExternalUserBaseView diff --git a/client-app/src/oldapp/user/views/UserProfileView.js b/client-app/src/oldapp/user/views/UserProfileView.js index 412e9516..f8d8a2a9 100644 --- a/client-app/src/oldapp/user/views/UserProfileView.js +++ b/client-app/src/oldapp/user/views/UserProfileView.js @@ -10,22 +10,22 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "src/utils/Credentials" - , "redmic/modules/base/_Window" - , "redmic/modules/base/_Persistence" - , "redmic/modules/browser/_ButtonsInRow" - , "redmic/modules/browser/_MultiTemplate" - , "redmic/modules/browser/ListImpl" - , "redmic/modules/layout/templateDisplayer/TemplateDisplayer" - , "redmic/modules/form/_CreateKeypad" - , "redmic/modules/form/FormContainerImpl" - , "redmic/modules/form/_ListenModelHasChanged" + , "src/component/base/_Window" + , "src/component/base/_Persistence" + , "src/component/browser/_ButtonsInRow" + , "src/component/browser/_MultiTemplate" + , "src/component/browser/ListImpl" + , "src/component/layout/templateDisplayer/TemplateDisplayer" + , "src/component/form/_CreateKeypad" + , "src/component/form/FormContainerImpl" + , "src/component/form/_ListenModelHasChanged" , "templates/UserImage" , "templates/UserTitle" , "templates/UserEmail" , "templates/UserName" , "templates/UserSector" , "templates/UserPassword" - , "redmic/modules/notification/TaskNotification" + , "src/component/notification/TaskNotification" ], function( Controller , Layout diff --git a/client-app/src/oldapp/user/views/_ExternalUserBaseView.js b/client-app/src/oldapp/user/views/_ExternalUserBaseView.js index 74f78f8d..e6d6191e 100644 --- a/client-app/src/oldapp/user/views/_ExternalUserBaseView.js +++ b/client-app/src/oldapp/user/views/_ExternalUserBaseView.js @@ -8,8 +8,8 @@ define([ , 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/_base/kernel' - , 'redmic/modules/base/_Module' - , 'redmic/modules/base/_Show' + , 'src/component/base/_Module' + , 'src/component/base/_Show' , 'dijit/form/Form' , 'dijit/form/ValidationTextBox' diff --git a/client-app/src/oldapp/viewers/views/ChartsView.js b/client-app/src/oldapp/viewers/views/ChartsView.js index 28aa82cc..6bad6275 100644 --- a/client-app/src/oldapp/viewers/views/ChartsView.js +++ b/client-app/src/oldapp/viewers/views/ChartsView.js @@ -11,20 +11,20 @@ define([ , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/_ShowInPopup" - , "redmic/modules/chart/ChartsContainer/_InfoOnMouseOver" - , "redmic/modules/chart/ChartsContainer/_TemporalAxisWithGridDrawing" - , "redmic/modules/chart/ChartsContainer/_VerticalAxesWithGridDrawing" - , "redmic/modules/chart/ChartsContainer/_ZoomByDragging" - , "redmic/modules/browser/HierarchicalImpl" - , "redmic/modules/browser/_ButtonsInRow" - , "redmic/modules/browser/_HierarchicalSelect" - , "redmic/modules/browser/_Framework" - , "redmic/modules/browser/bars/SelectionBox" - , "redmic/modules/map/LeafletImpl" - , "redmic/modules/map/layer/PruneClusterLayerImpl" - , "redmic/modules/map/layer/_Highlightable" - , "redmic/modules/map/layer/_Selectable" + , "src/component/base/_ShowInPopup" + , "src/component/chart/ChartsContainer/_InfoOnMouseOver" + , "src/component/chart/ChartsContainer/_TemporalAxisWithGridDrawing" + , "src/component/chart/ChartsContainer/_VerticalAxesWithGridDrawing" + , "src/component/chart/ChartsContainer/_ZoomByDragging" + , "src/component/browser/HierarchicalImpl" + , "src/component/browser/_ButtonsInRow" + , "src/component/browser/_HierarchicalSelect" + , "src/component/browser/_Framework" + , "src/component/browser/bars/SelectionBox" + , "src/component/map/LeafletImpl" + , "src/component/map/layer/PruneClusterLayerImpl" + , "src/component/map/layer/_Highlightable" + , "src/component/map/layer/_Selectable" , "templates/SurveyStationDataList" ], function ( alertify diff --git a/client-app/src/oldapp/viewers/views/RealTimeDashboardView.js b/client-app/src/oldapp/viewers/views/RealTimeDashboardView.js index 8315b8c9..40b83d3d 100644 --- a/client-app/src/oldapp/viewers/views/RealTimeDashboardView.js +++ b/client-app/src/oldapp/viewers/views/RealTimeDashboardView.js @@ -8,17 +8,17 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/Deferred" - , 'redmic/modules/base/_ExternalConfig' - , "redmic/modules/chart/ChartsContainer/_AngularAxisWithGridDrawing" - , "redmic/modules/chart/ChartsContainer/_InfoOnEmptyData" - , "redmic/modules/chart/ChartsContainer/_InfoOnMouseOver" - , "redmic/modules/chart/ChartsContainer/_LegendBar" - , "redmic/modules/chart/ChartsContainer/_RadialAxisWithGridDrawing" - , "redmic/modules/chart/ChartsContainer/_SummaryBox" - , "redmic/modules/layout/templateDisplayer/TemplateDisplayer" - , "redmic/modules/map/layer/GeoJsonLayerImpl" - , "redmic/modules/map/LeafletImpl" - , "redmic/modules/map/_PlaceNamesButton" + , 'src/component/base/_ExternalConfig' + , "src/component/chart/ChartsContainer/_AngularAxisWithGridDrawing" + , "src/component/chart/ChartsContainer/_InfoOnEmptyData" + , "src/component/chart/ChartsContainer/_InfoOnMouseOver" + , "src/component/chart/ChartsContainer/_LegendBar" + , "src/component/chart/ChartsContainer/_RadialAxisWithGridDrawing" + , "src/component/chart/ChartsContainer/_SummaryBox" + , "src/component/layout/templateDisplayer/TemplateDisplayer" + , "src/component/map/layer/GeoJsonLayerImpl" + , "src/component/map/LeafletImpl" + , "src/component/map/_PlaceNamesButton" , "templates/RealTimeInfo" , "templates/SitePopup" , "templates/DefaultEmbeddedContent" diff --git a/client-app/src/oldapp/viewers/views/RealTimeView.js b/client-app/src/oldapp/viewers/views/RealTimeView.js index b782d032..15c2576a 100644 --- a/client-app/src/oldapp/viewers/views/RealTimeView.js +++ b/client-app/src/oldapp/viewers/views/RealTimeView.js @@ -4,19 +4,19 @@ define([ , 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/modules/atlas/Atlas' - , 'redmic/modules/base/_Filter' - , 'redmic/modules/browser/ListImpl' - , 'redmic/modules/browser/_ButtonsInRow' - , 'redmic/modules/browser/_GeoJsonParser' - , 'redmic/modules/browser/_Framework' - , 'redmic/modules/browser/bars/Total' - , "redmic/modules/gateway/MapCenteringGatewayImpl" - , 'redmic/modules/layout/genericDisplayer/GenericWithTopbarDisplayerImpl' - , 'redmic/modules/layout/TabsDisplayer' - , 'redmic/modules/map/layer/PruneClusterLayerImpl' - , "redmic/modules/mapQuery/QueryOnMap" - , 'redmic/modules/search/TextImpl' + , 'src/component/atlas/Atlas' + , 'src/component/base/_Filter' + , 'src/component/browser/ListImpl' + , 'src/component/browser/_ButtonsInRow' + , 'src/component/browser/_GeoJsonParser' + , 'src/component/browser/_Framework' + , 'src/component/browser/bars/Total' + , "src/component/gateway/MapCenteringGatewayImpl" + , 'src/component/layout/genericDisplayer/GenericWithTopbarDisplayerImpl' + , 'src/component/layout/TabsDisplayer' + , 'src/component/map/layer/PruneClusterLayerImpl' + , "src/component/mapQuery/QueryOnMap" + , 'src/component/search/TextImpl' , 'templates/SurveyStationList' , 'templates/SurveyStationPopup' ], function( diff --git a/client-app/src/oldapp/viewers/views/SpeciesDistributionView.js b/client-app/src/oldapp/viewers/views/SpeciesDistributionView.js index 1eaabc9b..4f98eb83 100644 --- a/client-app/src/oldapp/viewers/views/SpeciesDistributionView.js +++ b/client-app/src/oldapp/viewers/views/SpeciesDistributionView.js @@ -9,34 +9,34 @@ define([ , "dojo/Deferred" , "put-selector/put" , "src/utils/Credentials" - , "redmic/modules/atlas/Atlas" - , "redmic/modules/base/_Filter" - , "redmic/modules/base/_Selection" - , "redmic/modules/base/_Store" - , "redmic/modules/browser/ListImpl" - , "redmic/modules/browser/_ButtonsInRow" - , "redmic/modules/browser/_Framework" - , "redmic/modules/browser/_Select" - , "redmic/modules/browser/bars/SelectionBox" - , "redmic/modules/browser/bars/Pagination" - , "redmic/modules/browser/bars/Total" - , 'redmic/modules/form/FormContainerImpl' - , 'redmic/modules/layout/TabsDisplayer' - , 'redmic/modules/layout/genericDisplayer/GenericWithTopbarDisplayerImpl' - , "redmic/modules/map/layer/_AddFilter" - , "redmic/modules/map/layer/_ListenBounds" - , "redmic/modules/map/layer/_ListenZoom" - , "redmic/modules/map/layer/_RadiusOnClick" - , "redmic/modules/map/layer/_PublishInfo" - , "redmic/modules/map/layer/GridLayerImpl" - , "redmic/modules/map/layer/PruneClusterLayerImpl" - , "redmic/modules/map/layer/WmsLayerImpl" - , "redmic/modules/mapQuery/QueryOnMap" - , "redmic/modules/search/TextImpl" - , "redmic/modules/tree/_LazyLoad" - , "redmic/modules/tree/_LeafSelection" -// , "redmic/modules/tree/_SelectionBox" - , "redmic/modules/tree/CbtreeImpl" + , "src/component/atlas/Atlas" + , "src/component/base/_Filter" + , "src/component/base/_Selection" + , "src/component/base/_Store" + , "src/component/browser/ListImpl" + , "src/component/browser/_ButtonsInRow" + , "src/component/browser/_Framework" + , "src/component/browser/_Select" + , "src/component/browser/bars/SelectionBox" + , "src/component/browser/bars/Pagination" + , "src/component/browser/bars/Total" + , 'src/component/form/FormContainerImpl' + , 'src/component/layout/TabsDisplayer' + , 'src/component/layout/genericDisplayer/GenericWithTopbarDisplayerImpl' + , "src/component/map/layer/_AddFilter" + , "src/component/map/layer/_ListenBounds" + , "src/component/map/layer/_ListenZoom" + , "src/component/map/layer/_RadiusOnClick" + , "src/component/map/layer/_PublishInfo" + , "src/component/map/layer/GridLayerImpl" + , "src/component/map/layer/PruneClusterLayerImpl" + , "src/component/map/layer/WmsLayerImpl" + , "src/component/mapQuery/QueryOnMap" + , "src/component/search/TextImpl" + , "src/component/tree/_LazyLoad" + , "src/component/tree/_LeafSelection" +// , "src/component/tree/_SelectionBox" + , "src/component/tree/CbtreeImpl" , "templates/SpeciesDistributionPopup" , "templates/SpeciesList" ], function( diff --git a/client-app/src/oldapp/viewers/views/StacBrowserView.js b/client-app/src/oldapp/viewers/views/StacBrowserView.js index 0e70d200..bb202fbd 100644 --- a/client-app/src/oldapp/viewers/views/StacBrowserView.js +++ b/client-app/src/oldapp/viewers/views/StacBrowserView.js @@ -3,7 +3,7 @@ define([ , 'app/designs/embeddedContent/Layout' , 'dojo/_base/declare' , 'dojo/_base/lang' - , 'redmic/modules/base/_ExternalConfig' + , 'src/component/base/_ExternalConfig' ], function( Controller , Layout diff --git a/client-app/src/oldapp/viewers/views/TrackingView.js b/client-app/src/oldapp/viewers/views/TrackingView.js index 10c9829f..34171a89 100644 --- a/client-app/src/oldapp/viewers/views/TrackingView.js +++ b/client-app/src/oldapp/viewers/views/TrackingView.js @@ -6,20 +6,20 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/base/_Selection" - , "redmic/modules/browser/_ButtonsInRow" - , "redmic/modules/browser/_HierarchicalLazyLoad" - , "redmic/modules/browser/_HierarchicalSelect" - , "redmic/modules/browser/_Framework" - , "redmic/modules/browser/_MultiTemplate" - , "redmic/modules/browser/_Select" - , "redmic/modules/browser/HierarchicalImpl" - , "redmic/modules/browser/ListImpl" - , "redmic/modules/browser/bars/Pagination" - , "redmic/modules/browser/bars/SelectionBox" - , "redmic/modules/browser/bars/Total" - , 'redmic/modules/layout/genericDisplayer/GenericWithTopbarDisplayerImpl' - , "redmic/modules/search/TextImpl" + , "src/component/base/_Selection" + , "src/component/browser/_ButtonsInRow" + , "src/component/browser/_HierarchicalLazyLoad" + , "src/component/browser/_HierarchicalSelect" + , "src/component/browser/_Framework" + , "src/component/browser/_MultiTemplate" + , "src/component/browser/_Select" + , "src/component/browser/HierarchicalImpl" + , "src/component/browser/ListImpl" + , "src/component/browser/bars/Pagination" + , "src/component/browser/bars/SelectionBox" + , "src/component/browser/bars/Total" + , 'src/component/layout/genericDisplayer/GenericWithTopbarDisplayerImpl' + , "src/component/search/TextImpl" , "templates/ActivityList" , "templates/LoadingCustom" ], function( diff --git a/client-app/src/oldapp/viewers/views/TrashCharts.js b/client-app/src/oldapp/viewers/views/TrashCharts.js index c32a4e4d..a4e3c9bc 100644 --- a/client-app/src/oldapp/viewers/views/TrashCharts.js +++ b/client-app/src/oldapp/viewers/views/TrashCharts.js @@ -11,15 +11,15 @@ define([ , "dojo/Deferred" , "dojo/on" , "RWidgets/Utilities" - , "redmic/modules/base/_Filter" - , "redmic/modules/base/_Store" - , "redmic/modules/chart/ChartsContainer/_BreadcrumbsBar" - , "redmic/modules/chart/ChartsContainer/_GroupedLegendBar" - , "redmic/modules/chart/ChartsContainer/_LegendBar" - , "redmic/modules/chart/ChartsContainer/_InfoOnMouseOver" - , "redmic/modules/chart/ChartsContainer/_TemporalAxisWithGridDrawing" - , "redmic/modules/chart/ChartsContainer/_VerticalAxesWithGridDrawing" - , "redmic/modules/chart/ChartsContainer/_ZoomByDragging" + , "src/component/base/_Filter" + , "src/component/base/_Store" + , "src/component/chart/ChartsContainer/_BreadcrumbsBar" + , "src/component/chart/ChartsContainer/_GroupedLegendBar" + , "src/component/chart/ChartsContainer/_LegendBar" + , "src/component/chart/ChartsContainer/_InfoOnMouseOver" + , "src/component/chart/ChartsContainer/_TemporalAxisWithGridDrawing" + , "src/component/chart/ChartsContainer/_VerticalAxesWithGridDrawing" + , "src/component/chart/ChartsContainer/_ZoomByDragging" ], function( _ProcessDataDefinitionAndGetTimeSeries , ChartsWithToolbarsAndSlider diff --git a/client-app/src/oldapp/viewers/views/TrashCollectionView.js b/client-app/src/oldapp/viewers/views/TrashCollectionView.js index 626f673d..5b57fe3c 100644 --- a/client-app/src/oldapp/viewers/views/TrashCollectionView.js +++ b/client-app/src/oldapp/viewers/views/TrashCollectionView.js @@ -5,22 +5,22 @@ define([ , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/atlas/Atlas" - , "redmic/modules/base/_Filter" - , "redmic/modules/base/_Selection" - , "redmic/modules/base/_ShowInPopup" - , "redmic/modules/base/_Store" - , "redmic/modules/browser/ListImpl" - , "redmic/modules/browser/_Framework" - , "redmic/modules/browser/_Select" - , "redmic/modules/browser/bars/SelectionBox" - , "redmic/modules/browser/bars/Total" - , 'redmic/modules/layout/genericDisplayer/GenericWithTopbarDisplayerImpl' - , 'redmic/modules/layout/TabsDisplayer' - , "redmic/modules/map/layer/GeoJsonLayerImpl" - , "redmic/modules/map/layer/_AddFilter" - , "redmic/modules/mapQuery/QueryOnMap" - , "redmic/modules/search/TextImpl" + , "src/component/atlas/Atlas" + , "src/component/base/_Filter" + , "src/component/base/_Selection" + , "src/component/base/_ShowInPopup" + , "src/component/base/_Store" + , "src/component/browser/ListImpl" + , "src/component/browser/_Framework" + , "src/component/browser/_Select" + , "src/component/browser/bars/SelectionBox" + , "src/component/browser/bars/Total" + , 'src/component/layout/genericDisplayer/GenericWithTopbarDisplayerImpl' + , 'src/component/layout/TabsDisplayer' + , "src/component/map/layer/GeoJsonLayerImpl" + , "src/component/map/layer/_AddFilter" + , "src/component/mapQuery/QueryOnMap" + , "src/component/search/TextImpl" , "templates/ActivityList" , "templates/FilterForm" , "./TrashDetails" diff --git a/client-app/src/oldapp/viewers/views/TrashDetails.js b/client-app/src/oldapp/viewers/views/TrashDetails.js index 2f31a9fa..a8375339 100644 --- a/client-app/src/oldapp/viewers/views/TrashDetails.js +++ b/client-app/src/oldapp/viewers/views/TrashDetails.js @@ -10,12 +10,12 @@ define([ , "dojo/_base/lang" , "dojo/Deferred" , 'moment/moment.min' - , "redmic/modules/base/_Filter" - , "redmic/modules/base/_Store" - , "redmic/modules/browser/HierarchicalImpl" - , "redmic/modules/browser/_DataTypeParser" - , "redmic/modules/browser/_HierarchicalTable" - , "redmic/modules/layout/templateDisplayer/TemplateDisplayer" + , "src/component/base/_Filter" + , "src/component/base/_Store" + , "src/component/browser/HierarchicalImpl" + , "src/component/browser/_DataTypeParser" + , "src/component/browser/_HierarchicalTable" + , "src/component/layout/templateDisplayer/TemplateDisplayer" , "templates/LoadingEmpty" ], function( DynamicContentController diff --git a/client-app/src/oldapp/viewers/views/TrashInfo.js b/client-app/src/oldapp/viewers/views/TrashInfo.js index 5803ad0f..0c1ac34b 100644 --- a/client-app/src/oldapp/viewers/views/TrashInfo.js +++ b/client-app/src/oldapp/viewers/views/TrashInfo.js @@ -3,9 +3,9 @@ define([ , "app/designs/details/Layout" , "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/browser/_MultiTemplate" - , "redmic/modules/browser/HierarchicalImpl" - , "redmic/modules/layout/templateDisplayer/TemplateDisplayer" + , "src/component/browser/_MultiTemplate" + , "src/component/browser/HierarchicalImpl" + , "src/component/layout/templateDisplayer/TemplateDisplayer" , "templates/ActivityInfo" , "templates/MeasurementChildList" , "templates/MeasurementParentList" diff --git a/client-app/src/oldapp/viewers/views/_SelectTimeInterval.js b/client-app/src/oldapp/viewers/views/_SelectTimeInterval.js index af61bebd..fc298b2b 100644 --- a/client-app/src/oldapp/viewers/views/_SelectTimeInterval.js +++ b/client-app/src/oldapp/viewers/views/_SelectTimeInterval.js @@ -3,8 +3,8 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "redmic/modules/form/input/SelectImpl" - , "redmic/modules/layout/dataDisplayer/DataDisplayer" + , "src/component/form/input/SelectImpl" + , "src/component/layout/dataDisplayer/DataDisplayer" , "put-selector/put" ], function( _ProcessInterval diff --git a/client-app/src/oldapp/viewers/views/_TimeSeriesDataManagement.js b/client-app/src/oldapp/viewers/views/_TimeSeriesDataManagement.js index 7bd2d695..1cf65e77 100644 --- a/client-app/src/oldapp/viewers/views/_TimeSeriesDataManagement.js +++ b/client-app/src/oldapp/viewers/views/_TimeSeriesDataManagement.js @@ -5,9 +5,9 @@ define([ , "dojo/_base/lang" , "dojo/aspect" , "dojo/Deferred" - , "redmic/modules/base/_Filter" - , "redmic/modules/base/_Store" - , "redmic/modules/search/FacetsImpl" + , "src/component/base/_Filter" + , "src/component/base/_Store" + , "src/component/search/FacetsImpl" ], function( redmicConfig , _ActivityTimeSeriesDataManagement diff --git a/client-app/src/oldapp/viewers/views/_TimeSeriesSelectionManagement.js b/client-app/src/oldapp/viewers/views/_TimeSeriesSelectionManagement.js index 395aaffd..2c664f92 100644 --- a/client-app/src/oldapp/viewers/views/_TimeSeriesSelectionManagement.js +++ b/client-app/src/oldapp/viewers/views/_TimeSeriesSelectionManagement.js @@ -3,7 +3,7 @@ define([ , 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/aspect' - , 'redmic/modules/base/_Selection' + , 'src/component/base/_Selection' ], function( alertify , declare diff --git a/client-app/tests/_intern-unit.js b/client-app/tests/_intern-unit.js index b78485a4..7dad22e1 100644 --- a/client-app/tests/_intern-unit.js +++ b/client-app/tests/_intern-unit.js @@ -29,46 +29,46 @@ module.exports = function(args) { , suitesPrefix + 'app/base/models/test_Model' // Módulos - , suitesPrefix + 'redmic/modules/base/test_Module' - , suitesPrefix + 'redmic/modules/store/testRestManager' - , suitesPrefix + 'redmic/modules/layout/wizard/testWizard' - , suitesPrefix + 'redmic/modules/model/testModelImpl' - , suitesPrefix + 'redmic/modules/map/testLeafletImpl' - , suitesPrefix + 'redmic/modules/tree/testTree' - , suitesPrefix + 'redmic/modules/selection/testSelector' - , suitesPrefix + 'redmic/modules/gateway/testGateway' - , suitesPrefix + 'redmic/modules/chart/ChartsContainer/testInfoChartsContainerImpl' - , suitesPrefix + 'redmic/modules/chart/layer/ChartLayer/testLinearChartImpl' - , suitesPrefix + 'redmic/modules/chart/Toolbar/testSliderSelectorImpl' - , suitesPrefix + 'redmic/modules/form/form/testUploadInput' - , suitesPrefix + 'redmic/modules/browser/testListImpl' - , suitesPrefix + 'redmic/modules/browser/testHierarchicalImpl' - , suitesPrefix + 'redmic/modules/browser/row/testRow' - , suitesPrefix + 'redmic/modules/browser/buttons/testButtons' - , suitesPrefix + 'redmic/modules/browser/bars/testOrder' - , suitesPrefix + 'redmic/modules/browser/bars/testPagination' - , suitesPrefix + 'redmic/modules/browser/bars/testSelectionBox' - , suitesPrefix + 'redmic/modules/browser/bars/testTotal' - , suitesPrefix + 'redmic/modules/search/testFacetsImpl' + , suitesPrefix + 'src/component/base/test_Module' + , suitesPrefix + 'src/component/store/testRestManager' + , suitesPrefix + 'src/component/layout/wizard/testWizard' + , suitesPrefix + 'src/component/model/testModelImpl' + , suitesPrefix + 'src/component/map/testLeafletImpl' + , suitesPrefix + 'src/component/tree/testTree' + , suitesPrefix + 'src/component/selection/testSelector' + , suitesPrefix + 'src/component/gateway/testGateway' + , suitesPrefix + 'src/component/chart/ChartsContainer/testInfoChartsContainerImpl' + , suitesPrefix + 'src/component/chart/layer/ChartLayer/testLinearChartImpl' + , suitesPrefix + 'src/component/chart/Toolbar/testSliderSelectorImpl' + , suitesPrefix + 'src/component/form/form/testUploadInput' + , suitesPrefix + 'src/component/browser/testListImpl' + , suitesPrefix + 'src/component/browser/testHierarchicalImpl' + , suitesPrefix + 'src/component/browser/row/testRow' + , suitesPrefix + 'src/component/browser/buttons/testButtons' + , suitesPrefix + 'src/component/browser/bars/testOrder' + , suitesPrefix + 'src/component/browser/bars/testPagination' + , suitesPrefix + 'src/component/browser/bars/testSelectionBox' + , suitesPrefix + 'src/component/browser/bars/testTotal' + , suitesPrefix + 'src/component/search/testFacetsImpl' ], // TODO irlos arreglando e incorporando a 'suites'. Borrar 'suitesFAIL' cuando se vacíe suitesFAIL: [ // Módulos - suitesPrefix + 'redmic/modules/layout/details/testDetails' - , suitesPrefix + 'redmic/modules/form/testForm' - , suitesPrefix + 'redmic/modules/search/testSearch' - , suitesPrefix + 'redmic/modules/base/testManager' - , suitesPrefix + 'redmic/modules/base/testSelectionBox' - , suitesPrefix + 'redmic/modules/base/testNotification' - , suitesPrefix + 'redmic/modules/socket/testSocket' - , suitesPrefix + 'redmic/modules/form/inputs/testTextBoxImpl' - , suitesPrefix + 'redmic/modules/form/inputs/testNumberTextBoxImpl' - , suitesPrefix + 'redmic/modules/form/inputs/testNumberSpinnerImpl' - , suitesPrefix + 'redmic/modules/form/inputs/testCheckBoxImpl' - , suitesPrefix + 'redmic/modules/form/inputs/testDateTextBoxImpl' - , suitesPrefix + 'redmic/modules/form/inputs/testTextAreaImpl' - , suitesPrefix + 'redmic/modules/form/inputs/testFilteringInputImpl' + suitesPrefix + 'src/component/layout/details/testDetails' + , suitesPrefix + 'src/component/form/testForm' + , suitesPrefix + 'src/component/search/testSearch' + , suitesPrefix + 'src/component/base/testManager' + , suitesPrefix + 'src/component/base/testSelectionBox' + , suitesPrefix + 'src/component/base/testNotification' + , suitesPrefix + 'src/component/socket/testSocket' + , suitesPrefix + 'src/component/form/inputs/testTextBoxImpl' + , suitesPrefix + 'src/component/form/inputs/testNumberTextBoxImpl' + , suitesPrefix + 'src/component/form/inputs/testNumberSpinnerImpl' + , suitesPrefix + 'src/component/form/inputs/testCheckBoxImpl' + , suitesPrefix + 'src/component/form/inputs/testDateTextBoxImpl' + , suitesPrefix + 'src/component/form/inputs/testTextAreaImpl' + , suitesPrefix + 'src/component/form/inputs/testFilteringInputImpl' //Vistas , suitesPrefix + 'app/base/views/extensions/test_EditionView' diff --git a/client-app/tests/functional/modules/components/Keypad/testKeypadScript.js b/client-app/tests/functional/modules/components/Keypad/testKeypadScript.js index 368ca035..5b881979 100644 --- a/client-app/tests/functional/modules/components/Keypad/testKeypadScript.js +++ b/client-app/tests/functional/modules/components/Keypad/testKeypadScript.js @@ -1,8 +1,8 @@ require([ 'dojo/_base/declare' , 'dojo/dom' - , 'redmic/modules/components/Keypad/TrizoneKeypadImpl' - , 'redmic/modules/components/Keypad/Keypad' + , 'src/component/components/Keypad/TrizoneKeypadImpl' + , 'src/component/components/Keypad/Keypad' ], function( declare , dom diff --git a/client-app/tests/functional/modules/form/input/MapSearchImpl/testMapSearchImplScript.js b/client-app/tests/functional/modules/form/input/MapSearchImpl/testMapSearchImplScript.js index 02ffb63d..1d9bb11d 100644 --- a/client-app/tests/functional/modules/form/input/MapSearchImpl/testMapSearchImplScript.js +++ b/client-app/tests/functional/modules/form/input/MapSearchImpl/testMapSearchImplScript.js @@ -1,7 +1,7 @@ require([ 'dojo/_base/declare' , 'dojo/dom' - , 'redmic/modules/form/input/MapSearchImpl' + , 'src/component/form/input/MapSearchImpl' ], function( declare , dom diff --git a/client-app/tests/functional/modules/form/input/UploadFileImpl/testUploadFileImplScript.js b/client-app/tests/functional/modules/form/input/UploadFileImpl/testUploadFileImplScript.js index 762deff0..740fb73b 100644 --- a/client-app/tests/functional/modules/form/input/UploadFileImpl/testUploadFileImplScript.js +++ b/client-app/tests/functional/modules/form/input/UploadFileImpl/testUploadFileImplScript.js @@ -2,7 +2,7 @@ require([ 'dojo/_base/declare' , 'dojo/Deferred' , 'dojo/dom' - , 'redmic/modules/form/input/UploadFileImpl' + , 'src/component/form/input/UploadFileImpl' ], function( declare , Deferred diff --git a/client-app/tests/functional/modules/form/testFormWithKeypadScript.js b/client-app/tests/functional/modules/form/testFormWithKeypadScript.js index c968bce0..705f9357 100644 --- a/client-app/tests/functional/modules/form/testFormWithKeypadScript.js +++ b/client-app/tests/functional/modules/form/testFormWithKeypadScript.js @@ -1,8 +1,8 @@ require([ 'dojo/_base/declare' , 'dojo/dom' - , 'redmic/modules/form/_CreateInternalKeypad' - , 'redmic/modules/form/FormContainerImpl' + , 'src/component/form/_CreateInternalKeypad' + , 'src/component/form/FormContainerImpl' , 'tests/support/resources/DomainModel' ], function( declare diff --git a/client-app/tests/functional/modules/search/testFacetsImplScript.js b/client-app/tests/functional/modules/search/testFacetsImplScript.js index 00383fe2..30ccf2ae 100644 --- a/client-app/tests/functional/modules/search/testFacetsImplScript.js +++ b/client-app/tests/functional/modules/search/testFacetsImplScript.js @@ -1,6 +1,6 @@ require([ 'dojo/dom' - , 'redmic/modules/search/FacetsImpl' + , 'src/component/search/FacetsImpl' ], function( dom , FacetsImpl diff --git a/client-app/tests/unit/app/base/views/extensions/test_EditionView.js b/client-app/tests/unit/app/base/views/extensions/test_EditionView.js index 5376a9d1..e7e97986 100644 --- a/client-app/tests/unit/app/base/views/extensions/test_EditionView.js +++ b/client-app/tests/unit/app/base/views/extensions/test_EditionView.js @@ -7,8 +7,8 @@ define([ , "dojo/_base/lang" , "dojo/i18n!app/nls/translation" , "src/utils/Mediator" - , "redmic/modules/base/Selector" - , "redmic/modules/store/MasterStore" + , "src/component/base/Selector" + , "src/component/store/MasterStore" ], function( Model , _View diff --git a/client-app/tests/unit/app/viewers/views/test_ChartsView.js b/client-app/tests/unit/app/viewers/views/test_ChartsView.js index 8d446f00..61e186ec 100644 --- a/client-app/tests/unit/app/viewers/views/test_ChartsView.js +++ b/client-app/tests/unit/app/viewers/views/test_ChartsView.js @@ -3,7 +3,7 @@ define([ , "dojo/_base/lang" , "dojo/date/stamp" , "app/viewers/views/ChartsView" - , "redmic/modules/store/MasterStore" + , "src/component/store/MasterStore" , "src/utils/Mediator" ], function( declare diff --git a/client-app/tests/unit/redmic/form/testUploadInput.js b/client-app/tests/unit/redmic/form/testUploadInput.js index e038a0bd..929d6820 100644 --- a/client-app/tests/unit/redmic/form/testUploadInput.js +++ b/client-app/tests/unit/redmic/form/testUploadInput.js @@ -2,7 +2,7 @@ define([ 'dojo/_base/lang' , 'dojo/Deferred' , 'dojo/on' - , 'redmic/modules/form/form/UploadInput' + , 'src/component/form/form/UploadInput' ], function( lang , Deferred diff --git a/client-app/tests/unit/redmic/modules/base/testManager.js b/client-app/tests/unit/redmic/modules/base/testManager.js index a39eb3a3..d92e7b95 100644 --- a/client-app/tests/unit/redmic/modules/base/testManager.js +++ b/client-app/tests/unit/redmic/modules/base/testManager.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/Manager" + , "src/component/base/Manager" , "src/utils/Mediator" ], function( declare diff --git a/client-app/tests/unit/redmic/modules/base/testNotification.js b/client-app/tests/unit/redmic/modules/base/testNotification.js index 673c1d7a..1075b47f 100644 --- a/client-app/tests/unit/redmic/modules/base/testNotification.js +++ b/client-app/tests/unit/redmic/modules/base/testNotification.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/base/Notification" + , "src/component/base/Notification" , "src/utils/Mediator" ], function( declare diff --git a/client-app/tests/unit/redmic/modules/base/testSelectionBox.js b/client-app/tests/unit/redmic/modules/base/testSelectionBox.js index 51000120..0d50ddff 100644 --- a/client-app/tests/unit/redmic/modules/base/testSelectionBox.js +++ b/client-app/tests/unit/redmic/modules/base/testSelectionBox.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "put-selector/put" - , "redmic/modules/base/SelectionBox" + , "src/component/base/SelectionBox" , "src/utils/Mediator" ], function( declare diff --git a/client-app/tests/unit/redmic/modules/base/test_Module.js b/client-app/tests/unit/redmic/modules/base/test_Module.js index 5b74faf6..b18a8b6e 100644 --- a/client-app/tests/unit/redmic/modules/base/test_Module.js +++ b/client-app/tests/unit/redmic/modules/base/test_Module.js @@ -3,7 +3,7 @@ define([ , 'dojo/_base/lang' , 'dojo/Deferred' , 'dojo/promise/all' - , 'redmic/modules/base/_Module' + , 'src/component/base/_Module' , 'src/utils/Mediator' ], function( diff --git a/client-app/tests/unit/redmic/modules/browser/bars/testOrder.js b/client-app/tests/unit/redmic/modules/browser/bars/testOrder.js index 73cfa981..2ce586e2 100644 --- a/client-app/tests/unit/redmic/modules/browser/bars/testOrder.js +++ b/client-app/tests/unit/redmic/modules/browser/bars/testOrder.js @@ -3,7 +3,7 @@ define([ , "dojo/_base/lang" , "put-selector/put" , "src/utils/Mediator" - , "redmic/modules/browser/bars/Order" + , "src/component/browser/bars/Order" ], function( declare , lang diff --git a/client-app/tests/unit/redmic/modules/browser/bars/testPagination.js b/client-app/tests/unit/redmic/modules/browser/bars/testPagination.js index b888d6ac..9cb0b022 100644 --- a/client-app/tests/unit/redmic/modules/browser/bars/testPagination.js +++ b/client-app/tests/unit/redmic/modules/browser/bars/testPagination.js @@ -3,7 +3,7 @@ define([ , "dojo/_base/lang" , "put-selector/put" , "src/utils/Mediator" - , "redmic/modules/browser/bars/Pagination" + , "src/component/browser/bars/Pagination" , "templates/DomainList" ], function( declare diff --git a/client-app/tests/unit/redmic/modules/browser/bars/testSelectionBox.js b/client-app/tests/unit/redmic/modules/browser/bars/testSelectionBox.js index 652b498e..a216848f 100644 --- a/client-app/tests/unit/redmic/modules/browser/bars/testSelectionBox.js +++ b/client-app/tests/unit/redmic/modules/browser/bars/testSelectionBox.js @@ -3,7 +3,7 @@ define([ , "dojo/_base/lang" , "put-selector/put" , "src/utils/Mediator" - , "redmic/modules/browser/bars/SelectionBox" + , "src/component/browser/bars/SelectionBox" ], function( declare , lang diff --git a/client-app/tests/unit/redmic/modules/browser/bars/testTotal.js b/client-app/tests/unit/redmic/modules/browser/bars/testTotal.js index df0b882d..e2a51bb8 100644 --- a/client-app/tests/unit/redmic/modules/browser/bars/testTotal.js +++ b/client-app/tests/unit/redmic/modules/browser/bars/testTotal.js @@ -3,8 +3,8 @@ define([ , "dojo/_base/lang" , "put-selector/put" , "src/utils/Mediator" - , "redmic/modules/browser/bars/Total" - , "redmic/modules/browser/ListImpl" + , "src/component/browser/bars/Total" + , "src/component/browser/ListImpl" , "templates/DomainList" ], function( declare diff --git a/client-app/tests/unit/redmic/modules/browser/buttons/testButtons.js b/client-app/tests/unit/redmic/modules/browser/buttons/testButtons.js index e3b1c239..e359058c 100644 --- a/client-app/tests/unit/redmic/modules/browser/buttons/testButtons.js +++ b/client-app/tests/unit/redmic/modules/browser/buttons/testButtons.js @@ -3,8 +3,8 @@ define([ , "dojo/_base/lang" , "put-selector/put" , "src/utils/Mediator" - , "redmic/modules/browser/buttons/_GroupButtons" - , "redmic/modules/browser/buttons/Buttons" + , "src/component/browser/buttons/_GroupButtons" + , "src/component/browser/buttons/Buttons" ], function( declare , lang diff --git a/client-app/tests/unit/redmic/modules/browser/row/testRow.js b/client-app/tests/unit/redmic/modules/browser/row/testRow.js index 0696f37c..8420dd30 100644 --- a/client-app/tests/unit/redmic/modules/browser/row/testRow.js +++ b/client-app/tests/unit/redmic/modules/browser/row/testRow.js @@ -3,11 +3,11 @@ define([ , "dojo/_base/lang" , "put-selector/put" , "src/utils/Mediator" - , "redmic/modules/browser/row/_Buttons" - , "redmic/modules/browser/row/_Hierarchical" - , "redmic/modules/browser/row/_HierarchicalSelect" - , "redmic/modules/browser/row/_Select" - , "redmic/modules/browser/row/Row" + , "src/component/browser/row/_Buttons" + , "src/component/browser/row/_Hierarchical" + , "src/component/browser/row/_HierarchicalSelect" + , "src/component/browser/row/_Select" + , "src/component/browser/row/Row" , "templates/DomainList" ], function( declare diff --git a/client-app/tests/unit/redmic/modules/browser/testHierarchicalImpl.js b/client-app/tests/unit/redmic/modules/browser/testHierarchicalImpl.js index 1e48fe70..794178ce 100644 --- a/client-app/tests/unit/redmic/modules/browser/testHierarchicalImpl.js +++ b/client-app/tests/unit/redmic/modules/browser/testHierarchicalImpl.js @@ -3,16 +3,16 @@ define([ , "dojo/_base/lang" , "dojo/dom-class" , "src/utils/Mediator" - , "redmic/modules/browser/_ButtonsInRow" - , "redmic/modules/browser/_Framework" - , "redmic/modules/browser/_GeoJsonParser" - , "redmic/modules/browser/_HierarchicalDragAndDrop" - , "redmic/modules/browser/_HierarchicalLazyLoad" - , "redmic/modules/browser/_HierarchicalSelect" - , "redmic/modules/browser/_HierarchicalTable" - , "redmic/modules/browser/_MultiTemplate" - , "redmic/modules/browser/_NoDataTemplate" - , "redmic/modules/browser/HierarchicalImpl" + , "src/component/browser/_ButtonsInRow" + , "src/component/browser/_Framework" + , "src/component/browser/_GeoJsonParser" + , "src/component/browser/_HierarchicalDragAndDrop" + , "src/component/browser/_HierarchicalLazyLoad" + , "src/component/browser/_HierarchicalSelect" + , "src/component/browser/_HierarchicalTable" + , "src/component/browser/_MultiTemplate" + , "src/component/browser/_NoDataTemplate" + , "src/component/browser/HierarchicalImpl" , "templates/DomainList" ], function( declare diff --git a/client-app/tests/unit/redmic/modules/browser/testListImpl.js b/client-app/tests/unit/redmic/modules/browser/testListImpl.js index b33bd57f..260511b7 100644 --- a/client-app/tests/unit/redmic/modules/browser/testListImpl.js +++ b/client-app/tests/unit/redmic/modules/browser/testListImpl.js @@ -3,16 +3,16 @@ define([ , "dojo/_base/lang" , "dojo/dom-class" , "src/utils/Mediator" - , "redmic/modules/browser/_ButtonsInRow" - , "redmic/modules/browser/_DragAndDrop" - , "redmic/modules/browser/_EditionTable" - , "redmic/modules/browser/_Framework" - , "redmic/modules/browser/_GeoJsonParser" - , "redmic/modules/browser/_MultiTemplate" - , "redmic/modules/browser/_NoDataTemplate" - , "redmic/modules/browser/_Select" - , "redmic/modules/browser/_Table" - , "redmic/modules/browser/ListImpl" + , "src/component/browser/_ButtonsInRow" + , "src/component/browser/_DragAndDrop" + , "src/component/browser/_EditionTable" + , "src/component/browser/_Framework" + , "src/component/browser/_GeoJsonParser" + , "src/component/browser/_MultiTemplate" + , "src/component/browser/_NoDataTemplate" + , "src/component/browser/_Select" + , "src/component/browser/_Table" + , "src/component/browser/ListImpl" , "templates/DomainList" ], function( declare diff --git a/client-app/tests/unit/redmic/modules/chart/ChartsContainer/testInfoChartsContainerImpl.js b/client-app/tests/unit/redmic/modules/chart/ChartsContainer/testInfoChartsContainerImpl.js index 71d31c8d..2c81095f 100644 --- a/client-app/tests/unit/redmic/modules/chart/ChartsContainer/testInfoChartsContainerImpl.js +++ b/client-app/tests/unit/redmic/modules/chart/ChartsContainer/testInfoChartsContainerImpl.js @@ -5,8 +5,8 @@ define([ , 'dojo/promise/all' , 'put-selector/put' , 'src/utils/Mediator' - , 'redmic/modules/chart/ChartsContainer/InfoChartsContainerImpl' - , 'redmic/modules/chart/layer/ChartLayer/LinearChartImpl' + , 'src/component/chart/ChartsContainer/InfoChartsContainerImpl' + , 'src/component/chart/layer/ChartLayer/LinearChartImpl' ], function( declare , lang diff --git a/client-app/tests/unit/redmic/modules/chart/Toolbar/testSliderSelectorImpl.js b/client-app/tests/unit/redmic/modules/chart/Toolbar/testSliderSelectorImpl.js index b7295ac7..663d134c 100644 --- a/client-app/tests/unit/redmic/modules/chart/Toolbar/testSliderSelectorImpl.js +++ b/client-app/tests/unit/redmic/modules/chart/Toolbar/testSliderSelectorImpl.js @@ -3,7 +3,7 @@ define([ , 'dojo/_base/lang' , 'put-selector/put' , 'src/utils/Mediator' - , 'redmic/modules/chart/Toolbar/SliderSelectorImpl' + , 'src/component/chart/Toolbar/SliderSelectorImpl' ], function( declare , lang diff --git a/client-app/tests/unit/redmic/modules/chart/layer/ChartLayer/testLinearChartImpl.js b/client-app/tests/unit/redmic/modules/chart/layer/ChartLayer/testLinearChartImpl.js index 2e4d4862..ec08595d 100644 --- a/client-app/tests/unit/redmic/modules/chart/layer/ChartLayer/testLinearChartImpl.js +++ b/client-app/tests/unit/redmic/modules/chart/layer/ChartLayer/testLinearChartImpl.js @@ -3,8 +3,8 @@ define([ , 'dojo/_base/lang' , 'put-selector/put' , 'src/utils/Mediator' - , 'redmic/modules/chart/ChartsContainer/InfoChartsContainerImpl' - , 'redmic/modules/chart/layer/ChartLayer/LinearChartImpl' + , 'src/component/chart/ChartsContainer/InfoChartsContainerImpl' + , 'src/component/chart/layer/ChartLayer/LinearChartImpl' ], function( declare , lang diff --git a/client-app/tests/unit/redmic/modules/form/inputs/testCheckBoxImpl.js b/client-app/tests/unit/redmic/modules/form/inputs/testCheckBoxImpl.js index 6325b758..9b8b40a3 100644 --- a/client-app/tests/unit/redmic/modules/form/inputs/testCheckBoxImpl.js +++ b/client-app/tests/unit/redmic/modules/form/inputs/testCheckBoxImpl.js @@ -2,9 +2,9 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "src/utils/Mediator" - , "redmic/modules/model/ModelImpl" - , "redmic/modules/form/inputs/CheckBoxImpl" - , "tests/redmic/modules/model/SupportModel" + , "src/component/model/ModelImpl" + , "src/component/form/inputs/CheckBoxImpl" + , "tests/src/component/model/SupportModel" ], function( declare , lang diff --git a/client-app/tests/unit/redmic/modules/form/inputs/testDateTextBoxImpl.js b/client-app/tests/unit/redmic/modules/form/inputs/testDateTextBoxImpl.js index 856192c9..72fc6f09 100644 --- a/client-app/tests/unit/redmic/modules/form/inputs/testDateTextBoxImpl.js +++ b/client-app/tests/unit/redmic/modules/form/inputs/testDateTextBoxImpl.js @@ -2,9 +2,9 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "src/utils/Mediator" - , "redmic/modules/model/ModelImpl" - , "redmic/modules/form/inputs/DateTextBoxImpl" - , "tests/redmic/modules/model/SupportModel" + , "src/component/model/ModelImpl" + , "src/component/form/inputs/DateTextBoxImpl" + , "tests/src/component/model/SupportModel" , "moment" ], function( declare diff --git a/client-app/tests/unit/redmic/modules/form/inputs/testFilteringInputImpl.js b/client-app/tests/unit/redmic/modules/form/inputs/testFilteringInputImpl.js index eee9ffc2..9f954af2 100644 --- a/client-app/tests/unit/redmic/modules/form/inputs/testFilteringInputImpl.js +++ b/client-app/tests/unit/redmic/modules/form/inputs/testFilteringInputImpl.js @@ -2,9 +2,9 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "src/utils/Mediator" - , "redmic/modules/model/ModelImpl" - , "redmic/modules/form/inputs/FilteringInputImpl" - , "tests/redmic/modules/model/SupportModel" + , "src/component/model/ModelImpl" + , "src/component/form/inputs/FilteringInputImpl" + , "tests/src/component/model/SupportModel" ], function( declare , lang diff --git a/client-app/tests/unit/redmic/modules/form/inputs/testNumberSpinnerImpl.js b/client-app/tests/unit/redmic/modules/form/inputs/testNumberSpinnerImpl.js index d8a6ed1c..da1681df 100644 --- a/client-app/tests/unit/redmic/modules/form/inputs/testNumberSpinnerImpl.js +++ b/client-app/tests/unit/redmic/modules/form/inputs/testNumberSpinnerImpl.js @@ -2,9 +2,9 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "src/utils/Mediator" - , "redmic/modules/model/ModelImpl" - , "redmic/modules/form/inputs/NumberSpinnerImpl" - , "tests/redmic/modules/model/SupportModel" + , "src/component/model/ModelImpl" + , "src/component/form/inputs/NumberSpinnerImpl" + , "tests/src/component/model/SupportModel" ], function( declare , lang diff --git a/client-app/tests/unit/redmic/modules/form/inputs/testNumberTextBoxImpl.js b/client-app/tests/unit/redmic/modules/form/inputs/testNumberTextBoxImpl.js index fe6ba1bf..99178146 100644 --- a/client-app/tests/unit/redmic/modules/form/inputs/testNumberTextBoxImpl.js +++ b/client-app/tests/unit/redmic/modules/form/inputs/testNumberTextBoxImpl.js @@ -2,9 +2,9 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "src/utils/Mediator" - , "redmic/modules/model/ModelImpl" - , "redmic/modules/form/inputs/NumberTextBoxImpl" - , "tests/redmic/modules/model/SupportModel" + , "src/component/model/ModelImpl" + , "src/component/form/inputs/NumberTextBoxImpl" + , "tests/src/component/model/SupportModel" ], function( declare , lang diff --git a/client-app/tests/unit/redmic/modules/form/inputs/testTextAreaImpl.js b/client-app/tests/unit/redmic/modules/form/inputs/testTextAreaImpl.js index 59cadacb..470e7d34 100644 --- a/client-app/tests/unit/redmic/modules/form/inputs/testTextAreaImpl.js +++ b/client-app/tests/unit/redmic/modules/form/inputs/testTextAreaImpl.js @@ -2,9 +2,9 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "src/utils/Mediator" - , "redmic/modules/model/ModelImpl" - , "redmic/modules/form/inputs/TextAreaImpl" - , "tests/redmic/modules/model/SupportModel" + , "src/component/model/ModelImpl" + , "src/component/form/inputs/TextAreaImpl" + , "tests/src/component/model/SupportModel" ], function( declare , lang diff --git a/client-app/tests/unit/redmic/modules/form/inputs/testTextBoxImpl.js b/client-app/tests/unit/redmic/modules/form/inputs/testTextBoxImpl.js index 5e7d4a59..b020d949 100644 --- a/client-app/tests/unit/redmic/modules/form/inputs/testTextBoxImpl.js +++ b/client-app/tests/unit/redmic/modules/form/inputs/testTextBoxImpl.js @@ -2,9 +2,9 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "src/utils/Mediator" - , "redmic/modules/model/ModelImpl" - , "redmic/modules/form/inputs/TextBoxImpl" - , "tests/redmic/modules/model/SupportModel" + , "src/component/model/ModelImpl" + , "src/component/form/inputs/TextBoxImpl" + , "tests/src/component/model/SupportModel" ], function( declare , lang diff --git a/client-app/tests/unit/redmic/modules/form/testForm.js b/client-app/tests/unit/redmic/modules/form/testForm.js index 6ea34b2e..896a22a3 100644 --- a/client-app/tests/unit/redmic/modules/form/testForm.js +++ b/client-app/tests/unit/redmic/modules/form/testForm.js @@ -7,9 +7,9 @@ define([ , "put-selector/put" , "src/utils/Mediator" , "redmic/dialog/LockDialogImpl" - , "redmic/modules/form/FormContainerImpl" - , "redmic/modules/form/UploadFileImpl" - , "redmic/modules/form/form/FormContainer" + , "src/component/form/FormContainerImpl" + , "src/component/form/UploadFileImpl" + , "src/component/form/form/FormContainer" ], function( _Persistent , Model diff --git a/client-app/tests/unit/redmic/modules/gateway/testGateway.js b/client-app/tests/unit/redmic/modules/gateway/testGateway.js index ade681b7..e36ba5a8 100644 --- a/client-app/tests/unit/redmic/modules/gateway/testGateway.js +++ b/client-app/tests/unit/redmic/modules/gateway/testGateway.js @@ -4,8 +4,8 @@ define([ , 'dojo/Deferred' , 'dojo/DeferredList' , 'src/utils/Mediator' - , 'redmic/modules/gateway/_GatewayItfc' - , 'redmic/modules/gateway/Gateway' + , 'src/component/gateway/_GatewayItfc' + , 'src/component/gateway/Gateway' ], function( declare , lang diff --git a/client-app/tests/unit/redmic/modules/layout/details/testDetails.js b/client-app/tests/unit/redmic/modules/layout/details/testDetails.js index 26cda798..e87d3ade 100644 --- a/client-app/tests/unit/redmic/modules/layout/details/testDetails.js +++ b/client-app/tests/unit/redmic/modules/layout/details/testDetails.js @@ -6,9 +6,9 @@ define([ , "src/utils/Mediator" , "redmic/dialog/LockDialogImpl" , "RWidgets/layout/Keypad" - , "redmic/modules/layout/details/Details" - , "redmic/modules/layout/details/DojoTemplateImpl" - , "redmic/modules/layout/details/HandleBarsTemplateImpl" + , "src/component/layout/details/Details" + , "src/component/layout/details/DojoTemplateImpl" + , "src/component/layout/details/HandleBarsTemplateImpl" , "RWidgets/TemplateWidget" , "templates/ActivityList" , "templates/DocumentInfo" diff --git a/client-app/tests/unit/redmic/modules/layout/wizard/testWizard.js b/client-app/tests/unit/redmic/modules/layout/wizard/testWizard.js index 33fe4896..3b8ed074 100644 --- a/client-app/tests/unit/redmic/modules/layout/wizard/testWizard.js +++ b/client-app/tests/unit/redmic/modules/layout/wizard/testWizard.js @@ -4,10 +4,10 @@ define([ , "dojo/_base/lang" , "put-selector/put" , "src/utils/Mediator" - , "redmic/modules/base/_Module" - , "redmic/modules/base/_Show" - , "redmic/modules/layout/wizard/_StepNavigation" - , "redmic/modules/layout/wizard/Wizard" + , "src/component/base/_Module" + , "src/component/base/_Show" + , "src/component/layout/wizard/_StepNavigation" + , "src/component/layout/wizard/Wizard" ], function( ContentPane , declare diff --git a/client-app/tests/unit/redmic/modules/map/testLeafletImpl.js b/client-app/tests/unit/redmic/modules/map/testLeafletImpl.js index 4902b08c..a1df6bd1 100644 --- a/client-app/tests/unit/redmic/modules/map/testLeafletImpl.js +++ b/client-app/tests/unit/redmic/modules/map/testLeafletImpl.js @@ -1,6 +1,6 @@ define([ 'src/utils/Mediator' - , 'redmic/modules/map/LeafletImpl' + , 'src/component/map/LeafletImpl' ], function( Mediator , LeafletImpl diff --git a/client-app/tests/unit/redmic/modules/model/testModelImpl.js b/client-app/tests/unit/redmic/modules/model/testModelImpl.js index 724baf44..4ce37645 100644 --- a/client-app/tests/unit/redmic/modules/model/testModelImpl.js +++ b/client-app/tests/unit/redmic/modules/model/testModelImpl.js @@ -1,7 +1,7 @@ define([ 'dojo/_base/declare' , 'src/utils/Mediator' - , 'redmic/modules/model/ModelImpl' + , 'src/component/model/ModelImpl' ], function( declare , Mediator diff --git a/client-app/tests/unit/redmic/modules/notification/test_Communication.js b/client-app/tests/unit/redmic/modules/notification/test_Communication.js index 6c9b81b7..5850abf5 100644 --- a/client-app/tests/unit/redmic/modules/notification/test_Communication.js +++ b/client-app/tests/unit/redmic/modules/notification/test_Communication.js @@ -1,9 +1,9 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/notification/CommunicationCenter" - , "redmic/modules/notification/Alert" - , "redmic/modules/notification/Notification" + , "src/component/notification/CommunicationCenter" + , "src/component/notification/Alert" + , "src/component/notification/Notification" , "src/utils/Mediator" ], function( declare diff --git a/client-app/tests/unit/redmic/modules/notification/test_Notification.js b/client-app/tests/unit/redmic/modules/notification/test_Notification.js index 94f35063..9751bae1 100644 --- a/client-app/tests/unit/redmic/modules/notification/test_Notification.js +++ b/client-app/tests/unit/redmic/modules/notification/test_Notification.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "redmic/modules/notification/Notification" + , "src/component/notification/Notification" , "src/utils/Mediator" ], function( declare diff --git a/client-app/tests/unit/redmic/modules/search/testFacetsImpl.js b/client-app/tests/unit/redmic/modules/search/testFacetsImpl.js index c4f8d33a..864b374a 100644 --- a/client-app/tests/unit/redmic/modules/search/testFacetsImpl.js +++ b/client-app/tests/unit/redmic/modules/search/testFacetsImpl.js @@ -1,6 +1,6 @@ define([ 'src/utils/Mediator' - , 'redmic/modules/search/FacetsImpl' + , 'src/component/search/FacetsImpl' ], function( Mediator , FacetsImpl diff --git a/client-app/tests/unit/redmic/modules/search/testSearch.js b/client-app/tests/unit/redmic/modules/search/testSearch.js index 6e9d5632..b285c131 100644 --- a/client-app/tests/unit/redmic/modules/search/testSearch.js +++ b/client-app/tests/unit/redmic/modules/search/testSearch.js @@ -2,9 +2,9 @@ define([ "dojo/_base/declare" , "put-selector/put" , "src/utils/Mediator" - , "redmic/modules/search/Search" - , "redmic/modules/search/TextSearchImpl" - , "redmic/modules/search/MapSearchImpl" + , "src/component/search/Search" + , "src/component/search/TextSearchImpl" + , "src/component/search/MapSearchImpl" ], function( declare , put diff --git a/client-app/tests/unit/redmic/modules/selection/testSelector.js b/client-app/tests/unit/redmic/modules/selection/testSelector.js index fba9b2c0..e0fb7858 100644 --- a/client-app/tests/unit/redmic/modules/selection/testSelector.js +++ b/client-app/tests/unit/redmic/modules/selection/testSelector.js @@ -2,7 +2,7 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' , 'src/utils/Mediator' - , 'redmic/modules/selection/Selector' + , 'src/component/selection/Selector' ], function( declare , lang diff --git a/client-app/tests/unit/redmic/modules/socket/testSocket.js b/client-app/tests/unit/redmic/modules/socket/testSocket.js index e7e146cf..9863c83d 100644 --- a/client-app/tests/unit/redmic/modules/socket/testSocket.js +++ b/client-app/tests/unit/redmic/modules/socket/testSocket.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/Deferred" , "src/utils/Mediator" - , "redmic/modules/base/Socket" + , "src/component/base/Socket" ], function( declare , Deferred diff --git a/client-app/tests/unit/redmic/modules/store/testRestManager.js b/client-app/tests/unit/redmic/modules/store/testRestManager.js index 556eb3da..e6c36db5 100644 --- a/client-app/tests/unit/redmic/modules/store/testRestManager.js +++ b/client-app/tests/unit/redmic/modules/store/testRestManager.js @@ -1,6 +1,6 @@ define([ 'src/utils/Mediator' - , 'redmic/modules/store/RestManagerImpl' + , 'src/component/store/RestManagerImpl' ], function( Mediator diff --git a/client-app/tests/unit/redmic/modules/tree/testTree.js b/client-app/tests/unit/redmic/modules/tree/testTree.js index 9b61734b..5f84cd32 100644 --- a/client-app/tests/unit/redmic/modules/tree/testTree.js +++ b/client-app/tests/unit/redmic/modules/tree/testTree.js @@ -1,9 +1,9 @@ define([ 'dojo/_base/declare' , 'src/utils/Mediator' - , 'redmic/modules/tree/_LazyLoad' - , 'redmic/modules/tree/_LeafSelection' - , 'redmic/modules/tree/CbtreeImpl' + , 'src/component/tree/_LazyLoad' + , 'src/component/tree/_LeafSelection' + , 'src/component/tree/CbtreeImpl' ], function( declare , Mediator diff --git a/client-app/tests/unit/redmic/modules/wizard/testWizard.js b/client-app/tests/unit/redmic/modules/wizard/testWizard.js index 06e3ee1a..3b1ded1b 100644 --- a/client-app/tests/unit/redmic/modules/wizard/testWizard.js +++ b/client-app/tests/unit/redmic/modules/wizard/testWizard.js @@ -3,8 +3,8 @@ define([ , "dojo/_base/lang" , "put-selector/put" , "src/utils/Mediator" - , "redmic/modules/wizard/Wizard" - , "redmic/modules/wizard/FacetsWizardImpl" + , "src/component/wizard/Wizard" + , "src/component/wizard/FacetsWizardImpl" ], function( declare , lang -- GitLab From 46ad023f8227afe96d83a3f0347a000b986680a2 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Tue, 23 Jul 2024 13:34:40 +0100 Subject: [PATCH 029/249] Renombra directorio utils a singular --- client-app/app.profile.js | 2 +- client-app/src/app/innerApp.js | 2 +- client-app/src/catalog/detail/_WidgetDefinition.js | 2 +- client-app/src/component/base/Credentials.js | 2 +- client-app/src/component/base/Manager.js | 2 +- client-app/src/component/base/_AuthFirewall.js | 4 ++-- client-app/src/component/base/_Module.js | 2 +- client-app/src/component/browser/bars/SelectionBox.js | 2 +- client-app/src/component/components/ExternalConfig.js | 2 +- client-app/src/component/components/PDFViewer/PDFViewer.js | 2 +- client-app/src/component/form/form/UploadInput.js | 2 +- client-app/src/component/form/input/UploadFileImpl.js | 4 ++-- client-app/src/component/map/MapButton.js | 2 +- client-app/src/component/map/layer/GridLayerImpl.js | 2 +- client-app/src/component/selection/SelectionBox.js | 2 +- client-app/src/component/selection/SelectionManager.js | 2 +- client-app/src/component/selection/_SelectorPersistence.js | 2 +- client-app/src/component/socket/Socket.js | 2 +- client-app/src/component/socket/Task.js | 2 +- client-app/src/component/socket/_IngestData.js | 2 +- client-app/src/component/socket/_Report.js | 2 +- client-app/src/component/socket/_Worms.js | 2 +- client-app/src/component/store/RestManagerImpl.js | 2 +- client-app/src/component/user/UserArea.js | 2 +- client-app/src/dojoConfig.js | 2 +- client-app/src/oldapp/base/models/attr/_Attr.js | 2 +- client-app/src/oldapp/base/views/_ViewListBase.js | 2 +- client-app/src/oldapp/components/CookieLoader.js | 2 +- client-app/src/oldapp/designs/details/main/Document.js | 2 +- client-app/src/oldapp/home/views/HomeView.js | 2 +- client-app/src/oldapp/user/views/FeedbackView.js | 2 +- client-app/src/oldapp/user/views/LoginView.js | 2 +- client-app/src/oldapp/user/views/UserProfileView.js | 2 +- .../src/oldapp/viewers/views/SpeciesDistributionView.js | 2 +- client-app/src/oldapp/views/ActivateAccount.js | 2 +- client-app/src/{utils => util}/Credentials.js | 2 +- client-app/src/{utils => util}/GuestChecker.js | 2 +- client-app/src/{utils => util}/Mediator.js | 0 client-app/src/{utils => util}/RedmicLocalStorage.js | 0 client-app/src/{utils => util}/stringFormats.js | 0 client-app/src/{utils => util}/tv4.js | 2 +- client-app/src/{utils => util}/widgets/Button.js | 0 client-app/src/{utils => util}/widgets/ComboButton.js | 0 client-app/src/{utils => util}/widgets/Converter.js | 0 client-app/src/{utils => util}/widgets/DatePicker.js | 0 client-app/src/{utils => util}/widgets/Facet.js | 0 client-app/src/{utils => util}/widgets/FilteringSelect.js | 0 client-app/src/{utils => util}/widgets/KeywordsInput.js | 0 client-app/src/{utils => util}/widgets/Map.js | 0 client-app/src/{utils => util}/widgets/ProgressSlider.js | 0 client-app/src/{utils => util}/widgets/README.md | 0 client-app/src/{utils => util}/widgets/RangeSlider.js | 0 client-app/src/{utils => util}/widgets/RedmicUtilities.js | 0 client-app/src/{utils => util}/widgets/Slider.js | 0 client-app/src/{utils => util}/widgets/Switch.js | 0 client-app/src/{utils => util}/widgets/TemplateWidget.js | 0 client-app/src/{utils => util}/widgets/TextSearch.js | 0 client-app/src/{utils => util}/widgets/TimeSelect.js | 0 client-app/src/{utils => util}/widgets/ToggleButton.js | 0 client-app/src/{utils => util}/widgets/Utilities.js | 0 .../src/{utils => util}/widgets/ValueAndUnitSelector.js | 0 .../src/{utils => util}/widgets/extensions/_ShowValue.js | 0 .../src/{utils => util}/widgets/layout/DialogComplex.js | 0 client-app/src/{utils => util}/widgets/layout/DialogSimple.js | 0 client-app/src/{utils => util}/widgets/layout/_DialogBase.js | 0 .../tests/unit/app/base/views/extensions/test_EditionView.js | 2 +- client-app/tests/unit/app/viewers/views/test_ChartsView.js | 2 +- client-app/tests/unit/redmic/base/testCredentials.js | 4 ++-- client-app/tests/unit/redmic/base/testMediator.js | 2 +- client-app/tests/unit/redmic/base/testRedmicLocalStorage.js | 2 +- client-app/tests/unit/redmic/modules/base/testManager.js | 2 +- client-app/tests/unit/redmic/modules/base/testNotification.js | 2 +- client-app/tests/unit/redmic/modules/base/testSelectionBox.js | 2 +- client-app/tests/unit/redmic/modules/base/test_Module.js | 2 +- .../tests/unit/redmic/modules/browser/bars/testOrder.js | 2 +- .../tests/unit/redmic/modules/browser/bars/testPagination.js | 2 +- .../unit/redmic/modules/browser/bars/testSelectionBox.js | 2 +- .../tests/unit/redmic/modules/browser/bars/testTotal.js | 2 +- .../tests/unit/redmic/modules/browser/buttons/testButtons.js | 2 +- client-app/tests/unit/redmic/modules/browser/row/testRow.js | 2 +- .../tests/unit/redmic/modules/browser/testHierarchicalImpl.js | 2 +- client-app/tests/unit/redmic/modules/browser/testListImpl.js | 2 +- .../chart/ChartsContainer/testInfoChartsContainerImpl.js | 2 +- .../redmic/modules/chart/Toolbar/testSliderSelectorImpl.js | 2 +- .../modules/chart/layer/ChartLayer/testLinearChartImpl.js | 2 +- .../tests/unit/redmic/modules/form/inputs/testCheckBoxImpl.js | 2 +- .../unit/redmic/modules/form/inputs/testDateTextBoxImpl.js | 2 +- .../unit/redmic/modules/form/inputs/testFilteringInputImpl.js | 2 +- .../unit/redmic/modules/form/inputs/testNumberSpinnerImpl.js | 2 +- .../unit/redmic/modules/form/inputs/testNumberTextBoxImpl.js | 2 +- .../tests/unit/redmic/modules/form/inputs/testTextAreaImpl.js | 2 +- .../tests/unit/redmic/modules/form/inputs/testTextBoxImpl.js | 2 +- client-app/tests/unit/redmic/modules/form/testForm.js | 2 +- client-app/tests/unit/redmic/modules/gateway/testGateway.js | 2 +- .../tests/unit/redmic/modules/layout/details/testDetails.js | 2 +- .../tests/unit/redmic/modules/layout/wizard/testWizard.js | 2 +- client-app/tests/unit/redmic/modules/map/testLeafletImpl.js | 2 +- client-app/tests/unit/redmic/modules/model/testModelImpl.js | 2 +- .../unit/redmic/modules/notification/test_Communication.js | 2 +- .../unit/redmic/modules/notification/test_Notification.js | 2 +- client-app/tests/unit/redmic/modules/search/testFacetsImpl.js | 2 +- client-app/tests/unit/redmic/modules/search/testSearch.js | 2 +- .../tests/unit/redmic/modules/selection/testSelector.js | 2 +- client-app/tests/unit/redmic/modules/socket/testSocket.js | 2 +- client-app/tests/unit/redmic/modules/store/testRestManager.js | 2 +- client-app/tests/unit/redmic/modules/tree/testTree.js | 2 +- client-app/tests/unit/redmic/modules/wizard/testWizard.js | 2 +- 107 files changed, 83 insertions(+), 83 deletions(-) rename client-app/src/{utils => util}/Credentials.js (98%) rename client-app/src/{utils => util}/GuestChecker.js (98%) rename client-app/src/{utils => util}/Mediator.js (100%) rename client-app/src/{utils => util}/RedmicLocalStorage.js (100%) rename client-app/src/{utils => util}/stringFormats.js (100%) rename client-app/src/{utils => util}/tv4.js (98%) rename client-app/src/{utils => util}/widgets/Button.js (100%) rename client-app/src/{utils => util}/widgets/ComboButton.js (100%) rename client-app/src/{utils => util}/widgets/Converter.js (100%) rename client-app/src/{utils => util}/widgets/DatePicker.js (100%) rename client-app/src/{utils => util}/widgets/Facet.js (100%) rename client-app/src/{utils => util}/widgets/FilteringSelect.js (100%) rename client-app/src/{utils => util}/widgets/KeywordsInput.js (100%) rename client-app/src/{utils => util}/widgets/Map.js (100%) rename client-app/src/{utils => util}/widgets/ProgressSlider.js (100%) rename client-app/src/{utils => util}/widgets/README.md (100%) rename client-app/src/{utils => util}/widgets/RangeSlider.js (100%) rename client-app/src/{utils => util}/widgets/RedmicUtilities.js (100%) rename client-app/src/{utils => util}/widgets/Slider.js (100%) rename client-app/src/{utils => util}/widgets/Switch.js (100%) rename client-app/src/{utils => util}/widgets/TemplateWidget.js (100%) rename client-app/src/{utils => util}/widgets/TextSearch.js (100%) rename client-app/src/{utils => util}/widgets/TimeSelect.js (100%) rename client-app/src/{utils => util}/widgets/ToggleButton.js (100%) rename client-app/src/{utils => util}/widgets/Utilities.js (100%) rename client-app/src/{utils => util}/widgets/ValueAndUnitSelector.js (100%) rename client-app/src/{utils => util}/widgets/extensions/_ShowValue.js (100%) rename client-app/src/{utils => util}/widgets/layout/DialogComplex.js (100%) rename client-app/src/{utils => util}/widgets/layout/DialogSimple.js (100%) rename client-app/src/{utils => util}/widgets/layout/_DialogBase.js (100%) diff --git a/client-app/app.profile.js b/client-app/app.profile.js index 8de00c13..3089c6b0 100644 --- a/client-app/app.profile.js +++ b/client-app/app.profile.js @@ -135,7 +135,7 @@ var profileObj = { } },{ name: 'RWidgets', - location: 'src/utils/widgets', + location: 'src/util/widgets', resourceTags: { amd: amdTagger } diff --git a/client-app/src/app/innerApp.js b/client-app/src/app/innerApp.js index b6b7e97f..c0f2bde1 100644 --- a/client-app/src/app/innerApp.js +++ b/client-app/src/app/innerApp.js @@ -4,7 +4,7 @@ define([ , 'dojo/aspect' , 'dojo/dom-class' , 'put-selector/put' - , 'src/utils/Credentials' + , 'src/util/Credentials' , 'src/app/_app' , 'src/component/components/Sidebar/MainSidebarImpl' , 'src/component/components/Topbar' diff --git a/client-app/src/catalog/detail/_WidgetDefinition.js b/client-app/src/catalog/detail/_WidgetDefinition.js index b93ce2ae..a0893e73 100644 --- a/client-app/src/catalog/detail/_WidgetDefinition.js +++ b/client-app/src/catalog/detail/_WidgetDefinition.js @@ -9,7 +9,7 @@ define([ , 'app/details/views/ActivityLayerMapBase' , 'dojo/_base/declare' , 'dojo/_base/lang' - , 'src/utils/Credentials' + , 'src/util/Credentials' , 'src/component/base/_Filter' , 'src/component/browser/_ButtonsInRow' , 'src/component/browser/_Framework' diff --git a/client-app/src/component/base/Credentials.js b/client-app/src/component/base/Credentials.js index 6017039f..cb756352 100644 --- a/client-app/src/component/base/Credentials.js +++ b/client-app/src/component/base/Credentials.js @@ -4,7 +4,7 @@ define([ , 'dojo/_base/lang' , 'src/component/base/_Module' , 'src/component/base/_Store' - , 'src/utils/Credentials' + , 'src/util/Credentials' ], function( redmicConfig , declare diff --git a/client-app/src/component/base/Manager.js b/client-app/src/component/base/Manager.js index 75ffafd6..5eb20452 100644 --- a/client-app/src/component/base/Manager.js +++ b/client-app/src/component/base/Manager.js @@ -5,7 +5,7 @@ define([ , 'dojo/_base/lang' , 'dojo/topic' , 'put-selector/put' - , 'src/utils/Credentials' + , 'src/util/Credentials' , 'src/component/base/_Module' , 'src/component/base/_Show' ], diff --git a/client-app/src/component/base/_AuthFirewall.js b/client-app/src/component/base/_AuthFirewall.js index 021fb605..92f6b7c4 100644 --- a/client-app/src/component/base/_AuthFirewall.js +++ b/client-app/src/component/base/_AuthFirewall.js @@ -2,8 +2,8 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "src/utils/Credentials" - , "src/utils/GuestChecker" + , "src/util/Credentials" + , "src/util/GuestChecker" ], function( declare , lang diff --git a/client-app/src/component/base/_Module.js b/client-app/src/component/base/_Module.js index d7a860b6..6f47382d 100644 --- a/client-app/src/component/base/_Module.js +++ b/client-app/src/component/base/_Module.js @@ -10,7 +10,7 @@ define([ , "dojo/on" , "dojo/promise/all" , "RWidgets/Utilities" - , "src/utils/Mediator" + , "src/util/Mediator" , "./_ChkCollection" , "./_CommunicationCenter" , "./_ManageClickEvent" diff --git a/client-app/src/component/browser/bars/SelectionBox.js b/client-app/src/component/browser/bars/SelectionBox.js index 8efd924e..091adcb2 100644 --- a/client-app/src/component/browser/bars/SelectionBox.js +++ b/client-app/src/component/browser/bars/SelectionBox.js @@ -2,7 +2,7 @@ define([ 'alertify/alertify.min' , "dojo/_base/declare" , "dojo/_base/lang" - , "src/utils/Credentials" + , "src/util/Credentials" , "src/component/base/_Module" , "src/component/base/_Show" , "src/component/selection/SelectionBox" diff --git a/client-app/src/component/components/ExternalConfig.js b/client-app/src/component/components/ExternalConfig.js index 61925f6a..4562b281 100644 --- a/client-app/src/component/components/ExternalConfig.js +++ b/client-app/src/component/components/ExternalConfig.js @@ -4,7 +4,7 @@ define([ , 'dojo/_base/lang' , 'src/component/base/_Module' , 'src/component/base/_Store' - , 'src/utils/Credentials' + , 'src/util/Credentials' ], function( redmicConfig , declare diff --git a/client-app/src/component/components/PDFViewer/PDFViewer.js b/client-app/src/component/components/PDFViewer/PDFViewer.js index abf58e05..1879af02 100644 --- a/client-app/src/component/components/PDFViewer/PDFViewer.js +++ b/client-app/src/component/components/PDFViewer/PDFViewer.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "src/utils/Credentials" + , "src/util/Credentials" , "src/component/base/_Module" , "src/component/base/_Show" , "src/component/layout/templateDisplayer/TemplateDisplayer" diff --git a/client-app/src/component/form/form/UploadInput.js b/client-app/src/component/form/form/UploadInput.js index 51899c0f..7d0d04cd 100644 --- a/client-app/src/component/form/form/UploadInput.js +++ b/client-app/src/component/form/form/UploadInput.js @@ -10,7 +10,7 @@ define([ , 'dojo/i18n!./nls/UploadInput' , 'dojo/text!./templates/UploadInput.html' , 'put-selector/put' - , 'src/utils/Credentials' + , 'src/util/Credentials' , 'dropzone/dropzone-amd-module.min' ], function( diff --git a/client-app/src/component/form/input/UploadFileImpl.js b/client-app/src/component/form/input/UploadFileImpl.js index 39d17dda..9c5c3744 100644 --- a/client-app/src/component/form/input/UploadFileImpl.js +++ b/client-app/src/component/form/input/UploadFileImpl.js @@ -3,10 +3,10 @@ define([ , 'dojo/_base/lang' , 'dojo/Deferred' , 'dojo/on' - , 'src/utils/Credentials' + , 'src/util/Credentials' , 'src/component/form/form/UploadInput' , 'src/component/form/input/Input' - , 'src/utils/stringFormats' + , 'src/util/stringFormats' , 'RWidgets/Utilities' ], function( declare diff --git a/client-app/src/component/map/MapButton.js b/client-app/src/component/map/MapButton.js index e3d4688a..a99c02c4 100644 --- a/client-app/src/component/map/MapButton.js +++ b/client-app/src/component/map/MapButton.js @@ -5,7 +5,7 @@ define([ , "dojo/dom-class" , "dojo/Stateful" , "put-selector/put" - , "src/utils/Mediator" + , "src/util/Mediator" ], function( _WidgetBase , declare diff --git a/client-app/src/component/map/layer/GridLayerImpl.js b/client-app/src/component/map/layer/GridLayerImpl.js index 9ce9c41a..e5ede037 100644 --- a/client-app/src/component/map/layer/GridLayerImpl.js +++ b/client-app/src/component/map/layer/GridLayerImpl.js @@ -4,7 +4,7 @@ define([ , "dojo/_base/lang" , "dojo/aspect" , 'leaflet/leaflet' - , "src/utils/Credentials" + , "src/util/Credentials" , "src/component/filter/Filter" , "./MapLayer" ], function( diff --git a/client-app/src/component/selection/SelectionBox.js b/client-app/src/component/selection/SelectionBox.js index ac67ea4b..548f5e3a 100644 --- a/client-app/src/component/selection/SelectionBox.js +++ b/client-app/src/component/selection/SelectionBox.js @@ -3,7 +3,7 @@ define([ , 'dojo/_base/lang' , 'dojo/Deferred' , 'put-selector/put' - , 'src/utils/Credentials' + , 'src/util/Credentials' , 'src/component/base/_ListenQueryParams' , 'src/component/base/_Module' , 'src/component/base/_Show' diff --git a/client-app/src/component/selection/SelectionManager.js b/client-app/src/component/selection/SelectionManager.js index f7b352e3..68911334 100644 --- a/client-app/src/component/selection/SelectionManager.js +++ b/client-app/src/component/selection/SelectionManager.js @@ -5,7 +5,7 @@ define([ , 'dojo/_base/lang' , 'dojo/Deferred' , 'put-selector/put' - , 'src/utils/Credentials' + , 'src/util/Credentials' , 'src/component/base/_Module' , 'src/component/base/_Selection' , 'src/component/base/_Show' diff --git a/client-app/src/component/selection/_SelectorPersistence.js b/client-app/src/component/selection/_SelectorPersistence.js index 799c3148..610286de 100644 --- a/client-app/src/component/selection/_SelectorPersistence.js +++ b/client-app/src/component/selection/_SelectorPersistence.js @@ -3,7 +3,7 @@ define([ , 'dojo/_base/lang' , 'src/component/base/_Persistence' , 'src/component/base/_Store' - , 'src/utils/Credentials' + , 'src/util/Credentials' ], function( declare , lang diff --git a/client-app/src/component/socket/Socket.js b/client-app/src/component/socket/Socket.js index ffa64959..0d7e9270 100644 --- a/client-app/src/component/socket/Socket.js +++ b/client-app/src/component/socket/Socket.js @@ -3,7 +3,7 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "src/component/base/_Module" - , "src/utils/Credentials" + , "src/util/Credentials" , 'sockjs/sockjs.min' , 'stomp-websocket/stomp.min' diff --git a/client-app/src/component/socket/Task.js b/client-app/src/component/socket/Task.js index f019e2d4..33e8ef40 100644 --- a/client-app/src/component/socket/Task.js +++ b/client-app/src/component/socket/Task.js @@ -5,7 +5,7 @@ define([ , "src/component/base/_Module" , "src/component/base/_Store" , "src/component/base/_Selection" - , "src/utils/Credentials" + , "src/util/Credentials" ], function( declare , lang diff --git a/client-app/src/component/socket/_IngestData.js b/client-app/src/component/socket/_IngestData.js index 78d19809..246048c3 100644 --- a/client-app/src/component/socket/_IngestData.js +++ b/client-app/src/component/socket/_IngestData.js @@ -3,7 +3,7 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "src/utils/Credentials" + , "src/util/Credentials" ], function( redmicConfig , declare diff --git a/client-app/src/component/socket/_Report.js b/client-app/src/component/socket/_Report.js index 6d54edeb..048459dd 100644 --- a/client-app/src/component/socket/_Report.js +++ b/client-app/src/component/socket/_Report.js @@ -4,7 +4,7 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "src/utils/Credentials" + , "src/util/Credentials" ], function( alertify , redmicConfig diff --git a/client-app/src/component/socket/_Worms.js b/client-app/src/component/socket/_Worms.js index 3c448802..c2ec11c5 100644 --- a/client-app/src/component/socket/_Worms.js +++ b/client-app/src/component/socket/_Worms.js @@ -3,7 +3,7 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "src/utils/Credentials" + , "src/util/Credentials" ], function( redmicConfig , declare diff --git a/client-app/src/component/store/RestManagerImpl.js b/client-app/src/component/store/RestManagerImpl.js index a058c925..0b640f0b 100644 --- a/client-app/src/component/store/RestManagerImpl.js +++ b/client-app/src/component/store/RestManagerImpl.js @@ -5,7 +5,7 @@ define([ , 'dojo/request' , 'dojo/request/notify' , 'dojo/request/registry' - , 'src/utils/Credentials' + , 'src/util/Credentials' , './RestManager' ], function( redmicConfig diff --git a/client-app/src/component/user/UserArea.js b/client-app/src/component/user/UserArea.js index 9080f452..8df73199 100644 --- a/client-app/src/component/user/UserArea.js +++ b/client-app/src/component/user/UserArea.js @@ -10,7 +10,7 @@ define([ , 'src/component/base/_Store' , 'src/component/layout/listMenu/ListMenu' , 'src/component/layout/templateDisplayer/TemplateDisplayer' - , 'src/utils/Credentials' + , 'src/util/Credentials' , 'templates/UserTopbarImage' , 'templates/UserTopbarMenu' ], function( diff --git a/client-app/src/dojoConfig.js b/client-app/src/dojoConfig.js index 6880dda9..88197f97 100644 --- a/client-app/src/dojoConfig.js +++ b/client-app/src/dojoConfig.js @@ -10,7 +10,7 @@ dojoConfig = { location: '../../src/redmic' },{ name: 'RWidgets', - location: '../../src/utils/widgets' + location: '../../src/util/widgets' },{ name: 'dojo', location: '../dojo' diff --git a/client-app/src/oldapp/base/models/attr/_Attr.js b/client-app/src/oldapp/base/models/attr/_Attr.js index 4fbf1151..2adb4db0 100644 --- a/client-app/src/oldapp/base/models/attr/_Attr.js +++ b/client-app/src/oldapp/base/models/attr/_Attr.js @@ -5,7 +5,7 @@ define([ , "dojo/Stateful" , "dojo/topic" , "json-schema-ref-parser/ref-parser.min" - , "src/utils/tv4" + , "src/util/tv4" ], function( declare , lang diff --git a/client-app/src/oldapp/base/views/_ViewListBase.js b/client-app/src/oldapp/base/views/_ViewListBase.js index 97aba624..803a2037 100644 --- a/client-app/src/oldapp/base/views/_ViewListBase.js +++ b/client-app/src/oldapp/base/views/_ViewListBase.js @@ -6,7 +6,7 @@ define([ , "dojo/_base/lang" , "dojo/aspect" , "put-selector/put" - , "src/utils/Credentials" + , "src/util/Credentials" ], function ( _Module , _Show diff --git a/client-app/src/oldapp/components/CookieLoader.js b/client-app/src/oldapp/components/CookieLoader.js index f2a69b0e..24ae471b 100644 --- a/client-app/src/oldapp/components/CookieLoader.js +++ b/client-app/src/oldapp/components/CookieLoader.js @@ -4,7 +4,7 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/i18n!app/nls/translation" - , "src/utils/Credentials" + , "src/util/Credentials" ], function( alertify , redmicConfig diff --git a/client-app/src/oldapp/designs/details/main/Document.js b/client-app/src/oldapp/designs/details/main/Document.js index 415423d0..9572213d 100644 --- a/client-app/src/oldapp/designs/details/main/Document.js +++ b/client-app/src/oldapp/designs/details/main/Document.js @@ -2,7 +2,7 @@ define([ 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' - , 'src/utils/Credentials' + , 'src/util/Credentials' , 'templates/DocumentInfo' , './_DetailsBase' , './DocumentPDF' diff --git a/client-app/src/oldapp/home/views/HomeView.js b/client-app/src/oldapp/home/views/HomeView.js index 960038a3..8482b838 100644 --- a/client-app/src/oldapp/home/views/HomeView.js +++ b/client-app/src/oldapp/home/views/HomeView.js @@ -11,7 +11,7 @@ define([ , 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' - , 'src/utils/Credentials' + , 'src/util/Credentials' , 'src/component/base/_Filter' , 'src/component/layout/templateDisplayer/TemplateDisplayer' , 'templates/InitialInfo' diff --git a/client-app/src/oldapp/user/views/FeedbackView.js b/client-app/src/oldapp/user/views/FeedbackView.js index 2318d8be..5e619a33 100644 --- a/client-app/src/oldapp/user/views/FeedbackView.js +++ b/client-app/src/oldapp/user/views/FeedbackView.js @@ -8,7 +8,7 @@ define([ , "dojo/_base/lang" , "dojo/query" , "dojo/text!./templates/Feedback.html" - , "src/utils/Credentials" + , "src/util/Credentials" , "src/component/form/FormContainerImpl" , "src/component/form/_ListenModelHasChanged" , "src/component/model/ModelImpl" diff --git a/client-app/src/oldapp/user/views/LoginView.js b/client-app/src/oldapp/user/views/LoginView.js index 34ca5d8b..2a4dc514 100644 --- a/client-app/src/oldapp/user/views/LoginView.js +++ b/client-app/src/oldapp/user/views/LoginView.js @@ -5,7 +5,7 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/text!./templates/Login.html" - , "src/utils/Credentials" + , "src/util/Credentials" , 'src/component/base/_Store' ], function( alertify diff --git a/client-app/src/oldapp/user/views/UserProfileView.js b/client-app/src/oldapp/user/views/UserProfileView.js index f8d8a2a9..57055ba1 100644 --- a/client-app/src/oldapp/user/views/UserProfileView.js +++ b/client-app/src/oldapp/user/views/UserProfileView.js @@ -9,7 +9,7 @@ define([ , "app/user/models/UserSectorModel" , "dojo/_base/declare" , "dojo/_base/lang" - , "src/utils/Credentials" + , "src/util/Credentials" , "src/component/base/_Window" , "src/component/base/_Persistence" , "src/component/browser/_ButtonsInRow" diff --git a/client-app/src/oldapp/viewers/views/SpeciesDistributionView.js b/client-app/src/oldapp/viewers/views/SpeciesDistributionView.js index 4f98eb83..9e869b97 100644 --- a/client-app/src/oldapp/viewers/views/SpeciesDistributionView.js +++ b/client-app/src/oldapp/viewers/views/SpeciesDistributionView.js @@ -8,7 +8,7 @@ define([ , "dojo/aspect" , "dojo/Deferred" , "put-selector/put" - , "src/utils/Credentials" + , "src/util/Credentials" , "src/component/atlas/Atlas" , "src/component/base/_Filter" , "src/component/base/_Selection" diff --git a/client-app/src/oldapp/views/ActivateAccount.js b/client-app/src/oldapp/views/ActivateAccount.js index f3c14799..35cb0470 100644 --- a/client-app/src/oldapp/views/ActivateAccount.js +++ b/client-app/src/oldapp/views/ActivateAccount.js @@ -3,7 +3,7 @@ define([ , 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/request' - , 'src/utils/RedmicLocalStorage' + , 'src/util/RedmicLocalStorage' ], function( redmicConfig , declare diff --git a/client-app/src/utils/Credentials.js b/client-app/src/util/Credentials.js similarity index 98% rename from client-app/src/utils/Credentials.js rename to client-app/src/util/Credentials.js index e0c51763..c076cb34 100644 --- a/client-app/src/utils/Credentials.js +++ b/client-app/src/util/Credentials.js @@ -3,7 +3,7 @@ define([ , 'dojo/_base/lang' , 'dojo/Evented' , 'dojo/has' - , 'src/utils/RedmicLocalStorage' + , 'src/util/RedmicLocalStorage' ], function( declare , lang diff --git a/client-app/src/utils/GuestChecker.js b/client-app/src/util/GuestChecker.js similarity index 98% rename from client-app/src/utils/GuestChecker.js rename to client-app/src/util/GuestChecker.js index 0864e5f7..2d7eea95 100644 --- a/client-app/src/utils/GuestChecker.js +++ b/client-app/src/util/GuestChecker.js @@ -3,7 +3,7 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/i18n!app/nls/translation" - , "src/utils/Credentials" + , "src/util/Credentials" ], function( alertify , declare diff --git a/client-app/src/utils/Mediator.js b/client-app/src/util/Mediator.js similarity index 100% rename from client-app/src/utils/Mediator.js rename to client-app/src/util/Mediator.js diff --git a/client-app/src/utils/RedmicLocalStorage.js b/client-app/src/util/RedmicLocalStorage.js similarity index 100% rename from client-app/src/utils/RedmicLocalStorage.js rename to client-app/src/util/RedmicLocalStorage.js diff --git a/client-app/src/utils/stringFormats.js b/client-app/src/util/stringFormats.js similarity index 100% rename from client-app/src/utils/stringFormats.js rename to client-app/src/util/stringFormats.js diff --git a/client-app/src/utils/tv4.js b/client-app/src/util/tv4.js similarity index 98% rename from client-app/src/utils/tv4.js rename to client-app/src/util/tv4.js index 25e553f0..8444b2d8 100644 --- a/client-app/src/utils/tv4.js +++ b/client-app/src/util/tv4.js @@ -2,7 +2,7 @@ define([ 'dojo/_base/lang' , 'dojo/has' , 'RWidgets/Utilities' - , 'src/utils/stringFormats' + , 'src/util/stringFormats' , 'tv4/tv4' ], function( lang diff --git a/client-app/src/utils/widgets/Button.js b/client-app/src/util/widgets/Button.js similarity index 100% rename from client-app/src/utils/widgets/Button.js rename to client-app/src/util/widgets/Button.js diff --git a/client-app/src/utils/widgets/ComboButton.js b/client-app/src/util/widgets/ComboButton.js similarity index 100% rename from client-app/src/utils/widgets/ComboButton.js rename to client-app/src/util/widgets/ComboButton.js diff --git a/client-app/src/utils/widgets/Converter.js b/client-app/src/util/widgets/Converter.js similarity index 100% rename from client-app/src/utils/widgets/Converter.js rename to client-app/src/util/widgets/Converter.js diff --git a/client-app/src/utils/widgets/DatePicker.js b/client-app/src/util/widgets/DatePicker.js similarity index 100% rename from client-app/src/utils/widgets/DatePicker.js rename to client-app/src/util/widgets/DatePicker.js diff --git a/client-app/src/utils/widgets/Facet.js b/client-app/src/util/widgets/Facet.js similarity index 100% rename from client-app/src/utils/widgets/Facet.js rename to client-app/src/util/widgets/Facet.js diff --git a/client-app/src/utils/widgets/FilteringSelect.js b/client-app/src/util/widgets/FilteringSelect.js similarity index 100% rename from client-app/src/utils/widgets/FilteringSelect.js rename to client-app/src/util/widgets/FilteringSelect.js diff --git a/client-app/src/utils/widgets/KeywordsInput.js b/client-app/src/util/widgets/KeywordsInput.js similarity index 100% rename from client-app/src/utils/widgets/KeywordsInput.js rename to client-app/src/util/widgets/KeywordsInput.js diff --git a/client-app/src/utils/widgets/Map.js b/client-app/src/util/widgets/Map.js similarity index 100% rename from client-app/src/utils/widgets/Map.js rename to client-app/src/util/widgets/Map.js diff --git a/client-app/src/utils/widgets/ProgressSlider.js b/client-app/src/util/widgets/ProgressSlider.js similarity index 100% rename from client-app/src/utils/widgets/ProgressSlider.js rename to client-app/src/util/widgets/ProgressSlider.js diff --git a/client-app/src/utils/widgets/README.md b/client-app/src/util/widgets/README.md similarity index 100% rename from client-app/src/utils/widgets/README.md rename to client-app/src/util/widgets/README.md diff --git a/client-app/src/utils/widgets/RangeSlider.js b/client-app/src/util/widgets/RangeSlider.js similarity index 100% rename from client-app/src/utils/widgets/RangeSlider.js rename to client-app/src/util/widgets/RangeSlider.js diff --git a/client-app/src/utils/widgets/RedmicUtilities.js b/client-app/src/util/widgets/RedmicUtilities.js similarity index 100% rename from client-app/src/utils/widgets/RedmicUtilities.js rename to client-app/src/util/widgets/RedmicUtilities.js diff --git a/client-app/src/utils/widgets/Slider.js b/client-app/src/util/widgets/Slider.js similarity index 100% rename from client-app/src/utils/widgets/Slider.js rename to client-app/src/util/widgets/Slider.js diff --git a/client-app/src/utils/widgets/Switch.js b/client-app/src/util/widgets/Switch.js similarity index 100% rename from client-app/src/utils/widgets/Switch.js rename to client-app/src/util/widgets/Switch.js diff --git a/client-app/src/utils/widgets/TemplateWidget.js b/client-app/src/util/widgets/TemplateWidget.js similarity index 100% rename from client-app/src/utils/widgets/TemplateWidget.js rename to client-app/src/util/widgets/TemplateWidget.js diff --git a/client-app/src/utils/widgets/TextSearch.js b/client-app/src/util/widgets/TextSearch.js similarity index 100% rename from client-app/src/utils/widgets/TextSearch.js rename to client-app/src/util/widgets/TextSearch.js diff --git a/client-app/src/utils/widgets/TimeSelect.js b/client-app/src/util/widgets/TimeSelect.js similarity index 100% rename from client-app/src/utils/widgets/TimeSelect.js rename to client-app/src/util/widgets/TimeSelect.js diff --git a/client-app/src/utils/widgets/ToggleButton.js b/client-app/src/util/widgets/ToggleButton.js similarity index 100% rename from client-app/src/utils/widgets/ToggleButton.js rename to client-app/src/util/widgets/ToggleButton.js diff --git a/client-app/src/utils/widgets/Utilities.js b/client-app/src/util/widgets/Utilities.js similarity index 100% rename from client-app/src/utils/widgets/Utilities.js rename to client-app/src/util/widgets/Utilities.js diff --git a/client-app/src/utils/widgets/ValueAndUnitSelector.js b/client-app/src/util/widgets/ValueAndUnitSelector.js similarity index 100% rename from client-app/src/utils/widgets/ValueAndUnitSelector.js rename to client-app/src/util/widgets/ValueAndUnitSelector.js diff --git a/client-app/src/utils/widgets/extensions/_ShowValue.js b/client-app/src/util/widgets/extensions/_ShowValue.js similarity index 100% rename from client-app/src/utils/widgets/extensions/_ShowValue.js rename to client-app/src/util/widgets/extensions/_ShowValue.js diff --git a/client-app/src/utils/widgets/layout/DialogComplex.js b/client-app/src/util/widgets/layout/DialogComplex.js similarity index 100% rename from client-app/src/utils/widgets/layout/DialogComplex.js rename to client-app/src/util/widgets/layout/DialogComplex.js diff --git a/client-app/src/utils/widgets/layout/DialogSimple.js b/client-app/src/util/widgets/layout/DialogSimple.js similarity index 100% rename from client-app/src/utils/widgets/layout/DialogSimple.js rename to client-app/src/util/widgets/layout/DialogSimple.js diff --git a/client-app/src/utils/widgets/layout/_DialogBase.js b/client-app/src/util/widgets/layout/_DialogBase.js similarity index 100% rename from client-app/src/utils/widgets/layout/_DialogBase.js rename to client-app/src/util/widgets/layout/_DialogBase.js diff --git a/client-app/tests/unit/app/base/views/extensions/test_EditionView.js b/client-app/tests/unit/app/base/views/extensions/test_EditionView.js index e7e97986..77424e18 100644 --- a/client-app/tests/unit/app/base/views/extensions/test_EditionView.js +++ b/client-app/tests/unit/app/base/views/extensions/test_EditionView.js @@ -6,7 +6,7 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/i18n!app/nls/translation" - , "src/utils/Mediator" + , "src/util/Mediator" , "src/component/base/Selector" , "src/component/store/MasterStore" ], function( diff --git a/client-app/tests/unit/app/viewers/views/test_ChartsView.js b/client-app/tests/unit/app/viewers/views/test_ChartsView.js index 61e186ec..92294e1e 100644 --- a/client-app/tests/unit/app/viewers/views/test_ChartsView.js +++ b/client-app/tests/unit/app/viewers/views/test_ChartsView.js @@ -4,7 +4,7 @@ define([ , "dojo/date/stamp" , "app/viewers/views/ChartsView" , "src/component/store/MasterStore" - , "src/utils/Mediator" + , "src/util/Mediator" ], function( declare , lang diff --git a/client-app/tests/unit/redmic/base/testCredentials.js b/client-app/tests/unit/redmic/base/testCredentials.js index 6bff0a1a..217059ce 100644 --- a/client-app/tests/unit/redmic/base/testCredentials.js +++ b/client-app/tests/unit/redmic/base/testCredentials.js @@ -1,6 +1,6 @@ define([ - "src/utils/Credentials" - , "src/utils/RedmicLocalStorage" + "src/util/Credentials" + , "src/util/RedmicLocalStorage" ], function( Credentials , RedmicLocalStorage diff --git a/client-app/tests/unit/redmic/base/testMediator.js b/client-app/tests/unit/redmic/base/testMediator.js index f2c4a74a..db22eb73 100644 --- a/client-app/tests/unit/redmic/base/testMediator.js +++ b/client-app/tests/unit/redmic/base/testMediator.js @@ -1,5 +1,5 @@ define([ - "src/utils/Mediator" + "src/util/Mediator" ], function( Mediator ){ diff --git a/client-app/tests/unit/redmic/base/testRedmicLocalStorage.js b/client-app/tests/unit/redmic/base/testRedmicLocalStorage.js index 700693ee..fd48e286 100644 --- a/client-app/tests/unit/redmic/base/testRedmicLocalStorage.js +++ b/client-app/tests/unit/redmic/base/testRedmicLocalStorage.js @@ -1,5 +1,5 @@ define([ - "src/utils/RedmicLocalStorage" + "src/util/RedmicLocalStorage" ], function( RedmicLocalStorage ){ diff --git a/client-app/tests/unit/redmic/modules/base/testManager.js b/client-app/tests/unit/redmic/modules/base/testManager.js index d92e7b95..a00c57e6 100644 --- a/client-app/tests/unit/redmic/modules/base/testManager.js +++ b/client-app/tests/unit/redmic/modules/base/testManager.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "src/component/base/Manager" - , "src/utils/Mediator" + , "src/util/Mediator" ], function( declare , lang diff --git a/client-app/tests/unit/redmic/modules/base/testNotification.js b/client-app/tests/unit/redmic/modules/base/testNotification.js index 1075b47f..14461ec5 100644 --- a/client-app/tests/unit/redmic/modules/base/testNotification.js +++ b/client-app/tests/unit/redmic/modules/base/testNotification.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "src/component/base/Notification" - , "src/utils/Mediator" + , "src/util/Mediator" ], function( declare , lang diff --git a/client-app/tests/unit/redmic/modules/base/testSelectionBox.js b/client-app/tests/unit/redmic/modules/base/testSelectionBox.js index 0d50ddff..f6ad04f4 100644 --- a/client-app/tests/unit/redmic/modules/base/testSelectionBox.js +++ b/client-app/tests/unit/redmic/modules/base/testSelectionBox.js @@ -3,7 +3,7 @@ define([ , "dojo/_base/lang" , "put-selector/put" , "src/component/base/SelectionBox" - , "src/utils/Mediator" + , "src/util/Mediator" ], function( declare , lang diff --git a/client-app/tests/unit/redmic/modules/base/test_Module.js b/client-app/tests/unit/redmic/modules/base/test_Module.js index b18a8b6e..47cbe876 100644 --- a/client-app/tests/unit/redmic/modules/base/test_Module.js +++ b/client-app/tests/unit/redmic/modules/base/test_Module.js @@ -4,7 +4,7 @@ define([ , 'dojo/Deferred' , 'dojo/promise/all' , 'src/component/base/_Module' - , 'src/utils/Mediator' + , 'src/util/Mediator' ], function( declare diff --git a/client-app/tests/unit/redmic/modules/browser/bars/testOrder.js b/client-app/tests/unit/redmic/modules/browser/bars/testOrder.js index 2ce586e2..351f1147 100644 --- a/client-app/tests/unit/redmic/modules/browser/bars/testOrder.js +++ b/client-app/tests/unit/redmic/modules/browser/bars/testOrder.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "put-selector/put" - , "src/utils/Mediator" + , "src/util/Mediator" , "src/component/browser/bars/Order" ], function( declare diff --git a/client-app/tests/unit/redmic/modules/browser/bars/testPagination.js b/client-app/tests/unit/redmic/modules/browser/bars/testPagination.js index 9cb0b022..5990dd0f 100644 --- a/client-app/tests/unit/redmic/modules/browser/bars/testPagination.js +++ b/client-app/tests/unit/redmic/modules/browser/bars/testPagination.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "put-selector/put" - , "src/utils/Mediator" + , "src/util/Mediator" , "src/component/browser/bars/Pagination" , "templates/DomainList" ], function( diff --git a/client-app/tests/unit/redmic/modules/browser/bars/testSelectionBox.js b/client-app/tests/unit/redmic/modules/browser/bars/testSelectionBox.js index a216848f..8c78198c 100644 --- a/client-app/tests/unit/redmic/modules/browser/bars/testSelectionBox.js +++ b/client-app/tests/unit/redmic/modules/browser/bars/testSelectionBox.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "put-selector/put" - , "src/utils/Mediator" + , "src/util/Mediator" , "src/component/browser/bars/SelectionBox" ], function( declare diff --git a/client-app/tests/unit/redmic/modules/browser/bars/testTotal.js b/client-app/tests/unit/redmic/modules/browser/bars/testTotal.js index e2a51bb8..5f341410 100644 --- a/client-app/tests/unit/redmic/modules/browser/bars/testTotal.js +++ b/client-app/tests/unit/redmic/modules/browser/bars/testTotal.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "put-selector/put" - , "src/utils/Mediator" + , "src/util/Mediator" , "src/component/browser/bars/Total" , "src/component/browser/ListImpl" , "templates/DomainList" diff --git a/client-app/tests/unit/redmic/modules/browser/buttons/testButtons.js b/client-app/tests/unit/redmic/modules/browser/buttons/testButtons.js index e359058c..eb2b3ada 100644 --- a/client-app/tests/unit/redmic/modules/browser/buttons/testButtons.js +++ b/client-app/tests/unit/redmic/modules/browser/buttons/testButtons.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "put-selector/put" - , "src/utils/Mediator" + , "src/util/Mediator" , "src/component/browser/buttons/_GroupButtons" , "src/component/browser/buttons/Buttons" ], function( diff --git a/client-app/tests/unit/redmic/modules/browser/row/testRow.js b/client-app/tests/unit/redmic/modules/browser/row/testRow.js index 8420dd30..a96886e7 100644 --- a/client-app/tests/unit/redmic/modules/browser/row/testRow.js +++ b/client-app/tests/unit/redmic/modules/browser/row/testRow.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "put-selector/put" - , "src/utils/Mediator" + , "src/util/Mediator" , "src/component/browser/row/_Buttons" , "src/component/browser/row/_Hierarchical" , "src/component/browser/row/_HierarchicalSelect" diff --git a/client-app/tests/unit/redmic/modules/browser/testHierarchicalImpl.js b/client-app/tests/unit/redmic/modules/browser/testHierarchicalImpl.js index 794178ce..bf2c729e 100644 --- a/client-app/tests/unit/redmic/modules/browser/testHierarchicalImpl.js +++ b/client-app/tests/unit/redmic/modules/browser/testHierarchicalImpl.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/dom-class" - , "src/utils/Mediator" + , "src/util/Mediator" , "src/component/browser/_ButtonsInRow" , "src/component/browser/_Framework" , "src/component/browser/_GeoJsonParser" diff --git a/client-app/tests/unit/redmic/modules/browser/testListImpl.js b/client-app/tests/unit/redmic/modules/browser/testListImpl.js index 260511b7..54518864 100644 --- a/client-app/tests/unit/redmic/modules/browser/testListImpl.js +++ b/client-app/tests/unit/redmic/modules/browser/testListImpl.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "dojo/dom-class" - , "src/utils/Mediator" + , "src/util/Mediator" , "src/component/browser/_ButtonsInRow" , "src/component/browser/_DragAndDrop" , "src/component/browser/_EditionTable" diff --git a/client-app/tests/unit/redmic/modules/chart/ChartsContainer/testInfoChartsContainerImpl.js b/client-app/tests/unit/redmic/modules/chart/ChartsContainer/testInfoChartsContainerImpl.js index 2c81095f..cb9daffe 100644 --- a/client-app/tests/unit/redmic/modules/chart/ChartsContainer/testInfoChartsContainerImpl.js +++ b/client-app/tests/unit/redmic/modules/chart/ChartsContainer/testInfoChartsContainerImpl.js @@ -4,7 +4,7 @@ define([ , 'dojo/Deferred' , 'dojo/promise/all' , 'put-selector/put' - , 'src/utils/Mediator' + , 'src/util/Mediator' , 'src/component/chart/ChartsContainer/InfoChartsContainerImpl' , 'src/component/chart/layer/ChartLayer/LinearChartImpl' ], function( diff --git a/client-app/tests/unit/redmic/modules/chart/Toolbar/testSliderSelectorImpl.js b/client-app/tests/unit/redmic/modules/chart/Toolbar/testSliderSelectorImpl.js index 663d134c..be75d017 100644 --- a/client-app/tests/unit/redmic/modules/chart/Toolbar/testSliderSelectorImpl.js +++ b/client-app/tests/unit/redmic/modules/chart/Toolbar/testSliderSelectorImpl.js @@ -2,7 +2,7 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' , 'put-selector/put' - , 'src/utils/Mediator' + , 'src/util/Mediator' , 'src/component/chart/Toolbar/SliderSelectorImpl' ], function( declare diff --git a/client-app/tests/unit/redmic/modules/chart/layer/ChartLayer/testLinearChartImpl.js b/client-app/tests/unit/redmic/modules/chart/layer/ChartLayer/testLinearChartImpl.js index ec08595d..b8450364 100644 --- a/client-app/tests/unit/redmic/modules/chart/layer/ChartLayer/testLinearChartImpl.js +++ b/client-app/tests/unit/redmic/modules/chart/layer/ChartLayer/testLinearChartImpl.js @@ -2,7 +2,7 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' , 'put-selector/put' - , 'src/utils/Mediator' + , 'src/util/Mediator' , 'src/component/chart/ChartsContainer/InfoChartsContainerImpl' , 'src/component/chart/layer/ChartLayer/LinearChartImpl' ], function( diff --git a/client-app/tests/unit/redmic/modules/form/inputs/testCheckBoxImpl.js b/client-app/tests/unit/redmic/modules/form/inputs/testCheckBoxImpl.js index 9b8b40a3..35a17980 100644 --- a/client-app/tests/unit/redmic/modules/form/inputs/testCheckBoxImpl.js +++ b/client-app/tests/unit/redmic/modules/form/inputs/testCheckBoxImpl.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "src/utils/Mediator" + , "src/util/Mediator" , "src/component/model/ModelImpl" , "src/component/form/inputs/CheckBoxImpl" , "tests/src/component/model/SupportModel" diff --git a/client-app/tests/unit/redmic/modules/form/inputs/testDateTextBoxImpl.js b/client-app/tests/unit/redmic/modules/form/inputs/testDateTextBoxImpl.js index 72fc6f09..c0d0c9ad 100644 --- a/client-app/tests/unit/redmic/modules/form/inputs/testDateTextBoxImpl.js +++ b/client-app/tests/unit/redmic/modules/form/inputs/testDateTextBoxImpl.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "src/utils/Mediator" + , "src/util/Mediator" , "src/component/model/ModelImpl" , "src/component/form/inputs/DateTextBoxImpl" , "tests/src/component/model/SupportModel" diff --git a/client-app/tests/unit/redmic/modules/form/inputs/testFilteringInputImpl.js b/client-app/tests/unit/redmic/modules/form/inputs/testFilteringInputImpl.js index 9f954af2..8cc7f6bb 100644 --- a/client-app/tests/unit/redmic/modules/form/inputs/testFilteringInputImpl.js +++ b/client-app/tests/unit/redmic/modules/form/inputs/testFilteringInputImpl.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "src/utils/Mediator" + , "src/util/Mediator" , "src/component/model/ModelImpl" , "src/component/form/inputs/FilteringInputImpl" , "tests/src/component/model/SupportModel" diff --git a/client-app/tests/unit/redmic/modules/form/inputs/testNumberSpinnerImpl.js b/client-app/tests/unit/redmic/modules/form/inputs/testNumberSpinnerImpl.js index da1681df..45b3e9ef 100644 --- a/client-app/tests/unit/redmic/modules/form/inputs/testNumberSpinnerImpl.js +++ b/client-app/tests/unit/redmic/modules/form/inputs/testNumberSpinnerImpl.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "src/utils/Mediator" + , "src/util/Mediator" , "src/component/model/ModelImpl" , "src/component/form/inputs/NumberSpinnerImpl" , "tests/src/component/model/SupportModel" diff --git a/client-app/tests/unit/redmic/modules/form/inputs/testNumberTextBoxImpl.js b/client-app/tests/unit/redmic/modules/form/inputs/testNumberTextBoxImpl.js index 99178146..12d9c419 100644 --- a/client-app/tests/unit/redmic/modules/form/inputs/testNumberTextBoxImpl.js +++ b/client-app/tests/unit/redmic/modules/form/inputs/testNumberTextBoxImpl.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "src/utils/Mediator" + , "src/util/Mediator" , "src/component/model/ModelImpl" , "src/component/form/inputs/NumberTextBoxImpl" , "tests/src/component/model/SupportModel" diff --git a/client-app/tests/unit/redmic/modules/form/inputs/testTextAreaImpl.js b/client-app/tests/unit/redmic/modules/form/inputs/testTextAreaImpl.js index 470e7d34..02e8be6a 100644 --- a/client-app/tests/unit/redmic/modules/form/inputs/testTextAreaImpl.js +++ b/client-app/tests/unit/redmic/modules/form/inputs/testTextAreaImpl.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "src/utils/Mediator" + , "src/util/Mediator" , "src/component/model/ModelImpl" , "src/component/form/inputs/TextAreaImpl" , "tests/src/component/model/SupportModel" diff --git a/client-app/tests/unit/redmic/modules/form/inputs/testTextBoxImpl.js b/client-app/tests/unit/redmic/modules/form/inputs/testTextBoxImpl.js index b020d949..08919e2a 100644 --- a/client-app/tests/unit/redmic/modules/form/inputs/testTextBoxImpl.js +++ b/client-app/tests/unit/redmic/modules/form/inputs/testTextBoxImpl.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "src/utils/Mediator" + , "src/util/Mediator" , "src/component/model/ModelImpl" , "src/component/form/inputs/TextBoxImpl" , "tests/src/component/model/SupportModel" diff --git a/client-app/tests/unit/redmic/modules/form/testForm.js b/client-app/tests/unit/redmic/modules/form/testForm.js index 896a22a3..a085a6a4 100644 --- a/client-app/tests/unit/redmic/modules/form/testForm.js +++ b/client-app/tests/unit/redmic/modules/form/testForm.js @@ -5,7 +5,7 @@ define([ , "dojo/_base/lang" , "dojo/i18n!app/nls/translation" , "put-selector/put" - , "src/utils/Mediator" + , "src/util/Mediator" , "redmic/dialog/LockDialogImpl" , "src/component/form/FormContainerImpl" , "src/component/form/UploadFileImpl" diff --git a/client-app/tests/unit/redmic/modules/gateway/testGateway.js b/client-app/tests/unit/redmic/modules/gateway/testGateway.js index e36ba5a8..dba3bb26 100644 --- a/client-app/tests/unit/redmic/modules/gateway/testGateway.js +++ b/client-app/tests/unit/redmic/modules/gateway/testGateway.js @@ -3,7 +3,7 @@ define([ , 'dojo/_base/lang' , 'dojo/Deferred' , 'dojo/DeferredList' - , 'src/utils/Mediator' + , 'src/util/Mediator' , 'src/component/gateway/_GatewayItfc' , 'src/component/gateway/Gateway' ], function( diff --git a/client-app/tests/unit/redmic/modules/layout/details/testDetails.js b/client-app/tests/unit/redmic/modules/layout/details/testDetails.js index e87d3ade..358aed92 100644 --- a/client-app/tests/unit/redmic/modules/layout/details/testDetails.js +++ b/client-app/tests/unit/redmic/modules/layout/details/testDetails.js @@ -3,7 +3,7 @@ define([ , "dojo/_base/lang" , "dojo/i18n!app/nls/translation" , "put-selector/put" - , "src/utils/Mediator" + , "src/util/Mediator" , "redmic/dialog/LockDialogImpl" , "RWidgets/layout/Keypad" , "src/component/layout/details/Details" diff --git a/client-app/tests/unit/redmic/modules/layout/wizard/testWizard.js b/client-app/tests/unit/redmic/modules/layout/wizard/testWizard.js index 3b8ed074..6e2374cb 100644 --- a/client-app/tests/unit/redmic/modules/layout/wizard/testWizard.js +++ b/client-app/tests/unit/redmic/modules/layout/wizard/testWizard.js @@ -3,7 +3,7 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "put-selector/put" - , "src/utils/Mediator" + , "src/util/Mediator" , "src/component/base/_Module" , "src/component/base/_Show" , "src/component/layout/wizard/_StepNavigation" diff --git a/client-app/tests/unit/redmic/modules/map/testLeafletImpl.js b/client-app/tests/unit/redmic/modules/map/testLeafletImpl.js index a1df6bd1..e0e1a270 100644 --- a/client-app/tests/unit/redmic/modules/map/testLeafletImpl.js +++ b/client-app/tests/unit/redmic/modules/map/testLeafletImpl.js @@ -1,5 +1,5 @@ define([ - 'src/utils/Mediator' + 'src/util/Mediator' , 'src/component/map/LeafletImpl' ], function( Mediator diff --git a/client-app/tests/unit/redmic/modules/model/testModelImpl.js b/client-app/tests/unit/redmic/modules/model/testModelImpl.js index 4ce37645..a4364624 100644 --- a/client-app/tests/unit/redmic/modules/model/testModelImpl.js +++ b/client-app/tests/unit/redmic/modules/model/testModelImpl.js @@ -1,6 +1,6 @@ define([ 'dojo/_base/declare' - , 'src/utils/Mediator' + , 'src/util/Mediator' , 'src/component/model/ModelImpl' ], function( declare diff --git a/client-app/tests/unit/redmic/modules/notification/test_Communication.js b/client-app/tests/unit/redmic/modules/notification/test_Communication.js index 5850abf5..c7030477 100644 --- a/client-app/tests/unit/redmic/modules/notification/test_Communication.js +++ b/client-app/tests/unit/redmic/modules/notification/test_Communication.js @@ -4,7 +4,7 @@ define([ , "src/component/notification/CommunicationCenter" , "src/component/notification/Alert" , "src/component/notification/Notification" - , "src/utils/Mediator" + , "src/util/Mediator" ], function( declare , lang diff --git a/client-app/tests/unit/redmic/modules/notification/test_Notification.js b/client-app/tests/unit/redmic/modules/notification/test_Notification.js index 9751bae1..3885bf53 100644 --- a/client-app/tests/unit/redmic/modules/notification/test_Notification.js +++ b/client-app/tests/unit/redmic/modules/notification/test_Notification.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "src/component/notification/Notification" - , "src/utils/Mediator" + , "src/util/Mediator" ], function( declare , lang diff --git a/client-app/tests/unit/redmic/modules/search/testFacetsImpl.js b/client-app/tests/unit/redmic/modules/search/testFacetsImpl.js index 864b374a..62d276af 100644 --- a/client-app/tests/unit/redmic/modules/search/testFacetsImpl.js +++ b/client-app/tests/unit/redmic/modules/search/testFacetsImpl.js @@ -1,5 +1,5 @@ define([ - 'src/utils/Mediator' + 'src/util/Mediator' , 'src/component/search/FacetsImpl' ], function( Mediator diff --git a/client-app/tests/unit/redmic/modules/search/testSearch.js b/client-app/tests/unit/redmic/modules/search/testSearch.js index b285c131..1b8feb12 100644 --- a/client-app/tests/unit/redmic/modules/search/testSearch.js +++ b/client-app/tests/unit/redmic/modules/search/testSearch.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "put-selector/put" - , "src/utils/Mediator" + , "src/util/Mediator" , "src/component/search/Search" , "src/component/search/TextSearchImpl" , "src/component/search/MapSearchImpl" diff --git a/client-app/tests/unit/redmic/modules/selection/testSelector.js b/client-app/tests/unit/redmic/modules/selection/testSelector.js index e0fb7858..3662229e 100644 --- a/client-app/tests/unit/redmic/modules/selection/testSelector.js +++ b/client-app/tests/unit/redmic/modules/selection/testSelector.js @@ -1,7 +1,7 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'src/utils/Mediator' + , 'src/util/Mediator' , 'src/component/selection/Selector' ], function( declare diff --git a/client-app/tests/unit/redmic/modules/socket/testSocket.js b/client-app/tests/unit/redmic/modules/socket/testSocket.js index 9863c83d..b7f9e39c 100644 --- a/client-app/tests/unit/redmic/modules/socket/testSocket.js +++ b/client-app/tests/unit/redmic/modules/socket/testSocket.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/Deferred" - , "src/utils/Mediator" + , "src/util/Mediator" , "src/component/base/Socket" ], function( declare diff --git a/client-app/tests/unit/redmic/modules/store/testRestManager.js b/client-app/tests/unit/redmic/modules/store/testRestManager.js index e6c36db5..772bff65 100644 --- a/client-app/tests/unit/redmic/modules/store/testRestManager.js +++ b/client-app/tests/unit/redmic/modules/store/testRestManager.js @@ -1,5 +1,5 @@ define([ - 'src/utils/Mediator' + 'src/util/Mediator' , 'src/component/store/RestManagerImpl' ], function( diff --git a/client-app/tests/unit/redmic/modules/tree/testTree.js b/client-app/tests/unit/redmic/modules/tree/testTree.js index 5f84cd32..1d6f28cd 100644 --- a/client-app/tests/unit/redmic/modules/tree/testTree.js +++ b/client-app/tests/unit/redmic/modules/tree/testTree.js @@ -1,6 +1,6 @@ define([ 'dojo/_base/declare' - , 'src/utils/Mediator' + , 'src/util/Mediator' , 'src/component/tree/_LazyLoad' , 'src/component/tree/_LeafSelection' , 'src/component/tree/CbtreeImpl' diff --git a/client-app/tests/unit/redmic/modules/wizard/testWizard.js b/client-app/tests/unit/redmic/modules/wizard/testWizard.js index 3b1ded1b..2ee4e145 100644 --- a/client-app/tests/unit/redmic/modules/wizard/testWizard.js +++ b/client-app/tests/unit/redmic/modules/wizard/testWizard.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , "put-selector/put" - , "src/utils/Mediator" + , "src/util/Mediator" , "src/component/wizard/Wizard" , "src/component/wizard/FacetsWizardImpl" ], function( -- GitLab From aac1719c82768063c4a4827799492a7fedd1e1ff Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Tue, 23 Jul 2024 13:47:30 +0100 Subject: [PATCH 030/249] =?UTF-8?q?Actualiza=20subm=C3=B3dulo=20y=20refere?= =?UTF-8?q?ncia=20a=20m=C3=B3dulos?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client-app/deps/templates | 2 +- client-app/src/dojoConfig.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client-app/deps/templates b/client-app/deps/templates index b2279857..78f34085 160000 --- a/client-app/deps/templates +++ b/client-app/deps/templates @@ -1 +1 @@ -Subproject commit b22798571a7b98e744b0bfa6e03a3c4048be6541 +Subproject commit 78f34085f8de7340cd10c4b093abb8256d3c4c7d diff --git a/client-app/src/dojoConfig.js b/client-app/src/dojoConfig.js index 88197f97..f2d4003a 100644 --- a/client-app/src/dojoConfig.js +++ b/client-app/src/dojoConfig.js @@ -7,7 +7,7 @@ dojoConfig = { location: '../../src/oldapp' },{ name: 'redmic', - location: '../../src/redmic' + location: '../../src/component' },{ name: 'RWidgets', location: '../../src/util/widgets' -- GitLab From 033e99ab088820988881de53f8c2ffe5ab2305aa Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Tue, 23 Jul 2024 14:05:20 +0100 Subject: [PATCH 031/249] Renombra tests a singular, actualiza ejemplos --- .gitlab-ci/test.yml | 4 +-- Gruntfile.js | 2 +- README.md | 8 +++--- client-app/{tests => test}/IpGetter.js | 0 client-app/{tests => test}/_dojoConfig.js | 4 +-- client-app/{tests => test}/_environments.js | 0 client-app/{tests => test}/_functions.js | 0 .../{tests => test}/_intern-functional.js | 0 client-app/{tests => test}/_intern-unit.js | 0 client-app/{tests => test}/_intern.js | 0 client-app/{tests => test}/_remote.js | 0 client-app/{tests => test}/apitest/app.js | 0 .../apitest/data/inputs/contacts.json | 0 .../apitest/data/inputs/organisations.json | 0 .../apitest/data/inputs/programs.json | 0 .../apitest/data/inputs/projects.json | 0 .../apitest/data/inputs/scopes.json | 0 .../{tests => test}/apitest/package.json | 0 .../functional/administrative/Activity.js | 0 .../functional/administrative/Animal.js | 0 .../functional/administrative/Contact.js | 0 .../functional/administrative/Device.js | 0 .../functional/administrative/Document.js | 6 ++--- .../functional/administrative/Organisation.js | 0 .../functional/administrative/Platform.js | 0 .../functional/administrative/Program.js | 0 .../functional/administrative/Project.js | 0 .../administrative/_Administrative.js | 8 +++--- .../administrative/_AdministrativeFacets.js | 2 +- .../administrative/_AdministrativeFilter.js | 2 +- .../administrative/_AdministrativeLinks.js | 2 +- .../administrative/taxonomy/Class.js | 0 .../administrative/taxonomy/Family.js | 0 .../administrative/taxonomy/Genus.js | 0 .../administrative/taxonomy/Kingdom.js | 0 .../taxonomy/Misidentification.js | 10 ++++---- .../administrative/taxonomy/Order.js | 0 .../administrative/taxonomy/Phylum.js | 0 .../administrative/taxonomy/Species.js | 8 +++--- .../administrative/taxonomy/Subphylum.js | 0 .../administrative/taxonomy/_Taxonomy.js | 6 ++--- .../administrativeDetails/Activity.js | 0 .../administrativeDetails/Contact.js | 0 .../administrativeDetails/Document.js | 0 .../administrativeDetails/Organisation.js | 0 .../administrativeDetails/Platform.js | 0 .../administrativeDetails/Program.js | 0 .../administrativeDetails/Project.js | 0 .../administrativeDetails/ServiceOGC.js | 0 .../administrativeDetails/Species.js | 0 .../administrativeDetails/Statistics.js | 0 .../administrativeDetails/_DetailsBase.js | 4 +-- .../administrativeDetails/_DetailsInfo.js | 12 ++++----- .../administrativeDetails/_DetailsMap.js | 2 +- .../administrativeDetails/_DetailsPDF.js | 2 +- .../functional/catalog/Activity.js | 0 .../functional/catalog/Organisation.js | 0 .../functional/catalog/Platform.js | 0 .../functional/catalog/Program.js | 0 .../functional/catalog/Project.js | 0 .../functional/catalog/Species.js | 4 +-- .../functional/catalog/_Catalog.js | 2 +- .../functional/catalog/_CatalogFilter.js | 4 +-- .../functional/catalog/_CatalogWithReport.js | 6 ++--- .../functional/catalogDetails/Activity.js | 4 +-- .../functional/catalogDetails/Document.js | 4 +-- .../functional/catalogDetails/Organisation.js | 2 +- .../functional/catalogDetails/Platform.js | 2 +- .../functional/catalogDetails/Program.js | 2 +- .../functional/catalogDetails/Project.js | 2 +- .../functional/catalogDetails/ServiceOGC.js | 2 +- .../functional/catalogDetails/Species.js | 4 +-- .../{tests => test}/functional/common/Home.js | 6 ++--- .../functional/common/Login.js | 6 ++--- .../functional/common/Profile.js | 6 ++--- .../functional/common/Sidebar.js | 6 ++--- .../functional/common/Topbar.js | 6 ++--- .../functional/dataLoader/Area.js | 4 +-- .../functional/dataLoader/Citation.js | 10 ++++---- .../functional/dataLoader/DataLoader.js | 2 +- .../functional/dataLoader/Infrastructure.js | 2 +- .../functional/dataLoader/ObjectCollection.js | 4 +-- .../functional/dataLoader/SurveyStation.js | 4 +-- .../functional/dataLoader/Tracking.js | 4 +-- .../functional/maintenance/ServiceOGC.js | 4 +-- .../functional/maintenance/domains/_Domain.js | 6 ++--- .../maintenance/domains/_DomainBase.js | 2 +- .../maintenance/domains/_DomainFacets.js | 4 +-- .../maintenance/domains/_DomainFormEdition.js | 4 +-- .../domains/_DomainHierarchical.js | 4 +-- .../domains/_DomainWizardEdition.js | 6 ++--- .../domains/admin/Accessibility.js | 0 .../domains/admin/ActivityFields.js | 0 .../domains/admin/ActivityTypes.js | 0 .../maintenance/domains/admin/ContactRoles.js | 0 .../maintenance/domains/admin/Countries.js | 0 .../maintenance/domains/admin/DeviceTypes.js | 0 .../domains/admin/DocumentTypes.js | 0 .../domains/admin/OrganisationRoles.js | 0 .../domains/admin/OrganisationTypes.js | 0 .../domains/admin/PlatformTypes.js | 0 .../domains/admin/ProjectGroups.js | 0 .../maintenance/domains/admin/Scopes.js | 0 .../maintenance/domains/geometry/AreaTypes.js | 0 .../maintenance/domains/geometry/Destiny.js | 0 .../maintenance/domains/geometry/Ending.js | 0 .../domains/geometry/InspireThemes.js | 0 .../maintenance/domains/geometry/LineTypes.js | 0 .../maintenance/domains/geometry/MeshTypes.js | 0 .../domains/geometry/RasterTypes.js | 0 .../domains/geometry/RecordingTypes.js | 0 .../domains/geometry/ShorelineTypes.js | 0 .../domains/geometry/ThematicTypes.js | 0 .../domains/geometry/ToponymTypes.js | 0 .../domains/observations/AttributeTypes.js | 0 .../domains/observations/CensusingStatus.js | 0 .../domains/observations/Confidence.js | 0 .../observations/InfrastructureType.js | 0 .../domains/observations/MetricGroups.js | 0 .../observations/MetricsDefinitions.js | 0 .../domains/observations/ObjectTypes.js | 0 .../domains/observations/ParameterTypes.js | 0 .../domains/observations/Parameters.js | 0 .../domains/observations/SampleTypes.js | 0 .../domains/observations/SeaConditions.js | 0 .../domains/observations/UnitTypes.js | 0 .../maintenance/domains/observations/Units.js | 0 .../domains/taxon/CanaryProtection.js | 0 .../maintenance/domains/taxon/EUProtection.js | 0 .../maintenance/domains/taxon/Ecology.js | 0 .../maintenance/domains/taxon/Endemicity.js | 0 .../maintenance/domains/taxon/Interest.js | 0 .../maintenance/domains/taxon/LifeStages.js | 0 .../maintenance/domains/taxon/Origin.js | 0 .../maintenance/domains/taxon/Permanence.js | 0 .../maintenance/domains/taxon/Rank.js | 0 .../maintenance/domains/taxon/Sex.js | 0 .../domains/taxon/SpainProtection.js | 0 .../maintenance/domains/taxon/Status.js | 0 .../domains/taxon/TrophicRegime.js | 0 .../modules/components/Keypad/testKeypad.js | 4 +-- .../components/Keypad/testKeypadScript.js | 0 .../input/MapSearchImpl/testMapSearchImpl.js | 4 +-- .../MapSearchImpl/testMapSearchImplScript.js | 0 .../UploadFileImpl/testUploadFileImpl.js | 4 +-- .../testUploadFileImplScript.js | 0 .../modules/form/testFormWithKeypad.js | 4 +-- .../modules/form/testFormWithKeypadScript.js | 2 +- .../modules/search/testFacetsImpl.js | 4 +-- .../modules/search/testFacetsImplScript.js | 0 .../functional/products/Atlas.js | 8 +++--- .../functional/products/ServiceOGC.js | 2 +- .../functional/viewers/Bibliography.js | 2 +- .../functional/viewers/SpeciesDistribution.js | 6 ++--- .../intern-functional-local.js | 0 .../intern-functional-remote.js | 0 .../{tests => test}/intern-unit-local.js | 0 .../{tests => test}/intern-unit-remote.js | 0 client-app/{tests => test}/sockTest/app.js | 0 client-app/{tests => test}/sockTest/stomp.js | 0 .../sockTest/websocket.mock.js | 0 client-app/{tests => test}/support/Config.js | 0 .../{tests => test}/support/CustomReporter.js | 0 client-app/{tests => test}/support/Utils.js | 2 +- .../{tests => test}/support/pages/Filter.js | 4 +-- .../{tests => test}/support/pages/List.js | 4 +-- .../support/pages/ListHierarchical.js | 4 +-- .../support/pages/ListWithTextSearch.js | 4 +-- .../pages/ListWithTextSearchAndFacets.js | 2 +- .../support/pages/ListWithTreeFilter.js | 4 +-- .../{tests => test}/support/pages/Login.js | 4 +-- .../{tests => test}/support/pages/Map.js | 4 +-- .../{tests => test}/support/pages/Wizard.js | 24 +++++++++--------- .../{tests => test}/support/pages/_Page.js | 0 .../support/pages/steps/DoubleList.js | 4 +-- .../support/pages/steps/DoubleListFiltered.js | 6 ++--- .../support/pages/steps/Form.js | 8 +++--- .../support/pages/steps/FormList.js | 4 +-- .../support/pages/steps/LayerImage.js | 6 ++--- .../support/pages/steps/LineGeometry.js | 4 +-- .../support/pages/steps/List.js | 4 +-- .../support/pages/steps/PointGeometry.js | 6 ++--- .../support/pages/steps/RelationData.js | 8 +++--- .../support/pages/steps/ReorderLayerList.js | 2 +- .../{tests => test}/support/pages/test.html | 0 .../support/resources/DomainModel.js | 0 .../{tests => test}/support/resources/doc.pdf | Bin .../support/resources/fileForLoadData/ar.zip | Bin .../resources/fileForLoadData/document.csv | 0 .../support/resources/fileForLoadData/ft.csv | 0 .../support/resources/fileForLoadData/oc.csv | 0 .../support/resources/fileForLoadData/pt.csv | 0 .../support/resources/profile.png | Bin .../{tests => test}/support/tests/Atlas.js | 16 ++++++------ .../support/tests/AtlasWithClickMap.js | 16 ++++++------ .../support/tests/CatalogFacets.js | 4 +-- .../support/tests/CatalogFacetsTotal.js | 4 +-- .../support/tests/CatalogGuestReport.js | 6 ++--- .../support/tests/CatalogLinks.js | 4 +-- .../support/tests/CatalogUserReport.js | 6 ++--- .../support/tests/CatalogWizardEdition.js | 4 +-- .../{tests => test}/support/tests/Citation.js | 8 +++--- .../support/tests/Dashboard.js | 2 +- .../support/tests/DetailsBase.js | 2 +- .../support/tests/DetailsEditionLink.js | 4 +-- .../support/tests/DetailsInfo.js | 4 +-- .../support/tests/DetailsPDF.js | 6 ++--- .../support/tests/DetailsTabs.js | 4 +-- .../{tests => test}/support/tests/Filter.js | 2 +- .../support/tests/FormAddition.js | 8 +++--- .../support/tests/FormEdition.js | 8 +++--- .../support/tests/ListFilterByTree.js | 4 +-- .../support/tests/ListHierarchical.js | 2 +- .../tests/ListHierarchicalWithSelection.js | 6 ++--- .../support/tests/ListSelection.js | 4 +-- .../support/tests/ListWithOrder.js | 4 +-- .../support/tests/ListWithTextSearch.js | 4 +-- .../{tests => test}/support/tests/Map.js | 6 ++--- .../support/tests/SpeciesDistribution.js | 20 +++++++-------- .../support/tests/WizardAddition.js | 6 ++--- .../support/tests/WizardEdition.js | 6 ++--- .../support/tests/WizardWorms.js | 6 ++--- .../support/tests/_BaseCommons.js | 4 +-- .../support/tests/_CatalogBase.js | 14 +++++----- .../{tests => test}/support/tests/_Commons.js | 6 ++--- .../support/tests/_DataLoader.js | 18 ++++++------- .../unit/app/base/models/_ModelTestCommons.js | 0 .../app/base/models/attr/testArrayAttr.js | 0 .../unit/app/base/models/attr/testAttr.js | 0 .../unit/app/base/models/attr/testObjAttr.js | 0 .../app/base/models/attr/testRelationAttr.js | 0 .../unit/app/base/models/test_Model.js | 0 .../base/views/extensions/test_EditionView.js | 0 .../unit/app/viewers/views/test_ChartsView.js | 0 .../test_TimeSeriesSelectionManagement.js | 0 .../unit/redmic/base/testCredentials.js | 0 .../unit/redmic/base/testMediator.js | 0 .../redmic/base/testRedmicLocalStorage.js | 0 .../unit/redmic/form/testUploadInput.js | 0 .../unit/redmic/modules/base/testManager.js | 0 .../redmic/modules/base/testNotification.js | 0 .../redmic/modules/base/testSelectionBox.js | 0 .../unit/redmic/modules/base/test_Module.js | 0 .../redmic/modules/browser/bars/testOrder.js | 0 .../modules/browser/bars/testPagination.js | 0 .../modules/browser/bars/testSelectionBox.js | 0 .../redmic/modules/browser/bars/testTotal.js | 0 .../modules/browser/buttons/testButtons.js | 0 .../redmic/modules/browser/row/testRow.js | 0 .../modules/browser/testHierarchicalImpl.js | 0 .../redmic/modules/browser/testListImpl.js | 0 .../testInfoChartsContainerImpl.js | 0 .../chart/Toolbar/testSliderSelectorImpl.js | 0 .../layer/ChartLayer/testLinearChartImpl.js | 0 .../modules/form/inputs/testCheckBoxImpl.js | 2 +- .../form/inputs/testDateTextBoxImpl.js | 2 +- .../form/inputs/testFilteringInputImpl.js | 2 +- .../form/inputs/testNumberSpinnerImpl.js | 2 +- .../form/inputs/testNumberTextBoxImpl.js | 2 +- .../modules/form/inputs/testTextAreaImpl.js | 2 +- .../modules/form/inputs/testTextBoxImpl.js | 2 +- .../unit/redmic/modules/form/testForm.js | 0 .../redmic/modules/gateway/testGateway.js | 0 .../modules/layout/details/testDetails.js | 0 .../modules/layout/wizard/testWizard.js | 0 .../redmic/modules/map/testLeafletImpl.js | 0 .../redmic/modules/model/testModelImpl.js | 0 .../notification/test_Communication.js | 0 .../modules/notification/test_Notification.js | 0 .../redmic/modules/search/testFacetsImpl.js | 0 .../unit/redmic/modules/search/testSearch.js | 0 .../redmic/modules/selection/testSelector.js | 0 .../unit/redmic/modules/socket/testSocket.js | 0 .../redmic/modules/store/testRestManager.js | 0 .../unit/redmic/modules/tree/testTree.js | 0 .../unit/redmic/modules/wizard/testWizard.js | 0 276 files changed, 295 insertions(+), 295 deletions(-) rename client-app/{tests => test}/IpGetter.js (100%) rename client-app/{tests => test}/_dojoConfig.js (95%) rename client-app/{tests => test}/_environments.js (100%) rename client-app/{tests => test}/_functions.js (100%) rename client-app/{tests => test}/_intern-functional.js (100%) rename client-app/{tests => test}/_intern-unit.js (100%) rename client-app/{tests => test}/_intern.js (100%) rename client-app/{tests => test}/_remote.js (100%) rename client-app/{tests => test}/apitest/app.js (100%) rename client-app/{tests => test}/apitest/data/inputs/contacts.json (100%) rename client-app/{tests => test}/apitest/data/inputs/organisations.json (100%) rename client-app/{tests => test}/apitest/data/inputs/programs.json (100%) rename client-app/{tests => test}/apitest/data/inputs/projects.json (100%) rename client-app/{tests => test}/apitest/data/inputs/scopes.json (100%) rename client-app/{tests => test}/apitest/package.json (100%) rename client-app/{tests => test}/functional/administrative/Activity.js (100%) rename client-app/{tests => test}/functional/administrative/Animal.js (100%) rename client-app/{tests => test}/functional/administrative/Contact.js (100%) rename client-app/{tests => test}/functional/administrative/Device.js (100%) rename client-app/{tests => test}/functional/administrative/Document.js (94%) rename client-app/{tests => test}/functional/administrative/Organisation.js (100%) rename client-app/{tests => test}/functional/administrative/Platform.js (100%) rename client-app/{tests => test}/functional/administrative/Program.js (100%) rename client-app/{tests => test}/functional/administrative/Project.js (100%) rename client-app/{tests => test}/functional/administrative/_Administrative.js (91%) rename client-app/{tests => test}/functional/administrative/_AdministrativeFacets.js (89%) rename client-app/{tests => test}/functional/administrative/_AdministrativeFilter.js (85%) rename client-app/{tests => test}/functional/administrative/_AdministrativeLinks.js (86%) rename client-app/{tests => test}/functional/administrative/taxonomy/Class.js (100%) rename client-app/{tests => test}/functional/administrative/taxonomy/Family.js (100%) rename client-app/{tests => test}/functional/administrative/taxonomy/Genus.js (100%) rename client-app/{tests => test}/functional/administrative/taxonomy/Kingdom.js (100%) rename client-app/{tests => test}/functional/administrative/taxonomy/Misidentification.js (93%) rename client-app/{tests => test}/functional/administrative/taxonomy/Order.js (100%) rename client-app/{tests => test}/functional/administrative/taxonomy/Phylum.js (100%) rename client-app/{tests => test}/functional/administrative/taxonomy/Species.js (92%) rename client-app/{tests => test}/functional/administrative/taxonomy/Subphylum.js (100%) rename client-app/{tests => test}/functional/administrative/taxonomy/_Taxonomy.js (92%) rename client-app/{tests => test}/functional/administrativeDetails/Activity.js (100%) rename client-app/{tests => test}/functional/administrativeDetails/Contact.js (100%) rename client-app/{tests => test}/functional/administrativeDetails/Document.js (100%) rename client-app/{tests => test}/functional/administrativeDetails/Organisation.js (100%) rename client-app/{tests => test}/functional/administrativeDetails/Platform.js (100%) rename client-app/{tests => test}/functional/administrativeDetails/Program.js (100%) rename client-app/{tests => test}/functional/administrativeDetails/Project.js (100%) rename client-app/{tests => test}/functional/administrativeDetails/ServiceOGC.js (100%) rename client-app/{tests => test}/functional/administrativeDetails/Species.js (100%) rename client-app/{tests => test}/functional/administrativeDetails/Statistics.js (100%) rename client-app/{tests => test}/functional/administrativeDetails/_DetailsBase.js (89%) rename client-app/{tests => test}/functional/administrativeDetails/_DetailsInfo.js (90%) rename client-app/{tests => test}/functional/administrativeDetails/_DetailsMap.js (94%) rename client-app/{tests => test}/functional/administrativeDetails/_DetailsPDF.js (93%) rename client-app/{tests => test}/functional/catalog/Activity.js (100%) rename client-app/{tests => test}/functional/catalog/Organisation.js (100%) rename client-app/{tests => test}/functional/catalog/Platform.js (100%) rename client-app/{tests => test}/functional/catalog/Program.js (100%) rename client-app/{tests => test}/functional/catalog/Project.js (100%) rename client-app/{tests => test}/functional/catalog/Species.js (86%) rename client-app/{tests => test}/functional/catalog/_Catalog.js (94%) rename client-app/{tests => test}/functional/catalog/_CatalogFilter.js (83%) rename client-app/{tests => test}/functional/catalog/_CatalogWithReport.js (88%) rename client-app/{tests => test}/functional/catalogDetails/Activity.js (85%) rename client-app/{tests => test}/functional/catalogDetails/Document.js (75%) rename client-app/{tests => test}/functional/catalogDetails/Organisation.js (73%) rename client-app/{tests => test}/functional/catalogDetails/Platform.js (72%) rename client-app/{tests => test}/functional/catalogDetails/Program.js (74%) rename client-app/{tests => test}/functional/catalogDetails/Project.js (74%) rename client-app/{tests => test}/functional/catalogDetails/ServiceOGC.js (74%) rename client-app/{tests => test}/functional/catalogDetails/Species.js (73%) rename client-app/{tests => test}/functional/common/Home.js (96%) rename client-app/{tests => test}/functional/common/Login.js (97%) rename client-app/{tests => test}/functional/common/Profile.js (99%) rename client-app/{tests => test}/functional/common/Sidebar.js (97%) rename client-app/{tests => test}/functional/common/Topbar.js (96%) rename client-app/{tests => test}/functional/dataLoader/Area.js (93%) rename client-app/{tests => test}/functional/dataLoader/Citation.js (80%) rename client-app/{tests => test}/functional/dataLoader/DataLoader.js (96%) rename client-app/{tests => test}/functional/dataLoader/Infrastructure.js (94%) rename client-app/{tests => test}/functional/dataLoader/ObjectCollection.js (95%) rename client-app/{tests => test}/functional/dataLoader/SurveyStation.js (94%) rename client-app/{tests => test}/functional/dataLoader/Tracking.js (94%) rename client-app/{tests => test}/functional/maintenance/ServiceOGC.js (93%) rename client-app/{tests => test}/functional/maintenance/domains/_Domain.js (92%) rename client-app/{tests => test}/functional/maintenance/domains/_DomainBase.js (89%) rename client-app/{tests => test}/functional/maintenance/domains/_DomainFacets.js (89%) rename client-app/{tests => test}/functional/maintenance/domains/_DomainFormEdition.js (90%) rename client-app/{tests => test}/functional/maintenance/domains/_DomainHierarchical.js (92%) rename client-app/{tests => test}/functional/maintenance/domains/_DomainWizardEdition.js (90%) rename client-app/{tests => test}/functional/maintenance/domains/admin/Accessibility.js (100%) rename client-app/{tests => test}/functional/maintenance/domains/admin/ActivityFields.js (100%) rename client-app/{tests => test}/functional/maintenance/domains/admin/ActivityTypes.js (100%) rename client-app/{tests => test}/functional/maintenance/domains/admin/ContactRoles.js (100%) rename client-app/{tests => test}/functional/maintenance/domains/admin/Countries.js (100%) rename client-app/{tests => test}/functional/maintenance/domains/admin/DeviceTypes.js (100%) rename client-app/{tests => test}/functional/maintenance/domains/admin/DocumentTypes.js (100%) rename client-app/{tests => test}/functional/maintenance/domains/admin/OrganisationRoles.js (100%) rename client-app/{tests => test}/functional/maintenance/domains/admin/OrganisationTypes.js (100%) rename client-app/{tests => test}/functional/maintenance/domains/admin/PlatformTypes.js (100%) rename client-app/{tests => test}/functional/maintenance/domains/admin/ProjectGroups.js (100%) rename client-app/{tests => test}/functional/maintenance/domains/admin/Scopes.js (100%) rename client-app/{tests => test}/functional/maintenance/domains/geometry/AreaTypes.js (100%) rename client-app/{tests => test}/functional/maintenance/domains/geometry/Destiny.js (100%) rename client-app/{tests => test}/functional/maintenance/domains/geometry/Ending.js (100%) rename client-app/{tests => test}/functional/maintenance/domains/geometry/InspireThemes.js (100%) rename client-app/{tests => test}/functional/maintenance/domains/geometry/LineTypes.js (100%) rename client-app/{tests => test}/functional/maintenance/domains/geometry/MeshTypes.js (100%) rename client-app/{tests => test}/functional/maintenance/domains/geometry/RasterTypes.js (100%) rename client-app/{tests => test}/functional/maintenance/domains/geometry/RecordingTypes.js (100%) rename client-app/{tests => test}/functional/maintenance/domains/geometry/ShorelineTypes.js (100%) rename client-app/{tests => test}/functional/maintenance/domains/geometry/ThematicTypes.js (100%) rename client-app/{tests => test}/functional/maintenance/domains/geometry/ToponymTypes.js (100%) rename client-app/{tests => test}/functional/maintenance/domains/observations/AttributeTypes.js (100%) rename client-app/{tests => test}/functional/maintenance/domains/observations/CensusingStatus.js (100%) rename client-app/{tests => test}/functional/maintenance/domains/observations/Confidence.js (100%) rename client-app/{tests => test}/functional/maintenance/domains/observations/InfrastructureType.js (100%) rename client-app/{tests => test}/functional/maintenance/domains/observations/MetricGroups.js (100%) rename client-app/{tests => test}/functional/maintenance/domains/observations/MetricsDefinitions.js (100%) rename client-app/{tests => test}/functional/maintenance/domains/observations/ObjectTypes.js (100%) rename client-app/{tests => test}/functional/maintenance/domains/observations/ParameterTypes.js (100%) rename client-app/{tests => test}/functional/maintenance/domains/observations/Parameters.js (100%) rename client-app/{tests => test}/functional/maintenance/domains/observations/SampleTypes.js (100%) rename client-app/{tests => test}/functional/maintenance/domains/observations/SeaConditions.js (100%) rename client-app/{tests => test}/functional/maintenance/domains/observations/UnitTypes.js (100%) rename client-app/{tests => test}/functional/maintenance/domains/observations/Units.js (100%) rename client-app/{tests => test}/functional/maintenance/domains/taxon/CanaryProtection.js (100%) rename client-app/{tests => test}/functional/maintenance/domains/taxon/EUProtection.js (100%) rename client-app/{tests => test}/functional/maintenance/domains/taxon/Ecology.js (100%) rename client-app/{tests => test}/functional/maintenance/domains/taxon/Endemicity.js (100%) rename client-app/{tests => test}/functional/maintenance/domains/taxon/Interest.js (100%) rename client-app/{tests => test}/functional/maintenance/domains/taxon/LifeStages.js (100%) rename client-app/{tests => test}/functional/maintenance/domains/taxon/Origin.js (100%) rename client-app/{tests => test}/functional/maintenance/domains/taxon/Permanence.js (100%) rename client-app/{tests => test}/functional/maintenance/domains/taxon/Rank.js (100%) rename client-app/{tests => test}/functional/maintenance/domains/taxon/Sex.js (100%) rename client-app/{tests => test}/functional/maintenance/domains/taxon/SpainProtection.js (100%) rename client-app/{tests => test}/functional/maintenance/domains/taxon/Status.js (100%) rename client-app/{tests => test}/functional/maintenance/domains/taxon/TrophicRegime.js (100%) rename client-app/{tests => test}/functional/modules/components/Keypad/testKeypad.js (97%) rename client-app/{tests => test}/functional/modules/components/Keypad/testKeypadScript.js (100%) rename client-app/{tests => test}/functional/modules/form/input/MapSearchImpl/testMapSearchImpl.js (96%) rename client-app/{tests => test}/functional/modules/form/input/MapSearchImpl/testMapSearchImplScript.js (100%) rename client-app/{tests => test}/functional/modules/form/input/UploadFileImpl/testUploadFileImpl.js (99%) rename client-app/{tests => test}/functional/modules/form/input/UploadFileImpl/testUploadFileImplScript.js (100%) rename client-app/{tests => test}/functional/modules/form/testFormWithKeypad.js (97%) rename client-app/{tests => test}/functional/modules/form/testFormWithKeypadScript.js (93%) rename client-app/{tests => test}/functional/modules/search/testFacetsImpl.js (99%) rename client-app/{tests => test}/functional/modules/search/testFacetsImplScript.js (100%) rename client-app/{tests => test}/functional/products/Atlas.js (85%) rename client-app/{tests => test}/functional/products/ServiceOGC.js (93%) rename client-app/{tests => test}/functional/viewers/Bibliography.js (84%) rename client-app/{tests => test}/functional/viewers/SpeciesDistribution.js (84%) rename client-app/{tests => test}/intern-functional-local.js (100%) rename client-app/{tests => test}/intern-functional-remote.js (100%) rename client-app/{tests => test}/intern-unit-local.js (100%) rename client-app/{tests => test}/intern-unit-remote.js (100%) rename client-app/{tests => test}/sockTest/app.js (100%) rename client-app/{tests => test}/sockTest/stomp.js (100%) rename client-app/{tests => test}/sockTest/websocket.mock.js (100%) rename client-app/{tests => test}/support/Config.js (100%) rename client-app/{tests => test}/support/CustomReporter.js (100%) rename client-app/{tests => test}/support/Utils.js (99%) rename client-app/{tests => test}/support/pages/Filter.js (98%) rename client-app/{tests => test}/support/pages/List.js (99%) rename client-app/{tests => test}/support/pages/ListHierarchical.js (98%) rename client-app/{tests => test}/support/pages/ListWithTextSearch.js (97%) rename client-app/{tests => test}/support/pages/ListWithTextSearchAndFacets.js (98%) rename client-app/{tests => test}/support/pages/ListWithTreeFilter.js (96%) rename client-app/{tests => test}/support/pages/Login.js (97%) rename client-app/{tests => test}/support/pages/Map.js (99%) rename client-app/{tests => test}/support/pages/Wizard.js (89%) rename client-app/{tests => test}/support/pages/_Page.js (100%) rename client-app/{tests => test}/support/pages/steps/DoubleList.js (87%) rename client-app/{tests => test}/support/pages/steps/DoubleListFiltered.js (92%) rename client-app/{tests => test}/support/pages/steps/Form.js (98%) rename client-app/{tests => test}/support/pages/steps/FormList.js (93%) rename client-app/{tests => test}/support/pages/steps/LayerImage.js (90%) rename client-app/{tests => test}/support/pages/steps/LineGeometry.js (90%) rename client-app/{tests => test}/support/pages/steps/List.js (91%) rename client-app/{tests => test}/support/pages/steps/PointGeometry.js (85%) rename client-app/{tests => test}/support/pages/steps/RelationData.js (96%) rename client-app/{tests => test}/support/pages/steps/ReorderLayerList.js (87%) rename client-app/{tests => test}/support/pages/test.html (100%) rename client-app/{tests => test}/support/resources/DomainModel.js (100%) rename client-app/{tests => test}/support/resources/doc.pdf (100%) rename client-app/{tests => test}/support/resources/fileForLoadData/ar.zip (100%) rename client-app/{tests => test}/support/resources/fileForLoadData/document.csv (100%) rename client-app/{tests => test}/support/resources/fileForLoadData/ft.csv (100%) rename client-app/{tests => test}/support/resources/fileForLoadData/oc.csv (100%) rename client-app/{tests => test}/support/resources/fileForLoadData/pt.csv (100%) rename client-app/{tests => test}/support/resources/profile.png (100%) rename client-app/{tests => test}/support/tests/Atlas.js (95%) rename client-app/{tests => test}/support/tests/AtlasWithClickMap.js (92%) rename client-app/{tests => test}/support/tests/CatalogFacets.js (93%) rename client-app/{tests => test}/support/tests/CatalogFacetsTotal.js (93%) rename client-app/{tests => test}/support/tests/CatalogGuestReport.js (95%) rename client-app/{tests => test}/support/tests/CatalogLinks.js (92%) rename client-app/{tests => test}/support/tests/CatalogUserReport.js (98%) rename client-app/{tests => test}/support/tests/CatalogWizardEdition.js (93%) rename client-app/{tests => test}/support/tests/Citation.js (95%) rename client-app/{tests => test}/support/tests/Dashboard.js (93%) rename client-app/{tests => test}/support/tests/DetailsBase.js (92%) rename client-app/{tests => test}/support/tests/DetailsEditionLink.js (92%) rename client-app/{tests => test}/support/tests/DetailsInfo.js (96%) rename client-app/{tests => test}/support/tests/DetailsPDF.js (93%) rename client-app/{tests => test}/support/tests/DetailsTabs.js (91%) rename client-app/{tests => test}/support/tests/Filter.js (99%) rename client-app/{tests => test}/support/tests/FormAddition.js (96%) rename client-app/{tests => test}/support/tests/FormEdition.js (96%) rename client-app/{tests => test}/support/tests/ListFilterByTree.js (97%) rename client-app/{tests => test}/support/tests/ListHierarchical.js (96%) rename client-app/{tests => test}/support/tests/ListHierarchicalWithSelection.js (95%) rename client-app/{tests => test}/support/tests/ListSelection.js (97%) rename client-app/{tests => test}/support/tests/ListWithOrder.js (97%) rename client-app/{tests => test}/support/tests/ListWithTextSearch.js (98%) rename client-app/{tests => test}/support/tests/Map.js (98%) rename client-app/{tests => test}/support/tests/SpeciesDistribution.js (94%) rename client-app/{tests => test}/support/tests/WizardAddition.js (97%) rename client-app/{tests => test}/support/tests/WizardEdition.js (98%) rename client-app/{tests => test}/support/tests/WizardWorms.js (95%) rename client-app/{tests => test}/support/tests/_BaseCommons.js (96%) rename client-app/{tests => test}/support/tests/_CatalogBase.js (85%) rename client-app/{tests => test}/support/tests/_Commons.js (97%) rename client-app/{tests => test}/support/tests/_DataLoader.js (89%) rename client-app/{tests => test}/unit/app/base/models/_ModelTestCommons.js (100%) rename client-app/{tests => test}/unit/app/base/models/attr/testArrayAttr.js (100%) rename client-app/{tests => test}/unit/app/base/models/attr/testAttr.js (100%) rename client-app/{tests => test}/unit/app/base/models/attr/testObjAttr.js (100%) rename client-app/{tests => test}/unit/app/base/models/attr/testRelationAttr.js (100%) rename client-app/{tests => test}/unit/app/base/models/test_Model.js (100%) rename client-app/{tests => test}/unit/app/base/views/extensions/test_EditionView.js (100%) rename client-app/{tests => test}/unit/app/viewers/views/test_ChartsView.js (100%) rename client-app/{tests => test}/unit/app/viewers/views/test_TimeSeriesSelectionManagement.js (100%) rename client-app/{tests => test}/unit/redmic/base/testCredentials.js (100%) rename client-app/{tests => test}/unit/redmic/base/testMediator.js (100%) rename client-app/{tests => test}/unit/redmic/base/testRedmicLocalStorage.js (100%) rename client-app/{tests => test}/unit/redmic/form/testUploadInput.js (100%) rename client-app/{tests => test}/unit/redmic/modules/base/testManager.js (100%) rename client-app/{tests => test}/unit/redmic/modules/base/testNotification.js (100%) rename client-app/{tests => test}/unit/redmic/modules/base/testSelectionBox.js (100%) rename client-app/{tests => test}/unit/redmic/modules/base/test_Module.js (100%) rename client-app/{tests => test}/unit/redmic/modules/browser/bars/testOrder.js (100%) rename client-app/{tests => test}/unit/redmic/modules/browser/bars/testPagination.js (100%) rename client-app/{tests => test}/unit/redmic/modules/browser/bars/testSelectionBox.js (100%) rename client-app/{tests => test}/unit/redmic/modules/browser/bars/testTotal.js (100%) rename client-app/{tests => test}/unit/redmic/modules/browser/buttons/testButtons.js (100%) rename client-app/{tests => test}/unit/redmic/modules/browser/row/testRow.js (100%) rename client-app/{tests => test}/unit/redmic/modules/browser/testHierarchicalImpl.js (100%) rename client-app/{tests => test}/unit/redmic/modules/browser/testListImpl.js (100%) rename client-app/{tests => test}/unit/redmic/modules/chart/ChartsContainer/testInfoChartsContainerImpl.js (100%) rename client-app/{tests => test}/unit/redmic/modules/chart/Toolbar/testSliderSelectorImpl.js (100%) rename client-app/{tests => test}/unit/redmic/modules/chart/layer/ChartLayer/testLinearChartImpl.js (100%) rename client-app/{tests => test}/unit/redmic/modules/form/inputs/testCheckBoxImpl.js (98%) rename client-app/{tests => test}/unit/redmic/modules/form/inputs/testDateTextBoxImpl.js (98%) rename client-app/{tests => test}/unit/redmic/modules/form/inputs/testFilteringInputImpl.js (98%) rename client-app/{tests => test}/unit/redmic/modules/form/inputs/testNumberSpinnerImpl.js (98%) rename client-app/{tests => test}/unit/redmic/modules/form/inputs/testNumberTextBoxImpl.js (98%) rename client-app/{tests => test}/unit/redmic/modules/form/inputs/testTextAreaImpl.js (98%) rename client-app/{tests => test}/unit/redmic/modules/form/inputs/testTextBoxImpl.js (99%) rename client-app/{tests => test}/unit/redmic/modules/form/testForm.js (100%) rename client-app/{tests => test}/unit/redmic/modules/gateway/testGateway.js (100%) rename client-app/{tests => test}/unit/redmic/modules/layout/details/testDetails.js (100%) rename client-app/{tests => test}/unit/redmic/modules/layout/wizard/testWizard.js (100%) rename client-app/{tests => test}/unit/redmic/modules/map/testLeafletImpl.js (100%) rename client-app/{tests => test}/unit/redmic/modules/model/testModelImpl.js (100%) rename client-app/{tests => test}/unit/redmic/modules/notification/test_Communication.js (100%) rename client-app/{tests => test}/unit/redmic/modules/notification/test_Notification.js (100%) rename client-app/{tests => test}/unit/redmic/modules/search/testFacetsImpl.js (100%) rename client-app/{tests => test}/unit/redmic/modules/search/testSearch.js (100%) rename client-app/{tests => test}/unit/redmic/modules/selection/testSelector.js (100%) rename client-app/{tests => test}/unit/redmic/modules/socket/testSocket.js (100%) rename client-app/{tests => test}/unit/redmic/modules/store/testRestManager.js (100%) rename client-app/{tests => test}/unit/redmic/modules/tree/testTree.js (100%) rename client-app/{tests => test}/unit/redmic/modules/wizard/testWizard.js (100%) diff --git a/.gitlab-ci/test.yml b/.gitlab-ci/test.yml index c01ab987..1045dada 100644 --- a/.gitlab-ci/test.yml +++ b/.gitlab-ci/test.yml @@ -90,7 +90,7 @@ run-local-modules-functional-tests: - npm start & - > grunt test-functional-local - --functionalSuites=tests/functional/modules/**/!\(*Script\).js + --functionalSuites=test/functional/modules/**/!\(*Script\).js --headless --browser=${TEST_BROWSER} --seleniumVersion=${LOCAL_SELENIUM_VERSION} @@ -106,7 +106,7 @@ run-local-modules-functional-tests: - npm start & - > grunt test-functional-remote - --functionalSuites=tests/functional/modules/**/!\(*Script\).js + --functionalSuites=test/functional/modules/**/!\(*Script\).js --headless --browser=${TEST_BROWSER} --ownServerHost="${TEST_OWN_SERVER_HOST}" diff --git a/Gruntfile.js b/Gruntfile.js index 3da4f2be..bf55ac39 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -14,7 +14,7 @@ module.exports = function(grunt) { rootPath: __dirname, srcPath: 'client-app/src', depsPath: 'client-app/deps', - testPath: 'client-app/tests', + testPath: 'client-app/test', distPath: 'dist', destDir: 'javascript' }, diff --git a/README.md b/README.md index 1aa18841..eea86a45 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,7 @@ Como ejemplo de ejecución de tests locales (unitarios y funcionales), veamos lo ```sh grunt test-unit-local \ - --suites=tests/unit/src/component/model/testModelImpl \ + --suites=test/unit/src/component/model/testModelImpl \ --browser=chrome \ --headless \ --coverage=false @@ -75,7 +75,7 @@ grunt test-unit-local \ ```sh grunt test-functional-local \ - --functionalSuites=tests/functional/modules/**/!(*Script).js \ + --functionalSuites=test/functional/modules/**/!(*Script).js \ --browser=chrome ``` @@ -137,7 +137,7 @@ Como ejemplo de ejecución de tests remotos (unitarios y funcionales), pero apun ```sh grunt test-unit-remote \ - --suites=tests/unit/src/component/model/testModelImpl \ + --suites=test/unit/src/component/model/testModelImpl \ --browser=firefox \ --headless \ --coverage=false @@ -147,7 +147,7 @@ grunt test-unit-remote \ ```sh grunt test-functional-remote \ - --functionalSuites=tests/functional/modules/**/!(*Script).js \ + --functionalSuites=test/functional/modules/**/!(*Script).js \ --browser=chrome \ --headless ``` diff --git a/client-app/tests/IpGetter.js b/client-app/test/IpGetter.js similarity index 100% rename from client-app/tests/IpGetter.js rename to client-app/test/IpGetter.js diff --git a/client-app/tests/_dojoConfig.js b/client-app/test/_dojoConfig.js similarity index 95% rename from client-app/tests/_dojoConfig.js rename to client-app/test/_dojoConfig.js index 7ef3bbb0..6b29f12e 100644 --- a/client-app/tests/_dojoConfig.js +++ b/client-app/test/_dojoConfig.js @@ -24,8 +24,8 @@ module.exports = function(args) { dojoConfig.baseUrl = dojoBaseUrl; dojoConfig.packages.push({ - name: 'tests', - location: '../../../tests' + name: 'test', + location: '../../../test' }); return dojoConfig; diff --git a/client-app/tests/_environments.js b/client-app/test/_environments.js similarity index 100% rename from client-app/tests/_environments.js rename to client-app/test/_environments.js diff --git a/client-app/tests/_functions.js b/client-app/test/_functions.js similarity index 100% rename from client-app/tests/_functions.js rename to client-app/test/_functions.js diff --git a/client-app/tests/_intern-functional.js b/client-app/test/_intern-functional.js similarity index 100% rename from client-app/tests/_intern-functional.js rename to client-app/test/_intern-functional.js diff --git a/client-app/tests/_intern-unit.js b/client-app/test/_intern-unit.js similarity index 100% rename from client-app/tests/_intern-unit.js rename to client-app/test/_intern-unit.js diff --git a/client-app/tests/_intern.js b/client-app/test/_intern.js similarity index 100% rename from client-app/tests/_intern.js rename to client-app/test/_intern.js diff --git a/client-app/tests/_remote.js b/client-app/test/_remote.js similarity index 100% rename from client-app/tests/_remote.js rename to client-app/test/_remote.js diff --git a/client-app/tests/apitest/app.js b/client-app/test/apitest/app.js similarity index 100% rename from client-app/tests/apitest/app.js rename to client-app/test/apitest/app.js diff --git a/client-app/tests/apitest/data/inputs/contacts.json b/client-app/test/apitest/data/inputs/contacts.json similarity index 100% rename from client-app/tests/apitest/data/inputs/contacts.json rename to client-app/test/apitest/data/inputs/contacts.json diff --git a/client-app/tests/apitest/data/inputs/organisations.json b/client-app/test/apitest/data/inputs/organisations.json similarity index 100% rename from client-app/tests/apitest/data/inputs/organisations.json rename to client-app/test/apitest/data/inputs/organisations.json diff --git a/client-app/tests/apitest/data/inputs/programs.json b/client-app/test/apitest/data/inputs/programs.json similarity index 100% rename from client-app/tests/apitest/data/inputs/programs.json rename to client-app/test/apitest/data/inputs/programs.json diff --git a/client-app/tests/apitest/data/inputs/projects.json b/client-app/test/apitest/data/inputs/projects.json similarity index 100% rename from client-app/tests/apitest/data/inputs/projects.json rename to client-app/test/apitest/data/inputs/projects.json diff --git a/client-app/tests/apitest/data/inputs/scopes.json b/client-app/test/apitest/data/inputs/scopes.json similarity index 100% rename from client-app/tests/apitest/data/inputs/scopes.json rename to client-app/test/apitest/data/inputs/scopes.json diff --git a/client-app/tests/apitest/package.json b/client-app/test/apitest/package.json similarity index 100% rename from client-app/tests/apitest/package.json rename to client-app/test/apitest/package.json diff --git a/client-app/tests/functional/administrative/Activity.js b/client-app/test/functional/administrative/Activity.js similarity index 100% rename from client-app/tests/functional/administrative/Activity.js rename to client-app/test/functional/administrative/Activity.js diff --git a/client-app/tests/functional/administrative/Animal.js b/client-app/test/functional/administrative/Animal.js similarity index 100% rename from client-app/tests/functional/administrative/Animal.js rename to client-app/test/functional/administrative/Animal.js diff --git a/client-app/tests/functional/administrative/Contact.js b/client-app/test/functional/administrative/Contact.js similarity index 100% rename from client-app/tests/functional/administrative/Contact.js rename to client-app/test/functional/administrative/Contact.js diff --git a/client-app/tests/functional/administrative/Device.js b/client-app/test/functional/administrative/Device.js similarity index 100% rename from client-app/tests/functional/administrative/Device.js rename to client-app/test/functional/administrative/Device.js diff --git a/client-app/tests/functional/administrative/Document.js b/client-app/test/functional/administrative/Document.js similarity index 94% rename from client-app/tests/functional/administrative/Document.js rename to client-app/test/functional/administrative/Document.js index 53abb9fd..14b79603 100644 --- a/client-app/tests/functional/administrative/Document.js +++ b/client-app/test/functional/administrative/Document.js @@ -2,9 +2,9 @@ define([ './_Administrative' , './_AdministrativeFacets' , './_AdministrativeLinks' - , 'tests/support/tests/WizardAddition' - , 'tests/support/Utils' - , 'tests/support/Config' + , 'test/support/tests/WizardAddition' + , 'test/support/Utils' + , 'test/support/Config' ], function ( _AdministrativeTests , _AdministrativeFacetsTests diff --git a/client-app/tests/functional/administrative/Organisation.js b/client-app/test/functional/administrative/Organisation.js similarity index 100% rename from client-app/tests/functional/administrative/Organisation.js rename to client-app/test/functional/administrative/Organisation.js diff --git a/client-app/tests/functional/administrative/Platform.js b/client-app/test/functional/administrative/Platform.js similarity index 100% rename from client-app/tests/functional/administrative/Platform.js rename to client-app/test/functional/administrative/Platform.js diff --git a/client-app/tests/functional/administrative/Program.js b/client-app/test/functional/administrative/Program.js similarity index 100% rename from client-app/tests/functional/administrative/Program.js rename to client-app/test/functional/administrative/Program.js diff --git a/client-app/tests/functional/administrative/Project.js b/client-app/test/functional/administrative/Project.js similarity index 100% rename from client-app/tests/functional/administrative/Project.js rename to client-app/test/functional/administrative/Project.js diff --git a/client-app/tests/functional/administrative/_Administrative.js b/client-app/test/functional/administrative/_Administrative.js similarity index 91% rename from client-app/tests/functional/administrative/_Administrative.js rename to client-app/test/functional/administrative/_Administrative.js index f6e7b6ea..25d3cc6e 100644 --- a/client-app/tests/functional/administrative/_Administrative.js +++ b/client-app/test/functional/administrative/_Administrative.js @@ -1,10 +1,10 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'tests/support/tests/_CatalogBase' - , 'tests/support/tests/CatalogWizardEdition' - , 'tests/support/tests/WizardEdition' - , 'tests/support/tests/WizardAddition' + , 'test/support/tests/_CatalogBase' + , 'test/support/tests/CatalogWizardEdition' + , 'test/support/tests/WizardEdition' + , 'test/support/tests/WizardAddition' ], function( declare , lang diff --git a/client-app/tests/functional/administrative/_AdministrativeFacets.js b/client-app/test/functional/administrative/_AdministrativeFacets.js similarity index 89% rename from client-app/tests/functional/administrative/_AdministrativeFacets.js rename to client-app/test/functional/administrative/_AdministrativeFacets.js index 3c9748c2..1e0f07a5 100644 --- a/client-app/tests/functional/administrative/_AdministrativeFacets.js +++ b/client-app/test/functional/administrative/_AdministrativeFacets.js @@ -1,6 +1,6 @@ define([ 'dojo/_base/declare' - , 'tests/support/tests/_CatalogBase' + , 'test/support/tests/_CatalogBase' ], function( declare , _CatalogBase diff --git a/client-app/tests/functional/administrative/_AdministrativeFilter.js b/client-app/test/functional/administrative/_AdministrativeFilter.js similarity index 85% rename from client-app/tests/functional/administrative/_AdministrativeFilter.js rename to client-app/test/functional/administrative/_AdministrativeFilter.js index 4752671a..12bb002d 100644 --- a/client-app/tests/functional/administrative/_AdministrativeFilter.js +++ b/client-app/test/functional/administrative/_AdministrativeFilter.js @@ -1,6 +1,6 @@ define([ 'dojo/_base/declare' - , 'tests/support/tests/_CatalogBase' + , 'test/support/tests/_CatalogBase' ], function( declare , _CatalogBase diff --git a/client-app/tests/functional/administrative/_AdministrativeLinks.js b/client-app/test/functional/administrative/_AdministrativeLinks.js similarity index 86% rename from client-app/tests/functional/administrative/_AdministrativeLinks.js rename to client-app/test/functional/administrative/_AdministrativeLinks.js index a66d4780..567d2548 100644 --- a/client-app/tests/functional/administrative/_AdministrativeLinks.js +++ b/client-app/test/functional/administrative/_AdministrativeLinks.js @@ -1,6 +1,6 @@ define([ 'dojo/_base/declare' - , 'tests/support/tests/_CatalogBase' + , 'test/support/tests/_CatalogBase' ], function( declare , _CatalogBase diff --git a/client-app/tests/functional/administrative/taxonomy/Class.js b/client-app/test/functional/administrative/taxonomy/Class.js similarity index 100% rename from client-app/tests/functional/administrative/taxonomy/Class.js rename to client-app/test/functional/administrative/taxonomy/Class.js diff --git a/client-app/tests/functional/administrative/taxonomy/Family.js b/client-app/test/functional/administrative/taxonomy/Family.js similarity index 100% rename from client-app/tests/functional/administrative/taxonomy/Family.js rename to client-app/test/functional/administrative/taxonomy/Family.js diff --git a/client-app/tests/functional/administrative/taxonomy/Genus.js b/client-app/test/functional/administrative/taxonomy/Genus.js similarity index 100% rename from client-app/tests/functional/administrative/taxonomy/Genus.js rename to client-app/test/functional/administrative/taxonomy/Genus.js diff --git a/client-app/tests/functional/administrative/taxonomy/Kingdom.js b/client-app/test/functional/administrative/taxonomy/Kingdom.js similarity index 100% rename from client-app/tests/functional/administrative/taxonomy/Kingdom.js rename to client-app/test/functional/administrative/taxonomy/Kingdom.js diff --git a/client-app/tests/functional/administrative/taxonomy/Misidentification.js b/client-app/test/functional/administrative/taxonomy/Misidentification.js similarity index 93% rename from client-app/tests/functional/administrative/taxonomy/Misidentification.js rename to client-app/test/functional/administrative/taxonomy/Misidentification.js index af967e42..e4536bde 100644 --- a/client-app/tests/functional/administrative/taxonomy/Misidentification.js +++ b/client-app/test/functional/administrative/taxonomy/Misidentification.js @@ -1,11 +1,11 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'tests/support/tests/_CatalogBase' - , 'tests/support/tests/CatalogWizardEdition' - , 'tests/support/tests/Dashboard' - , 'tests/support/tests/WizardEdition' - , 'tests/support/tests/WizardAddition' + , 'test/support/tests/_CatalogBase' + , 'test/support/tests/CatalogWizardEdition' + , 'test/support/tests/Dashboard' + , 'test/support/tests/WizardEdition' + , 'test/support/tests/WizardAddition' ], function( declare , lang diff --git a/client-app/tests/functional/administrative/taxonomy/Order.js b/client-app/test/functional/administrative/taxonomy/Order.js similarity index 100% rename from client-app/tests/functional/administrative/taxonomy/Order.js rename to client-app/test/functional/administrative/taxonomy/Order.js diff --git a/client-app/tests/functional/administrative/taxonomy/Phylum.js b/client-app/test/functional/administrative/taxonomy/Phylum.js similarity index 100% rename from client-app/tests/functional/administrative/taxonomy/Phylum.js rename to client-app/test/functional/administrative/taxonomy/Phylum.js diff --git a/client-app/tests/functional/administrative/taxonomy/Species.js b/client-app/test/functional/administrative/taxonomy/Species.js similarity index 92% rename from client-app/tests/functional/administrative/taxonomy/Species.js rename to client-app/test/functional/administrative/taxonomy/Species.js index e59c076a..e9a6d789 100644 --- a/client-app/tests/functional/administrative/taxonomy/Species.js +++ b/client-app/test/functional/administrative/taxonomy/Species.js @@ -1,8 +1,8 @@ define([ - 'tests/support/tests/ListFilterByTree' - , 'tests/support/Utils' - , 'tests/support/tests/Dashboard' - , 'tests/support/tests/WizardWorms' + 'test/support/tests/ListFilterByTree' + , 'test/support/Utils' + , 'test/support/tests/Dashboard' + , 'test/support/tests/WizardWorms' , '../_Administrative' , '../_AdministrativeFacets' , '../_AdministrativeLinks' diff --git a/client-app/tests/functional/administrative/taxonomy/Subphylum.js b/client-app/test/functional/administrative/taxonomy/Subphylum.js similarity index 100% rename from client-app/tests/functional/administrative/taxonomy/Subphylum.js rename to client-app/test/functional/administrative/taxonomy/Subphylum.js diff --git a/client-app/tests/functional/administrative/taxonomy/_Taxonomy.js b/client-app/test/functional/administrative/taxonomy/_Taxonomy.js similarity index 92% rename from client-app/tests/functional/administrative/taxonomy/_Taxonomy.js rename to client-app/test/functional/administrative/taxonomy/_Taxonomy.js index 89cf96df..7bd9392f 100644 --- a/client-app/tests/functional/administrative/taxonomy/_Taxonomy.js +++ b/client-app/test/functional/administrative/taxonomy/_Taxonomy.js @@ -1,9 +1,9 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'tests/support/tests/_CatalogBase' - , 'tests/support/tests/Dashboard' - , 'tests/support/tests/FormEdition' + , 'test/support/tests/_CatalogBase' + , 'test/support/tests/Dashboard' + , 'test/support/tests/FormEdition' ], function( declare , lang diff --git a/client-app/tests/functional/administrativeDetails/Activity.js b/client-app/test/functional/administrativeDetails/Activity.js similarity index 100% rename from client-app/tests/functional/administrativeDetails/Activity.js rename to client-app/test/functional/administrativeDetails/Activity.js diff --git a/client-app/tests/functional/administrativeDetails/Contact.js b/client-app/test/functional/administrativeDetails/Contact.js similarity index 100% rename from client-app/tests/functional/administrativeDetails/Contact.js rename to client-app/test/functional/administrativeDetails/Contact.js diff --git a/client-app/tests/functional/administrativeDetails/Document.js b/client-app/test/functional/administrativeDetails/Document.js similarity index 100% rename from client-app/tests/functional/administrativeDetails/Document.js rename to client-app/test/functional/administrativeDetails/Document.js diff --git a/client-app/tests/functional/administrativeDetails/Organisation.js b/client-app/test/functional/administrativeDetails/Organisation.js similarity index 100% rename from client-app/tests/functional/administrativeDetails/Organisation.js rename to client-app/test/functional/administrativeDetails/Organisation.js diff --git a/client-app/tests/functional/administrativeDetails/Platform.js b/client-app/test/functional/administrativeDetails/Platform.js similarity index 100% rename from client-app/tests/functional/administrativeDetails/Platform.js rename to client-app/test/functional/administrativeDetails/Platform.js diff --git a/client-app/tests/functional/administrativeDetails/Program.js b/client-app/test/functional/administrativeDetails/Program.js similarity index 100% rename from client-app/tests/functional/administrativeDetails/Program.js rename to client-app/test/functional/administrativeDetails/Program.js diff --git a/client-app/tests/functional/administrativeDetails/Project.js b/client-app/test/functional/administrativeDetails/Project.js similarity index 100% rename from client-app/tests/functional/administrativeDetails/Project.js rename to client-app/test/functional/administrativeDetails/Project.js diff --git a/client-app/tests/functional/administrativeDetails/ServiceOGC.js b/client-app/test/functional/administrativeDetails/ServiceOGC.js similarity index 100% rename from client-app/tests/functional/administrativeDetails/ServiceOGC.js rename to client-app/test/functional/administrativeDetails/ServiceOGC.js diff --git a/client-app/tests/functional/administrativeDetails/Species.js b/client-app/test/functional/administrativeDetails/Species.js similarity index 100% rename from client-app/tests/functional/administrativeDetails/Species.js rename to client-app/test/functional/administrativeDetails/Species.js diff --git a/client-app/tests/functional/administrativeDetails/Statistics.js b/client-app/test/functional/administrativeDetails/Statistics.js similarity index 100% rename from client-app/tests/functional/administrativeDetails/Statistics.js rename to client-app/test/functional/administrativeDetails/Statistics.js diff --git a/client-app/tests/functional/administrativeDetails/_DetailsBase.js b/client-app/test/functional/administrativeDetails/_DetailsBase.js similarity index 89% rename from client-app/tests/functional/administrativeDetails/_DetailsBase.js rename to client-app/test/functional/administrativeDetails/_DetailsBase.js index 79c5817d..d7d59b25 100644 --- a/client-app/tests/functional/administrativeDetails/_DetailsBase.js +++ b/client-app/test/functional/administrativeDetails/_DetailsBase.js @@ -1,7 +1,7 @@ define([ 'dojo/_base/declare' - , 'tests/support/tests/_BaseCommons' - , 'tests/support/tests/DetailsBase' + , 'test/support/tests/_BaseCommons' + , 'test/support/tests/DetailsBase' ], function( declare , _BaseCommons diff --git a/client-app/tests/functional/administrativeDetails/_DetailsInfo.js b/client-app/test/functional/administrativeDetails/_DetailsInfo.js similarity index 90% rename from client-app/tests/functional/administrativeDetails/_DetailsInfo.js rename to client-app/test/functional/administrativeDetails/_DetailsInfo.js index 9a262c11..8f12d643 100644 --- a/client-app/tests/functional/administrativeDetails/_DetailsInfo.js +++ b/client-app/test/functional/administrativeDetails/_DetailsInfo.js @@ -1,11 +1,11 @@ define([ 'dojo/_base/declare' - , 'tests/support/Config' - , 'tests/support/tests/CatalogUserReport' - , 'tests/support/tests/CatalogGuestReport' - , 'tests/support/tests/DetailsEditionLink' - , 'tests/support/tests/DetailsInfo' - , 'tests/support/tests/DetailsTabs' + , 'test/support/Config' + , 'test/support/tests/CatalogUserReport' + , 'test/support/tests/CatalogGuestReport' + , 'test/support/tests/DetailsEditionLink' + , 'test/support/tests/DetailsInfo' + , 'test/support/tests/DetailsTabs' , './_DetailsBase' ], function( declare diff --git a/client-app/tests/functional/administrativeDetails/_DetailsMap.js b/client-app/test/functional/administrativeDetails/_DetailsMap.js similarity index 94% rename from client-app/tests/functional/administrativeDetails/_DetailsMap.js rename to client-app/test/functional/administrativeDetails/_DetailsMap.js index 9132d965..cac4c83d 100644 --- a/client-app/tests/functional/administrativeDetails/_DetailsMap.js +++ b/client-app/test/functional/administrativeDetails/_DetailsMap.js @@ -1,7 +1,7 @@ define([ 'dojo/_base/declare' , './_DetailsBase' - , 'tests/support/tests/Map' + , 'test/support/tests/Map' ], function( declare , _DetailsBase diff --git a/client-app/tests/functional/administrativeDetails/_DetailsPDF.js b/client-app/test/functional/administrativeDetails/_DetailsPDF.js similarity index 93% rename from client-app/tests/functional/administrativeDetails/_DetailsPDF.js rename to client-app/test/functional/administrativeDetails/_DetailsPDF.js index a398a667..217c662c 100644 --- a/client-app/tests/functional/administrativeDetails/_DetailsPDF.js +++ b/client-app/test/functional/administrativeDetails/_DetailsPDF.js @@ -1,7 +1,7 @@ define([ 'dojo/_base/declare' , './_DetailsBase' - , 'tests/support/tests/DetailsPDF' + , 'test/support/tests/DetailsPDF' ], function( declare , _DetailsBase diff --git a/client-app/tests/functional/catalog/Activity.js b/client-app/test/functional/catalog/Activity.js similarity index 100% rename from client-app/tests/functional/catalog/Activity.js rename to client-app/test/functional/catalog/Activity.js diff --git a/client-app/tests/functional/catalog/Organisation.js b/client-app/test/functional/catalog/Organisation.js similarity index 100% rename from client-app/tests/functional/catalog/Organisation.js rename to client-app/test/functional/catalog/Organisation.js diff --git a/client-app/tests/functional/catalog/Platform.js b/client-app/test/functional/catalog/Platform.js similarity index 100% rename from client-app/tests/functional/catalog/Platform.js rename to client-app/test/functional/catalog/Platform.js diff --git a/client-app/tests/functional/catalog/Program.js b/client-app/test/functional/catalog/Program.js similarity index 100% rename from client-app/tests/functional/catalog/Program.js rename to client-app/test/functional/catalog/Program.js diff --git a/client-app/tests/functional/catalog/Project.js b/client-app/test/functional/catalog/Project.js similarity index 100% rename from client-app/tests/functional/catalog/Project.js rename to client-app/test/functional/catalog/Project.js diff --git a/client-app/tests/functional/catalog/Species.js b/client-app/test/functional/catalog/Species.js similarity index 86% rename from client-app/tests/functional/catalog/Species.js rename to client-app/test/functional/catalog/Species.js index d6ab1186..5668063c 100644 --- a/client-app/tests/functional/catalog/Species.js +++ b/client-app/test/functional/catalog/Species.js @@ -1,7 +1,7 @@ define([ './_CatalogWithReport' - , 'tests/support/tests/ListFilterByTree' - , 'tests/support/Utils' + , 'test/support/tests/ListFilterByTree' + , 'test/support/Utils' ], function ( _CatalogWithReport , ListFilterByTree diff --git a/client-app/tests/functional/catalog/_Catalog.js b/client-app/test/functional/catalog/_Catalog.js similarity index 94% rename from client-app/tests/functional/catalog/_Catalog.js rename to client-app/test/functional/catalog/_Catalog.js index 07748761..8d186ec8 100644 --- a/client-app/tests/functional/catalog/_Catalog.js +++ b/client-app/test/functional/catalog/_Catalog.js @@ -1,6 +1,6 @@ define([ 'dojo/_base/declare' - , 'tests/support/tests/_CatalogBase' + , 'test/support/tests/_CatalogBase' ], function( declare , _CatalogBase diff --git a/client-app/tests/functional/catalog/_CatalogFilter.js b/client-app/test/functional/catalog/_CatalogFilter.js similarity index 83% rename from client-app/tests/functional/catalog/_CatalogFilter.js rename to client-app/test/functional/catalog/_CatalogFilter.js index 471da4b2..319782d1 100644 --- a/client-app/tests/functional/catalog/_CatalogFilter.js +++ b/client-app/test/functional/catalog/_CatalogFilter.js @@ -1,7 +1,7 @@ define([ 'dojo/_base/declare' - , 'tests/support/Config' - , 'tests/support/tests/_CatalogBase' + , 'test/support/Config' + , 'test/support/tests/_CatalogBase' ], function( declare , Config diff --git a/client-app/tests/functional/catalog/_CatalogWithReport.js b/client-app/test/functional/catalog/_CatalogWithReport.js similarity index 88% rename from client-app/tests/functional/catalog/_CatalogWithReport.js rename to client-app/test/functional/catalog/_CatalogWithReport.js index 0e4f5c5c..0cd9b918 100644 --- a/client-app/tests/functional/catalog/_CatalogWithReport.js +++ b/client-app/test/functional/catalog/_CatalogWithReport.js @@ -1,8 +1,8 @@ define([ 'dojo/_base/declare' - , 'tests/support/Config' - , 'tests/support/tests/CatalogUserReport' - , 'tests/support/tests/CatalogGuestReport' + , 'test/support/Config' + , 'test/support/tests/CatalogUserReport' + , 'test/support/tests/CatalogGuestReport' , './_Catalog' ], function( declare diff --git a/client-app/tests/functional/catalogDetails/Activity.js b/client-app/test/functional/catalogDetails/Activity.js similarity index 85% rename from client-app/tests/functional/catalogDetails/Activity.js rename to client-app/test/functional/catalogDetails/Activity.js index 3a20da1d..b426c3f6 100644 --- a/client-app/tests/functional/catalogDetails/Activity.js +++ b/client-app/test/functional/catalogDetails/Activity.js @@ -1,6 +1,6 @@ define([ - 'tests/functional/administrativeDetails/_DetailsInfo' - , 'tests/functional/administrativeDetails/_DetailsMap' + 'test/functional/administrativeDetails/_DetailsInfo' + , 'test/functional/administrativeDetails/_DetailsMap' ], function ( _DetailsInfo , _DetailsMap diff --git a/client-app/tests/functional/catalogDetails/Document.js b/client-app/test/functional/catalogDetails/Document.js similarity index 75% rename from client-app/tests/functional/catalogDetails/Document.js rename to client-app/test/functional/catalogDetails/Document.js index 65688ff0..b3ce2d61 100644 --- a/client-app/tests/functional/catalogDetails/Document.js +++ b/client-app/test/functional/catalogDetails/Document.js @@ -1,6 +1,6 @@ define([ - 'tests/functional/administrativeDetails/_DetailsInfo' - , 'tests/functional/administrativeDetails/_DetailsPDF' + 'test/functional/administrativeDetails/_DetailsInfo' + , 'test/functional/administrativeDetails/_DetailsPDF' ], function ( _DetailsInfo , _DetailsPDF diff --git a/client-app/tests/functional/catalogDetails/Organisation.js b/client-app/test/functional/catalogDetails/Organisation.js similarity index 73% rename from client-app/tests/functional/catalogDetails/Organisation.js rename to client-app/test/functional/catalogDetails/Organisation.js index 7bf3bb2a..793e25b6 100644 --- a/client-app/tests/functional/catalogDetails/Organisation.js +++ b/client-app/test/functional/catalogDetails/Organisation.js @@ -1,5 +1,5 @@ define([ - 'tests/functional/administrativeDetails/_DetailsInfo' + 'test/functional/administrativeDetails/_DetailsInfo' ], function ( _DetailsInfo ) { diff --git a/client-app/tests/functional/catalogDetails/Platform.js b/client-app/test/functional/catalogDetails/Platform.js similarity index 72% rename from client-app/tests/functional/catalogDetails/Platform.js rename to client-app/test/functional/catalogDetails/Platform.js index 8e37e510..11973100 100644 --- a/client-app/tests/functional/catalogDetails/Platform.js +++ b/client-app/test/functional/catalogDetails/Platform.js @@ -1,5 +1,5 @@ define([ - 'tests/functional/administrativeDetails/_DetailsInfo' + 'test/functional/administrativeDetails/_DetailsInfo' ], function ( _DetailsInfo ) { diff --git a/client-app/tests/functional/catalogDetails/Program.js b/client-app/test/functional/catalogDetails/Program.js similarity index 74% rename from client-app/tests/functional/catalogDetails/Program.js rename to client-app/test/functional/catalogDetails/Program.js index f0f04592..7ac86f8c 100644 --- a/client-app/tests/functional/catalogDetails/Program.js +++ b/client-app/test/functional/catalogDetails/Program.js @@ -1,5 +1,5 @@ define([ - 'tests/functional/administrativeDetails/_DetailsInfo' + 'test/functional/administrativeDetails/_DetailsInfo' ], function ( _DetailsInfo ) { diff --git a/client-app/tests/functional/catalogDetails/Project.js b/client-app/test/functional/catalogDetails/Project.js similarity index 74% rename from client-app/tests/functional/catalogDetails/Project.js rename to client-app/test/functional/catalogDetails/Project.js index 9aaaf92e..f2640c5b 100644 --- a/client-app/tests/functional/catalogDetails/Project.js +++ b/client-app/test/functional/catalogDetails/Project.js @@ -1,5 +1,5 @@ define([ - 'tests/functional/administrativeDetails/_DetailsInfo' + 'test/functional/administrativeDetails/_DetailsInfo' ], function ( _DetailsInfo ) { diff --git a/client-app/tests/functional/catalogDetails/ServiceOGC.js b/client-app/test/functional/catalogDetails/ServiceOGC.js similarity index 74% rename from client-app/tests/functional/catalogDetails/ServiceOGC.js rename to client-app/test/functional/catalogDetails/ServiceOGC.js index 6bdd2224..7b3e478f 100644 --- a/client-app/tests/functional/catalogDetails/ServiceOGC.js +++ b/client-app/test/functional/catalogDetails/ServiceOGC.js @@ -1,5 +1,5 @@ define([ - 'tests/functional/administrativeDetails/_DetailsInfo' + 'test/functional/administrativeDetails/_DetailsInfo' ], function ( _DetailsInfo ) { diff --git a/client-app/tests/functional/catalogDetails/Species.js b/client-app/test/functional/catalogDetails/Species.js similarity index 73% rename from client-app/tests/functional/catalogDetails/Species.js rename to client-app/test/functional/catalogDetails/Species.js index ec9dcd10..be35dd11 100644 --- a/client-app/tests/functional/catalogDetails/Species.js +++ b/client-app/test/functional/catalogDetails/Species.js @@ -1,6 +1,6 @@ define([ - 'tests/functional/administrativeDetails/_DetailsInfo' - , 'tests/functional/administrativeDetails/_DetailsMap' + 'test/functional/administrativeDetails/_DetailsInfo' + , 'test/functional/administrativeDetails/_DetailsMap' ], function ( _DetailsInfo , _DetailsMap diff --git a/client-app/tests/functional/common/Home.js b/client-app/test/functional/common/Home.js similarity index 96% rename from client-app/tests/functional/common/Home.js rename to client-app/test/functional/common/Home.js index 82654f48..e0dbe16f 100644 --- a/client-app/tests/functional/common/Home.js +++ b/client-app/test/functional/common/Home.js @@ -1,8 +1,8 @@ define([ 'dojo/_base/lang' - , 'tests/support/Config' - , 'tests/support/pages/Login' - , 'tests/support/Utils' + , 'test/support/Config' + , 'test/support/pages/Login' + , 'test/support/Utils' ], function( lang , Config diff --git a/client-app/tests/functional/common/Login.js b/client-app/test/functional/common/Login.js similarity index 97% rename from client-app/tests/functional/common/Login.js rename to client-app/test/functional/common/Login.js index 22fc03f6..69aa33f3 100644 --- a/client-app/tests/functional/common/Login.js +++ b/client-app/test/functional/common/Login.js @@ -1,8 +1,8 @@ define([ 'dojo/_base/lang' - , 'tests/support/Config' - , 'tests/support/pages/Login' - , 'tests/support/Utils' + , 'test/support/Config' + , 'test/support/pages/Login' + , 'test/support/Utils' ], function ( lang , Config diff --git a/client-app/tests/functional/common/Profile.js b/client-app/test/functional/common/Profile.js similarity index 99% rename from client-app/tests/functional/common/Profile.js rename to client-app/test/functional/common/Profile.js index f1fb8b6d..b2cdea38 100644 --- a/client-app/tests/functional/common/Profile.js +++ b/client-app/test/functional/common/Profile.js @@ -1,8 +1,8 @@ define([ 'dojo/_base/lang' - , 'tests/support/Config' - , 'tests/support/pages/Login' - , 'tests/support/Utils' + , 'test/support/Config' + , 'test/support/pages/Login' + , 'test/support/Utils' ], function ( lang , Config diff --git a/client-app/tests/functional/common/Sidebar.js b/client-app/test/functional/common/Sidebar.js similarity index 97% rename from client-app/tests/functional/common/Sidebar.js rename to client-app/test/functional/common/Sidebar.js index 1612ba07..eeda4038 100644 --- a/client-app/tests/functional/common/Sidebar.js +++ b/client-app/test/functional/common/Sidebar.js @@ -1,7 +1,7 @@ define([ - 'tests/support/pages/Login' - , 'tests/support/Config' - , 'tests/support/Utils' + 'test/support/pages/Login' + , 'test/support/Config' + , 'test/support/Utils' ], function( LoginPage , Config diff --git a/client-app/tests/functional/common/Topbar.js b/client-app/test/functional/common/Topbar.js similarity index 96% rename from client-app/tests/functional/common/Topbar.js rename to client-app/test/functional/common/Topbar.js index 6b602be4..3d77623e 100644 --- a/client-app/tests/functional/common/Topbar.js +++ b/client-app/test/functional/common/Topbar.js @@ -1,8 +1,8 @@ define([ 'dojo/_base/lang' - , 'tests/support/Config' - , 'tests/support/pages/Login' - , 'tests/support/Utils' + , 'test/support/Config' + , 'test/support/pages/Login' + , 'test/support/Utils' ], function ( lang , Config diff --git a/client-app/tests/functional/dataLoader/Area.js b/client-app/test/functional/dataLoader/Area.js similarity index 93% rename from client-app/tests/functional/dataLoader/Area.js rename to client-app/test/functional/dataLoader/Area.js index 596c4681..13183caf 100644 --- a/client-app/tests/functional/dataLoader/Area.js +++ b/client-app/test/functional/dataLoader/Area.js @@ -1,8 +1,8 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'tests/support/tests/_DataLoader' - , 'tests/support/Config' + , 'test/support/tests/_DataLoader' + , 'test/support/Config' ], function( declare , lang diff --git a/client-app/tests/functional/dataLoader/Citation.js b/client-app/test/functional/dataLoader/Citation.js similarity index 80% rename from client-app/tests/functional/dataLoader/Citation.js rename to client-app/test/functional/dataLoader/Citation.js index bf8d5bde..42bdd6a5 100644 --- a/client-app/tests/functional/dataLoader/Citation.js +++ b/client-app/test/functional/dataLoader/Citation.js @@ -1,9 +1,9 @@ define([ - 'tests/support/tests/Citation' - , 'tests/support/tests/FormAddition' - , 'tests/support/tests/FormEdition' - , 'tests/support/tests/_DataLoader' - , 'tests/support/Utils' + 'test/support/tests/Citation' + , 'test/support/tests/FormAddition' + , 'test/support/tests/FormEdition' + , 'test/support/tests/_DataLoader' + , 'test/support/Utils' ], function( CitationTests , FormAdditionTests diff --git a/client-app/tests/functional/dataLoader/DataLoader.js b/client-app/test/functional/dataLoader/DataLoader.js similarity index 96% rename from client-app/tests/functional/dataLoader/DataLoader.js rename to client-app/test/functional/dataLoader/DataLoader.js index 21e76d82..31d177e4 100644 --- a/client-app/tests/functional/dataLoader/DataLoader.js +++ b/client-app/test/functional/dataLoader/DataLoader.js @@ -1,7 +1,7 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'tests/support/tests/_CatalogBase' + , 'test/support/tests/_CatalogBase' ], function( declare , lang diff --git a/client-app/tests/functional/dataLoader/Infrastructure.js b/client-app/test/functional/dataLoader/Infrastructure.js similarity index 94% rename from client-app/tests/functional/dataLoader/Infrastructure.js rename to client-app/test/functional/dataLoader/Infrastructure.js index 472237f1..1cf4366d 100644 --- a/client-app/tests/functional/dataLoader/Infrastructure.js +++ b/client-app/test/functional/dataLoader/Infrastructure.js @@ -1,7 +1,7 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'tests/support/tests/_DataLoader' + , 'test/support/tests/_DataLoader' ], function( declare , lang diff --git a/client-app/tests/functional/dataLoader/ObjectCollection.js b/client-app/test/functional/dataLoader/ObjectCollection.js similarity index 95% rename from client-app/tests/functional/dataLoader/ObjectCollection.js rename to client-app/test/functional/dataLoader/ObjectCollection.js index c4395e3c..20d0dbce 100644 --- a/client-app/tests/functional/dataLoader/ObjectCollection.js +++ b/client-app/test/functional/dataLoader/ObjectCollection.js @@ -1,8 +1,8 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'tests/support/tests/_DataLoader' - , 'tests/support/Config' + , 'test/support/tests/_DataLoader' + , 'test/support/Config' ], function( declare , lang diff --git a/client-app/tests/functional/dataLoader/SurveyStation.js b/client-app/test/functional/dataLoader/SurveyStation.js similarity index 94% rename from client-app/tests/functional/dataLoader/SurveyStation.js rename to client-app/test/functional/dataLoader/SurveyStation.js index 302028d3..3f5919d8 100644 --- a/client-app/tests/functional/dataLoader/SurveyStation.js +++ b/client-app/test/functional/dataLoader/SurveyStation.js @@ -1,8 +1,8 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'tests/support/tests/_DataLoader' - , 'tests/support/Config' + , 'test/support/tests/_DataLoader' + , 'test/support/Config' ], function( declare , lang diff --git a/client-app/tests/functional/dataLoader/Tracking.js b/client-app/test/functional/dataLoader/Tracking.js similarity index 94% rename from client-app/tests/functional/dataLoader/Tracking.js rename to client-app/test/functional/dataLoader/Tracking.js index 0c08c9ab..c871af25 100644 --- a/client-app/tests/functional/dataLoader/Tracking.js +++ b/client-app/test/functional/dataLoader/Tracking.js @@ -1,8 +1,8 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'tests/support/tests/_DataLoader' - , 'tests/support/Config' + , 'test/support/tests/_DataLoader' + , 'test/support/Config' ], function( declare , lang diff --git a/client-app/tests/functional/maintenance/ServiceOGC.js b/client-app/test/functional/maintenance/ServiceOGC.js similarity index 93% rename from client-app/tests/functional/maintenance/ServiceOGC.js rename to client-app/test/functional/maintenance/ServiceOGC.js index 2aa38fbe..19523271 100644 --- a/client-app/tests/functional/maintenance/ServiceOGC.js +++ b/client-app/test/functional/maintenance/ServiceOGC.js @@ -1,7 +1,7 @@ define([ 'dojo/_base/declare' - , 'tests/support/tests/_CatalogBase' - , 'tests/support/tests/WizardEdition' + , 'test/support/tests/_CatalogBase' + , 'test/support/tests/WizardEdition' ], function( declare , _CatalogBaseTests diff --git a/client-app/tests/functional/maintenance/domains/_Domain.js b/client-app/test/functional/maintenance/domains/_Domain.js similarity index 92% rename from client-app/tests/functional/maintenance/domains/_Domain.js rename to client-app/test/functional/maintenance/domains/_Domain.js index 01a0f6c6..c6840943 100644 --- a/client-app/tests/functional/maintenance/domains/_Domain.js +++ b/client-app/test/functional/maintenance/domains/_Domain.js @@ -1,9 +1,9 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'tests/support/tests/Dashboard' - , 'tests/support/tests/ListWithOrder' - , 'tests/support/tests/ListWithTextSearch' + , 'test/support/tests/Dashboard' + , 'test/support/tests/ListWithOrder' + , 'test/support/tests/ListWithTextSearch' , './_DomainBase' ], function( declare diff --git a/client-app/tests/functional/maintenance/domains/_DomainBase.js b/client-app/test/functional/maintenance/domains/_DomainBase.js similarity index 89% rename from client-app/tests/functional/maintenance/domains/_DomainBase.js rename to client-app/test/functional/maintenance/domains/_DomainBase.js index 8f53c418..c5c80b9c 100644 --- a/client-app/tests/functional/maintenance/domains/_DomainBase.js +++ b/client-app/test/functional/maintenance/domains/_DomainBase.js @@ -1,7 +1,7 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'tests/support/tests/_BaseCommons' + , 'test/support/tests/_BaseCommons' ], function( declare , lang diff --git a/client-app/tests/functional/maintenance/domains/_DomainFacets.js b/client-app/test/functional/maintenance/domains/_DomainFacets.js similarity index 89% rename from client-app/tests/functional/maintenance/domains/_DomainFacets.js rename to client-app/test/functional/maintenance/domains/_DomainFacets.js index 7344e5d9..8fff57c8 100644 --- a/client-app/tests/functional/maintenance/domains/_DomainFacets.js +++ b/client-app/test/functional/maintenance/domains/_DomainFacets.js @@ -1,7 +1,7 @@ define([ 'dojo/_base/declare' - , 'tests/support/tests/CatalogFacets' - , 'tests/support/tests/CatalogFacetsTotal' + , 'test/support/tests/CatalogFacets' + , 'test/support/tests/CatalogFacetsTotal' , './_DomainBase' ], function( declare diff --git a/client-app/tests/functional/maintenance/domains/_DomainFormEdition.js b/client-app/test/functional/maintenance/domains/_DomainFormEdition.js similarity index 90% rename from client-app/tests/functional/maintenance/domains/_DomainFormEdition.js rename to client-app/test/functional/maintenance/domains/_DomainFormEdition.js index f812186e..cd84fcaa 100644 --- a/client-app/tests/functional/maintenance/domains/_DomainFormEdition.js +++ b/client-app/test/functional/maintenance/domains/_DomainFormEdition.js @@ -1,7 +1,7 @@ define([ 'dojo/_base/declare' - , 'tests/support/tests/FormAddition' - , 'tests/support/tests/FormEdition' + , 'test/support/tests/FormAddition' + , 'test/support/tests/FormEdition' , './_DomainBase' ], function( declare diff --git a/client-app/tests/functional/maintenance/domains/_DomainHierarchical.js b/client-app/test/functional/maintenance/domains/_DomainHierarchical.js similarity index 92% rename from client-app/tests/functional/maintenance/domains/_DomainHierarchical.js rename to client-app/test/functional/maintenance/domains/_DomainHierarchical.js index af5e2785..18088dc3 100644 --- a/client-app/tests/functional/maintenance/domains/_DomainHierarchical.js +++ b/client-app/test/functional/maintenance/domains/_DomainHierarchical.js @@ -1,7 +1,7 @@ define([ 'dojo/_base/declare' - , 'tests/support/tests/FormAddition' - , 'tests/support/tests/ListHierarchical' + , 'test/support/tests/FormAddition' + , 'test/support/tests/ListHierarchical' , './_DomainBase' ], function( declare diff --git a/client-app/tests/functional/maintenance/domains/_DomainWizardEdition.js b/client-app/test/functional/maintenance/domains/_DomainWizardEdition.js similarity index 90% rename from client-app/tests/functional/maintenance/domains/_DomainWizardEdition.js rename to client-app/test/functional/maintenance/domains/_DomainWizardEdition.js index 48c3faf6..67cfb1c6 100644 --- a/client-app/tests/functional/maintenance/domains/_DomainWizardEdition.js +++ b/client-app/test/functional/maintenance/domains/_DomainWizardEdition.js @@ -1,8 +1,8 @@ define([ 'dojo/_base/declare' - , 'tests/support/tests/CatalogWizardEdition' - , 'tests/support/tests/WizardAddition' - , 'tests/support/tests/WizardEdition' + , 'test/support/tests/CatalogWizardEdition' + , 'test/support/tests/WizardAddition' + , 'test/support/tests/WizardEdition' , './_DomainBase' ], function( declare diff --git a/client-app/tests/functional/maintenance/domains/admin/Accessibility.js b/client-app/test/functional/maintenance/domains/admin/Accessibility.js similarity index 100% rename from client-app/tests/functional/maintenance/domains/admin/Accessibility.js rename to client-app/test/functional/maintenance/domains/admin/Accessibility.js diff --git a/client-app/tests/functional/maintenance/domains/admin/ActivityFields.js b/client-app/test/functional/maintenance/domains/admin/ActivityFields.js similarity index 100% rename from client-app/tests/functional/maintenance/domains/admin/ActivityFields.js rename to client-app/test/functional/maintenance/domains/admin/ActivityFields.js diff --git a/client-app/tests/functional/maintenance/domains/admin/ActivityTypes.js b/client-app/test/functional/maintenance/domains/admin/ActivityTypes.js similarity index 100% rename from client-app/tests/functional/maintenance/domains/admin/ActivityTypes.js rename to client-app/test/functional/maintenance/domains/admin/ActivityTypes.js diff --git a/client-app/tests/functional/maintenance/domains/admin/ContactRoles.js b/client-app/test/functional/maintenance/domains/admin/ContactRoles.js similarity index 100% rename from client-app/tests/functional/maintenance/domains/admin/ContactRoles.js rename to client-app/test/functional/maintenance/domains/admin/ContactRoles.js diff --git a/client-app/tests/functional/maintenance/domains/admin/Countries.js b/client-app/test/functional/maintenance/domains/admin/Countries.js similarity index 100% rename from client-app/tests/functional/maintenance/domains/admin/Countries.js rename to client-app/test/functional/maintenance/domains/admin/Countries.js diff --git a/client-app/tests/functional/maintenance/domains/admin/DeviceTypes.js b/client-app/test/functional/maintenance/domains/admin/DeviceTypes.js similarity index 100% rename from client-app/tests/functional/maintenance/domains/admin/DeviceTypes.js rename to client-app/test/functional/maintenance/domains/admin/DeviceTypes.js diff --git a/client-app/tests/functional/maintenance/domains/admin/DocumentTypes.js b/client-app/test/functional/maintenance/domains/admin/DocumentTypes.js similarity index 100% rename from client-app/tests/functional/maintenance/domains/admin/DocumentTypes.js rename to client-app/test/functional/maintenance/domains/admin/DocumentTypes.js diff --git a/client-app/tests/functional/maintenance/domains/admin/OrganisationRoles.js b/client-app/test/functional/maintenance/domains/admin/OrganisationRoles.js similarity index 100% rename from client-app/tests/functional/maintenance/domains/admin/OrganisationRoles.js rename to client-app/test/functional/maintenance/domains/admin/OrganisationRoles.js diff --git a/client-app/tests/functional/maintenance/domains/admin/OrganisationTypes.js b/client-app/test/functional/maintenance/domains/admin/OrganisationTypes.js similarity index 100% rename from client-app/tests/functional/maintenance/domains/admin/OrganisationTypes.js rename to client-app/test/functional/maintenance/domains/admin/OrganisationTypes.js diff --git a/client-app/tests/functional/maintenance/domains/admin/PlatformTypes.js b/client-app/test/functional/maintenance/domains/admin/PlatformTypes.js similarity index 100% rename from client-app/tests/functional/maintenance/domains/admin/PlatformTypes.js rename to client-app/test/functional/maintenance/domains/admin/PlatformTypes.js diff --git a/client-app/tests/functional/maintenance/domains/admin/ProjectGroups.js b/client-app/test/functional/maintenance/domains/admin/ProjectGroups.js similarity index 100% rename from client-app/tests/functional/maintenance/domains/admin/ProjectGroups.js rename to client-app/test/functional/maintenance/domains/admin/ProjectGroups.js diff --git a/client-app/tests/functional/maintenance/domains/admin/Scopes.js b/client-app/test/functional/maintenance/domains/admin/Scopes.js similarity index 100% rename from client-app/tests/functional/maintenance/domains/admin/Scopes.js rename to client-app/test/functional/maintenance/domains/admin/Scopes.js diff --git a/client-app/tests/functional/maintenance/domains/geometry/AreaTypes.js b/client-app/test/functional/maintenance/domains/geometry/AreaTypes.js similarity index 100% rename from client-app/tests/functional/maintenance/domains/geometry/AreaTypes.js rename to client-app/test/functional/maintenance/domains/geometry/AreaTypes.js diff --git a/client-app/tests/functional/maintenance/domains/geometry/Destiny.js b/client-app/test/functional/maintenance/domains/geometry/Destiny.js similarity index 100% rename from client-app/tests/functional/maintenance/domains/geometry/Destiny.js rename to client-app/test/functional/maintenance/domains/geometry/Destiny.js diff --git a/client-app/tests/functional/maintenance/domains/geometry/Ending.js b/client-app/test/functional/maintenance/domains/geometry/Ending.js similarity index 100% rename from client-app/tests/functional/maintenance/domains/geometry/Ending.js rename to client-app/test/functional/maintenance/domains/geometry/Ending.js diff --git a/client-app/tests/functional/maintenance/domains/geometry/InspireThemes.js b/client-app/test/functional/maintenance/domains/geometry/InspireThemes.js similarity index 100% rename from client-app/tests/functional/maintenance/domains/geometry/InspireThemes.js rename to client-app/test/functional/maintenance/domains/geometry/InspireThemes.js diff --git a/client-app/tests/functional/maintenance/domains/geometry/LineTypes.js b/client-app/test/functional/maintenance/domains/geometry/LineTypes.js similarity index 100% rename from client-app/tests/functional/maintenance/domains/geometry/LineTypes.js rename to client-app/test/functional/maintenance/domains/geometry/LineTypes.js diff --git a/client-app/tests/functional/maintenance/domains/geometry/MeshTypes.js b/client-app/test/functional/maintenance/domains/geometry/MeshTypes.js similarity index 100% rename from client-app/tests/functional/maintenance/domains/geometry/MeshTypes.js rename to client-app/test/functional/maintenance/domains/geometry/MeshTypes.js diff --git a/client-app/tests/functional/maintenance/domains/geometry/RasterTypes.js b/client-app/test/functional/maintenance/domains/geometry/RasterTypes.js similarity index 100% rename from client-app/tests/functional/maintenance/domains/geometry/RasterTypes.js rename to client-app/test/functional/maintenance/domains/geometry/RasterTypes.js diff --git a/client-app/tests/functional/maintenance/domains/geometry/RecordingTypes.js b/client-app/test/functional/maintenance/domains/geometry/RecordingTypes.js similarity index 100% rename from client-app/tests/functional/maintenance/domains/geometry/RecordingTypes.js rename to client-app/test/functional/maintenance/domains/geometry/RecordingTypes.js diff --git a/client-app/tests/functional/maintenance/domains/geometry/ShorelineTypes.js b/client-app/test/functional/maintenance/domains/geometry/ShorelineTypes.js similarity index 100% rename from client-app/tests/functional/maintenance/domains/geometry/ShorelineTypes.js rename to client-app/test/functional/maintenance/domains/geometry/ShorelineTypes.js diff --git a/client-app/tests/functional/maintenance/domains/geometry/ThematicTypes.js b/client-app/test/functional/maintenance/domains/geometry/ThematicTypes.js similarity index 100% rename from client-app/tests/functional/maintenance/domains/geometry/ThematicTypes.js rename to client-app/test/functional/maintenance/domains/geometry/ThematicTypes.js diff --git a/client-app/tests/functional/maintenance/domains/geometry/ToponymTypes.js b/client-app/test/functional/maintenance/domains/geometry/ToponymTypes.js similarity index 100% rename from client-app/tests/functional/maintenance/domains/geometry/ToponymTypes.js rename to client-app/test/functional/maintenance/domains/geometry/ToponymTypes.js diff --git a/client-app/tests/functional/maintenance/domains/observations/AttributeTypes.js b/client-app/test/functional/maintenance/domains/observations/AttributeTypes.js similarity index 100% rename from client-app/tests/functional/maintenance/domains/observations/AttributeTypes.js rename to client-app/test/functional/maintenance/domains/observations/AttributeTypes.js diff --git a/client-app/tests/functional/maintenance/domains/observations/CensusingStatus.js b/client-app/test/functional/maintenance/domains/observations/CensusingStatus.js similarity index 100% rename from client-app/tests/functional/maintenance/domains/observations/CensusingStatus.js rename to client-app/test/functional/maintenance/domains/observations/CensusingStatus.js diff --git a/client-app/tests/functional/maintenance/domains/observations/Confidence.js b/client-app/test/functional/maintenance/domains/observations/Confidence.js similarity index 100% rename from client-app/tests/functional/maintenance/domains/observations/Confidence.js rename to client-app/test/functional/maintenance/domains/observations/Confidence.js diff --git a/client-app/tests/functional/maintenance/domains/observations/InfrastructureType.js b/client-app/test/functional/maintenance/domains/observations/InfrastructureType.js similarity index 100% rename from client-app/tests/functional/maintenance/domains/observations/InfrastructureType.js rename to client-app/test/functional/maintenance/domains/observations/InfrastructureType.js diff --git a/client-app/tests/functional/maintenance/domains/observations/MetricGroups.js b/client-app/test/functional/maintenance/domains/observations/MetricGroups.js similarity index 100% rename from client-app/tests/functional/maintenance/domains/observations/MetricGroups.js rename to client-app/test/functional/maintenance/domains/observations/MetricGroups.js diff --git a/client-app/tests/functional/maintenance/domains/observations/MetricsDefinitions.js b/client-app/test/functional/maintenance/domains/observations/MetricsDefinitions.js similarity index 100% rename from client-app/tests/functional/maintenance/domains/observations/MetricsDefinitions.js rename to client-app/test/functional/maintenance/domains/observations/MetricsDefinitions.js diff --git a/client-app/tests/functional/maintenance/domains/observations/ObjectTypes.js b/client-app/test/functional/maintenance/domains/observations/ObjectTypes.js similarity index 100% rename from client-app/tests/functional/maintenance/domains/observations/ObjectTypes.js rename to client-app/test/functional/maintenance/domains/observations/ObjectTypes.js diff --git a/client-app/tests/functional/maintenance/domains/observations/ParameterTypes.js b/client-app/test/functional/maintenance/domains/observations/ParameterTypes.js similarity index 100% rename from client-app/tests/functional/maintenance/domains/observations/ParameterTypes.js rename to client-app/test/functional/maintenance/domains/observations/ParameterTypes.js diff --git a/client-app/tests/functional/maintenance/domains/observations/Parameters.js b/client-app/test/functional/maintenance/domains/observations/Parameters.js similarity index 100% rename from client-app/tests/functional/maintenance/domains/observations/Parameters.js rename to client-app/test/functional/maintenance/domains/observations/Parameters.js diff --git a/client-app/tests/functional/maintenance/domains/observations/SampleTypes.js b/client-app/test/functional/maintenance/domains/observations/SampleTypes.js similarity index 100% rename from client-app/tests/functional/maintenance/domains/observations/SampleTypes.js rename to client-app/test/functional/maintenance/domains/observations/SampleTypes.js diff --git a/client-app/tests/functional/maintenance/domains/observations/SeaConditions.js b/client-app/test/functional/maintenance/domains/observations/SeaConditions.js similarity index 100% rename from client-app/tests/functional/maintenance/domains/observations/SeaConditions.js rename to client-app/test/functional/maintenance/domains/observations/SeaConditions.js diff --git a/client-app/tests/functional/maintenance/domains/observations/UnitTypes.js b/client-app/test/functional/maintenance/domains/observations/UnitTypes.js similarity index 100% rename from client-app/tests/functional/maintenance/domains/observations/UnitTypes.js rename to client-app/test/functional/maintenance/domains/observations/UnitTypes.js diff --git a/client-app/tests/functional/maintenance/domains/observations/Units.js b/client-app/test/functional/maintenance/domains/observations/Units.js similarity index 100% rename from client-app/tests/functional/maintenance/domains/observations/Units.js rename to client-app/test/functional/maintenance/domains/observations/Units.js diff --git a/client-app/tests/functional/maintenance/domains/taxon/CanaryProtection.js b/client-app/test/functional/maintenance/domains/taxon/CanaryProtection.js similarity index 100% rename from client-app/tests/functional/maintenance/domains/taxon/CanaryProtection.js rename to client-app/test/functional/maintenance/domains/taxon/CanaryProtection.js diff --git a/client-app/tests/functional/maintenance/domains/taxon/EUProtection.js b/client-app/test/functional/maintenance/domains/taxon/EUProtection.js similarity index 100% rename from client-app/tests/functional/maintenance/domains/taxon/EUProtection.js rename to client-app/test/functional/maintenance/domains/taxon/EUProtection.js diff --git a/client-app/tests/functional/maintenance/domains/taxon/Ecology.js b/client-app/test/functional/maintenance/domains/taxon/Ecology.js similarity index 100% rename from client-app/tests/functional/maintenance/domains/taxon/Ecology.js rename to client-app/test/functional/maintenance/domains/taxon/Ecology.js diff --git a/client-app/tests/functional/maintenance/domains/taxon/Endemicity.js b/client-app/test/functional/maintenance/domains/taxon/Endemicity.js similarity index 100% rename from client-app/tests/functional/maintenance/domains/taxon/Endemicity.js rename to client-app/test/functional/maintenance/domains/taxon/Endemicity.js diff --git a/client-app/tests/functional/maintenance/domains/taxon/Interest.js b/client-app/test/functional/maintenance/domains/taxon/Interest.js similarity index 100% rename from client-app/tests/functional/maintenance/domains/taxon/Interest.js rename to client-app/test/functional/maintenance/domains/taxon/Interest.js diff --git a/client-app/tests/functional/maintenance/domains/taxon/LifeStages.js b/client-app/test/functional/maintenance/domains/taxon/LifeStages.js similarity index 100% rename from client-app/tests/functional/maintenance/domains/taxon/LifeStages.js rename to client-app/test/functional/maintenance/domains/taxon/LifeStages.js diff --git a/client-app/tests/functional/maintenance/domains/taxon/Origin.js b/client-app/test/functional/maintenance/domains/taxon/Origin.js similarity index 100% rename from client-app/tests/functional/maintenance/domains/taxon/Origin.js rename to client-app/test/functional/maintenance/domains/taxon/Origin.js diff --git a/client-app/tests/functional/maintenance/domains/taxon/Permanence.js b/client-app/test/functional/maintenance/domains/taxon/Permanence.js similarity index 100% rename from client-app/tests/functional/maintenance/domains/taxon/Permanence.js rename to client-app/test/functional/maintenance/domains/taxon/Permanence.js diff --git a/client-app/tests/functional/maintenance/domains/taxon/Rank.js b/client-app/test/functional/maintenance/domains/taxon/Rank.js similarity index 100% rename from client-app/tests/functional/maintenance/domains/taxon/Rank.js rename to client-app/test/functional/maintenance/domains/taxon/Rank.js diff --git a/client-app/tests/functional/maintenance/domains/taxon/Sex.js b/client-app/test/functional/maintenance/domains/taxon/Sex.js similarity index 100% rename from client-app/tests/functional/maintenance/domains/taxon/Sex.js rename to client-app/test/functional/maintenance/domains/taxon/Sex.js diff --git a/client-app/tests/functional/maintenance/domains/taxon/SpainProtection.js b/client-app/test/functional/maintenance/domains/taxon/SpainProtection.js similarity index 100% rename from client-app/tests/functional/maintenance/domains/taxon/SpainProtection.js rename to client-app/test/functional/maintenance/domains/taxon/SpainProtection.js diff --git a/client-app/tests/functional/maintenance/domains/taxon/Status.js b/client-app/test/functional/maintenance/domains/taxon/Status.js similarity index 100% rename from client-app/tests/functional/maintenance/domains/taxon/Status.js rename to client-app/test/functional/maintenance/domains/taxon/Status.js diff --git a/client-app/tests/functional/maintenance/domains/taxon/TrophicRegime.js b/client-app/test/functional/maintenance/domains/taxon/TrophicRegime.js similarity index 100% rename from client-app/tests/functional/maintenance/domains/taxon/TrophicRegime.js rename to client-app/test/functional/maintenance/domains/taxon/TrophicRegime.js diff --git a/client-app/tests/functional/modules/components/Keypad/testKeypad.js b/client-app/test/functional/modules/components/Keypad/testKeypad.js similarity index 97% rename from client-app/tests/functional/modules/components/Keypad/testKeypad.js rename to client-app/test/functional/modules/components/Keypad/testKeypad.js index 984c241e..b567a186 100644 --- a/client-app/tests/functional/modules/components/Keypad/testKeypad.js +++ b/client-app/test/functional/modules/components/Keypad/testKeypad.js @@ -2,8 +2,8 @@ define([ 'dojo/_base/lang' , 'dojo/node!@theintern/leadfoot/helpers/pollUntil' , 'module' - , 'tests/support/Config' - , 'tests/support/Utils' + , 'test/support/Config' + , 'test/support/Utils' ], function( lang , pollUntil diff --git a/client-app/tests/functional/modules/components/Keypad/testKeypadScript.js b/client-app/test/functional/modules/components/Keypad/testKeypadScript.js similarity index 100% rename from client-app/tests/functional/modules/components/Keypad/testKeypadScript.js rename to client-app/test/functional/modules/components/Keypad/testKeypadScript.js diff --git a/client-app/tests/functional/modules/form/input/MapSearchImpl/testMapSearchImpl.js b/client-app/test/functional/modules/form/input/MapSearchImpl/testMapSearchImpl.js similarity index 96% rename from client-app/tests/functional/modules/form/input/MapSearchImpl/testMapSearchImpl.js rename to client-app/test/functional/modules/form/input/MapSearchImpl/testMapSearchImpl.js index abdd76e1..ba30631e 100644 --- a/client-app/tests/functional/modules/form/input/MapSearchImpl/testMapSearchImpl.js +++ b/client-app/test/functional/modules/form/input/MapSearchImpl/testMapSearchImpl.js @@ -1,8 +1,8 @@ define([ 'dojo/_base/lang' , 'module' - , 'tests/support/Config' - , 'tests/support/Utils' + , 'test/support/Config' + , 'test/support/Utils' ], function( lang , module diff --git a/client-app/tests/functional/modules/form/input/MapSearchImpl/testMapSearchImplScript.js b/client-app/test/functional/modules/form/input/MapSearchImpl/testMapSearchImplScript.js similarity index 100% rename from client-app/tests/functional/modules/form/input/MapSearchImpl/testMapSearchImplScript.js rename to client-app/test/functional/modules/form/input/MapSearchImpl/testMapSearchImplScript.js diff --git a/client-app/tests/functional/modules/form/input/UploadFileImpl/testUploadFileImpl.js b/client-app/test/functional/modules/form/input/UploadFileImpl/testUploadFileImpl.js similarity index 99% rename from client-app/tests/functional/modules/form/input/UploadFileImpl/testUploadFileImpl.js rename to client-app/test/functional/modules/form/input/UploadFileImpl/testUploadFileImpl.js index 8c8e5416..6dfff73c 100644 --- a/client-app/tests/functional/modules/form/input/UploadFileImpl/testUploadFileImpl.js +++ b/client-app/test/functional/modules/form/input/UploadFileImpl/testUploadFileImpl.js @@ -1,8 +1,8 @@ define([ 'dojo/_base/lang' , 'module' - , 'tests/support/Config' - , 'tests/support/Utils' + , 'test/support/Config' + , 'test/support/Utils' ], function( lang , module diff --git a/client-app/tests/functional/modules/form/input/UploadFileImpl/testUploadFileImplScript.js b/client-app/test/functional/modules/form/input/UploadFileImpl/testUploadFileImplScript.js similarity index 100% rename from client-app/tests/functional/modules/form/input/UploadFileImpl/testUploadFileImplScript.js rename to client-app/test/functional/modules/form/input/UploadFileImpl/testUploadFileImplScript.js diff --git a/client-app/tests/functional/modules/form/testFormWithKeypad.js b/client-app/test/functional/modules/form/testFormWithKeypad.js similarity index 97% rename from client-app/tests/functional/modules/form/testFormWithKeypad.js rename to client-app/test/functional/modules/form/testFormWithKeypad.js index 500e153b..8f467d1f 100644 --- a/client-app/tests/functional/modules/form/testFormWithKeypad.js +++ b/client-app/test/functional/modules/form/testFormWithKeypad.js @@ -1,8 +1,8 @@ define([ 'dojo/_base/lang' , 'module' - , 'tests/support/Config' - , 'tests/support/Utils' + , 'test/support/Config' + , 'test/support/Utils' ], function( lang , module diff --git a/client-app/tests/functional/modules/form/testFormWithKeypadScript.js b/client-app/test/functional/modules/form/testFormWithKeypadScript.js similarity index 93% rename from client-app/tests/functional/modules/form/testFormWithKeypadScript.js rename to client-app/test/functional/modules/form/testFormWithKeypadScript.js index 705f9357..2c0760ab 100644 --- a/client-app/tests/functional/modules/form/testFormWithKeypadScript.js +++ b/client-app/test/functional/modules/form/testFormWithKeypadScript.js @@ -3,7 +3,7 @@ require([ , 'dojo/dom' , 'src/component/form/_CreateInternalKeypad' , 'src/component/form/FormContainerImpl' - , 'tests/support/resources/DomainModel' + , 'test/support/resources/DomainModel' ], function( declare , dom diff --git a/client-app/tests/functional/modules/search/testFacetsImpl.js b/client-app/test/functional/modules/search/testFacetsImpl.js similarity index 99% rename from client-app/tests/functional/modules/search/testFacetsImpl.js rename to client-app/test/functional/modules/search/testFacetsImpl.js index f63e61a9..09d8e5b6 100644 --- a/client-app/tests/functional/modules/search/testFacetsImpl.js +++ b/client-app/test/functional/modules/search/testFacetsImpl.js @@ -1,7 +1,7 @@ define([ 'module' - , 'tests/support/Config' - , 'tests/support/Utils' + , 'test/support/Config' + , 'test/support/Utils' ], function( module , Config diff --git a/client-app/tests/functional/modules/search/testFacetsImplScript.js b/client-app/test/functional/modules/search/testFacetsImplScript.js similarity index 100% rename from client-app/tests/functional/modules/search/testFacetsImplScript.js rename to client-app/test/functional/modules/search/testFacetsImplScript.js diff --git a/client-app/tests/functional/products/Atlas.js b/client-app/test/functional/products/Atlas.js similarity index 85% rename from client-app/tests/functional/products/Atlas.js rename to client-app/test/functional/products/Atlas.js index 8b6c7a8f..d7e6a395 100644 --- a/client-app/tests/functional/products/Atlas.js +++ b/client-app/test/functional/products/Atlas.js @@ -1,9 +1,9 @@ define([ 'dojo/_base/declare' - , 'tests/support/tests/_BaseCommons' - , 'tests/support/tests/Atlas' - , 'tests/support/tests/AtlasWithClickMap' - , 'tests/support/Utils' + , 'test/support/tests/_BaseCommons' + , 'test/support/tests/Atlas' + , 'test/support/tests/AtlasWithClickMap' + , 'test/support/Utils' ], function ( declare , _BaseCommons diff --git a/client-app/tests/functional/products/ServiceOGC.js b/client-app/test/functional/products/ServiceOGC.js similarity index 93% rename from client-app/tests/functional/products/ServiceOGC.js rename to client-app/test/functional/products/ServiceOGC.js index 412dd47f..37961306 100644 --- a/client-app/tests/functional/products/ServiceOGC.js +++ b/client-app/test/functional/products/ServiceOGC.js @@ -1,6 +1,6 @@ define([ 'dojo/_base/declare' - , 'tests/support/tests/_CatalogBase' + , 'test/support/tests/_CatalogBase' ], function( declare , _CatalogBaseTests diff --git a/client-app/tests/functional/viewers/Bibliography.js b/client-app/test/functional/viewers/Bibliography.js similarity index 84% rename from client-app/tests/functional/viewers/Bibliography.js rename to client-app/test/functional/viewers/Bibliography.js index 95d083e8..6b87b154 100644 --- a/client-app/tests/functional/viewers/Bibliography.js +++ b/client-app/test/functional/viewers/Bibliography.js @@ -1,5 +1,5 @@ define([ - 'tests/functional/catalog/_CatalogWithReport' + 'test/functional/catalog/_CatalogWithReport' ], function ( _CatalogWithReport ) { diff --git a/client-app/tests/functional/viewers/SpeciesDistribution.js b/client-app/test/functional/viewers/SpeciesDistribution.js similarity index 84% rename from client-app/tests/functional/viewers/SpeciesDistribution.js rename to client-app/test/functional/viewers/SpeciesDistribution.js index 13d5919e..78596cdd 100644 --- a/client-app/tests/functional/viewers/SpeciesDistribution.js +++ b/client-app/test/functional/viewers/SpeciesDistribution.js @@ -1,8 +1,8 @@ define([ 'dojo/_base/declare' - , 'tests/support/tests/_BaseCommons' - , 'tests/support/tests/SpeciesDistribution' - , 'tests/support/Utils' + , 'test/support/tests/_BaseCommons' + , 'test/support/tests/SpeciesDistribution' + , 'test/support/Utils' ], function ( declare , _BaseCommons diff --git a/client-app/tests/intern-functional-local.js b/client-app/test/intern-functional-local.js similarity index 100% rename from client-app/tests/intern-functional-local.js rename to client-app/test/intern-functional-local.js diff --git a/client-app/tests/intern-functional-remote.js b/client-app/test/intern-functional-remote.js similarity index 100% rename from client-app/tests/intern-functional-remote.js rename to client-app/test/intern-functional-remote.js diff --git a/client-app/tests/intern-unit-local.js b/client-app/test/intern-unit-local.js similarity index 100% rename from client-app/tests/intern-unit-local.js rename to client-app/test/intern-unit-local.js diff --git a/client-app/tests/intern-unit-remote.js b/client-app/test/intern-unit-remote.js similarity index 100% rename from client-app/tests/intern-unit-remote.js rename to client-app/test/intern-unit-remote.js diff --git a/client-app/tests/sockTest/app.js b/client-app/test/sockTest/app.js similarity index 100% rename from client-app/tests/sockTest/app.js rename to client-app/test/sockTest/app.js diff --git a/client-app/tests/sockTest/stomp.js b/client-app/test/sockTest/stomp.js similarity index 100% rename from client-app/tests/sockTest/stomp.js rename to client-app/test/sockTest/stomp.js diff --git a/client-app/tests/sockTest/websocket.mock.js b/client-app/test/sockTest/websocket.mock.js similarity index 100% rename from client-app/tests/sockTest/websocket.mock.js rename to client-app/test/sockTest/websocket.mock.js diff --git a/client-app/tests/support/Config.js b/client-app/test/support/Config.js similarity index 100% rename from client-app/tests/support/Config.js rename to client-app/test/support/Config.js diff --git a/client-app/tests/support/CustomReporter.js b/client-app/test/support/CustomReporter.js similarity index 100% rename from client-app/tests/support/CustomReporter.js rename to client-app/test/support/CustomReporter.js diff --git a/client-app/tests/support/Utils.js b/client-app/test/support/Utils.js similarity index 99% rename from client-app/tests/support/Utils.js rename to client-app/test/support/Utils.js index e2f290fe..05a66124 100644 --- a/client-app/tests/support/Utils.js +++ b/client-app/test/support/Utils.js @@ -25,7 +25,7 @@ define([ // Devuelve la URL a la página aislada de testeo, acompañada de la ruta hasta el script específico // para el test actual. - var pagePath = 'tests/support/pages/test.html', + var pagePath = 'test/support/pages/test.html', scriptPath = '/' + testPath.substring(0, testPath.length - 3) + Config.env.scriptSuffix + '.js', urlParams = '?script=' + scriptPath; diff --git a/client-app/tests/support/pages/Filter.js b/client-app/test/support/pages/Filter.js similarity index 98% rename from client-app/tests/support/pages/Filter.js rename to client-app/test/support/pages/Filter.js index b75cb969..9556d66e 100644 --- a/client-app/tests/support/pages/Filter.js +++ b/client-app/test/support/pages/Filter.js @@ -1,8 +1,8 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'tests/support/Config' - , 'tests/support/Utils' + , 'test/support/Config' + , 'test/support/Utils' , './List' , './steps/Form' ], function ( diff --git a/client-app/tests/support/pages/List.js b/client-app/test/support/pages/List.js similarity index 99% rename from client-app/tests/support/pages/List.js rename to client-app/test/support/pages/List.js index 31ee51bd..e24147e4 100644 --- a/client-app/tests/support/pages/List.js +++ b/client-app/test/support/pages/List.js @@ -1,8 +1,8 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'tests/support/Config' - , 'tests/support/Utils' + , 'test/support/Config' + , 'test/support/Utils' , './_Page' ], function ( declare diff --git a/client-app/tests/support/pages/ListHierarchical.js b/client-app/test/support/pages/ListHierarchical.js similarity index 98% rename from client-app/tests/support/pages/ListHierarchical.js rename to client-app/test/support/pages/ListHierarchical.js index 3a761cf8..235b9599 100644 --- a/client-app/tests/support/pages/ListHierarchical.js +++ b/client-app/test/support/pages/ListHierarchical.js @@ -1,8 +1,8 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'tests/support/pages/List' - , 'tests/support/Utils' + , 'test/support/pages/List' + , 'test/support/Utils' ], function ( declare , lang diff --git a/client-app/tests/support/pages/ListWithTextSearch.js b/client-app/test/support/pages/ListWithTextSearch.js similarity index 97% rename from client-app/tests/support/pages/ListWithTextSearch.js rename to client-app/test/support/pages/ListWithTextSearch.js index 6b98e5f3..ddfebd8f 100644 --- a/client-app/tests/support/pages/ListWithTextSearch.js +++ b/client-app/test/support/pages/ListWithTextSearch.js @@ -1,8 +1,8 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'tests/support/pages/List' - , 'tests/support/Utils' + , 'test/support/pages/List' + , 'test/support/Utils' ], function ( declare , lang diff --git a/client-app/tests/support/pages/ListWithTextSearchAndFacets.js b/client-app/test/support/pages/ListWithTextSearchAndFacets.js similarity index 98% rename from client-app/tests/support/pages/ListWithTextSearchAndFacets.js rename to client-app/test/support/pages/ListWithTextSearchAndFacets.js index a8222295..64bd2dff 100644 --- a/client-app/tests/support/pages/ListWithTextSearchAndFacets.js +++ b/client-app/test/support/pages/ListWithTextSearchAndFacets.js @@ -1,7 +1,7 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'tests/support/pages/ListWithTextSearch' + , 'test/support/pages/ListWithTextSearch' ], function ( declare , lang diff --git a/client-app/tests/support/pages/ListWithTreeFilter.js b/client-app/test/support/pages/ListWithTreeFilter.js similarity index 96% rename from client-app/tests/support/pages/ListWithTreeFilter.js rename to client-app/test/support/pages/ListWithTreeFilter.js index e5687fed..9b83489e 100644 --- a/client-app/tests/support/pages/ListWithTreeFilter.js +++ b/client-app/test/support/pages/ListWithTreeFilter.js @@ -1,8 +1,8 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'tests/support/pages/List' - , 'tests/support/Utils' + , 'test/support/pages/List' + , 'test/support/Utils' ], function ( declare , lang diff --git a/client-app/tests/support/pages/Login.js b/client-app/test/support/pages/Login.js similarity index 97% rename from client-app/tests/support/pages/Login.js rename to client-app/test/support/pages/Login.js index cc294864..d2f7e2a4 100644 --- a/client-app/tests/support/pages/Login.js +++ b/client-app/test/support/pages/Login.js @@ -1,7 +1,7 @@ define([ 'dojo/_base/declare' - , 'tests/support/Config' - , 'tests/support/Utils' + , 'test/support/Config' + , 'test/support/Utils' , './_Page' ], function ( declare diff --git a/client-app/tests/support/pages/Map.js b/client-app/test/support/pages/Map.js similarity index 99% rename from client-app/tests/support/pages/Map.js rename to client-app/test/support/pages/Map.js index 966b7f2c..e9d2dace 100644 --- a/client-app/tests/support/pages/Map.js +++ b/client-app/test/support/pages/Map.js @@ -1,8 +1,8 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'tests/support/Config' - , 'tests/support/Utils' + , 'test/support/Config' + , 'test/support/Utils' , './_Page' ], function ( declare diff --git a/client-app/tests/support/pages/Wizard.js b/client-app/test/support/pages/Wizard.js similarity index 89% rename from client-app/tests/support/pages/Wizard.js rename to client-app/test/support/pages/Wizard.js index f8a9e244..b3c14d7c 100644 --- a/client-app/tests/support/pages/Wizard.js +++ b/client-app/test/support/pages/Wizard.js @@ -1,18 +1,18 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'tests/support/pages/_Page' - , 'tests/support/pages/steps/DoubleListFiltered' - , 'tests/support/pages/steps/DoubleList' - , 'tests/support/pages/steps/Form' - , 'tests/support/pages/steps/FormList' - , 'tests/support/pages/steps/LayerImage' - , 'tests/support/pages/steps/LineGeometry' - , 'tests/support/pages/steps/List' - , 'tests/support/pages/steps/RelationData' - , 'tests/support/pages/steps/ReorderLayerList' - , 'tests/support/pages/steps/PointGeometry' - , 'tests/support/Utils' + , 'test/support/pages/_Page' + , 'test/support/pages/steps/DoubleListFiltered' + , 'test/support/pages/steps/DoubleList' + , 'test/support/pages/steps/Form' + , 'test/support/pages/steps/FormList' + , 'test/support/pages/steps/LayerImage' + , 'test/support/pages/steps/LineGeometry' + , 'test/support/pages/steps/List' + , 'test/support/pages/steps/RelationData' + , 'test/support/pages/steps/ReorderLayerList' + , 'test/support/pages/steps/PointGeometry' + , 'test/support/Utils' ], function ( declare , lang diff --git a/client-app/tests/support/pages/_Page.js b/client-app/test/support/pages/_Page.js similarity index 100% rename from client-app/tests/support/pages/_Page.js rename to client-app/test/support/pages/_Page.js diff --git a/client-app/tests/support/pages/steps/DoubleList.js b/client-app/test/support/pages/steps/DoubleList.js similarity index 87% rename from client-app/tests/support/pages/steps/DoubleList.js rename to client-app/test/support/pages/steps/DoubleList.js index b0459974..0a689383 100644 --- a/client-app/tests/support/pages/steps/DoubleList.js +++ b/client-app/test/support/pages/steps/DoubleList.js @@ -1,8 +1,8 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'tests/support/pages/List' - , 'tests/support/Config' + , 'test/support/pages/List' + , 'test/support/Config' ], function ( declare , lang diff --git a/client-app/tests/support/pages/steps/DoubleListFiltered.js b/client-app/test/support/pages/steps/DoubleListFiltered.js similarity index 92% rename from client-app/tests/support/pages/steps/DoubleListFiltered.js rename to client-app/test/support/pages/steps/DoubleListFiltered.js index 5d9f17cd..c844a4bc 100644 --- a/client-app/tests/support/pages/steps/DoubleListFiltered.js +++ b/client-app/test/support/pages/steps/DoubleListFiltered.js @@ -1,9 +1,9 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'tests/support/pages/List' - , 'tests/support/Config' - , 'tests/support/Utils' + , 'test/support/pages/List' + , 'test/support/Config' + , 'test/support/Utils' ], function ( declare , lang diff --git a/client-app/tests/support/pages/steps/Form.js b/client-app/test/support/pages/steps/Form.js similarity index 98% rename from client-app/tests/support/pages/steps/Form.js rename to client-app/test/support/pages/steps/Form.js index 4377e5b2..6aedbd46 100644 --- a/client-app/tests/support/pages/steps/Form.js +++ b/client-app/test/support/pages/steps/Form.js @@ -2,10 +2,10 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' , 'RWidgets/Utilities' - , 'tests/support/pages/_Page' - , 'tests/support/pages/ListHierarchical' - , 'tests/support/Utils' - , 'tests/support/Config' + , 'test/support/pages/_Page' + , 'test/support/pages/ListHierarchical' + , 'test/support/Utils' + , 'test/support/Config' ], function ( declare , lang diff --git a/client-app/tests/support/pages/steps/FormList.js b/client-app/test/support/pages/steps/FormList.js similarity index 93% rename from client-app/tests/support/pages/steps/FormList.js rename to client-app/test/support/pages/steps/FormList.js index 89f44ac2..50af2b1e 100644 --- a/client-app/tests/support/pages/steps/FormList.js +++ b/client-app/test/support/pages/steps/FormList.js @@ -1,8 +1,8 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'tests/support/pages/steps/Form' - , 'tests/support/Utils' + , 'test/support/pages/steps/Form' + , 'test/support/Utils' ], function ( declare , lang diff --git a/client-app/tests/support/pages/steps/LayerImage.js b/client-app/test/support/pages/steps/LayerImage.js similarity index 90% rename from client-app/tests/support/pages/steps/LayerImage.js rename to client-app/test/support/pages/steps/LayerImage.js index 3c1fa435..6de0507c 100644 --- a/client-app/tests/support/pages/steps/LayerImage.js +++ b/client-app/test/support/pages/steps/LayerImage.js @@ -1,9 +1,9 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'tests/support/pages/_Page' - , 'tests/support/Config' - , 'tests/support/Utils' + , 'test/support/pages/_Page' + , 'test/support/Config' + , 'test/support/Utils' ], function ( declare , lang diff --git a/client-app/tests/support/pages/steps/LineGeometry.js b/client-app/test/support/pages/steps/LineGeometry.js similarity index 90% rename from client-app/tests/support/pages/steps/LineGeometry.js rename to client-app/test/support/pages/steps/LineGeometry.js index 20214359..520d0be9 100644 --- a/client-app/tests/support/pages/steps/LineGeometry.js +++ b/client-app/test/support/pages/steps/LineGeometry.js @@ -1,8 +1,8 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'tests/support/pages/steps/Form' - , 'tests/support/Utils' + , 'test/support/pages/steps/Form' + , 'test/support/Utils' ], function ( declare , lang diff --git a/client-app/tests/support/pages/steps/List.js b/client-app/test/support/pages/steps/List.js similarity index 91% rename from client-app/tests/support/pages/steps/List.js rename to client-app/test/support/pages/steps/List.js index b6a2c8d6..0cd6174d 100644 --- a/client-app/tests/support/pages/steps/List.js +++ b/client-app/test/support/pages/steps/List.js @@ -1,8 +1,8 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'tests/support/pages/List' - , 'tests/support/Utils' + , 'test/support/pages/List' + , 'test/support/Utils' ], function ( declare , lang diff --git a/client-app/tests/support/pages/steps/PointGeometry.js b/client-app/test/support/pages/steps/PointGeometry.js similarity index 85% rename from client-app/tests/support/pages/steps/PointGeometry.js rename to client-app/test/support/pages/steps/PointGeometry.js index 2f280456..13c7acc9 100644 --- a/client-app/tests/support/pages/steps/PointGeometry.js +++ b/client-app/test/support/pages/steps/PointGeometry.js @@ -1,9 +1,9 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'tests/support/pages/Map' - , 'tests/support/pages/steps/Form' - , 'tests/support/Utils' + , 'test/support/pages/Map' + , 'test/support/pages/steps/Form' + , 'test/support/Utils' ], function ( declare , lang diff --git a/client-app/tests/support/pages/steps/RelationData.js b/client-app/test/support/pages/steps/RelationData.js similarity index 96% rename from client-app/tests/support/pages/steps/RelationData.js rename to client-app/test/support/pages/steps/RelationData.js index d46e08fc..0f97a97c 100644 --- a/client-app/tests/support/pages/steps/RelationData.js +++ b/client-app/test/support/pages/steps/RelationData.js @@ -2,10 +2,10 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' , 'RWidgets/Utilities' - , 'tests/support/pages/steps/Form' - , 'tests/support/pages/ListHierarchical' - , 'tests/support/Utils' - , 'tests/support/Config' + , 'test/support/pages/steps/Form' + , 'test/support/pages/ListHierarchical' + , 'test/support/Utils' + , 'test/support/Config' ], function ( declare , lang diff --git a/client-app/tests/support/pages/steps/ReorderLayerList.js b/client-app/test/support/pages/steps/ReorderLayerList.js similarity index 87% rename from client-app/tests/support/pages/steps/ReorderLayerList.js rename to client-app/test/support/pages/steps/ReorderLayerList.js index de30b78b..856239e9 100644 --- a/client-app/tests/support/pages/steps/ReorderLayerList.js +++ b/client-app/test/support/pages/steps/ReorderLayerList.js @@ -1,7 +1,7 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'tests/support/pages/List' + , 'test/support/pages/List' ], function ( declare , lang diff --git a/client-app/tests/support/pages/test.html b/client-app/test/support/pages/test.html similarity index 100% rename from client-app/tests/support/pages/test.html rename to client-app/test/support/pages/test.html diff --git a/client-app/tests/support/resources/DomainModel.js b/client-app/test/support/resources/DomainModel.js similarity index 100% rename from client-app/tests/support/resources/DomainModel.js rename to client-app/test/support/resources/DomainModel.js diff --git a/client-app/tests/support/resources/doc.pdf b/client-app/test/support/resources/doc.pdf similarity index 100% rename from client-app/tests/support/resources/doc.pdf rename to client-app/test/support/resources/doc.pdf diff --git a/client-app/tests/support/resources/fileForLoadData/ar.zip b/client-app/test/support/resources/fileForLoadData/ar.zip similarity index 100% rename from client-app/tests/support/resources/fileForLoadData/ar.zip rename to client-app/test/support/resources/fileForLoadData/ar.zip diff --git a/client-app/tests/support/resources/fileForLoadData/document.csv b/client-app/test/support/resources/fileForLoadData/document.csv similarity index 100% rename from client-app/tests/support/resources/fileForLoadData/document.csv rename to client-app/test/support/resources/fileForLoadData/document.csv diff --git a/client-app/tests/support/resources/fileForLoadData/ft.csv b/client-app/test/support/resources/fileForLoadData/ft.csv similarity index 100% rename from client-app/tests/support/resources/fileForLoadData/ft.csv rename to client-app/test/support/resources/fileForLoadData/ft.csv diff --git a/client-app/tests/support/resources/fileForLoadData/oc.csv b/client-app/test/support/resources/fileForLoadData/oc.csv similarity index 100% rename from client-app/tests/support/resources/fileForLoadData/oc.csv rename to client-app/test/support/resources/fileForLoadData/oc.csv diff --git a/client-app/tests/support/resources/fileForLoadData/pt.csv b/client-app/test/support/resources/fileForLoadData/pt.csv similarity index 100% rename from client-app/tests/support/resources/fileForLoadData/pt.csv rename to client-app/test/support/resources/fileForLoadData/pt.csv diff --git a/client-app/tests/support/resources/profile.png b/client-app/test/support/resources/profile.png similarity index 100% rename from client-app/tests/support/resources/profile.png rename to client-app/test/support/resources/profile.png diff --git a/client-app/tests/support/tests/Atlas.js b/client-app/test/support/tests/Atlas.js similarity index 95% rename from client-app/tests/support/tests/Atlas.js rename to client-app/test/support/tests/Atlas.js index 8f38ed38..d04a4462 100644 --- a/client-app/tests/support/tests/Atlas.js +++ b/client-app/test/support/tests/Atlas.js @@ -1,14 +1,14 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'tests/support/Config' - , 'tests/support/pages/ListHierarchical' - , 'tests/support/pages/ListWithTextSearch' - , 'tests/support/pages/Map' - , 'tests/support/Utils' - , 'tests/support/tests/ListHierarchical' - , 'tests/support/tests/ListHierarchicalWithSelection' - , 'tests/support/tests/Map' + , 'test/support/Config' + , 'test/support/pages/ListHierarchical' + , 'test/support/pages/ListWithTextSearch' + , 'test/support/pages/Map' + , 'test/support/Utils' + , 'test/support/tests/ListHierarchical' + , 'test/support/tests/ListHierarchicalWithSelection' + , 'test/support/tests/Map' , './_Commons' ], function ( declare diff --git a/client-app/tests/support/tests/AtlasWithClickMap.js b/client-app/test/support/tests/AtlasWithClickMap.js similarity index 92% rename from client-app/tests/support/tests/AtlasWithClickMap.js rename to client-app/test/support/tests/AtlasWithClickMap.js index d6313b87..124d7cd4 100644 --- a/client-app/tests/support/tests/AtlasWithClickMap.js +++ b/client-app/test/support/tests/AtlasWithClickMap.js @@ -1,14 +1,14 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'tests/support/Config' - , 'tests/support/pages/ListHierarchical' - , 'tests/support/pages/ListWithTextSearch' - , 'tests/support/pages/Map' - , 'tests/support/Utils' - , 'tests/support/tests/ListHierarchical' - , 'tests/support/tests/ListHierarchicalWithSelection' - , 'tests/support/tests/Map' + , 'test/support/Config' + , 'test/support/pages/ListHierarchical' + , 'test/support/pages/ListWithTextSearch' + , 'test/support/pages/Map' + , 'test/support/Utils' + , 'test/support/tests/ListHierarchical' + , 'test/support/tests/ListHierarchicalWithSelection' + , 'test/support/tests/Map' , './_Commons' ], function ( declare diff --git a/client-app/tests/support/tests/CatalogFacets.js b/client-app/test/support/tests/CatalogFacets.js similarity index 93% rename from client-app/tests/support/tests/CatalogFacets.js rename to client-app/test/support/tests/CatalogFacets.js index 743c744d..a8d72501 100644 --- a/client-app/tests/support/tests/CatalogFacets.js +++ b/client-app/test/support/tests/CatalogFacets.js @@ -1,8 +1,8 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'tests/support/pages/ListWithTextSearchAndFacets' - , 'tests/support/Utils' + , 'test/support/pages/ListWithTextSearchAndFacets' + , 'test/support/Utils' , './_Commons' ], function ( declare diff --git a/client-app/tests/support/tests/CatalogFacetsTotal.js b/client-app/test/support/tests/CatalogFacetsTotal.js similarity index 93% rename from client-app/tests/support/tests/CatalogFacetsTotal.js rename to client-app/test/support/tests/CatalogFacetsTotal.js index fd92e154..12e8e62e 100644 --- a/client-app/tests/support/tests/CatalogFacetsTotal.js +++ b/client-app/test/support/tests/CatalogFacetsTotal.js @@ -1,8 +1,8 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'tests/support/pages/ListWithTextSearchAndFacets' - , 'tests/support/Utils' + , 'test/support/pages/ListWithTextSearchAndFacets' + , 'test/support/Utils' , './_Commons' ], function ( declare diff --git a/client-app/tests/support/tests/CatalogGuestReport.js b/client-app/test/support/tests/CatalogGuestReport.js similarity index 95% rename from client-app/tests/support/tests/CatalogGuestReport.js rename to client-app/test/support/tests/CatalogGuestReport.js index b145992d..e64d1249 100644 --- a/client-app/tests/support/tests/CatalogGuestReport.js +++ b/client-app/test/support/tests/CatalogGuestReport.js @@ -1,9 +1,9 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'tests/support/Config' - , 'tests/support/pages/List' - , 'tests/support/Utils' + , 'test/support/Config' + , 'test/support/pages/List' + , 'test/support/Utils' , './_Commons' ], function ( declare diff --git a/client-app/tests/support/tests/CatalogLinks.js b/client-app/test/support/tests/CatalogLinks.js similarity index 92% rename from client-app/tests/support/tests/CatalogLinks.js rename to client-app/test/support/tests/CatalogLinks.js index 552c0c90..4e65234c 100644 --- a/client-app/tests/support/tests/CatalogLinks.js +++ b/client-app/test/support/tests/CatalogLinks.js @@ -1,8 +1,8 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'tests/support/pages/List' - , 'tests/support/Utils' + , 'test/support/pages/List' + , 'test/support/Utils' , './_Commons' ], function ( declare diff --git a/client-app/tests/support/tests/CatalogUserReport.js b/client-app/test/support/tests/CatalogUserReport.js similarity index 98% rename from client-app/tests/support/tests/CatalogUserReport.js rename to client-app/test/support/tests/CatalogUserReport.js index 1a1b9a78..3c92fa54 100644 --- a/client-app/tests/support/tests/CatalogUserReport.js +++ b/client-app/test/support/tests/CatalogUserReport.js @@ -1,9 +1,9 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'tests/support/Config' - , 'tests/support/pages/List' - , 'tests/support/Utils' + , 'test/support/Config' + , 'test/support/pages/List' + , 'test/support/Utils' , './_Commons' ], function ( declare diff --git a/client-app/tests/support/tests/CatalogWizardEdition.js b/client-app/test/support/tests/CatalogWizardEdition.js similarity index 93% rename from client-app/tests/support/tests/CatalogWizardEdition.js rename to client-app/test/support/tests/CatalogWizardEdition.js index aeae2ca1..796f5292 100644 --- a/client-app/tests/support/tests/CatalogWizardEdition.js +++ b/client-app/test/support/tests/CatalogWizardEdition.js @@ -1,7 +1,7 @@ define([ 'dojo/_base/declare' - , 'tests/support/pages/List' - , 'tests/support/Utils' + , 'test/support/pages/List' + , 'test/support/Utils' , './_Commons' ], function ( declare diff --git a/client-app/tests/support/tests/Citation.js b/client-app/test/support/tests/Citation.js similarity index 95% rename from client-app/tests/support/tests/Citation.js rename to client-app/test/support/tests/Citation.js index 2f7b3b51..81009185 100644 --- a/client-app/tests/support/tests/Citation.js +++ b/client-app/test/support/tests/Citation.js @@ -1,10 +1,10 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'tests/support/pages/List' - , 'tests/support/pages/steps/PointGeometry' - , 'tests/support/Config' - , 'tests/support/Utils' + , 'test/support/pages/List' + , 'test/support/pages/steps/PointGeometry' + , 'test/support/Config' + , 'test/support/Utils' , './_Commons' ], function ( declare diff --git a/client-app/tests/support/tests/Dashboard.js b/client-app/test/support/tests/Dashboard.js similarity index 93% rename from client-app/tests/support/tests/Dashboard.js rename to client-app/test/support/tests/Dashboard.js index 3842ba62..2f1ff993 100644 --- a/client-app/tests/support/tests/Dashboard.js +++ b/client-app/test/support/tests/Dashboard.js @@ -1,6 +1,6 @@ define([ 'dojo/_base/declare' - , 'tests/support/pages/_Page' + , 'test/support/pages/_Page' , './_Commons' ], function ( declare diff --git a/client-app/tests/support/tests/DetailsBase.js b/client-app/test/support/tests/DetailsBase.js similarity index 92% rename from client-app/tests/support/tests/DetailsBase.js rename to client-app/test/support/tests/DetailsBase.js index 7eedca12..a6b58cd5 100644 --- a/client-app/tests/support/tests/DetailsBase.js +++ b/client-app/test/support/tests/DetailsBase.js @@ -1,6 +1,6 @@ define([ 'dojo/_base/declare' - , 'tests/support/pages/_Page' + , 'test/support/pages/_Page' , './_Commons' ], function ( declare diff --git a/client-app/tests/support/tests/DetailsEditionLink.js b/client-app/test/support/tests/DetailsEditionLink.js similarity index 92% rename from client-app/tests/support/tests/DetailsEditionLink.js rename to client-app/test/support/tests/DetailsEditionLink.js index c5b58ced..560e744c 100644 --- a/client-app/tests/support/tests/DetailsEditionLink.js +++ b/client-app/test/support/tests/DetailsEditionLink.js @@ -1,8 +1,8 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'tests/support/pages/_Page' - , 'tests/support/Utils' + , 'test/support/pages/_Page' + , 'test/support/Utils' , './_Commons' ], function ( declare diff --git a/client-app/tests/support/tests/DetailsInfo.js b/client-app/test/support/tests/DetailsInfo.js similarity index 96% rename from client-app/tests/support/tests/DetailsInfo.js rename to client-app/test/support/tests/DetailsInfo.js index 5325bb7f..f0ca791a 100644 --- a/client-app/tests/support/tests/DetailsInfo.js +++ b/client-app/test/support/tests/DetailsInfo.js @@ -1,8 +1,8 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'tests/support/pages/_Page' - , 'tests/support/Utils' + , 'test/support/pages/_Page' + , 'test/support/Utils' , './_Commons' ], function ( declare diff --git a/client-app/tests/support/tests/DetailsPDF.js b/client-app/test/support/tests/DetailsPDF.js similarity index 93% rename from client-app/tests/support/tests/DetailsPDF.js rename to client-app/test/support/tests/DetailsPDF.js index d264fc23..0357001d 100644 --- a/client-app/tests/support/tests/DetailsPDF.js +++ b/client-app/test/support/tests/DetailsPDF.js @@ -1,9 +1,9 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'tests/support/pages/_Page' - , 'tests/support/Config' - , 'tests/support/Utils' + , 'test/support/pages/_Page' + , 'test/support/Config' + , 'test/support/Utils' , './_Commons' ], function ( declare diff --git a/client-app/tests/support/tests/DetailsTabs.js b/client-app/test/support/tests/DetailsTabs.js similarity index 91% rename from client-app/tests/support/tests/DetailsTabs.js rename to client-app/test/support/tests/DetailsTabs.js index 43add351..368b75d1 100644 --- a/client-app/tests/support/tests/DetailsTabs.js +++ b/client-app/test/support/tests/DetailsTabs.js @@ -1,8 +1,8 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'tests/support/pages/_Page' - , 'tests/support/Utils' + , 'test/support/pages/_Page' + , 'test/support/Utils' , './_Commons' ], function ( declare diff --git a/client-app/tests/support/tests/Filter.js b/client-app/test/support/tests/Filter.js similarity index 99% rename from client-app/tests/support/tests/Filter.js rename to client-app/test/support/tests/Filter.js index 3516b491..802a6f17 100644 --- a/client-app/tests/support/tests/Filter.js +++ b/client-app/test/support/tests/Filter.js @@ -1,6 +1,6 @@ define([ 'dojo/_base/declare' - , 'tests/support/pages/Filter' + , 'test/support/pages/Filter' , './_Commons' ], function ( declare diff --git a/client-app/tests/support/tests/FormAddition.js b/client-app/test/support/tests/FormAddition.js similarity index 96% rename from client-app/tests/support/tests/FormAddition.js rename to client-app/test/support/tests/FormAddition.js index 2a2e3607..b03f7411 100644 --- a/client-app/tests/support/tests/FormAddition.js +++ b/client-app/test/support/tests/FormAddition.js @@ -1,10 +1,10 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'tests/support/pages/List' - , 'tests/support/pages/steps/Form' - , 'tests/support/Config' - , 'tests/support/Utils' + , 'test/support/pages/List' + , 'test/support/pages/steps/Form' + , 'test/support/Config' + , 'test/support/Utils' , './_Commons' ], function ( declare diff --git a/client-app/tests/support/tests/FormEdition.js b/client-app/test/support/tests/FormEdition.js similarity index 96% rename from client-app/tests/support/tests/FormEdition.js rename to client-app/test/support/tests/FormEdition.js index 5ce5df04..f5f8e9a6 100644 --- a/client-app/tests/support/tests/FormEdition.js +++ b/client-app/test/support/tests/FormEdition.js @@ -1,10 +1,10 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'tests/support/pages/List' - , 'tests/support/pages/steps/Form' - , 'tests/support/Config' - , 'tests/support/Utils' + , 'test/support/pages/List' + , 'test/support/pages/steps/Form' + , 'test/support/Config' + , 'test/support/Utils' , './_Commons' ], function ( declare diff --git a/client-app/tests/support/tests/ListFilterByTree.js b/client-app/test/support/tests/ListFilterByTree.js similarity index 97% rename from client-app/tests/support/tests/ListFilterByTree.js rename to client-app/test/support/tests/ListFilterByTree.js index 0b53a732..17be80a2 100644 --- a/client-app/tests/support/tests/ListFilterByTree.js +++ b/client-app/test/support/tests/ListFilterByTree.js @@ -1,8 +1,8 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'tests/support/pages/ListWithTreeFilter' - , 'tests/support/Utils' + , 'test/support/pages/ListWithTreeFilter' + , 'test/support/Utils' , './_Commons' ], function ( declare diff --git a/client-app/tests/support/tests/ListHierarchical.js b/client-app/test/support/tests/ListHierarchical.js similarity index 96% rename from client-app/tests/support/tests/ListHierarchical.js rename to client-app/test/support/tests/ListHierarchical.js index 4d6391fa..cdefe018 100644 --- a/client-app/tests/support/tests/ListHierarchical.js +++ b/client-app/test/support/tests/ListHierarchical.js @@ -1,6 +1,6 @@ define([ 'dojo/_base/declare' - , 'tests/support/pages/ListHierarchical' + , 'test/support/pages/ListHierarchical' , './_Commons' ], function ( declare diff --git a/client-app/tests/support/tests/ListHierarchicalWithSelection.js b/client-app/test/support/tests/ListHierarchicalWithSelection.js similarity index 95% rename from client-app/tests/support/tests/ListHierarchicalWithSelection.js rename to client-app/test/support/tests/ListHierarchicalWithSelection.js index da56f8ed..de41a1f2 100644 --- a/client-app/tests/support/tests/ListHierarchicalWithSelection.js +++ b/client-app/test/support/tests/ListHierarchicalWithSelection.js @@ -1,9 +1,9 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'tests/support/Config' - , 'tests/support/pages/ListHierarchical' - , 'tests/support/Utils' + , 'test/support/Config' + , 'test/support/pages/ListHierarchical' + , 'test/support/Utils' , './_Commons' ], function ( declare diff --git a/client-app/tests/support/tests/ListSelection.js b/client-app/test/support/tests/ListSelection.js similarity index 97% rename from client-app/tests/support/tests/ListSelection.js rename to client-app/test/support/tests/ListSelection.js index 424b91fc..9692a8b4 100644 --- a/client-app/tests/support/tests/ListSelection.js +++ b/client-app/test/support/tests/ListSelection.js @@ -1,8 +1,8 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'tests/support/pages/List' - , 'tests/support/Utils' + , 'test/support/pages/List' + , 'test/support/Utils' , './_Commons' ], function ( declare diff --git a/client-app/tests/support/tests/ListWithOrder.js b/client-app/test/support/tests/ListWithOrder.js similarity index 97% rename from client-app/tests/support/tests/ListWithOrder.js rename to client-app/test/support/tests/ListWithOrder.js index d4b0fdb0..c2164567 100644 --- a/client-app/tests/support/tests/ListWithOrder.js +++ b/client-app/test/support/tests/ListWithOrder.js @@ -1,8 +1,8 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'tests/support/pages/List' - , 'tests/support/Utils' + , 'test/support/pages/List' + , 'test/support/Utils' , './_Commons' ], function ( declare diff --git a/client-app/tests/support/tests/ListWithTextSearch.js b/client-app/test/support/tests/ListWithTextSearch.js similarity index 98% rename from client-app/tests/support/tests/ListWithTextSearch.js rename to client-app/test/support/tests/ListWithTextSearch.js index 30de144e..53f813fb 100644 --- a/client-app/tests/support/tests/ListWithTextSearch.js +++ b/client-app/test/support/tests/ListWithTextSearch.js @@ -1,8 +1,8 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'tests/support/pages/ListWithTextSearch' - , 'tests/support/Utils' + , 'test/support/pages/ListWithTextSearch' + , 'test/support/Utils' , './_Commons' ], function ( declare diff --git a/client-app/tests/support/tests/Map.js b/client-app/test/support/tests/Map.js similarity index 98% rename from client-app/tests/support/tests/Map.js rename to client-app/test/support/tests/Map.js index fa7d890e..4ed640b4 100644 --- a/client-app/tests/support/tests/Map.js +++ b/client-app/test/support/tests/Map.js @@ -1,9 +1,9 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'tests/support/Config' - , 'tests/support/pages/Map' - , 'tests/support/Utils' + , 'test/support/Config' + , 'test/support/pages/Map' + , 'test/support/Utils' , './_Commons' ], function ( declare diff --git a/client-app/tests/support/tests/SpeciesDistribution.js b/client-app/test/support/tests/SpeciesDistribution.js similarity index 94% rename from client-app/tests/support/tests/SpeciesDistribution.js rename to client-app/test/support/tests/SpeciesDistribution.js index 51ba4c92..1347d41f 100644 --- a/client-app/tests/support/tests/SpeciesDistribution.js +++ b/client-app/test/support/tests/SpeciesDistribution.js @@ -1,16 +1,16 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'tests/support/Config' - , 'tests/support/pages/ListWithTextSearch' - , 'tests/support/pages/ListWithTreeFilter' - , 'tests/support/pages/Map' - , 'tests/support/Utils' - , 'tests/support/tests/Atlas' - , 'tests/support/tests/AtlasWithClickMap' - , 'tests/support/tests/ListSelection' - , 'tests/support/tests/ListWithTextSearch' - , 'tests/support/tests/Map' + , 'test/support/Config' + , 'test/support/pages/ListWithTextSearch' + , 'test/support/pages/ListWithTreeFilter' + , 'test/support/pages/Map' + , 'test/support/Utils' + , 'test/support/tests/Atlas' + , 'test/support/tests/AtlasWithClickMap' + , 'test/support/tests/ListSelection' + , 'test/support/tests/ListWithTextSearch' + , 'test/support/tests/Map' , './_Commons' ], function ( declare diff --git a/client-app/tests/support/tests/WizardAddition.js b/client-app/test/support/tests/WizardAddition.js similarity index 97% rename from client-app/tests/support/tests/WizardAddition.js rename to client-app/test/support/tests/WizardAddition.js index 8e40126e..e1337e17 100644 --- a/client-app/tests/support/tests/WizardAddition.js +++ b/client-app/test/support/tests/WizardAddition.js @@ -1,8 +1,8 @@ define([ 'dojo/_base/declare' - , 'tests/support/pages/Wizard' - , 'tests/support/Config' - , 'tests/support/Utils' + , 'test/support/pages/Wizard' + , 'test/support/Config' + , 'test/support/Utils' , './_Commons' ], function ( declare diff --git a/client-app/tests/support/tests/WizardEdition.js b/client-app/test/support/tests/WizardEdition.js similarity index 98% rename from client-app/tests/support/tests/WizardEdition.js rename to client-app/test/support/tests/WizardEdition.js index 512e60ff..7815451b 100644 --- a/client-app/tests/support/tests/WizardEdition.js +++ b/client-app/test/support/tests/WizardEdition.js @@ -1,8 +1,8 @@ define([ 'dojo/_base/declare' - , 'tests/support/pages/Wizard' - , 'tests/support/Config' - , 'tests/support/Utils' + , 'test/support/pages/Wizard' + , 'test/support/Config' + , 'test/support/Utils' , './_Commons' ], function ( declare diff --git a/client-app/tests/support/tests/WizardWorms.js b/client-app/test/support/tests/WizardWorms.js similarity index 95% rename from client-app/tests/support/tests/WizardWorms.js rename to client-app/test/support/tests/WizardWorms.js index c92ae1d4..32fe3bb5 100644 --- a/client-app/tests/support/tests/WizardWorms.js +++ b/client-app/test/support/tests/WizardWorms.js @@ -1,8 +1,8 @@ define([ 'dojo/_base/declare' - , 'tests/support/pages/Wizard' - , 'tests/support/Config' - , 'tests/support/Utils' + , 'test/support/pages/Wizard' + , 'test/support/Config' + , 'test/support/Utils' , './_Commons' ], function ( declare diff --git a/client-app/tests/support/tests/_BaseCommons.js b/client-app/test/support/tests/_BaseCommons.js similarity index 96% rename from client-app/tests/support/tests/_BaseCommons.js rename to client-app/test/support/tests/_BaseCommons.js index e3395e9b..49126e82 100644 --- a/client-app/tests/support/tests/_BaseCommons.js +++ b/client-app/test/support/tests/_BaseCommons.js @@ -1,8 +1,8 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'tests/support/Config' - , 'tests/support/Utils' + , 'test/support/Config' + , 'test/support/Utils' ], function( declare , lang diff --git a/client-app/tests/support/tests/_CatalogBase.js b/client-app/test/support/tests/_CatalogBase.js similarity index 85% rename from client-app/tests/support/tests/_CatalogBase.js rename to client-app/test/support/tests/_CatalogBase.js index f869beb9..13de3d6b 100644 --- a/client-app/tests/support/tests/_CatalogBase.js +++ b/client-app/test/support/tests/_CatalogBase.js @@ -1,12 +1,12 @@ define([ 'dojo/_base/declare' - , 'tests/support/tests/CatalogFacets' - , 'tests/support/tests/CatalogFacetsTotal' - , 'tests/support/tests/CatalogLinks' - , 'tests/support/tests/Filter' - , 'tests/support/tests/ListSelection' - , 'tests/support/tests/ListWithOrder' - , 'tests/support/tests/ListWithTextSearch' + , 'test/support/tests/CatalogFacets' + , 'test/support/tests/CatalogFacetsTotal' + , 'test/support/tests/CatalogLinks' + , 'test/support/tests/Filter' + , 'test/support/tests/ListSelection' + , 'test/support/tests/ListWithOrder' + , 'test/support/tests/ListWithTextSearch' , './_BaseCommons' ], function( declare diff --git a/client-app/tests/support/tests/_Commons.js b/client-app/test/support/tests/_Commons.js similarity index 97% rename from client-app/tests/support/tests/_Commons.js rename to client-app/test/support/tests/_Commons.js index f42eb434..d65b9266 100644 --- a/client-app/tests/support/tests/_Commons.js +++ b/client-app/test/support/tests/_Commons.js @@ -2,9 +2,9 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/aspect' - , 'tests/support/pages/Login' - , 'tests/support/Config' - , 'tests/support/Utils' + , 'test/support/pages/Login' + , 'test/support/Config' + , 'test/support/Utils' ], function ( declare , lang diff --git a/client-app/tests/support/tests/_DataLoader.js b/client-app/test/support/tests/_DataLoader.js similarity index 89% rename from client-app/tests/support/tests/_DataLoader.js rename to client-app/test/support/tests/_DataLoader.js index 473677dd..d2d85e31 100644 --- a/client-app/tests/support/tests/_DataLoader.js +++ b/client-app/test/support/tests/_DataLoader.js @@ -1,15 +1,15 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'tests/support/tests/Atlas' - , 'tests/support/tests/CatalogWizardEdition' - , 'tests/support/tests/ListWithOrder' - , 'tests/support/tests/ListWithTextSearch' - , 'tests/support/tests/Map' - , 'tests/support/tests/WizardEdition' - , 'tests/support/tests/WizardAddition' - , 'tests/support/Config' - , 'tests/support/Utils' + , 'test/support/tests/Atlas' + , 'test/support/tests/CatalogWizardEdition' + , 'test/support/tests/ListWithOrder' + , 'test/support/tests/ListWithTextSearch' + , 'test/support/tests/Map' + , 'test/support/tests/WizardEdition' + , 'test/support/tests/WizardAddition' + , 'test/support/Config' + , 'test/support/Utils' , './_BaseCommons' ], function ( declare diff --git a/client-app/tests/unit/app/base/models/_ModelTestCommons.js b/client-app/test/unit/app/base/models/_ModelTestCommons.js similarity index 100% rename from client-app/tests/unit/app/base/models/_ModelTestCommons.js rename to client-app/test/unit/app/base/models/_ModelTestCommons.js diff --git a/client-app/tests/unit/app/base/models/attr/testArrayAttr.js b/client-app/test/unit/app/base/models/attr/testArrayAttr.js similarity index 100% rename from client-app/tests/unit/app/base/models/attr/testArrayAttr.js rename to client-app/test/unit/app/base/models/attr/testArrayAttr.js diff --git a/client-app/tests/unit/app/base/models/attr/testAttr.js b/client-app/test/unit/app/base/models/attr/testAttr.js similarity index 100% rename from client-app/tests/unit/app/base/models/attr/testAttr.js rename to client-app/test/unit/app/base/models/attr/testAttr.js diff --git a/client-app/tests/unit/app/base/models/attr/testObjAttr.js b/client-app/test/unit/app/base/models/attr/testObjAttr.js similarity index 100% rename from client-app/tests/unit/app/base/models/attr/testObjAttr.js rename to client-app/test/unit/app/base/models/attr/testObjAttr.js diff --git a/client-app/tests/unit/app/base/models/attr/testRelationAttr.js b/client-app/test/unit/app/base/models/attr/testRelationAttr.js similarity index 100% rename from client-app/tests/unit/app/base/models/attr/testRelationAttr.js rename to client-app/test/unit/app/base/models/attr/testRelationAttr.js diff --git a/client-app/tests/unit/app/base/models/test_Model.js b/client-app/test/unit/app/base/models/test_Model.js similarity index 100% rename from client-app/tests/unit/app/base/models/test_Model.js rename to client-app/test/unit/app/base/models/test_Model.js diff --git a/client-app/tests/unit/app/base/views/extensions/test_EditionView.js b/client-app/test/unit/app/base/views/extensions/test_EditionView.js similarity index 100% rename from client-app/tests/unit/app/base/views/extensions/test_EditionView.js rename to client-app/test/unit/app/base/views/extensions/test_EditionView.js diff --git a/client-app/tests/unit/app/viewers/views/test_ChartsView.js b/client-app/test/unit/app/viewers/views/test_ChartsView.js similarity index 100% rename from client-app/tests/unit/app/viewers/views/test_ChartsView.js rename to client-app/test/unit/app/viewers/views/test_ChartsView.js diff --git a/client-app/tests/unit/app/viewers/views/test_TimeSeriesSelectionManagement.js b/client-app/test/unit/app/viewers/views/test_TimeSeriesSelectionManagement.js similarity index 100% rename from client-app/tests/unit/app/viewers/views/test_TimeSeriesSelectionManagement.js rename to client-app/test/unit/app/viewers/views/test_TimeSeriesSelectionManagement.js diff --git a/client-app/tests/unit/redmic/base/testCredentials.js b/client-app/test/unit/redmic/base/testCredentials.js similarity index 100% rename from client-app/tests/unit/redmic/base/testCredentials.js rename to client-app/test/unit/redmic/base/testCredentials.js diff --git a/client-app/tests/unit/redmic/base/testMediator.js b/client-app/test/unit/redmic/base/testMediator.js similarity index 100% rename from client-app/tests/unit/redmic/base/testMediator.js rename to client-app/test/unit/redmic/base/testMediator.js diff --git a/client-app/tests/unit/redmic/base/testRedmicLocalStorage.js b/client-app/test/unit/redmic/base/testRedmicLocalStorage.js similarity index 100% rename from client-app/tests/unit/redmic/base/testRedmicLocalStorage.js rename to client-app/test/unit/redmic/base/testRedmicLocalStorage.js diff --git a/client-app/tests/unit/redmic/form/testUploadInput.js b/client-app/test/unit/redmic/form/testUploadInput.js similarity index 100% rename from client-app/tests/unit/redmic/form/testUploadInput.js rename to client-app/test/unit/redmic/form/testUploadInput.js diff --git a/client-app/tests/unit/redmic/modules/base/testManager.js b/client-app/test/unit/redmic/modules/base/testManager.js similarity index 100% rename from client-app/tests/unit/redmic/modules/base/testManager.js rename to client-app/test/unit/redmic/modules/base/testManager.js diff --git a/client-app/tests/unit/redmic/modules/base/testNotification.js b/client-app/test/unit/redmic/modules/base/testNotification.js similarity index 100% rename from client-app/tests/unit/redmic/modules/base/testNotification.js rename to client-app/test/unit/redmic/modules/base/testNotification.js diff --git a/client-app/tests/unit/redmic/modules/base/testSelectionBox.js b/client-app/test/unit/redmic/modules/base/testSelectionBox.js similarity index 100% rename from client-app/tests/unit/redmic/modules/base/testSelectionBox.js rename to client-app/test/unit/redmic/modules/base/testSelectionBox.js diff --git a/client-app/tests/unit/redmic/modules/base/test_Module.js b/client-app/test/unit/redmic/modules/base/test_Module.js similarity index 100% rename from client-app/tests/unit/redmic/modules/base/test_Module.js rename to client-app/test/unit/redmic/modules/base/test_Module.js diff --git a/client-app/tests/unit/redmic/modules/browser/bars/testOrder.js b/client-app/test/unit/redmic/modules/browser/bars/testOrder.js similarity index 100% rename from client-app/tests/unit/redmic/modules/browser/bars/testOrder.js rename to client-app/test/unit/redmic/modules/browser/bars/testOrder.js diff --git a/client-app/tests/unit/redmic/modules/browser/bars/testPagination.js b/client-app/test/unit/redmic/modules/browser/bars/testPagination.js similarity index 100% rename from client-app/tests/unit/redmic/modules/browser/bars/testPagination.js rename to client-app/test/unit/redmic/modules/browser/bars/testPagination.js diff --git a/client-app/tests/unit/redmic/modules/browser/bars/testSelectionBox.js b/client-app/test/unit/redmic/modules/browser/bars/testSelectionBox.js similarity index 100% rename from client-app/tests/unit/redmic/modules/browser/bars/testSelectionBox.js rename to client-app/test/unit/redmic/modules/browser/bars/testSelectionBox.js diff --git a/client-app/tests/unit/redmic/modules/browser/bars/testTotal.js b/client-app/test/unit/redmic/modules/browser/bars/testTotal.js similarity index 100% rename from client-app/tests/unit/redmic/modules/browser/bars/testTotal.js rename to client-app/test/unit/redmic/modules/browser/bars/testTotal.js diff --git a/client-app/tests/unit/redmic/modules/browser/buttons/testButtons.js b/client-app/test/unit/redmic/modules/browser/buttons/testButtons.js similarity index 100% rename from client-app/tests/unit/redmic/modules/browser/buttons/testButtons.js rename to client-app/test/unit/redmic/modules/browser/buttons/testButtons.js diff --git a/client-app/tests/unit/redmic/modules/browser/row/testRow.js b/client-app/test/unit/redmic/modules/browser/row/testRow.js similarity index 100% rename from client-app/tests/unit/redmic/modules/browser/row/testRow.js rename to client-app/test/unit/redmic/modules/browser/row/testRow.js diff --git a/client-app/tests/unit/redmic/modules/browser/testHierarchicalImpl.js b/client-app/test/unit/redmic/modules/browser/testHierarchicalImpl.js similarity index 100% rename from client-app/tests/unit/redmic/modules/browser/testHierarchicalImpl.js rename to client-app/test/unit/redmic/modules/browser/testHierarchicalImpl.js diff --git a/client-app/tests/unit/redmic/modules/browser/testListImpl.js b/client-app/test/unit/redmic/modules/browser/testListImpl.js similarity index 100% rename from client-app/tests/unit/redmic/modules/browser/testListImpl.js rename to client-app/test/unit/redmic/modules/browser/testListImpl.js diff --git a/client-app/tests/unit/redmic/modules/chart/ChartsContainer/testInfoChartsContainerImpl.js b/client-app/test/unit/redmic/modules/chart/ChartsContainer/testInfoChartsContainerImpl.js similarity index 100% rename from client-app/tests/unit/redmic/modules/chart/ChartsContainer/testInfoChartsContainerImpl.js rename to client-app/test/unit/redmic/modules/chart/ChartsContainer/testInfoChartsContainerImpl.js diff --git a/client-app/tests/unit/redmic/modules/chart/Toolbar/testSliderSelectorImpl.js b/client-app/test/unit/redmic/modules/chart/Toolbar/testSliderSelectorImpl.js similarity index 100% rename from client-app/tests/unit/redmic/modules/chart/Toolbar/testSliderSelectorImpl.js rename to client-app/test/unit/redmic/modules/chart/Toolbar/testSliderSelectorImpl.js diff --git a/client-app/tests/unit/redmic/modules/chart/layer/ChartLayer/testLinearChartImpl.js b/client-app/test/unit/redmic/modules/chart/layer/ChartLayer/testLinearChartImpl.js similarity index 100% rename from client-app/tests/unit/redmic/modules/chart/layer/ChartLayer/testLinearChartImpl.js rename to client-app/test/unit/redmic/modules/chart/layer/ChartLayer/testLinearChartImpl.js diff --git a/client-app/tests/unit/redmic/modules/form/inputs/testCheckBoxImpl.js b/client-app/test/unit/redmic/modules/form/inputs/testCheckBoxImpl.js similarity index 98% rename from client-app/tests/unit/redmic/modules/form/inputs/testCheckBoxImpl.js rename to client-app/test/unit/redmic/modules/form/inputs/testCheckBoxImpl.js index 35a17980..d00d1319 100644 --- a/client-app/tests/unit/redmic/modules/form/inputs/testCheckBoxImpl.js +++ b/client-app/test/unit/redmic/modules/form/inputs/testCheckBoxImpl.js @@ -4,7 +4,7 @@ define([ , "src/util/Mediator" , "src/component/model/ModelImpl" , "src/component/form/inputs/CheckBoxImpl" - , "tests/src/component/model/SupportModel" + , 'test/src/component/model/SupportModel" ], function( declare , lang diff --git a/client-app/tests/unit/redmic/modules/form/inputs/testDateTextBoxImpl.js b/client-app/test/unit/redmic/modules/form/inputs/testDateTextBoxImpl.js similarity index 98% rename from client-app/tests/unit/redmic/modules/form/inputs/testDateTextBoxImpl.js rename to client-app/test/unit/redmic/modules/form/inputs/testDateTextBoxImpl.js index c0d0c9ad..57866ea2 100644 --- a/client-app/tests/unit/redmic/modules/form/inputs/testDateTextBoxImpl.js +++ b/client-app/test/unit/redmic/modules/form/inputs/testDateTextBoxImpl.js @@ -4,7 +4,7 @@ define([ , "src/util/Mediator" , "src/component/model/ModelImpl" , "src/component/form/inputs/DateTextBoxImpl" - , "tests/src/component/model/SupportModel" + , 'test/src/component/model/SupportModel" , "moment" ], function( declare diff --git a/client-app/tests/unit/redmic/modules/form/inputs/testFilteringInputImpl.js b/client-app/test/unit/redmic/modules/form/inputs/testFilteringInputImpl.js similarity index 98% rename from client-app/tests/unit/redmic/modules/form/inputs/testFilteringInputImpl.js rename to client-app/test/unit/redmic/modules/form/inputs/testFilteringInputImpl.js index 8cc7f6bb..023e181a 100644 --- a/client-app/tests/unit/redmic/modules/form/inputs/testFilteringInputImpl.js +++ b/client-app/test/unit/redmic/modules/form/inputs/testFilteringInputImpl.js @@ -4,7 +4,7 @@ define([ , "src/util/Mediator" , "src/component/model/ModelImpl" , "src/component/form/inputs/FilteringInputImpl" - , "tests/src/component/model/SupportModel" + , 'test/src/component/model/SupportModel" ], function( declare , lang diff --git a/client-app/tests/unit/redmic/modules/form/inputs/testNumberSpinnerImpl.js b/client-app/test/unit/redmic/modules/form/inputs/testNumberSpinnerImpl.js similarity index 98% rename from client-app/tests/unit/redmic/modules/form/inputs/testNumberSpinnerImpl.js rename to client-app/test/unit/redmic/modules/form/inputs/testNumberSpinnerImpl.js index 45b3e9ef..061c2216 100644 --- a/client-app/tests/unit/redmic/modules/form/inputs/testNumberSpinnerImpl.js +++ b/client-app/test/unit/redmic/modules/form/inputs/testNumberSpinnerImpl.js @@ -4,7 +4,7 @@ define([ , "src/util/Mediator" , "src/component/model/ModelImpl" , "src/component/form/inputs/NumberSpinnerImpl" - , "tests/src/component/model/SupportModel" + , 'test/src/component/model/SupportModel" ], function( declare , lang diff --git a/client-app/tests/unit/redmic/modules/form/inputs/testNumberTextBoxImpl.js b/client-app/test/unit/redmic/modules/form/inputs/testNumberTextBoxImpl.js similarity index 98% rename from client-app/tests/unit/redmic/modules/form/inputs/testNumberTextBoxImpl.js rename to client-app/test/unit/redmic/modules/form/inputs/testNumberTextBoxImpl.js index 12d9c419..70cc7a34 100644 --- a/client-app/tests/unit/redmic/modules/form/inputs/testNumberTextBoxImpl.js +++ b/client-app/test/unit/redmic/modules/form/inputs/testNumberTextBoxImpl.js @@ -4,7 +4,7 @@ define([ , "src/util/Mediator" , "src/component/model/ModelImpl" , "src/component/form/inputs/NumberTextBoxImpl" - , "tests/src/component/model/SupportModel" + , 'test/src/component/model/SupportModel" ], function( declare , lang diff --git a/client-app/tests/unit/redmic/modules/form/inputs/testTextAreaImpl.js b/client-app/test/unit/redmic/modules/form/inputs/testTextAreaImpl.js similarity index 98% rename from client-app/tests/unit/redmic/modules/form/inputs/testTextAreaImpl.js rename to client-app/test/unit/redmic/modules/form/inputs/testTextAreaImpl.js index 02e8be6a..9a9207c8 100644 --- a/client-app/tests/unit/redmic/modules/form/inputs/testTextAreaImpl.js +++ b/client-app/test/unit/redmic/modules/form/inputs/testTextAreaImpl.js @@ -4,7 +4,7 @@ define([ , "src/util/Mediator" , "src/component/model/ModelImpl" , "src/component/form/inputs/TextAreaImpl" - , "tests/src/component/model/SupportModel" + , 'test/src/component/model/SupportModel" ], function( declare , lang diff --git a/client-app/tests/unit/redmic/modules/form/inputs/testTextBoxImpl.js b/client-app/test/unit/redmic/modules/form/inputs/testTextBoxImpl.js similarity index 99% rename from client-app/tests/unit/redmic/modules/form/inputs/testTextBoxImpl.js rename to client-app/test/unit/redmic/modules/form/inputs/testTextBoxImpl.js index 08919e2a..f575c3b5 100644 --- a/client-app/tests/unit/redmic/modules/form/inputs/testTextBoxImpl.js +++ b/client-app/test/unit/redmic/modules/form/inputs/testTextBoxImpl.js @@ -4,7 +4,7 @@ define([ , "src/util/Mediator" , "src/component/model/ModelImpl" , "src/component/form/inputs/TextBoxImpl" - , "tests/src/component/model/SupportModel" + , 'test/src/component/model/SupportModel" ], function( declare , lang diff --git a/client-app/tests/unit/redmic/modules/form/testForm.js b/client-app/test/unit/redmic/modules/form/testForm.js similarity index 100% rename from client-app/tests/unit/redmic/modules/form/testForm.js rename to client-app/test/unit/redmic/modules/form/testForm.js diff --git a/client-app/tests/unit/redmic/modules/gateway/testGateway.js b/client-app/test/unit/redmic/modules/gateway/testGateway.js similarity index 100% rename from client-app/tests/unit/redmic/modules/gateway/testGateway.js rename to client-app/test/unit/redmic/modules/gateway/testGateway.js diff --git a/client-app/tests/unit/redmic/modules/layout/details/testDetails.js b/client-app/test/unit/redmic/modules/layout/details/testDetails.js similarity index 100% rename from client-app/tests/unit/redmic/modules/layout/details/testDetails.js rename to client-app/test/unit/redmic/modules/layout/details/testDetails.js diff --git a/client-app/tests/unit/redmic/modules/layout/wizard/testWizard.js b/client-app/test/unit/redmic/modules/layout/wizard/testWizard.js similarity index 100% rename from client-app/tests/unit/redmic/modules/layout/wizard/testWizard.js rename to client-app/test/unit/redmic/modules/layout/wizard/testWizard.js diff --git a/client-app/tests/unit/redmic/modules/map/testLeafletImpl.js b/client-app/test/unit/redmic/modules/map/testLeafletImpl.js similarity index 100% rename from client-app/tests/unit/redmic/modules/map/testLeafletImpl.js rename to client-app/test/unit/redmic/modules/map/testLeafletImpl.js diff --git a/client-app/tests/unit/redmic/modules/model/testModelImpl.js b/client-app/test/unit/redmic/modules/model/testModelImpl.js similarity index 100% rename from client-app/tests/unit/redmic/modules/model/testModelImpl.js rename to client-app/test/unit/redmic/modules/model/testModelImpl.js diff --git a/client-app/tests/unit/redmic/modules/notification/test_Communication.js b/client-app/test/unit/redmic/modules/notification/test_Communication.js similarity index 100% rename from client-app/tests/unit/redmic/modules/notification/test_Communication.js rename to client-app/test/unit/redmic/modules/notification/test_Communication.js diff --git a/client-app/tests/unit/redmic/modules/notification/test_Notification.js b/client-app/test/unit/redmic/modules/notification/test_Notification.js similarity index 100% rename from client-app/tests/unit/redmic/modules/notification/test_Notification.js rename to client-app/test/unit/redmic/modules/notification/test_Notification.js diff --git a/client-app/tests/unit/redmic/modules/search/testFacetsImpl.js b/client-app/test/unit/redmic/modules/search/testFacetsImpl.js similarity index 100% rename from client-app/tests/unit/redmic/modules/search/testFacetsImpl.js rename to client-app/test/unit/redmic/modules/search/testFacetsImpl.js diff --git a/client-app/tests/unit/redmic/modules/search/testSearch.js b/client-app/test/unit/redmic/modules/search/testSearch.js similarity index 100% rename from client-app/tests/unit/redmic/modules/search/testSearch.js rename to client-app/test/unit/redmic/modules/search/testSearch.js diff --git a/client-app/tests/unit/redmic/modules/selection/testSelector.js b/client-app/test/unit/redmic/modules/selection/testSelector.js similarity index 100% rename from client-app/tests/unit/redmic/modules/selection/testSelector.js rename to client-app/test/unit/redmic/modules/selection/testSelector.js diff --git a/client-app/tests/unit/redmic/modules/socket/testSocket.js b/client-app/test/unit/redmic/modules/socket/testSocket.js similarity index 100% rename from client-app/tests/unit/redmic/modules/socket/testSocket.js rename to client-app/test/unit/redmic/modules/socket/testSocket.js diff --git a/client-app/tests/unit/redmic/modules/store/testRestManager.js b/client-app/test/unit/redmic/modules/store/testRestManager.js similarity index 100% rename from client-app/tests/unit/redmic/modules/store/testRestManager.js rename to client-app/test/unit/redmic/modules/store/testRestManager.js diff --git a/client-app/tests/unit/redmic/modules/tree/testTree.js b/client-app/test/unit/redmic/modules/tree/testTree.js similarity index 100% rename from client-app/tests/unit/redmic/modules/tree/testTree.js rename to client-app/test/unit/redmic/modules/tree/testTree.js diff --git a/client-app/tests/unit/redmic/modules/wizard/testWizard.js b/client-app/test/unit/redmic/modules/wizard/testWizard.js similarity index 100% rename from client-app/tests/unit/redmic/modules/wizard/testWizard.js rename to client-app/test/unit/redmic/modules/wizard/testWizard.js -- GitLab From e63c93e97984879cef9e08e9adc740edb607a874 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Tue, 23 Jul 2024 14:15:20 +0100 Subject: [PATCH 032/249] Corrige mezcla de comillas --- .../test/unit/redmic/modules/form/inputs/testCheckBoxImpl.js | 2 +- .../test/unit/redmic/modules/form/inputs/testDateTextBoxImpl.js | 2 +- .../unit/redmic/modules/form/inputs/testFilteringInputImpl.js | 2 +- .../unit/redmic/modules/form/inputs/testNumberSpinnerImpl.js | 2 +- .../unit/redmic/modules/form/inputs/testNumberTextBoxImpl.js | 2 +- .../test/unit/redmic/modules/form/inputs/testTextAreaImpl.js | 2 +- .../test/unit/redmic/modules/form/inputs/testTextBoxImpl.js | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/client-app/test/unit/redmic/modules/form/inputs/testCheckBoxImpl.js b/client-app/test/unit/redmic/modules/form/inputs/testCheckBoxImpl.js index d00d1319..f52babeb 100644 --- a/client-app/test/unit/redmic/modules/form/inputs/testCheckBoxImpl.js +++ b/client-app/test/unit/redmic/modules/form/inputs/testCheckBoxImpl.js @@ -4,7 +4,7 @@ define([ , "src/util/Mediator" , "src/component/model/ModelImpl" , "src/component/form/inputs/CheckBoxImpl" - , 'test/src/component/model/SupportModel" + , 'test/src/component/model/SupportModel' ], function( declare , lang diff --git a/client-app/test/unit/redmic/modules/form/inputs/testDateTextBoxImpl.js b/client-app/test/unit/redmic/modules/form/inputs/testDateTextBoxImpl.js index 57866ea2..63b3323a 100644 --- a/client-app/test/unit/redmic/modules/form/inputs/testDateTextBoxImpl.js +++ b/client-app/test/unit/redmic/modules/form/inputs/testDateTextBoxImpl.js @@ -4,7 +4,7 @@ define([ , "src/util/Mediator" , "src/component/model/ModelImpl" , "src/component/form/inputs/DateTextBoxImpl" - , 'test/src/component/model/SupportModel" + , 'test/src/component/model/SupportModel' , "moment" ], function( declare diff --git a/client-app/test/unit/redmic/modules/form/inputs/testFilteringInputImpl.js b/client-app/test/unit/redmic/modules/form/inputs/testFilteringInputImpl.js index 023e181a..079be84f 100644 --- a/client-app/test/unit/redmic/modules/form/inputs/testFilteringInputImpl.js +++ b/client-app/test/unit/redmic/modules/form/inputs/testFilteringInputImpl.js @@ -4,7 +4,7 @@ define([ , "src/util/Mediator" , "src/component/model/ModelImpl" , "src/component/form/inputs/FilteringInputImpl" - , 'test/src/component/model/SupportModel" + , 'test/src/component/model/SupportModel' ], function( declare , lang diff --git a/client-app/test/unit/redmic/modules/form/inputs/testNumberSpinnerImpl.js b/client-app/test/unit/redmic/modules/form/inputs/testNumberSpinnerImpl.js index 061c2216..72b5d5fc 100644 --- a/client-app/test/unit/redmic/modules/form/inputs/testNumberSpinnerImpl.js +++ b/client-app/test/unit/redmic/modules/form/inputs/testNumberSpinnerImpl.js @@ -4,7 +4,7 @@ define([ , "src/util/Mediator" , "src/component/model/ModelImpl" , "src/component/form/inputs/NumberSpinnerImpl" - , 'test/src/component/model/SupportModel" + , 'test/src/component/model/SupportModel' ], function( declare , lang diff --git a/client-app/test/unit/redmic/modules/form/inputs/testNumberTextBoxImpl.js b/client-app/test/unit/redmic/modules/form/inputs/testNumberTextBoxImpl.js index 70cc7a34..088e8155 100644 --- a/client-app/test/unit/redmic/modules/form/inputs/testNumberTextBoxImpl.js +++ b/client-app/test/unit/redmic/modules/form/inputs/testNumberTextBoxImpl.js @@ -4,7 +4,7 @@ define([ , "src/util/Mediator" , "src/component/model/ModelImpl" , "src/component/form/inputs/NumberTextBoxImpl" - , 'test/src/component/model/SupportModel" + , 'test/src/component/model/SupportModel' ], function( declare , lang diff --git a/client-app/test/unit/redmic/modules/form/inputs/testTextAreaImpl.js b/client-app/test/unit/redmic/modules/form/inputs/testTextAreaImpl.js index 9a9207c8..ef86b6f0 100644 --- a/client-app/test/unit/redmic/modules/form/inputs/testTextAreaImpl.js +++ b/client-app/test/unit/redmic/modules/form/inputs/testTextAreaImpl.js @@ -4,7 +4,7 @@ define([ , "src/util/Mediator" , "src/component/model/ModelImpl" , "src/component/form/inputs/TextAreaImpl" - , 'test/src/component/model/SupportModel" + , 'test/src/component/model/SupportModel' ], function( declare , lang diff --git a/client-app/test/unit/redmic/modules/form/inputs/testTextBoxImpl.js b/client-app/test/unit/redmic/modules/form/inputs/testTextBoxImpl.js index f575c3b5..7edcbe95 100644 --- a/client-app/test/unit/redmic/modules/form/inputs/testTextBoxImpl.js +++ b/client-app/test/unit/redmic/modules/form/inputs/testTextBoxImpl.js @@ -4,7 +4,7 @@ define([ , "src/util/Mediator" , "src/component/model/ModelImpl" , "src/component/form/inputs/TextBoxImpl" - , 'test/src/component/model/SupportModel" + , 'test/src/component/model/SupportModel' ], function( declare , lang -- GitLab From 5ad0744154fb2e6d439be1193fbaac4580fe32e5 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Thu, 25 Jul 2024 08:33:35 +0100 Subject: [PATCH 033/249] =?UTF-8?q?Actualiza=20ruta=20a=20m=C3=B3dulos=20e?= =?UTF-8?q?n=20perfil=20de=20compilado?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client-app/app.profile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client-app/app.profile.js b/client-app/app.profile.js index 3089c6b0..c261e3d2 100644 --- a/client-app/app.profile.js +++ b/client-app/app.profile.js @@ -141,7 +141,7 @@ var profileObj = { } },{ name: 'redmic', - location: 'src/redmic', + location: 'src/component', resourceTags: { amd: amdTagger } -- GitLab From bbb82b1b7e69f48302fb97db8a7642fe81dd9f3e Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Mon, 29 Jul 2024 08:31:52 +0100 Subject: [PATCH 034/249] Elimina ruta a directorio redmic en compilado --- client-app/app.profile.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/client-app/app.profile.js b/client-app/app.profile.js index c261e3d2..04cd6d02 100644 --- a/client-app/app.profile.js +++ b/client-app/app.profile.js @@ -139,12 +139,6 @@ var profileObj = { resourceTags: { amd: amdTagger } - },{ - name: 'redmic', - location: 'src/component', - resourceTags: { - amd: amdTagger - } },{ name: 'src', location: 'src', -- GitLab From 0254a1122ae2534865ea6dea4c63f68520fcc459 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Mon, 29 Jul 2024 09:40:35 +0100 Subject: [PATCH 035/249] Corrige rutas de test, limpia redmic de dojoConfig --- client-app/src/dojoConfig.js | 3 --- client-app/test/_dojoConfig.js | 2 +- .../unit/{redmic/modules => src/component}/base/testManager.js | 0 .../{redmic/modules => src/component}/base/testNotification.js | 0 .../{redmic/modules => src/component}/base/testSelectionBox.js | 0 .../unit/{redmic/modules => src/component}/base/test_Module.js | 0 .../modules => src/component}/browser/bars/testOrder.js | 0 .../modules => src/component}/browser/bars/testPagination.js | 0 .../modules => src/component}/browser/bars/testSelectionBox.js | 0 .../modules => src/component}/browser/bars/testTotal.js | 0 .../modules => src/component}/browser/buttons/testButtons.js | 0 .../{redmic/modules => src/component}/browser/row/testRow.js | 0 .../modules => src/component}/browser/testHierarchicalImpl.js | 0 .../{redmic/modules => src/component}/browser/testListImpl.js | 0 .../chart/ChartsContainer/testInfoChartsContainerImpl.js | 0 .../component}/chart/Toolbar/testSliderSelectorImpl.js | 0 .../component}/chart/layer/ChartLayer/testLinearChartImpl.js | 0 .../modules => src/component}/form/inputs/testCheckBoxImpl.js | 0 .../component}/form/inputs/testDateTextBoxImpl.js | 0 .../component}/form/inputs/testFilteringInputImpl.js | 0 .../component}/form/inputs/testNumberSpinnerImpl.js | 0 .../component}/form/inputs/testNumberTextBoxImpl.js | 0 .../modules => src/component}/form/inputs/testTextAreaImpl.js | 0 .../modules => src/component}/form/inputs/testTextBoxImpl.js | 0 .../unit/{redmic/modules => src/component}/form/testForm.js | 0 .../{redmic/modules => src/component}/gateway/testGateway.js | 0 .../modules => src/component}/layout/details/testDetails.js | 0 .../modules => src/component}/layout/wizard/testWizard.js | 0 .../{redmic/modules => src/component}/map/testLeafletImpl.js | 0 .../{redmic/modules => src/component}/model/testModelImpl.js | 0 .../component}/notification/test_Communication.js | 0 .../component}/notification/test_Notification.js | 0 .../{redmic/modules => src/component}/search/testFacetsImpl.js | 0 .../{redmic/modules => src/component}/search/testSearch.js | 0 .../modules => src/component}/selection/testSelector.js | 0 .../{redmic/modules => src/component}/socket/testSocket.js | 0 .../{redmic/modules => src/component}/store/testRestManager.js | 0 .../unit/{redmic/modules => src/component}/tree/testTree.js | 0 .../{redmic/modules => src/component}/wizard/testWizard.js | 0 grunt/config/cleanBuiltApp.js | 2 +- grunt/config/test.js | 3 ++- 41 files changed, 4 insertions(+), 6 deletions(-) rename client-app/test/unit/{redmic/modules => src/component}/base/testManager.js (100%) rename client-app/test/unit/{redmic/modules => src/component}/base/testNotification.js (100%) rename client-app/test/unit/{redmic/modules => src/component}/base/testSelectionBox.js (100%) rename client-app/test/unit/{redmic/modules => src/component}/base/test_Module.js (100%) rename client-app/test/unit/{redmic/modules => src/component}/browser/bars/testOrder.js (100%) rename client-app/test/unit/{redmic/modules => src/component}/browser/bars/testPagination.js (100%) rename client-app/test/unit/{redmic/modules => src/component}/browser/bars/testSelectionBox.js (100%) rename client-app/test/unit/{redmic/modules => src/component}/browser/bars/testTotal.js (100%) rename client-app/test/unit/{redmic/modules => src/component}/browser/buttons/testButtons.js (100%) rename client-app/test/unit/{redmic/modules => src/component}/browser/row/testRow.js (100%) rename client-app/test/unit/{redmic/modules => src/component}/browser/testHierarchicalImpl.js (100%) rename client-app/test/unit/{redmic/modules => src/component}/browser/testListImpl.js (100%) rename client-app/test/unit/{redmic/modules => src/component}/chart/ChartsContainer/testInfoChartsContainerImpl.js (100%) rename client-app/test/unit/{redmic/modules => src/component}/chart/Toolbar/testSliderSelectorImpl.js (100%) rename client-app/test/unit/{redmic/modules => src/component}/chart/layer/ChartLayer/testLinearChartImpl.js (100%) rename client-app/test/unit/{redmic/modules => src/component}/form/inputs/testCheckBoxImpl.js (100%) rename client-app/test/unit/{redmic/modules => src/component}/form/inputs/testDateTextBoxImpl.js (100%) rename client-app/test/unit/{redmic/modules => src/component}/form/inputs/testFilteringInputImpl.js (100%) rename client-app/test/unit/{redmic/modules => src/component}/form/inputs/testNumberSpinnerImpl.js (100%) rename client-app/test/unit/{redmic/modules => src/component}/form/inputs/testNumberTextBoxImpl.js (100%) rename client-app/test/unit/{redmic/modules => src/component}/form/inputs/testTextAreaImpl.js (100%) rename client-app/test/unit/{redmic/modules => src/component}/form/inputs/testTextBoxImpl.js (100%) rename client-app/test/unit/{redmic/modules => src/component}/form/testForm.js (100%) rename client-app/test/unit/{redmic/modules => src/component}/gateway/testGateway.js (100%) rename client-app/test/unit/{redmic/modules => src/component}/layout/details/testDetails.js (100%) rename client-app/test/unit/{redmic/modules => src/component}/layout/wizard/testWizard.js (100%) rename client-app/test/unit/{redmic/modules => src/component}/map/testLeafletImpl.js (100%) rename client-app/test/unit/{redmic/modules => src/component}/model/testModelImpl.js (100%) rename client-app/test/unit/{redmic/modules => src/component}/notification/test_Communication.js (100%) rename client-app/test/unit/{redmic/modules => src/component}/notification/test_Notification.js (100%) rename client-app/test/unit/{redmic/modules => src/component}/search/testFacetsImpl.js (100%) rename client-app/test/unit/{redmic/modules => src/component}/search/testSearch.js (100%) rename client-app/test/unit/{redmic/modules => src/component}/selection/testSelector.js (100%) rename client-app/test/unit/{redmic/modules => src/component}/socket/testSocket.js (100%) rename client-app/test/unit/{redmic/modules => src/component}/store/testRestManager.js (100%) rename client-app/test/unit/{redmic/modules => src/component}/tree/testTree.js (100%) rename client-app/test/unit/{redmic/modules => src/component}/wizard/testWizard.js (100%) diff --git a/client-app/src/dojoConfig.js b/client-app/src/dojoConfig.js index f2d4003a..dd4b9ad4 100644 --- a/client-app/src/dojoConfig.js +++ b/client-app/src/dojoConfig.js @@ -5,9 +5,6 @@ dojoConfig = { },{ name: 'app', location: '../../src/oldapp' - },{ - name: 'redmic', - location: '../../src/component' },{ name: 'RWidgets', location: '../../src/util/widgets' diff --git a/client-app/test/_dojoConfig.js b/client-app/test/_dojoConfig.js index 6b29f12e..5ca3dd23 100644 --- a/client-app/test/_dojoConfig.js +++ b/client-app/test/_dojoConfig.js @@ -25,7 +25,7 @@ module.exports = function(args) { dojoConfig.packages.push({ name: 'test', - location: '../../../test' + location: '../../test' }); return dojoConfig; diff --git a/client-app/test/unit/redmic/modules/base/testManager.js b/client-app/test/unit/src/component/base/testManager.js similarity index 100% rename from client-app/test/unit/redmic/modules/base/testManager.js rename to client-app/test/unit/src/component/base/testManager.js diff --git a/client-app/test/unit/redmic/modules/base/testNotification.js b/client-app/test/unit/src/component/base/testNotification.js similarity index 100% rename from client-app/test/unit/redmic/modules/base/testNotification.js rename to client-app/test/unit/src/component/base/testNotification.js diff --git a/client-app/test/unit/redmic/modules/base/testSelectionBox.js b/client-app/test/unit/src/component/base/testSelectionBox.js similarity index 100% rename from client-app/test/unit/redmic/modules/base/testSelectionBox.js rename to client-app/test/unit/src/component/base/testSelectionBox.js diff --git a/client-app/test/unit/redmic/modules/base/test_Module.js b/client-app/test/unit/src/component/base/test_Module.js similarity index 100% rename from client-app/test/unit/redmic/modules/base/test_Module.js rename to client-app/test/unit/src/component/base/test_Module.js diff --git a/client-app/test/unit/redmic/modules/browser/bars/testOrder.js b/client-app/test/unit/src/component/browser/bars/testOrder.js similarity index 100% rename from client-app/test/unit/redmic/modules/browser/bars/testOrder.js rename to client-app/test/unit/src/component/browser/bars/testOrder.js diff --git a/client-app/test/unit/redmic/modules/browser/bars/testPagination.js b/client-app/test/unit/src/component/browser/bars/testPagination.js similarity index 100% rename from client-app/test/unit/redmic/modules/browser/bars/testPagination.js rename to client-app/test/unit/src/component/browser/bars/testPagination.js diff --git a/client-app/test/unit/redmic/modules/browser/bars/testSelectionBox.js b/client-app/test/unit/src/component/browser/bars/testSelectionBox.js similarity index 100% rename from client-app/test/unit/redmic/modules/browser/bars/testSelectionBox.js rename to client-app/test/unit/src/component/browser/bars/testSelectionBox.js diff --git a/client-app/test/unit/redmic/modules/browser/bars/testTotal.js b/client-app/test/unit/src/component/browser/bars/testTotal.js similarity index 100% rename from client-app/test/unit/redmic/modules/browser/bars/testTotal.js rename to client-app/test/unit/src/component/browser/bars/testTotal.js diff --git a/client-app/test/unit/redmic/modules/browser/buttons/testButtons.js b/client-app/test/unit/src/component/browser/buttons/testButtons.js similarity index 100% rename from client-app/test/unit/redmic/modules/browser/buttons/testButtons.js rename to client-app/test/unit/src/component/browser/buttons/testButtons.js diff --git a/client-app/test/unit/redmic/modules/browser/row/testRow.js b/client-app/test/unit/src/component/browser/row/testRow.js similarity index 100% rename from client-app/test/unit/redmic/modules/browser/row/testRow.js rename to client-app/test/unit/src/component/browser/row/testRow.js diff --git a/client-app/test/unit/redmic/modules/browser/testHierarchicalImpl.js b/client-app/test/unit/src/component/browser/testHierarchicalImpl.js similarity index 100% rename from client-app/test/unit/redmic/modules/browser/testHierarchicalImpl.js rename to client-app/test/unit/src/component/browser/testHierarchicalImpl.js diff --git a/client-app/test/unit/redmic/modules/browser/testListImpl.js b/client-app/test/unit/src/component/browser/testListImpl.js similarity index 100% rename from client-app/test/unit/redmic/modules/browser/testListImpl.js rename to client-app/test/unit/src/component/browser/testListImpl.js diff --git a/client-app/test/unit/redmic/modules/chart/ChartsContainer/testInfoChartsContainerImpl.js b/client-app/test/unit/src/component/chart/ChartsContainer/testInfoChartsContainerImpl.js similarity index 100% rename from client-app/test/unit/redmic/modules/chart/ChartsContainer/testInfoChartsContainerImpl.js rename to client-app/test/unit/src/component/chart/ChartsContainer/testInfoChartsContainerImpl.js diff --git a/client-app/test/unit/redmic/modules/chart/Toolbar/testSliderSelectorImpl.js b/client-app/test/unit/src/component/chart/Toolbar/testSliderSelectorImpl.js similarity index 100% rename from client-app/test/unit/redmic/modules/chart/Toolbar/testSliderSelectorImpl.js rename to client-app/test/unit/src/component/chart/Toolbar/testSliderSelectorImpl.js diff --git a/client-app/test/unit/redmic/modules/chart/layer/ChartLayer/testLinearChartImpl.js b/client-app/test/unit/src/component/chart/layer/ChartLayer/testLinearChartImpl.js similarity index 100% rename from client-app/test/unit/redmic/modules/chart/layer/ChartLayer/testLinearChartImpl.js rename to client-app/test/unit/src/component/chart/layer/ChartLayer/testLinearChartImpl.js diff --git a/client-app/test/unit/redmic/modules/form/inputs/testCheckBoxImpl.js b/client-app/test/unit/src/component/form/inputs/testCheckBoxImpl.js similarity index 100% rename from client-app/test/unit/redmic/modules/form/inputs/testCheckBoxImpl.js rename to client-app/test/unit/src/component/form/inputs/testCheckBoxImpl.js diff --git a/client-app/test/unit/redmic/modules/form/inputs/testDateTextBoxImpl.js b/client-app/test/unit/src/component/form/inputs/testDateTextBoxImpl.js similarity index 100% rename from client-app/test/unit/redmic/modules/form/inputs/testDateTextBoxImpl.js rename to client-app/test/unit/src/component/form/inputs/testDateTextBoxImpl.js diff --git a/client-app/test/unit/redmic/modules/form/inputs/testFilteringInputImpl.js b/client-app/test/unit/src/component/form/inputs/testFilteringInputImpl.js similarity index 100% rename from client-app/test/unit/redmic/modules/form/inputs/testFilteringInputImpl.js rename to client-app/test/unit/src/component/form/inputs/testFilteringInputImpl.js diff --git a/client-app/test/unit/redmic/modules/form/inputs/testNumberSpinnerImpl.js b/client-app/test/unit/src/component/form/inputs/testNumberSpinnerImpl.js similarity index 100% rename from client-app/test/unit/redmic/modules/form/inputs/testNumberSpinnerImpl.js rename to client-app/test/unit/src/component/form/inputs/testNumberSpinnerImpl.js diff --git a/client-app/test/unit/redmic/modules/form/inputs/testNumberTextBoxImpl.js b/client-app/test/unit/src/component/form/inputs/testNumberTextBoxImpl.js similarity index 100% rename from client-app/test/unit/redmic/modules/form/inputs/testNumberTextBoxImpl.js rename to client-app/test/unit/src/component/form/inputs/testNumberTextBoxImpl.js diff --git a/client-app/test/unit/redmic/modules/form/inputs/testTextAreaImpl.js b/client-app/test/unit/src/component/form/inputs/testTextAreaImpl.js similarity index 100% rename from client-app/test/unit/redmic/modules/form/inputs/testTextAreaImpl.js rename to client-app/test/unit/src/component/form/inputs/testTextAreaImpl.js diff --git a/client-app/test/unit/redmic/modules/form/inputs/testTextBoxImpl.js b/client-app/test/unit/src/component/form/inputs/testTextBoxImpl.js similarity index 100% rename from client-app/test/unit/redmic/modules/form/inputs/testTextBoxImpl.js rename to client-app/test/unit/src/component/form/inputs/testTextBoxImpl.js diff --git a/client-app/test/unit/redmic/modules/form/testForm.js b/client-app/test/unit/src/component/form/testForm.js similarity index 100% rename from client-app/test/unit/redmic/modules/form/testForm.js rename to client-app/test/unit/src/component/form/testForm.js diff --git a/client-app/test/unit/redmic/modules/gateway/testGateway.js b/client-app/test/unit/src/component/gateway/testGateway.js similarity index 100% rename from client-app/test/unit/redmic/modules/gateway/testGateway.js rename to client-app/test/unit/src/component/gateway/testGateway.js diff --git a/client-app/test/unit/redmic/modules/layout/details/testDetails.js b/client-app/test/unit/src/component/layout/details/testDetails.js similarity index 100% rename from client-app/test/unit/redmic/modules/layout/details/testDetails.js rename to client-app/test/unit/src/component/layout/details/testDetails.js diff --git a/client-app/test/unit/redmic/modules/layout/wizard/testWizard.js b/client-app/test/unit/src/component/layout/wizard/testWizard.js similarity index 100% rename from client-app/test/unit/redmic/modules/layout/wizard/testWizard.js rename to client-app/test/unit/src/component/layout/wizard/testWizard.js diff --git a/client-app/test/unit/redmic/modules/map/testLeafletImpl.js b/client-app/test/unit/src/component/map/testLeafletImpl.js similarity index 100% rename from client-app/test/unit/redmic/modules/map/testLeafletImpl.js rename to client-app/test/unit/src/component/map/testLeafletImpl.js diff --git a/client-app/test/unit/redmic/modules/model/testModelImpl.js b/client-app/test/unit/src/component/model/testModelImpl.js similarity index 100% rename from client-app/test/unit/redmic/modules/model/testModelImpl.js rename to client-app/test/unit/src/component/model/testModelImpl.js diff --git a/client-app/test/unit/redmic/modules/notification/test_Communication.js b/client-app/test/unit/src/component/notification/test_Communication.js similarity index 100% rename from client-app/test/unit/redmic/modules/notification/test_Communication.js rename to client-app/test/unit/src/component/notification/test_Communication.js diff --git a/client-app/test/unit/redmic/modules/notification/test_Notification.js b/client-app/test/unit/src/component/notification/test_Notification.js similarity index 100% rename from client-app/test/unit/redmic/modules/notification/test_Notification.js rename to client-app/test/unit/src/component/notification/test_Notification.js diff --git a/client-app/test/unit/redmic/modules/search/testFacetsImpl.js b/client-app/test/unit/src/component/search/testFacetsImpl.js similarity index 100% rename from client-app/test/unit/redmic/modules/search/testFacetsImpl.js rename to client-app/test/unit/src/component/search/testFacetsImpl.js diff --git a/client-app/test/unit/redmic/modules/search/testSearch.js b/client-app/test/unit/src/component/search/testSearch.js similarity index 100% rename from client-app/test/unit/redmic/modules/search/testSearch.js rename to client-app/test/unit/src/component/search/testSearch.js diff --git a/client-app/test/unit/redmic/modules/selection/testSelector.js b/client-app/test/unit/src/component/selection/testSelector.js similarity index 100% rename from client-app/test/unit/redmic/modules/selection/testSelector.js rename to client-app/test/unit/src/component/selection/testSelector.js diff --git a/client-app/test/unit/redmic/modules/socket/testSocket.js b/client-app/test/unit/src/component/socket/testSocket.js similarity index 100% rename from client-app/test/unit/redmic/modules/socket/testSocket.js rename to client-app/test/unit/src/component/socket/testSocket.js diff --git a/client-app/test/unit/redmic/modules/store/testRestManager.js b/client-app/test/unit/src/component/store/testRestManager.js similarity index 100% rename from client-app/test/unit/redmic/modules/store/testRestManager.js rename to client-app/test/unit/src/component/store/testRestManager.js diff --git a/client-app/test/unit/redmic/modules/tree/testTree.js b/client-app/test/unit/src/component/tree/testTree.js similarity index 100% rename from client-app/test/unit/redmic/modules/tree/testTree.js rename to client-app/test/unit/src/component/tree/testTree.js diff --git a/client-app/test/unit/redmic/modules/wizard/testWizard.js b/client-app/test/unit/src/component/wizard/testWizard.js similarity index 100% rename from client-app/test/unit/redmic/modules/wizard/testWizard.js rename to client-app/test/unit/src/component/wizard/testWizard.js diff --git a/grunt/config/cleanBuiltApp.js b/grunt/config/cleanBuiltApp.js index 56c074b3..b837372b 100644 --- a/grunt/config/cleanBuiltApp.js +++ b/grunt/config/cleanBuiltApp.js @@ -4,7 +4,7 @@ module.exports = function(grunt) { 'alertify', 'awesome-markers', 'cbtree', 'd3Tip', 'dijit', 'dojo', 'dojox', 'deepmerge', 'dropzone', 'handlebars', 'L-areaselect', 'L-coordinates', 'L-draw', 'L-miniMap', 'L-navBar', 'leaflet', 'leaflet-nontiledlayer', 'mediatorjs', 'moment', 'uuid', 'proj4', 'pruneCluster', 'put-selector', - 'redmic', 'RWidgets', 'sockjs', 'stomp-websocket', 'src', 'templates', 'tv4', 'wicket' + 'RWidgets', 'sockjs', 'stomp-websocket', 'templates', 'tv4', 'wicket' ]; var recursiveDirectoriesToDelete = [ diff --git a/grunt/config/test.js b/grunt/config/test.js index 5a0c79a6..1e2cf763 100644 --- a/grunt/config/test.js +++ b/grunt/config/test.js @@ -11,6 +11,7 @@ module.exports = function(grunt) { rootPath = grunt.config('redmicConfig.rootPath'), srcPath = grunt.config('redmicConfig.srcPath'), + depsPath = grunt.config('redmicConfig.depsPath'), testPath = grunt.config('redmicConfig.testPath'), outputPath = 'test_reports', @@ -85,7 +86,7 @@ module.exports = function(grunt) { testUnitRemotePath = path.join(absoluteTestsPath, 'intern-unit-remote'), testFunctionalLocalPath = path.join(absoluteTestsPath, 'intern-functional-local'), testFunctionalRemotePath = path.join(absoluteTestsPath, 'intern-functional-remote'), - dojoCommonBaseUrl = path.join(' ', srcPath, '*').trim(), + dojoCommonBaseUrl = path.join(' ', depsPath, '*').trim(), ipGetterPath = path.join(absoluteTestsPath, 'IpGetter'), IpGetter = require(ipGetterPath)(), -- GitLab From 6970c7881ee51e101c1b84a80f25ac15e626d87b Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Mon, 29 Jul 2024 12:15:36 +0100 Subject: [PATCH 036/249] =?UTF-8?q?Baja=20el=20n=C3=BAmero=20de=20procesos?= =?UTF-8?q?=20de=20compilado?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client-app/app.profile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client-app/app.profile.js b/client-app/app.profile.js index 04cd6d02..c0d64ebe 100644 --- a/client-app/app.profile.js +++ b/client-app/app.profile.js @@ -44,7 +44,7 @@ var profileObj = { localeList: includeLocales.join(','), useSourceMaps: false, buildReportDir: '../..', - maxOptimizationProcesses: 2, + maxOptimizationProcesses: 1, resourceTags: { amd: amdTagger, -- GitLab From 45d47a1c0abe3aad2b8f35c7934d05ce2c5000c4 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Mon, 29 Jul 2024 12:35:16 +0100 Subject: [PATCH 037/249] =?UTF-8?q?Mueve=20implementaci=C3=B3n=20de=20mode?= =?UTF-8?q?los=20a=20componente?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client-app/src/component/model/ModelImpl.js | 2 +- .../base/models => component/model/model}/_Model.js | 2 +- .../models => component/model/model}/attr/ArrayAttr.js | 8 ++++---- .../base/models => component/model/model}/attr/Attr.js | 2 +- .../models => component/model/model}/attr/ObjAttr.js | 8 ++++---- .../model/model}/attr/RelationAttr.js | 2 +- .../models => component/model/model}/attr/_Attr.js | 0 .../model/model}/attr/_ComplexAttr.js | 2 +- client-app/test/_intern-unit.js | 10 +++++----- .../test/unit/app/base/models/attr/testArrayAttr.js | 2 +- client-app/test/unit/app/base/models/attr/testAttr.js | 2 +- .../test/unit/app/base/models/attr/testObjAttr.js | 2 +- .../test/unit/app/base/models/attr/testRelationAttr.js | 2 +- client-app/test/unit/app/base/models/test_Model.js | 2 +- client-app/test/unit/src/component/form/testForm.js | 2 +- 15 files changed, 24 insertions(+), 24 deletions(-) rename client-app/src/{oldapp/base/models => component/model/model}/_Model.js (99%) rename client-app/src/{oldapp/base/models => component/model/model}/attr/ArrayAttr.js (98%) rename client-app/src/{oldapp/base/models => component/model/model}/attr/Attr.js (99%) rename client-app/src/{oldapp/base/models => component/model/model}/attr/ObjAttr.js (98%) rename client-app/src/{oldapp/base/models => component/model/model}/attr/RelationAttr.js (99%) rename client-app/src/{oldapp/base/models => component/model/model}/attr/_Attr.js (100%) rename client-app/src/{oldapp/base/models => component/model/model}/attr/_ComplexAttr.js (98%) diff --git a/client-app/src/component/model/ModelImpl.js b/client-app/src/component/model/ModelImpl.js index 458ab43a..0d079d6b 100644 --- a/client-app/src/component/model/ModelImpl.js +++ b/client-app/src/component/model/ModelImpl.js @@ -1,5 +1,5 @@ define([ - "app/base/models/_Model" + "src/component/model/model/_Model" , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" diff --git a/client-app/src/oldapp/base/models/_Model.js b/client-app/src/component/model/model/_Model.js similarity index 99% rename from client-app/src/oldapp/base/models/_Model.js rename to client-app/src/component/model/model/_Model.js index 486313ab..443367bf 100644 --- a/client-app/src/oldapp/base/models/_Model.js +++ b/client-app/src/component/model/model/_Model.js @@ -1,5 +1,5 @@ define([ - "app/base/models/attr/ObjAttr" + "src/component/model/model/attr/ObjAttr" , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/Evented" diff --git a/client-app/src/oldapp/base/models/attr/ArrayAttr.js b/client-app/src/component/model/model/attr/ArrayAttr.js similarity index 98% rename from client-app/src/oldapp/base/models/attr/ArrayAttr.js rename to client-app/src/component/model/model/attr/ArrayAttr.js index 153fa91d..d21aaa45 100644 --- a/client-app/src/oldapp/base/models/attr/ArrayAttr.js +++ b/client-app/src/component/model/model/attr/ArrayAttr.js @@ -4,7 +4,7 @@ define([ , "dojo/Deferred" , "RWidgets/Utilities" , 'uuid/uuidv4.min' - , "./_ComplexAttr" + , "src/component/model/model/attr/_ComplexAttr" ], function ( declare , lang @@ -402,7 +402,7 @@ define([ this._buildItem({ name: "_requiredObjAttr", - path: "app/base/models/attr/ObjAttr" + path: "src/component/model/model/attr/ObjAttr" }, schema, props, dfd); }, @@ -434,7 +434,7 @@ define([ this._buildItem({ name: "_requiredRelationAttr", - path: "app/base/models/attr/RelationAttr" + path: "src/component/model/model/attr/RelationAttr" }, schema, props, dfd); }, @@ -450,7 +450,7 @@ define([ this._buildItem({ name: "_requiredAttr", - path: "app/base/models/attr/Attr" + path: "src/component/model/model/attr/Attr" }, schema, props, dfd); }, diff --git a/client-app/src/oldapp/base/models/attr/Attr.js b/client-app/src/component/model/model/attr/Attr.js similarity index 99% rename from client-app/src/oldapp/base/models/attr/Attr.js rename to client-app/src/component/model/model/attr/Attr.js index 5b788995..a831e17f 100644 --- a/client-app/src/oldapp/base/models/attr/Attr.js +++ b/client-app/src/component/model/model/attr/Attr.js @@ -2,7 +2,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" , 'moment/moment.min' - , "./_Attr" + , "src/component/model/model/attr/_Attr" ], function( declare , lang diff --git a/client-app/src/oldapp/base/models/attr/ObjAttr.js b/client-app/src/component/model/model/attr/ObjAttr.js similarity index 98% rename from client-app/src/oldapp/base/models/attr/ObjAttr.js rename to client-app/src/component/model/model/attr/ObjAttr.js index a23ffbff..015374c0 100644 --- a/client-app/src/oldapp/base/models/attr/ObjAttr.js +++ b/client-app/src/component/model/model/attr/ObjAttr.js @@ -1,11 +1,11 @@ define([ - "app/base/models/attr/ArrayAttr" - , "app/base/models/attr/Attr" - , "app/base/models/attr/RelationAttr" + "src/component/model/model/attr/ArrayAttr" + , "src/component/model/model/attr/Attr" + , "src/component/model/model/attr/RelationAttr" , "dojo/_base/declare" , "dojo/_base/lang" , "RWidgets/Utilities" - , "./_ComplexAttr" + , "src/component/model/model/attr/_ComplexAttr" ], function( ArrayAttr , Attr diff --git a/client-app/src/oldapp/base/models/attr/RelationAttr.js b/client-app/src/component/model/model/attr/RelationAttr.js similarity index 99% rename from client-app/src/oldapp/base/models/attr/RelationAttr.js rename to client-app/src/component/model/model/attr/RelationAttr.js index a958eaa4..8e3acea7 100644 --- a/client-app/src/oldapp/base/models/attr/RelationAttr.js +++ b/client-app/src/component/model/model/attr/RelationAttr.js @@ -1,5 +1,5 @@ define([ - "app/base/models/attr/Attr" + "src/component/model/model/attr/Attr" , "dojo/_base/declare" , "dojo/_base/lang" ], function ( diff --git a/client-app/src/oldapp/base/models/attr/_Attr.js b/client-app/src/component/model/model/attr/_Attr.js similarity index 100% rename from client-app/src/oldapp/base/models/attr/_Attr.js rename to client-app/src/component/model/model/attr/_Attr.js diff --git a/client-app/src/oldapp/base/models/attr/_ComplexAttr.js b/client-app/src/component/model/model/attr/_ComplexAttr.js similarity index 98% rename from client-app/src/oldapp/base/models/attr/_ComplexAttr.js rename to client-app/src/component/model/model/attr/_ComplexAttr.js index 0304ffb4..2169aae5 100644 --- a/client-app/src/oldapp/base/models/attr/_ComplexAttr.js +++ b/client-app/src/component/model/model/attr/_ComplexAttr.js @@ -1,7 +1,7 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "./_Attr" + , "src/component/model/model/attr/_Attr" ], function( declare , lang diff --git a/client-app/test/_intern-unit.js b/client-app/test/_intern-unit.js index 7dad22e1..70d9bb9c 100644 --- a/client-app/test/_intern-unit.js +++ b/client-app/test/_intern-unit.js @@ -22,11 +22,11 @@ module.exports = function(args) { , suitesPrefix + 'redmic/base/testMediator' // Modelos - , suitesPrefix + 'app/base/models/attr/testAttr' - , suitesPrefix + 'app/base/models/attr/testRelationAttr' - , suitesPrefix + 'app/base/models/attr/testObjAttr' - , suitesPrefix + 'app/base/models/attr/testArrayAttr' - , suitesPrefix + 'app/base/models/test_Model' + , suitesPrefix + 'src/component/model/model/attr/testAttr' + , suitesPrefix + 'src/component/model/model/attr/testRelationAttr' + , suitesPrefix + 'src/component/model/model/attr/testObjAttr' + , suitesPrefix + 'src/component/model/model/attr/testArrayAttr' + , suitesPrefix + 'src/component/model/model/test_Model' // Módulos , suitesPrefix + 'src/component/base/test_Module' diff --git a/client-app/test/unit/app/base/models/attr/testArrayAttr.js b/client-app/test/unit/app/base/models/attr/testArrayAttr.js index 0acce51a..a1c9c443 100644 --- a/client-app/test/unit/app/base/models/attr/testArrayAttr.js +++ b/client-app/test/unit/app/base/models/attr/testArrayAttr.js @@ -1,5 +1,5 @@ define([ - "app/base/models/attr/ArrayAttr" + "src/component/model/model/attr/ArrayAttr" , "dojo/_base/lang" , "../_ModelTestCommons" ], function( diff --git a/client-app/test/unit/app/base/models/attr/testAttr.js b/client-app/test/unit/app/base/models/attr/testAttr.js index 61ffdd4b..dd0e6653 100644 --- a/client-app/test/unit/app/base/models/attr/testAttr.js +++ b/client-app/test/unit/app/base/models/attr/testAttr.js @@ -1,5 +1,5 @@ define([ - 'app/base/models/attr/Attr' + 'src/component/model/model/attr/Attr' , '../_ModelTestCommons' ], function( Attr diff --git a/client-app/test/unit/app/base/models/attr/testObjAttr.js b/client-app/test/unit/app/base/models/attr/testObjAttr.js index 2bcb3653..2ba3414d 100644 --- a/client-app/test/unit/app/base/models/attr/testObjAttr.js +++ b/client-app/test/unit/app/base/models/attr/testObjAttr.js @@ -1,5 +1,5 @@ define([ - "app/base/models/attr/ObjAttr" + "src/component/model/model/attr/ObjAttr" , "dojo/_base/lang" , "../_ModelTestCommons" ], function( diff --git a/client-app/test/unit/app/base/models/attr/testRelationAttr.js b/client-app/test/unit/app/base/models/attr/testRelationAttr.js index b4abadf3..ab3055ad 100644 --- a/client-app/test/unit/app/base/models/attr/testRelationAttr.js +++ b/client-app/test/unit/app/base/models/attr/testRelationAttr.js @@ -1,5 +1,5 @@ define([ - "app/base/models/attr/RelationAttr" + "src/component/model/model/attr/RelationAttr" , "../_ModelTestCommons" ], function( RelationAttr diff --git a/client-app/test/unit/app/base/models/test_Model.js b/client-app/test/unit/app/base/models/test_Model.js index 1915af0e..38bc5c29 100644 --- a/client-app/test/unit/app/base/models/test_Model.js +++ b/client-app/test/unit/app/base/models/test_Model.js @@ -1,5 +1,5 @@ define([ - "app/base/models/_Model" + "src/component/model/model/_Model" , "dojo/_base/lang" , "RWidgets/Utilities" ], function( diff --git a/client-app/test/unit/src/component/form/testForm.js b/client-app/test/unit/src/component/form/testForm.js index a085a6a4..1a921639 100644 --- a/client-app/test/unit/src/component/form/testForm.js +++ b/client-app/test/unit/src/component/form/testForm.js @@ -1,5 +1,5 @@ define([ - "app/base/models/_Persistent" + "src/component/model/model/_Persistent" , "app/administrative/domains/models/CountryModel" , "dojo/_base/declare" , "dojo/_base/lang" -- GitLab From 0015d2d8a11a4a5120f0e3bc0972d4793626bd44 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Mon, 29 Jul 2024 12:37:06 +0100 Subject: [PATCH 038/249] Mueve utilidad de recaptcha a src/util --- client-app/src/oldapp/user/views/FeedbackView.js | 2 +- client-app/src/oldapp/user/views/RegisterView.js | 2 +- client-app/src/{oldapp/components => util}/ReCaptcha.js | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename client-app/src/{oldapp/components => util}/ReCaptcha.js (100%) diff --git a/client-app/src/oldapp/user/views/FeedbackView.js b/client-app/src/oldapp/user/views/FeedbackView.js index 5e619a33..41a88fa2 100644 --- a/client-app/src/oldapp/user/views/FeedbackView.js +++ b/client-app/src/oldapp/user/views/FeedbackView.js @@ -1,6 +1,6 @@ define([ 'alertify/alertify.min' - , 'app/components/ReCaptcha' + , 'src/util/ReCaptcha' , "app/user/models/FeedbackModel" , "app/user/views/_ExternalUserBaseView" , 'src/redmicConfig' diff --git a/client-app/src/oldapp/user/views/RegisterView.js b/client-app/src/oldapp/user/views/RegisterView.js index 3952264b..e98af81c 100644 --- a/client-app/src/oldapp/user/views/RegisterView.js +++ b/client-app/src/oldapp/user/views/RegisterView.js @@ -1,6 +1,6 @@ define([ 'alertify/alertify.min' - , 'app/components/ReCaptcha' + , 'src/util/ReCaptcha' , "app/user/models/RegisterModel" , "app/user/views/_ExternalUserBaseView" , 'src/redmicConfig' diff --git a/client-app/src/oldapp/components/ReCaptcha.js b/client-app/src/util/ReCaptcha.js similarity index 100% rename from client-app/src/oldapp/components/ReCaptcha.js rename to client-app/src/util/ReCaptcha.js -- GitLab From d0602c67593139f8d08e4f3e98814cb2cd7b3443 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Mon, 29 Jul 2024 12:40:48 +0100 Subject: [PATCH 039/249] Mueve cookieloader a directorio src/app --- client-app/src/app/App.js | 8 ++++---- client-app/src/{oldapp/components => app}/CookieLoader.js | 0 2 files changed, 4 insertions(+), 4 deletions(-) rename client-app/src/{oldapp/components => app}/CookieLoader.js (100%) diff --git a/client-app/src/app/App.js b/client-app/src/app/App.js index f4a6febb..b933242f 100644 --- a/client-app/src/app/App.js +++ b/client-app/src/app/App.js @@ -1,12 +1,12 @@ define([ - 'app/components/CookieLoader' - , 'src/redmicConfig' + 'src/redmicConfig' , 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/dom' , 'dojo/has' , 'put-selector/put' , 'src/app/CheckBrowser' + , 'src/app/CookieLoader' , 'src/app/innerApp' , 'src/app/ModuleStore' , 'src/app/outerApp' @@ -23,14 +23,14 @@ define([ , 'src/component/store/RestManagerImpl' , 'templates/LoadingCustom' ], function( - CookieLoader - , redmicConfig + redmicConfig , declare , lang , dom , has , put , CheckBrowser + , CookieLoader , InnerApp , ModuleStore , OuterApp diff --git a/client-app/src/oldapp/components/CookieLoader.js b/client-app/src/app/CookieLoader.js similarity index 100% rename from client-app/src/oldapp/components/CookieLoader.js rename to client-app/src/app/CookieLoader.js -- GitLab From 760d6656121fd165395743dc2d4e18fe7a396bdf Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Mon, 29 Jul 2024 13:15:23 +0100 Subject: [PATCH 040/249] Reorganiza rutas de tests --- README.md | 8 +- client-app/test/_intern-functional.js | 2 +- client-app/test/_intern-unit.js | 86 +++++++++---------- .../components/Keypad/testKeypad.js | 0 .../components/Keypad/testKeypadScript.js | 0 .../input/MapSearchImpl/testMapSearchImpl.js | 0 .../MapSearchImpl/testMapSearchImplScript.js | 0 .../UploadFileImpl/testUploadFileImpl.js | 0 .../testUploadFileImplScript.js | 0 .../form/testFormWithKeypad.js | 0 .../form/testFormWithKeypadScript.js | 0 .../search/testFacetsImpl.js | 0 .../search/testFacetsImplScript.js | 0 .../{src => }/component/base/testManager.js | 0 .../component/base/testNotification.js | 0 .../component/base/testSelectionBox.js | 0 .../{src => }/component/base/test_Module.js | 0 .../component/browser/bars/testOrder.js | 0 .../component/browser/bars/testPagination.js | 0 .../browser/bars/testSelectionBox.js | 0 .../component/browser/bars/testTotal.js | 0 .../component/browser/buttons/testButtons.js | 0 .../component/browser/row/testRow.js | 0 .../component/browser/testHierarchicalImpl.js | 0 .../component/browser/testListImpl.js | 0 .../testInfoChartsContainerImpl.js | 0 .../chart/Toolbar/testSliderSelectorImpl.js | 0 .../layer/ChartLayer/testLinearChartImpl.js | 0 .../form}/form/testUploadInput.js | 0 .../component/form/inputs/testCheckBoxImpl.js | 0 .../form/inputs/testDateTextBoxImpl.js | 0 .../form/inputs/testFilteringInputImpl.js | 0 .../form/inputs/testNumberSpinnerImpl.js | 0 .../form/inputs/testNumberTextBoxImpl.js | 0 .../component/form/inputs/testTextAreaImpl.js | 0 .../component/form/inputs/testTextBoxImpl.js | 0 .../unit/{src => }/component/form/testForm.js | 0 .../component/gateway/testGateway.js | 0 .../component/layout/details/testDetails.js | 0 .../component/layout/wizard/testWizard.js | 0 .../component/map/testLeafletImpl.js | 0 .../model/model}/_ModelTestCommons.js | 0 .../model/model}/attr/testArrayAttr.js | 0 .../model/model}/attr/testAttr.js | 0 .../model/model}/attr/testObjAttr.js | 0 .../model/model}/attr/testRelationAttr.js | 0 .../model/model}/test_Model.js | 0 .../component/model/testModelImpl.js | 0 .../notification/test_Communication.js | 0 .../notification/test_Notification.js | 0 .../component/search/testFacetsImpl.js | 0 .../{src => }/component/search/testSearch.js | 0 .../component/selection/testSelector.js | 0 .../{src => }/component/socket/testSocket.js | 0 .../component/store/testRestManager.js | 0 .../unit/{src => }/component/tree/testTree.js | 0 .../{src => }/component/wizard/testWizard.js | 0 .../{redmic/base => util}/testCredentials.js | 0 .../{redmic/base => util}/testMediator.js | 0 .../base => util}/testRedmicLocalStorage.js | 0 60 files changed, 48 insertions(+), 48 deletions(-) rename client-app/test/functional/{modules => component}/components/Keypad/testKeypad.js (100%) rename client-app/test/functional/{modules => component}/components/Keypad/testKeypadScript.js (100%) rename client-app/test/functional/{modules => component}/form/input/MapSearchImpl/testMapSearchImpl.js (100%) rename client-app/test/functional/{modules => component}/form/input/MapSearchImpl/testMapSearchImplScript.js (100%) rename client-app/test/functional/{modules => component}/form/input/UploadFileImpl/testUploadFileImpl.js (100%) rename client-app/test/functional/{modules => component}/form/input/UploadFileImpl/testUploadFileImplScript.js (100%) rename client-app/test/functional/{modules => component}/form/testFormWithKeypad.js (100%) rename client-app/test/functional/{modules => component}/form/testFormWithKeypadScript.js (100%) rename client-app/test/functional/{modules => component}/search/testFacetsImpl.js (100%) rename client-app/test/functional/{modules => component}/search/testFacetsImplScript.js (100%) rename client-app/test/unit/{src => }/component/base/testManager.js (100%) rename client-app/test/unit/{src => }/component/base/testNotification.js (100%) rename client-app/test/unit/{src => }/component/base/testSelectionBox.js (100%) rename client-app/test/unit/{src => }/component/base/test_Module.js (100%) rename client-app/test/unit/{src => }/component/browser/bars/testOrder.js (100%) rename client-app/test/unit/{src => }/component/browser/bars/testPagination.js (100%) rename client-app/test/unit/{src => }/component/browser/bars/testSelectionBox.js (100%) rename client-app/test/unit/{src => }/component/browser/bars/testTotal.js (100%) rename client-app/test/unit/{src => }/component/browser/buttons/testButtons.js (100%) rename client-app/test/unit/{src => }/component/browser/row/testRow.js (100%) rename client-app/test/unit/{src => }/component/browser/testHierarchicalImpl.js (100%) rename client-app/test/unit/{src => }/component/browser/testListImpl.js (100%) rename client-app/test/unit/{src => }/component/chart/ChartsContainer/testInfoChartsContainerImpl.js (100%) rename client-app/test/unit/{src => }/component/chart/Toolbar/testSliderSelectorImpl.js (100%) rename client-app/test/unit/{src => }/component/chart/layer/ChartLayer/testLinearChartImpl.js (100%) rename client-app/test/unit/{redmic => component/form}/form/testUploadInput.js (100%) rename client-app/test/unit/{src => }/component/form/inputs/testCheckBoxImpl.js (100%) rename client-app/test/unit/{src => }/component/form/inputs/testDateTextBoxImpl.js (100%) rename client-app/test/unit/{src => }/component/form/inputs/testFilteringInputImpl.js (100%) rename client-app/test/unit/{src => }/component/form/inputs/testNumberSpinnerImpl.js (100%) rename client-app/test/unit/{src => }/component/form/inputs/testNumberTextBoxImpl.js (100%) rename client-app/test/unit/{src => }/component/form/inputs/testTextAreaImpl.js (100%) rename client-app/test/unit/{src => }/component/form/inputs/testTextBoxImpl.js (100%) rename client-app/test/unit/{src => }/component/form/testForm.js (100%) rename client-app/test/unit/{src => }/component/gateway/testGateway.js (100%) rename client-app/test/unit/{src => }/component/layout/details/testDetails.js (100%) rename client-app/test/unit/{src => }/component/layout/wizard/testWizard.js (100%) rename client-app/test/unit/{src => }/component/map/testLeafletImpl.js (100%) rename client-app/test/unit/{app/base/models => component/model/model}/_ModelTestCommons.js (100%) rename client-app/test/unit/{app/base/models => component/model/model}/attr/testArrayAttr.js (100%) rename client-app/test/unit/{app/base/models => component/model/model}/attr/testAttr.js (100%) rename client-app/test/unit/{app/base/models => component/model/model}/attr/testObjAttr.js (100%) rename client-app/test/unit/{app/base/models => component/model/model}/attr/testRelationAttr.js (100%) rename client-app/test/unit/{app/base/models => component/model/model}/test_Model.js (100%) rename client-app/test/unit/{src => }/component/model/testModelImpl.js (100%) rename client-app/test/unit/{src => }/component/notification/test_Communication.js (100%) rename client-app/test/unit/{src => }/component/notification/test_Notification.js (100%) rename client-app/test/unit/{src => }/component/search/testFacetsImpl.js (100%) rename client-app/test/unit/{src => }/component/search/testSearch.js (100%) rename client-app/test/unit/{src => }/component/selection/testSelector.js (100%) rename client-app/test/unit/{src => }/component/socket/testSocket.js (100%) rename client-app/test/unit/{src => }/component/store/testRestManager.js (100%) rename client-app/test/unit/{src => }/component/tree/testTree.js (100%) rename client-app/test/unit/{src => }/component/wizard/testWizard.js (100%) rename client-app/test/unit/{redmic/base => util}/testCredentials.js (100%) rename client-app/test/unit/{redmic/base => util}/testMediator.js (100%) rename client-app/test/unit/{redmic/base => util}/testRedmicLocalStorage.js (100%) diff --git a/README.md b/README.md index eea86a45..b43ef710 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,7 @@ Como ejemplo de ejecución de tests locales (unitarios y funcionales), veamos lo ```sh grunt test-unit-local \ - --suites=test/unit/src/component/model/testModelImpl \ + --suites=test/unit/component/model/testModelImpl \ --browser=chrome \ --headless \ --coverage=false @@ -75,7 +75,7 @@ grunt test-unit-local \ ```sh grunt test-functional-local \ - --functionalSuites=test/functional/modules/**/!(*Script).js \ + --functionalSuites=client-app/test/functional/component/**/!(*Script).js \ --browser=chrome ``` @@ -137,7 +137,7 @@ Como ejemplo de ejecución de tests remotos (unitarios y funcionales), pero apun ```sh grunt test-unit-remote \ - --suites=test/unit/src/component/model/testModelImpl \ + --suites=test/unit/component/model/testModelImpl \ --browser=firefox \ --headless \ --coverage=false @@ -147,7 +147,7 @@ grunt test-unit-remote \ ```sh grunt test-functional-remote \ - --functionalSuites=test/functional/modules/**/!(*Script).js \ + --functionalSuites=client-app/test/functional/component/**/!(*Script).js \ --browser=chrome \ --headless ``` diff --git a/client-app/test/_intern-functional.js b/client-app/test/_intern-functional.js index b66ff24a..ddf310c4 100644 --- a/client-app/test/_intern-functional.js +++ b/client-app/test/_intern-functional.js @@ -27,7 +27,7 @@ module.exports = function(args) { } var defaultFunctionalSuites = _functions.getSuites(pathPrefix, suitesLimitedByRole), - excludePattern = '!' + path.join(pathPrefix, 'modules', '**'); + excludePattern = '!' + path.join(pathPrefix, 'component', '**'); defaultFunctionalSuites.push(excludePattern); config.functionalSuites = defaultFunctionalSuites; diff --git a/client-app/test/_intern-unit.js b/client-app/test/_intern-unit.js index 70d9bb9c..72e19aba 100644 --- a/client-app/test/_intern-unit.js +++ b/client-app/test/_intern-unit.js @@ -17,58 +17,58 @@ module.exports = function(args) { config = { suites: [ // Funcionalidades básicas - suitesPrefix + 'redmic/base/testRedmicLocalStorage' - , suitesPrefix + 'redmic/base/testCredentials' - , suitesPrefix + 'redmic/base/testMediator' + suitesPrefix + 'util/testRedmicLocalStorage' + , suitesPrefix + 'util/testCredentials' + , suitesPrefix + 'util/testMediator' // Modelos - , suitesPrefix + 'src/component/model/model/attr/testAttr' - , suitesPrefix + 'src/component/model/model/attr/testRelationAttr' - , suitesPrefix + 'src/component/model/model/attr/testObjAttr' - , suitesPrefix + 'src/component/model/model/attr/testArrayAttr' - , suitesPrefix + 'src/component/model/model/test_Model' + , suitesPrefix + 'component/model/model/attr/testAttr' + , suitesPrefix + 'component/model/model/attr/testRelationAttr' + , suitesPrefix + 'component/model/model/attr/testObjAttr' + , suitesPrefix + 'component/model/model/attr/testArrayAttr' + , suitesPrefix + 'component/model/model/test_Model' // Módulos - , suitesPrefix + 'src/component/base/test_Module' - , suitesPrefix + 'src/component/store/testRestManager' - , suitesPrefix + 'src/component/layout/wizard/testWizard' - , suitesPrefix + 'src/component/model/testModelImpl' - , suitesPrefix + 'src/component/map/testLeafletImpl' - , suitesPrefix + 'src/component/tree/testTree' - , suitesPrefix + 'src/component/selection/testSelector' - , suitesPrefix + 'src/component/gateway/testGateway' - , suitesPrefix + 'src/component/chart/ChartsContainer/testInfoChartsContainerImpl' - , suitesPrefix + 'src/component/chart/layer/ChartLayer/testLinearChartImpl' - , suitesPrefix + 'src/component/chart/Toolbar/testSliderSelectorImpl' - , suitesPrefix + 'src/component/form/form/testUploadInput' - , suitesPrefix + 'src/component/browser/testListImpl' - , suitesPrefix + 'src/component/browser/testHierarchicalImpl' - , suitesPrefix + 'src/component/browser/row/testRow' - , suitesPrefix + 'src/component/browser/buttons/testButtons' - , suitesPrefix + 'src/component/browser/bars/testOrder' - , suitesPrefix + 'src/component/browser/bars/testPagination' - , suitesPrefix + 'src/component/browser/bars/testSelectionBox' - , suitesPrefix + 'src/component/browser/bars/testTotal' - , suitesPrefix + 'src/component/search/testFacetsImpl' + , suitesPrefix + 'component/base/test_Module' + , suitesPrefix + 'component/store/testRestManager' + , suitesPrefix + 'component/layout/wizard/testWizard' + , suitesPrefix + 'component/model/testModelImpl' + , suitesPrefix + 'component/map/testLeafletImpl' + , suitesPrefix + 'component/tree/testTree' + , suitesPrefix + 'component/selection/testSelector' + , suitesPrefix + 'component/gateway/testGateway' + , suitesPrefix + 'component/chart/ChartsContainer/testInfoChartsContainerImpl' + , suitesPrefix + 'component/chart/layer/ChartLayer/testLinearChartImpl' + , suitesPrefix + 'component/chart/Toolbar/testSliderSelectorImpl' + , suitesPrefix + 'component/form/form/testUploadInput' + , suitesPrefix + 'component/browser/testListImpl' + , suitesPrefix + 'component/browser/testHierarchicalImpl' + , suitesPrefix + 'component/browser/row/testRow' + , suitesPrefix + 'component/browser/buttons/testButtons' + , suitesPrefix + 'component/browser/bars/testOrder' + , suitesPrefix + 'component/browser/bars/testPagination' + , suitesPrefix + 'component/browser/bars/testSelectionBox' + , suitesPrefix + 'component/browser/bars/testTotal' + , suitesPrefix + 'component/search/testFacetsImpl' ], // TODO irlos arreglando e incorporando a 'suites'. Borrar 'suitesFAIL' cuando se vacíe suitesFAIL: [ // Módulos - suitesPrefix + 'src/component/layout/details/testDetails' - , suitesPrefix + 'src/component/form/testForm' - , suitesPrefix + 'src/component/search/testSearch' - , suitesPrefix + 'src/component/base/testManager' - , suitesPrefix + 'src/component/base/testSelectionBox' - , suitesPrefix + 'src/component/base/testNotification' - , suitesPrefix + 'src/component/socket/testSocket' - , suitesPrefix + 'src/component/form/inputs/testTextBoxImpl' - , suitesPrefix + 'src/component/form/inputs/testNumberTextBoxImpl' - , suitesPrefix + 'src/component/form/inputs/testNumberSpinnerImpl' - , suitesPrefix + 'src/component/form/inputs/testCheckBoxImpl' - , suitesPrefix + 'src/component/form/inputs/testDateTextBoxImpl' - , suitesPrefix + 'src/component/form/inputs/testTextAreaImpl' - , suitesPrefix + 'src/component/form/inputs/testFilteringInputImpl' + suitesPrefix + 'component/layout/details/testDetails' + , suitesPrefix + 'component/form/testForm' + , suitesPrefix + 'component/search/testSearch' + , suitesPrefix + 'component/base/testManager' + , suitesPrefix + 'component/base/testSelectionBox' + , suitesPrefix + 'component/base/testNotification' + , suitesPrefix + 'component/socket/testSocket' + , suitesPrefix + 'component/form/inputs/testTextBoxImpl' + , suitesPrefix + 'component/form/inputs/testNumberTextBoxImpl' + , suitesPrefix + 'component/form/inputs/testNumberSpinnerImpl' + , suitesPrefix + 'component/form/inputs/testCheckBoxImpl' + , suitesPrefix + 'component/form/inputs/testDateTextBoxImpl' + , suitesPrefix + 'component/form/inputs/testTextAreaImpl' + , suitesPrefix + 'component/form/inputs/testFilteringInputImpl' //Vistas , suitesPrefix + 'app/base/views/extensions/test_EditionView' diff --git a/client-app/test/functional/modules/components/Keypad/testKeypad.js b/client-app/test/functional/component/components/Keypad/testKeypad.js similarity index 100% rename from client-app/test/functional/modules/components/Keypad/testKeypad.js rename to client-app/test/functional/component/components/Keypad/testKeypad.js diff --git a/client-app/test/functional/modules/components/Keypad/testKeypadScript.js b/client-app/test/functional/component/components/Keypad/testKeypadScript.js similarity index 100% rename from client-app/test/functional/modules/components/Keypad/testKeypadScript.js rename to client-app/test/functional/component/components/Keypad/testKeypadScript.js diff --git a/client-app/test/functional/modules/form/input/MapSearchImpl/testMapSearchImpl.js b/client-app/test/functional/component/form/input/MapSearchImpl/testMapSearchImpl.js similarity index 100% rename from client-app/test/functional/modules/form/input/MapSearchImpl/testMapSearchImpl.js rename to client-app/test/functional/component/form/input/MapSearchImpl/testMapSearchImpl.js diff --git a/client-app/test/functional/modules/form/input/MapSearchImpl/testMapSearchImplScript.js b/client-app/test/functional/component/form/input/MapSearchImpl/testMapSearchImplScript.js similarity index 100% rename from client-app/test/functional/modules/form/input/MapSearchImpl/testMapSearchImplScript.js rename to client-app/test/functional/component/form/input/MapSearchImpl/testMapSearchImplScript.js diff --git a/client-app/test/functional/modules/form/input/UploadFileImpl/testUploadFileImpl.js b/client-app/test/functional/component/form/input/UploadFileImpl/testUploadFileImpl.js similarity index 100% rename from client-app/test/functional/modules/form/input/UploadFileImpl/testUploadFileImpl.js rename to client-app/test/functional/component/form/input/UploadFileImpl/testUploadFileImpl.js diff --git a/client-app/test/functional/modules/form/input/UploadFileImpl/testUploadFileImplScript.js b/client-app/test/functional/component/form/input/UploadFileImpl/testUploadFileImplScript.js similarity index 100% rename from client-app/test/functional/modules/form/input/UploadFileImpl/testUploadFileImplScript.js rename to client-app/test/functional/component/form/input/UploadFileImpl/testUploadFileImplScript.js diff --git a/client-app/test/functional/modules/form/testFormWithKeypad.js b/client-app/test/functional/component/form/testFormWithKeypad.js similarity index 100% rename from client-app/test/functional/modules/form/testFormWithKeypad.js rename to client-app/test/functional/component/form/testFormWithKeypad.js diff --git a/client-app/test/functional/modules/form/testFormWithKeypadScript.js b/client-app/test/functional/component/form/testFormWithKeypadScript.js similarity index 100% rename from client-app/test/functional/modules/form/testFormWithKeypadScript.js rename to client-app/test/functional/component/form/testFormWithKeypadScript.js diff --git a/client-app/test/functional/modules/search/testFacetsImpl.js b/client-app/test/functional/component/search/testFacetsImpl.js similarity index 100% rename from client-app/test/functional/modules/search/testFacetsImpl.js rename to client-app/test/functional/component/search/testFacetsImpl.js diff --git a/client-app/test/functional/modules/search/testFacetsImplScript.js b/client-app/test/functional/component/search/testFacetsImplScript.js similarity index 100% rename from client-app/test/functional/modules/search/testFacetsImplScript.js rename to client-app/test/functional/component/search/testFacetsImplScript.js diff --git a/client-app/test/unit/src/component/base/testManager.js b/client-app/test/unit/component/base/testManager.js similarity index 100% rename from client-app/test/unit/src/component/base/testManager.js rename to client-app/test/unit/component/base/testManager.js diff --git a/client-app/test/unit/src/component/base/testNotification.js b/client-app/test/unit/component/base/testNotification.js similarity index 100% rename from client-app/test/unit/src/component/base/testNotification.js rename to client-app/test/unit/component/base/testNotification.js diff --git a/client-app/test/unit/src/component/base/testSelectionBox.js b/client-app/test/unit/component/base/testSelectionBox.js similarity index 100% rename from client-app/test/unit/src/component/base/testSelectionBox.js rename to client-app/test/unit/component/base/testSelectionBox.js diff --git a/client-app/test/unit/src/component/base/test_Module.js b/client-app/test/unit/component/base/test_Module.js similarity index 100% rename from client-app/test/unit/src/component/base/test_Module.js rename to client-app/test/unit/component/base/test_Module.js diff --git a/client-app/test/unit/src/component/browser/bars/testOrder.js b/client-app/test/unit/component/browser/bars/testOrder.js similarity index 100% rename from client-app/test/unit/src/component/browser/bars/testOrder.js rename to client-app/test/unit/component/browser/bars/testOrder.js diff --git a/client-app/test/unit/src/component/browser/bars/testPagination.js b/client-app/test/unit/component/browser/bars/testPagination.js similarity index 100% rename from client-app/test/unit/src/component/browser/bars/testPagination.js rename to client-app/test/unit/component/browser/bars/testPagination.js diff --git a/client-app/test/unit/src/component/browser/bars/testSelectionBox.js b/client-app/test/unit/component/browser/bars/testSelectionBox.js similarity index 100% rename from client-app/test/unit/src/component/browser/bars/testSelectionBox.js rename to client-app/test/unit/component/browser/bars/testSelectionBox.js diff --git a/client-app/test/unit/src/component/browser/bars/testTotal.js b/client-app/test/unit/component/browser/bars/testTotal.js similarity index 100% rename from client-app/test/unit/src/component/browser/bars/testTotal.js rename to client-app/test/unit/component/browser/bars/testTotal.js diff --git a/client-app/test/unit/src/component/browser/buttons/testButtons.js b/client-app/test/unit/component/browser/buttons/testButtons.js similarity index 100% rename from client-app/test/unit/src/component/browser/buttons/testButtons.js rename to client-app/test/unit/component/browser/buttons/testButtons.js diff --git a/client-app/test/unit/src/component/browser/row/testRow.js b/client-app/test/unit/component/browser/row/testRow.js similarity index 100% rename from client-app/test/unit/src/component/browser/row/testRow.js rename to client-app/test/unit/component/browser/row/testRow.js diff --git a/client-app/test/unit/src/component/browser/testHierarchicalImpl.js b/client-app/test/unit/component/browser/testHierarchicalImpl.js similarity index 100% rename from client-app/test/unit/src/component/browser/testHierarchicalImpl.js rename to client-app/test/unit/component/browser/testHierarchicalImpl.js diff --git a/client-app/test/unit/src/component/browser/testListImpl.js b/client-app/test/unit/component/browser/testListImpl.js similarity index 100% rename from client-app/test/unit/src/component/browser/testListImpl.js rename to client-app/test/unit/component/browser/testListImpl.js diff --git a/client-app/test/unit/src/component/chart/ChartsContainer/testInfoChartsContainerImpl.js b/client-app/test/unit/component/chart/ChartsContainer/testInfoChartsContainerImpl.js similarity index 100% rename from client-app/test/unit/src/component/chart/ChartsContainer/testInfoChartsContainerImpl.js rename to client-app/test/unit/component/chart/ChartsContainer/testInfoChartsContainerImpl.js diff --git a/client-app/test/unit/src/component/chart/Toolbar/testSliderSelectorImpl.js b/client-app/test/unit/component/chart/Toolbar/testSliderSelectorImpl.js similarity index 100% rename from client-app/test/unit/src/component/chart/Toolbar/testSliderSelectorImpl.js rename to client-app/test/unit/component/chart/Toolbar/testSliderSelectorImpl.js diff --git a/client-app/test/unit/src/component/chart/layer/ChartLayer/testLinearChartImpl.js b/client-app/test/unit/component/chart/layer/ChartLayer/testLinearChartImpl.js similarity index 100% rename from client-app/test/unit/src/component/chart/layer/ChartLayer/testLinearChartImpl.js rename to client-app/test/unit/component/chart/layer/ChartLayer/testLinearChartImpl.js diff --git a/client-app/test/unit/redmic/form/testUploadInput.js b/client-app/test/unit/component/form/form/testUploadInput.js similarity index 100% rename from client-app/test/unit/redmic/form/testUploadInput.js rename to client-app/test/unit/component/form/form/testUploadInput.js diff --git a/client-app/test/unit/src/component/form/inputs/testCheckBoxImpl.js b/client-app/test/unit/component/form/inputs/testCheckBoxImpl.js similarity index 100% rename from client-app/test/unit/src/component/form/inputs/testCheckBoxImpl.js rename to client-app/test/unit/component/form/inputs/testCheckBoxImpl.js diff --git a/client-app/test/unit/src/component/form/inputs/testDateTextBoxImpl.js b/client-app/test/unit/component/form/inputs/testDateTextBoxImpl.js similarity index 100% rename from client-app/test/unit/src/component/form/inputs/testDateTextBoxImpl.js rename to client-app/test/unit/component/form/inputs/testDateTextBoxImpl.js diff --git a/client-app/test/unit/src/component/form/inputs/testFilteringInputImpl.js b/client-app/test/unit/component/form/inputs/testFilteringInputImpl.js similarity index 100% rename from client-app/test/unit/src/component/form/inputs/testFilteringInputImpl.js rename to client-app/test/unit/component/form/inputs/testFilteringInputImpl.js diff --git a/client-app/test/unit/src/component/form/inputs/testNumberSpinnerImpl.js b/client-app/test/unit/component/form/inputs/testNumberSpinnerImpl.js similarity index 100% rename from client-app/test/unit/src/component/form/inputs/testNumberSpinnerImpl.js rename to client-app/test/unit/component/form/inputs/testNumberSpinnerImpl.js diff --git a/client-app/test/unit/src/component/form/inputs/testNumberTextBoxImpl.js b/client-app/test/unit/component/form/inputs/testNumberTextBoxImpl.js similarity index 100% rename from client-app/test/unit/src/component/form/inputs/testNumberTextBoxImpl.js rename to client-app/test/unit/component/form/inputs/testNumberTextBoxImpl.js diff --git a/client-app/test/unit/src/component/form/inputs/testTextAreaImpl.js b/client-app/test/unit/component/form/inputs/testTextAreaImpl.js similarity index 100% rename from client-app/test/unit/src/component/form/inputs/testTextAreaImpl.js rename to client-app/test/unit/component/form/inputs/testTextAreaImpl.js diff --git a/client-app/test/unit/src/component/form/inputs/testTextBoxImpl.js b/client-app/test/unit/component/form/inputs/testTextBoxImpl.js similarity index 100% rename from client-app/test/unit/src/component/form/inputs/testTextBoxImpl.js rename to client-app/test/unit/component/form/inputs/testTextBoxImpl.js diff --git a/client-app/test/unit/src/component/form/testForm.js b/client-app/test/unit/component/form/testForm.js similarity index 100% rename from client-app/test/unit/src/component/form/testForm.js rename to client-app/test/unit/component/form/testForm.js diff --git a/client-app/test/unit/src/component/gateway/testGateway.js b/client-app/test/unit/component/gateway/testGateway.js similarity index 100% rename from client-app/test/unit/src/component/gateway/testGateway.js rename to client-app/test/unit/component/gateway/testGateway.js diff --git a/client-app/test/unit/src/component/layout/details/testDetails.js b/client-app/test/unit/component/layout/details/testDetails.js similarity index 100% rename from client-app/test/unit/src/component/layout/details/testDetails.js rename to client-app/test/unit/component/layout/details/testDetails.js diff --git a/client-app/test/unit/src/component/layout/wizard/testWizard.js b/client-app/test/unit/component/layout/wizard/testWizard.js similarity index 100% rename from client-app/test/unit/src/component/layout/wizard/testWizard.js rename to client-app/test/unit/component/layout/wizard/testWizard.js diff --git a/client-app/test/unit/src/component/map/testLeafletImpl.js b/client-app/test/unit/component/map/testLeafletImpl.js similarity index 100% rename from client-app/test/unit/src/component/map/testLeafletImpl.js rename to client-app/test/unit/component/map/testLeafletImpl.js diff --git a/client-app/test/unit/app/base/models/_ModelTestCommons.js b/client-app/test/unit/component/model/model/_ModelTestCommons.js similarity index 100% rename from client-app/test/unit/app/base/models/_ModelTestCommons.js rename to client-app/test/unit/component/model/model/_ModelTestCommons.js diff --git a/client-app/test/unit/app/base/models/attr/testArrayAttr.js b/client-app/test/unit/component/model/model/attr/testArrayAttr.js similarity index 100% rename from client-app/test/unit/app/base/models/attr/testArrayAttr.js rename to client-app/test/unit/component/model/model/attr/testArrayAttr.js diff --git a/client-app/test/unit/app/base/models/attr/testAttr.js b/client-app/test/unit/component/model/model/attr/testAttr.js similarity index 100% rename from client-app/test/unit/app/base/models/attr/testAttr.js rename to client-app/test/unit/component/model/model/attr/testAttr.js diff --git a/client-app/test/unit/app/base/models/attr/testObjAttr.js b/client-app/test/unit/component/model/model/attr/testObjAttr.js similarity index 100% rename from client-app/test/unit/app/base/models/attr/testObjAttr.js rename to client-app/test/unit/component/model/model/attr/testObjAttr.js diff --git a/client-app/test/unit/app/base/models/attr/testRelationAttr.js b/client-app/test/unit/component/model/model/attr/testRelationAttr.js similarity index 100% rename from client-app/test/unit/app/base/models/attr/testRelationAttr.js rename to client-app/test/unit/component/model/model/attr/testRelationAttr.js diff --git a/client-app/test/unit/app/base/models/test_Model.js b/client-app/test/unit/component/model/model/test_Model.js similarity index 100% rename from client-app/test/unit/app/base/models/test_Model.js rename to client-app/test/unit/component/model/model/test_Model.js diff --git a/client-app/test/unit/src/component/model/testModelImpl.js b/client-app/test/unit/component/model/testModelImpl.js similarity index 100% rename from client-app/test/unit/src/component/model/testModelImpl.js rename to client-app/test/unit/component/model/testModelImpl.js diff --git a/client-app/test/unit/src/component/notification/test_Communication.js b/client-app/test/unit/component/notification/test_Communication.js similarity index 100% rename from client-app/test/unit/src/component/notification/test_Communication.js rename to client-app/test/unit/component/notification/test_Communication.js diff --git a/client-app/test/unit/src/component/notification/test_Notification.js b/client-app/test/unit/component/notification/test_Notification.js similarity index 100% rename from client-app/test/unit/src/component/notification/test_Notification.js rename to client-app/test/unit/component/notification/test_Notification.js diff --git a/client-app/test/unit/src/component/search/testFacetsImpl.js b/client-app/test/unit/component/search/testFacetsImpl.js similarity index 100% rename from client-app/test/unit/src/component/search/testFacetsImpl.js rename to client-app/test/unit/component/search/testFacetsImpl.js diff --git a/client-app/test/unit/src/component/search/testSearch.js b/client-app/test/unit/component/search/testSearch.js similarity index 100% rename from client-app/test/unit/src/component/search/testSearch.js rename to client-app/test/unit/component/search/testSearch.js diff --git a/client-app/test/unit/src/component/selection/testSelector.js b/client-app/test/unit/component/selection/testSelector.js similarity index 100% rename from client-app/test/unit/src/component/selection/testSelector.js rename to client-app/test/unit/component/selection/testSelector.js diff --git a/client-app/test/unit/src/component/socket/testSocket.js b/client-app/test/unit/component/socket/testSocket.js similarity index 100% rename from client-app/test/unit/src/component/socket/testSocket.js rename to client-app/test/unit/component/socket/testSocket.js diff --git a/client-app/test/unit/src/component/store/testRestManager.js b/client-app/test/unit/component/store/testRestManager.js similarity index 100% rename from client-app/test/unit/src/component/store/testRestManager.js rename to client-app/test/unit/component/store/testRestManager.js diff --git a/client-app/test/unit/src/component/tree/testTree.js b/client-app/test/unit/component/tree/testTree.js similarity index 100% rename from client-app/test/unit/src/component/tree/testTree.js rename to client-app/test/unit/component/tree/testTree.js diff --git a/client-app/test/unit/src/component/wizard/testWizard.js b/client-app/test/unit/component/wizard/testWizard.js similarity index 100% rename from client-app/test/unit/src/component/wizard/testWizard.js rename to client-app/test/unit/component/wizard/testWizard.js diff --git a/client-app/test/unit/redmic/base/testCredentials.js b/client-app/test/unit/util/testCredentials.js similarity index 100% rename from client-app/test/unit/redmic/base/testCredentials.js rename to client-app/test/unit/util/testCredentials.js diff --git a/client-app/test/unit/redmic/base/testMediator.js b/client-app/test/unit/util/testMediator.js similarity index 100% rename from client-app/test/unit/redmic/base/testMediator.js rename to client-app/test/unit/util/testMediator.js diff --git a/client-app/test/unit/redmic/base/testRedmicLocalStorage.js b/client-app/test/unit/util/testRedmicLocalStorage.js similarity index 100% rename from client-app/test/unit/redmic/base/testRedmicLocalStorage.js rename to client-app/test/unit/util/testRedmicLocalStorage.js -- GitLab From 0b00d030ad1043ff3cd6eebab78a88bf88b250f1 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Tue, 30 Jul 2024 08:30:28 +0100 Subject: [PATCH 041/249] Limpia directorio src tras compilado Mientras se mantengan las rutas antiguas, donde app/ es la base de los require (apuntando hacia el directorio src/oldapp), se debe eliminar el directorio dist/javascript/src/, ya que su contenido se encuentra en las vistas compiladas en dist/javascript/app. --- grunt/config/cleanBuiltApp.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grunt/config/cleanBuiltApp.js b/grunt/config/cleanBuiltApp.js index b837372b..95c4a866 100644 --- a/grunt/config/cleanBuiltApp.js +++ b/grunt/config/cleanBuiltApp.js @@ -4,7 +4,7 @@ module.exports = function(grunt) { 'alertify', 'awesome-markers', 'cbtree', 'd3Tip', 'dijit', 'dojo', 'dojox', 'deepmerge', 'dropzone', 'handlebars', 'L-areaselect', 'L-coordinates', 'L-draw', 'L-miniMap', 'L-navBar', 'leaflet', 'leaflet-nontiledlayer', 'mediatorjs', 'moment', 'uuid', 'proj4', 'pruneCluster', 'put-selector', - 'RWidgets', 'sockjs', 'stomp-websocket', 'templates', 'tv4', 'wicket' + 'RWidgets', 'sockjs', 'stomp-websocket', 'src', 'templates', 'tv4', 'wicket' ]; var recursiveDirectoriesToDelete = [ -- GitLab From 832d4f599c2ecb633059cb95331fdb67befd2ca4 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Tue, 30 Jul 2024 08:32:51 +0100 Subject: [PATCH 042/249] Actualiza comando en imagen de contenedor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit La aplicación del lado del servidor ahora no se encuentra en el directorio app/, sino en server-app/, por lo que se actualiza el comando de lanzamiento. --- build/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Dockerfile b/build/Dockerfile index aca777a7..b497bb11 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -11,7 +11,7 @@ EXPOSE 3050 HEALTHCHECK --interval=30s --timeout=15s --start-period=1m --retries=3 \ CMD wget --spider -q http://localhost:3050 || exit 1 -CMD ["app", "-b"] +CMD ["server-app", "-b"] WORKDIR /redmic -- GitLab From de7be56ebe4a634176a928fecaadae0cc5c654d1 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Tue, 30 Jul 2024 09:32:23 +0100 Subject: [PATCH 043/249] =?UTF-8?q?Actualiza=20ruta=20de=20subm=C3=B3dulo?= =?UTF-8?q?=20de=20estilos?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index c9c00f44..11ae0337 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,5 +1,5 @@ -[submodule "client-app/stylesheets"] - path = client-app/stylesheets +[submodule "client-app/style"] + path = client-app/style url = ../style.git branch = master ignore = dirty -- GitLab From c4b594e05501a381082b4c46771579a915b4697b Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Tue, 30 Jul 2024 09:36:47 +0100 Subject: [PATCH 044/249] =?UTF-8?q?Actualiza=20subm=C3=B3dulo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client-app/stylesheets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client-app/stylesheets b/client-app/stylesheets index 6f9e29d7..72b51a41 160000 --- a/client-app/stylesheets +++ b/client-app/stylesheets @@ -1 +1 @@ -Subproject commit 6f9e29d749ea25a75d275eba150f1aee4b7b00ed +Subproject commit 72b51a41bd183521a73908928945ac8a88ad30d8 -- GitLab From e3bcee09a617db1a0bdf70c472dfca14dd5fae99 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Tue, 30 Jul 2024 09:41:37 +0100 Subject: [PATCH 045/249] =?UTF-8?q?Mueve=20subm=C3=B3dulo,=20actualiza=20r?= =?UTF-8?q?utas=20y=20agrega=20recursos?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci/build.yml | 8 ++++---- client-app/resources/images/bglogin.png | Bin 0 -> 460621 bytes client-app/resources/images/loading.svg | 2 ++ client-app/{stylesheets => style} | 0 client-app/test/support/pages/test.html | 2 +- grunt/config/buildModules.js | 2 +- grunt/config/copy.js | 4 ++-- grunt/config/ownModules.js | 2 +- grunt/task/buildStyles.js | 2 +- server-app/views/layout.pug | 2 +- 10 files changed, 13 insertions(+), 11 deletions(-) create mode 100644 client-app/resources/images/bglogin.png create mode 100644 client-app/resources/images/loading.svg rename client-app/{stylesheets => style} (100%) diff --git a/.gitlab-ci/build.yml b/.gitlab-ci/build.yml index a0e327f1..99ac27ca 100644 --- a/.gitlab-ci/build.yml +++ b/.gitlab-ci/build.yml @@ -11,7 +11,7 @@ paths: - node_modules/ - client-app/deps/templates/node_modules/ - - client-app/stylesheets/node_modules/ + - client-app/style/node_modules/ prepare-unbuilt-version: extends: .web-build @@ -27,9 +27,9 @@ prepare-unbuilt-version: paths: - node_modules/ - client-app/deps/templates/dist/ - - client-app/stylesheets/style.styl - - client-app/stylesheets/src/ - - client-app/stylesheets/submodules/ + - client-app/style/style.styl + - client-app/style/src/ + - client-app/style/submodules/ rules: - if: $CI_MERGE_REQUEST_ID || $CI_COMMIT_TAG || diff --git a/client-app/resources/images/bglogin.png b/client-app/resources/images/bglogin.png new file mode 100644 index 0000000000000000000000000000000000000000..c9d8be5268d858c298a11304f02830798a5b3d9d GIT binary patch literal 460621 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≪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

*8$nd-;07o%OCmQ-uH;_PWkE`pB>Jxc=T@l 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 z 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

Mm(3i{LM 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%0DsVW0O{Cgl9(oy#Xo>u21h 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

$8uMu>$_%epMC4Gu-RUzb*rJbznv?f1kAb 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 K=d#Wzp$Py1PVC+Q literal 0 HcmV?d00001 diff --git a/client-app/resources/images/loading.svg b/client-app/resources/images/loading.svg new file mode 100644 index 00000000..10909fb1 --- /dev/null +++ b/client-app/resources/images/loading.svg @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/client-app/stylesheets b/client-app/style similarity index 100% rename from client-app/stylesheets rename to client-app/style diff --git a/client-app/test/support/pages/test.html b/client-app/test/support/pages/test.html index a861db83..05b98da1 100644 --- a/client-app/test/support/pages/test.html +++ b/client-app/test/support/pages/test.html @@ -4,7 +4,7 @@ Test page - + diff --git a/grunt/config/buildModules.js b/grunt/config/buildModules.js index bcb24db9..be19ff0d 100644 --- a/grunt/config/buildModules.js +++ b/grunt/config/buildModules.js @@ -13,7 +13,7 @@ module.exports = function(grunt) { 'client-app/deps/templates': preBuildCmds.concat([ 'grunt' ]), - 'client-app/stylesheets': preBuildCmds.concat([ + 'client-app/style': preBuildCmds.concat([ 'grunt addModules buildModules' ]) }); diff --git a/grunt/config/copy.js b/grunt/config/copy.js index 87d8fd1e..f2ab9a47 100644 --- a/grunt/config/copy.js +++ b/grunt/config/copy.js @@ -10,9 +10,9 @@ module.exports = function(grunt) { resourcesPath = 'resources/**', - stylesPath = publicPath + '/stylesheets', + stylesPath = publicPath + '/style', stylesDistPath = stylesPath + '/dist', - distStylesSubPath = distPath + '/stylesheets', + distStylesSubPath = distPath + '/style', leafletPath = 'leaflet', srcLeafletPath = path.join(depsPath, leafletPath), diff --git a/grunt/config/ownModules.js b/grunt/config/ownModules.js index 7db78656..99320357 100644 --- a/grunt/config/ownModules.js +++ b/grunt/config/ownModules.js @@ -2,6 +2,6 @@ module.exports = function(grunt) { grunt.config('redmicConfig.ownModules', [ 'client-app/deps/templates', - 'client-app/stylesheets' + 'client-app/style' ]); }; diff --git a/grunt/task/buildStyles.js b/grunt/task/buildStyles.js index ac2f28e1..250883d8 100644 --- a/grunt/task/buildStyles.js +++ b/grunt/task/buildStyles.js @@ -6,7 +6,7 @@ module.exports = function(grunt) { var srcPath = grunt.config('redmicConfig.srcPath'), publicPath = srcPath.split('/')[0], - stylesPath = publicPath + '/stylesheets'; + stylesPath = publicPath + '/style'; grunt.config('shell.buildStyles', { options: { diff --git a/server-app/views/layout.pug b/server-app/views/layout.pug index 54b950ee..00b081f8 100644 --- a/server-app/views/layout.pug +++ b/server-app/views/layout.pug @@ -57,4 +57,4 @@ if !env.useBuilt link(rel='stylesheet', href='https://fonts.googleapis.com/css?family=Open+Sans:400italic,600,400') link(rel='stylesheet', href='https://fonts.googleapis.com/css?family=Exo+2:700') -link(rel='stylesheet', href=basePath + '/stylesheets/style.css') +link(rel='stylesheet', href=basePath + '/style/style.css') -- GitLab From 68114e2b0343af8670a30b46027cecd896949c31 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Tue, 30 Jul 2024 10:11:29 +0100 Subject: [PATCH 046/249] =?UTF-8?q?Mueve=20subm=C3=B3dulo=20de=20plantilla?= =?UTF-8?q?s=20a=20nueva=20ruta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitmodules | 4 ++-- client-app/{deps => dep}/templates | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename client-app/{deps => dep}/templates (100%) diff --git a/.gitmodules b/.gitmodules index 11ae0337..0f041c9a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,8 +3,8 @@ url = ../style.git branch = master ignore = dirty -[submodule "client-app/deps/templates"] - path = client-app/deps/templates +[submodule "client-app/dep/templates"] + path = client-app/dep/templates url = ../templates.git branch = master ignore = dirty diff --git a/client-app/deps/templates b/client-app/dep/templates similarity index 100% rename from client-app/deps/templates rename to client-app/dep/templates -- GitLab From f0efb79d9ff4945d7b8edf3d57e912d3384111ad Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Tue, 30 Jul 2024 10:12:41 +0100 Subject: [PATCH 047/249] Mueve dependencias a nueva ruta --- client-app/{deps => dep}/alertify | 0 client-app/{deps => dep}/cbtree | 0 client-app/{deps => dep}/color-js | 0 client-app/{deps => dep}/d3 | 0 client-app/{deps => dep}/d3-v6-tip | 0 client-app/{deps => dep}/deepmerge | 0 client-app/{deps => dep}/dijit | 0 client-app/{deps => dep}/dojo | 0 client-app/{deps => dep}/dojox | 0 client-app/{deps => dep}/draggabilly | 0 client-app/{deps => dep}/dropzone | 0 client-app/{deps => dep}/handlebars | 0 client-app/{deps => dep}/json-schema-ref-parser | 0 client-app/{deps => dep}/leaflet | 0 client-app/{deps => dep}/leaflet-areaselect | 0 client-app/{deps => dep}/leaflet-awesome-markers | 0 client-app/{deps => dep}/leaflet-coordinates | 0 client-app/{deps => dep}/leaflet-draw | 0 client-app/{deps => dep}/leaflet-measure | 0 client-app/{deps => dep}/leaflet-minimap | 0 client-app/{deps => dep}/leaflet-navbar | 0 client-app/{deps => dep}/leaflet-nontiledlayer | 0 client-app/{deps => dep}/mediatorjs | 0 client-app/{deps => dep}/moment | 0 client-app/{deps => dep}/packery | 0 client-app/{deps => dep}/pdfjs | 0 client-app/{deps => dep}/proj4 | 0 client-app/{deps => dep}/pruneCluster | 0 client-app/{deps => dep}/put-selector | 0 client-app/{deps => dep}/sockjs | 0 client-app/{deps => dep}/stomp-websocket | 0 client-app/{deps => dep}/tv4 | 0 client-app/{deps => dep}/util | 0 client-app/{deps => dep}/uuid | 0 client-app/{deps => dep}/wicket | 0 35 files changed, 0 insertions(+), 0 deletions(-) rename client-app/{deps => dep}/alertify (100%) rename client-app/{deps => dep}/cbtree (100%) rename client-app/{deps => dep}/color-js (100%) rename client-app/{deps => dep}/d3 (100%) rename client-app/{deps => dep}/d3-v6-tip (100%) rename client-app/{deps => dep}/deepmerge (100%) rename client-app/{deps => dep}/dijit (100%) rename client-app/{deps => dep}/dojo (100%) rename client-app/{deps => dep}/dojox (100%) rename client-app/{deps => dep}/draggabilly (100%) rename client-app/{deps => dep}/dropzone (100%) rename client-app/{deps => dep}/handlebars (100%) rename client-app/{deps => dep}/json-schema-ref-parser (100%) rename client-app/{deps => dep}/leaflet (100%) rename client-app/{deps => dep}/leaflet-areaselect (100%) rename client-app/{deps => dep}/leaflet-awesome-markers (100%) rename client-app/{deps => dep}/leaflet-coordinates (100%) rename client-app/{deps => dep}/leaflet-draw (100%) rename client-app/{deps => dep}/leaflet-measure (100%) rename client-app/{deps => dep}/leaflet-minimap (100%) rename client-app/{deps => dep}/leaflet-navbar (100%) rename client-app/{deps => dep}/leaflet-nontiledlayer (100%) rename client-app/{deps => dep}/mediatorjs (100%) rename client-app/{deps => dep}/moment (100%) rename client-app/{deps => dep}/packery (100%) rename client-app/{deps => dep}/pdfjs (100%) rename client-app/{deps => dep}/proj4 (100%) rename client-app/{deps => dep}/pruneCluster (100%) rename client-app/{deps => dep}/put-selector (100%) rename client-app/{deps => dep}/sockjs (100%) rename client-app/{deps => dep}/stomp-websocket (100%) rename client-app/{deps => dep}/tv4 (100%) rename client-app/{deps => dep}/util (100%) rename client-app/{deps => dep}/uuid (100%) rename client-app/{deps => dep}/wicket (100%) diff --git a/client-app/deps/alertify b/client-app/dep/alertify similarity index 100% rename from client-app/deps/alertify rename to client-app/dep/alertify diff --git a/client-app/deps/cbtree b/client-app/dep/cbtree similarity index 100% rename from client-app/deps/cbtree rename to client-app/dep/cbtree diff --git a/client-app/deps/color-js b/client-app/dep/color-js similarity index 100% rename from client-app/deps/color-js rename to client-app/dep/color-js diff --git a/client-app/deps/d3 b/client-app/dep/d3 similarity index 100% rename from client-app/deps/d3 rename to client-app/dep/d3 diff --git a/client-app/deps/d3-v6-tip b/client-app/dep/d3-v6-tip similarity index 100% rename from client-app/deps/d3-v6-tip rename to client-app/dep/d3-v6-tip diff --git a/client-app/deps/deepmerge b/client-app/dep/deepmerge similarity index 100% rename from client-app/deps/deepmerge rename to client-app/dep/deepmerge diff --git a/client-app/deps/dijit b/client-app/dep/dijit similarity index 100% rename from client-app/deps/dijit rename to client-app/dep/dijit diff --git a/client-app/deps/dojo b/client-app/dep/dojo similarity index 100% rename from client-app/deps/dojo rename to client-app/dep/dojo diff --git a/client-app/deps/dojox b/client-app/dep/dojox similarity index 100% rename from client-app/deps/dojox rename to client-app/dep/dojox diff --git a/client-app/deps/draggabilly b/client-app/dep/draggabilly similarity index 100% rename from client-app/deps/draggabilly rename to client-app/dep/draggabilly diff --git a/client-app/deps/dropzone b/client-app/dep/dropzone similarity index 100% rename from client-app/deps/dropzone rename to client-app/dep/dropzone diff --git a/client-app/deps/handlebars b/client-app/dep/handlebars similarity index 100% rename from client-app/deps/handlebars rename to client-app/dep/handlebars diff --git a/client-app/deps/json-schema-ref-parser b/client-app/dep/json-schema-ref-parser similarity index 100% rename from client-app/deps/json-schema-ref-parser rename to client-app/dep/json-schema-ref-parser diff --git a/client-app/deps/leaflet b/client-app/dep/leaflet similarity index 100% rename from client-app/deps/leaflet rename to client-app/dep/leaflet diff --git a/client-app/deps/leaflet-areaselect b/client-app/dep/leaflet-areaselect similarity index 100% rename from client-app/deps/leaflet-areaselect rename to client-app/dep/leaflet-areaselect diff --git a/client-app/deps/leaflet-awesome-markers b/client-app/dep/leaflet-awesome-markers similarity index 100% rename from client-app/deps/leaflet-awesome-markers rename to client-app/dep/leaflet-awesome-markers diff --git a/client-app/deps/leaflet-coordinates b/client-app/dep/leaflet-coordinates similarity index 100% rename from client-app/deps/leaflet-coordinates rename to client-app/dep/leaflet-coordinates diff --git a/client-app/deps/leaflet-draw b/client-app/dep/leaflet-draw similarity index 100% rename from client-app/deps/leaflet-draw rename to client-app/dep/leaflet-draw diff --git a/client-app/deps/leaflet-measure b/client-app/dep/leaflet-measure similarity index 100% rename from client-app/deps/leaflet-measure rename to client-app/dep/leaflet-measure diff --git a/client-app/deps/leaflet-minimap b/client-app/dep/leaflet-minimap similarity index 100% rename from client-app/deps/leaflet-minimap rename to client-app/dep/leaflet-minimap diff --git a/client-app/deps/leaflet-navbar b/client-app/dep/leaflet-navbar similarity index 100% rename from client-app/deps/leaflet-navbar rename to client-app/dep/leaflet-navbar diff --git a/client-app/deps/leaflet-nontiledlayer b/client-app/dep/leaflet-nontiledlayer similarity index 100% rename from client-app/deps/leaflet-nontiledlayer rename to client-app/dep/leaflet-nontiledlayer diff --git a/client-app/deps/mediatorjs b/client-app/dep/mediatorjs similarity index 100% rename from client-app/deps/mediatorjs rename to client-app/dep/mediatorjs diff --git a/client-app/deps/moment b/client-app/dep/moment similarity index 100% rename from client-app/deps/moment rename to client-app/dep/moment diff --git a/client-app/deps/packery b/client-app/dep/packery similarity index 100% rename from client-app/deps/packery rename to client-app/dep/packery diff --git a/client-app/deps/pdfjs b/client-app/dep/pdfjs similarity index 100% rename from client-app/deps/pdfjs rename to client-app/dep/pdfjs diff --git a/client-app/deps/proj4 b/client-app/dep/proj4 similarity index 100% rename from client-app/deps/proj4 rename to client-app/dep/proj4 diff --git a/client-app/deps/pruneCluster b/client-app/dep/pruneCluster similarity index 100% rename from client-app/deps/pruneCluster rename to client-app/dep/pruneCluster diff --git a/client-app/deps/put-selector b/client-app/dep/put-selector similarity index 100% rename from client-app/deps/put-selector rename to client-app/dep/put-selector diff --git a/client-app/deps/sockjs b/client-app/dep/sockjs similarity index 100% rename from client-app/deps/sockjs rename to client-app/dep/sockjs diff --git a/client-app/deps/stomp-websocket b/client-app/dep/stomp-websocket similarity index 100% rename from client-app/deps/stomp-websocket rename to client-app/dep/stomp-websocket diff --git a/client-app/deps/tv4 b/client-app/dep/tv4 similarity index 100% rename from client-app/deps/tv4 rename to client-app/dep/tv4 diff --git a/client-app/deps/util b/client-app/dep/util similarity index 100% rename from client-app/deps/util rename to client-app/dep/util diff --git a/client-app/deps/uuid b/client-app/dep/uuid similarity index 100% rename from client-app/deps/uuid rename to client-app/dep/uuid diff --git a/client-app/deps/wicket b/client-app/dep/wicket similarity index 100% rename from client-app/deps/wicket rename to client-app/dep/wicket -- GitLab From 129f40de4d734e05fd1c3690e65a55722bdb69a7 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Tue, 30 Jul 2024 10:18:25 +0100 Subject: [PATCH 048/249] Modifica rutas hacia dependencias --- .gitlab-ci/build.yml | 4 +- Gruntfile.js | 2 +- client-app/app.profile.js | 68 ++++++++++++------------- client-app/test/support/pages/test.html | 2 +- grunt/config/buildModules.js | 6 +-- grunt/config/copy.js | 6 +-- grunt/config/ownModules.js | 2 +- grunt/config/test.js | 4 +- grunt/task/buildApp.js | 4 +- server-app/views/layout.pug | 2 +- 10 files changed, 50 insertions(+), 50 deletions(-) diff --git a/.gitlab-ci/build.yml b/.gitlab-ci/build.yml index 99ac27ca..f0a323aa 100644 --- a/.gitlab-ci/build.yml +++ b/.gitlab-ci/build.yml @@ -10,7 +10,7 @@ cache: paths: - node_modules/ - - client-app/deps/templates/node_modules/ + - client-app/dep/templates/node_modules/ - client-app/style/node_modules/ prepare-unbuilt-version: @@ -26,7 +26,7 @@ prepare-unbuilt-version: expire_in: 1 week paths: - node_modules/ - - client-app/deps/templates/dist/ + - client-app/dep/templates/dist/ - client-app/style/style.styl - client-app/style/src/ - client-app/style/submodules/ diff --git a/Gruntfile.js b/Gruntfile.js index bf55ac39..0f991fb7 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -13,7 +13,7 @@ module.exports = function(grunt) { redmicConfig: { rootPath: __dirname, srcPath: 'client-app/src', - depsPath: 'client-app/deps', + depPath: 'client-app/dep', testPath: 'client-app/test', distPath: 'dist', destDir: 'javascript' diff --git a/client-app/app.profile.js b/client-app/app.profile.js index c0d64ebe..2df94482 100644 --- a/client-app/app.profile.js +++ b/client-app/app.profile.js @@ -85,16 +85,16 @@ var profileObj = { packages: [{ name: 'dijit', - location: 'deps/dijit' + location: 'dep/dijit' },{ name: 'dojo', - location: 'deps/dojo' + location: 'dep/dojo' },{ name: 'dojox', - location: 'deps/dojox' + location: 'dep/dojox' },{ name: 'cbtree', - location: 'deps/cbtree', + location: 'dep/cbtree', resourceTags: { amd: amdTagger, ignore: ignoreTagger.bind(null, [ @@ -119,10 +119,10 @@ var profileObj = { } },{ name: 'put-selector', - location: 'deps/put-selector' + location: 'dep/put-selector' },{ name: 'wicket', - location: 'deps/wicket', + location: 'dep/wicket', resourceTags: { amd: amdTagger, ignore: ignoreTagger.bind(null, ['wicket/wicket.min', 'wicket/wicket-leaflet.min']) @@ -147,78 +147,78 @@ var profileObj = { } },{ name: 'mediatorjs', - location: 'deps/mediatorjs', + location: 'dep/mediatorjs', resourceTags: { amd: amdTagger, ignore: ignoreTagger.bind(null, 'mediatorjs/mediator.min') } },{ name: 'moment', - location: 'deps/moment/min', + location: 'dep/moment/min', resourceTags: { amd: amdTagger, ignore: ignoreTagger.bind(null, 'moment/moment.min') } },{ name: 'deepmerge', - location: 'deps/deepmerge/dist', + location: 'dep/deepmerge/dist', resourceTags: { amd: amdTagger, ignore: ignoreTagger.bind(null, 'deepmerge/umd') } },{ name: 'leaflet', - location: 'deps/leaflet/dist', + location: 'dep/leaflet/dist', resourceTags: { amd: amdTagger, ignore: ignoreTagger.bind(null, 'leaflet/leaflet') } },{ name: 'leaflet-nontiledlayer', - location: 'deps/leaflet-nontiledlayer/dist', + location: 'dep/leaflet-nontiledlayer/dist', resourceTags: { amd: amdTagger } },{ name: 'awesome-markers', - location: 'deps/leaflet-awesome-markers/dist', + location: 'dep/leaflet-awesome-markers/dist', resourceTags: { ignore: ignoreTagger.bind(null, 'awesome-markers/leaflet.awesome-markers.min') } },{ name: 'L-coordinates', - location: 'deps/leaflet-coordinates/dist', + location: 'dep/leaflet-coordinates/dist', resourceTags: { ignore: ignoreTagger.bind(null, 'L-coordinates/Leaflet.Coordinates-0.1.5.min') } },{ name: 'L-draw', - location: 'deps/leaflet-draw/dist', + location: 'dep/leaflet-draw/dist', resourceTags: { ignore: ignoreTagger.bind(null, 'L-draw/leaflet.draw') } },{ name: 'L-miniMap', - location: 'deps/leaflet-minimap/dist', + location: 'dep/leaflet-minimap/dist', resourceTags: { amd: amdTagger, ignore: ignoreTagger.bind(null, 'L-miniMap/Control.MiniMap.min') } },{ name: 'L-navBar', - location: 'deps/leaflet-navbar/src', + location: 'dep/leaflet-navbar/src', resourceTags: { ignore: ignoreTagger.bind(null, 'L-navBar/Leaflet.NavBar') } },{ name: 'L-areaselect', - location: 'deps/leaflet-areaselect/src', + location: 'dep/leaflet-areaselect/src', resourceTags: { ignore: ignoreTagger.bind(null, 'L-areaselect/leaflet-areaselect') } },{ name: 'leaflet-measure', - location: 'deps/leaflet-measure/dist', + location: 'dep/leaflet-measure/dist', resourceTags: { amd: amdTagger, ignore: ignoreTagger.bind(null, [ @@ -228,110 +228,110 @@ var profileObj = { } },{ name: 'pruneCluster', - location: 'deps/pruneCluster/dist', + location: 'dep/pruneCluster/dist', resourceTags: { amd: amdTagger, ignore: ignoreTagger.bind(null, 'pruneCluster/PruneCluster.amd.min') } },{ name: 'sockjs', - location: 'deps/sockjs/dist', + location: 'dep/sockjs/dist', resourceTags: { amd: amdTagger, ignore: ignoreTagger.bind(null, 'sockjs/sockjs.min') } },{ name: 'stomp-websocket', - location: 'deps/stomp-websocket/lib', + location: 'dep/stomp-websocket/lib', resourceTags: { ignore: ignoreTagger.bind(null, 'stomp-websocket/stomp.min') } },{ name: 'alertify', - location: 'deps/alertify/build', + location: 'dep/alertify/build', resourceTags: { amd: amdTagger, ignore: ignoreTagger.bind(null, 'alertify/alertify.min') } },{ name: 'templates', - location: 'deps/templates/dist', + location: 'dep/templates/dist', resourceTags: { amd: amdTagger } },{ name: 'd3', - location: 'deps/d3/dist', + location: 'dep/d3/dist', resourceTags: { amd: amdTagger, ignore: ignoreTagger.bind(null, 'd3/d3.min') } },{ name: 'd3Tip', - location: 'deps/d3-v6-tip/build', + location: 'dep/d3-v6-tip/build', resourceTags: { amd: amdTagger, ignore: ignoreTagger.bind(null, 'd3Tip/d3-v6-tip.min') } },{ name: 'uuid', - location: 'deps/uuid/dist/umd', + location: 'dep/uuid/dist/umd', resourceTags: { amd: amdTagger, ignore: ignoreTagger.bind(null, 'uuid/uuidv4.min') } },{ name: 'proj4', - location: 'deps/proj4/dist', + location: 'dep/proj4/dist', resourceTags: { amd: amdTagger, ignore: ignoreTagger.bind(null, 'proj4/proj4') } },{ name: 'dropzone', - location: 'deps/dropzone/dist/min', + location: 'dep/dropzone/dist/min', resourceTags: { amd: amdTagger, ignore: ignoreTagger.bind(null, 'dropzone/dropzone-amd-module.min') } },{ name: 'tv4', - location: 'deps/tv4', + location: 'dep/tv4', resourceTags: { amd: amdTagger, ignore: ignoreTagger.bind(null, 'tv4/tv4') } },{ name: 'colorjs', - location: 'deps/color-js', + location: 'dep/color-js', resourceTags: { copyOnly: copyOnlyTagger, ignore: ignoreTagger.bind(null, 'colorjs/color') } },{ name: 'json-schema-ref-parser', - location: 'deps/json-schema-ref-parser/dist', + location: 'dep/json-schema-ref-parser/dist', resourceTags: { copyOnly: copyOnlyTagger, ignore: ignoreTagger.bind(null, 'json-schema-ref-parser/ref-parser.min') } },{ name: 'packery', - location: 'deps/packery/dist', + location: 'dep/packery/dist', resourceTags: { copyOnly: copyOnlyTagger, ignore: ignoreTagger.bind(null, 'packery/packery.pkgd.min') } },{ name: 'draggabilly', - location: 'deps/draggabilly/dist', + location: 'dep/draggabilly/dist', resourceTags: { copyOnly: copyOnlyTagger, ignore: ignoreTagger.bind(null, 'draggabilly/draggabilly.pkgd.min') } },{ name: 'handlebars', - location: 'deps/handlebars/dist', + location: 'dep/handlebars/dist', resourceTags: { amd: amdTagger, ignore: ignoreTagger.bind(null, 'handlebars/handlebars.runtime.min') diff --git a/client-app/test/support/pages/test.html b/client-app/test/support/pages/test.html index 05b98da1..b990c166 100644 --- a/client-app/test/support/pages/test.html +++ b/client-app/test/support/pages/test.html @@ -15,7 +15,7 @@ location: '../../../tests' }); - +

diff --git a/grunt/config/buildModules.js b/grunt/config/buildModules.js index be19ff0d..51d150d3 100644 --- a/grunt/config/buildModules.js +++ b/grunt/config/buildModules.js @@ -3,14 +3,14 @@ module.exports = function(grunt) { var preBuildCmds = ['yarn install']; grunt.config('redmicConfig.buildModules', { - 'client-app/deps/pruneCluster': [ + 'client-app/dep/pruneCluster': [ 'npm install', 'grunt build:dist --force' ], - 'client-app/deps/wicket': [ + 'client-app/dep/wicket': [ 'npm run build' ], - 'client-app/deps/templates': preBuildCmds.concat([ + 'client-app/dep/templates': preBuildCmds.concat([ 'grunt' ]), 'client-app/style': preBuildCmds.concat([ diff --git a/grunt/config/copy.js b/grunt/config/copy.js index f2ab9a47..15c03791 100644 --- a/grunt/config/copy.js +++ b/grunt/config/copy.js @@ -3,7 +3,7 @@ module.exports = function(grunt) { var path = require('path'), srcPath = grunt.config('redmicConfig.srcPath'), - depsPath = grunt.config('redmicConfig.depsPath'), + depPath = grunt.config('redmicConfig.depPath'), distPath = grunt.config('redmicConfig.distPath'), destDir = grunt.config('redmicConfig.destDir'), publicPath = srcPath.split('/')[0], @@ -15,11 +15,11 @@ module.exports = function(grunt) { distStylesSubPath = distPath + '/style', leafletPath = 'leaflet', - srcLeafletPath = path.join(depsPath, leafletPath), + srcLeafletPath = path.join(depPath, leafletPath), distLeafletPath = path.join(distPath, destDir, leafletPath), pdfjsPath = 'pdfjs', - srcPdfjsPath = path.join(depsPath, pdfjsPath), + srcPdfjsPath = path.join(depPath, pdfjsPath), distPdfjsPath = path.join(distPath, destDir, pdfjsPath), pdfjsWebName = 'web', pdfjsBuildName = 'build'; diff --git a/grunt/config/ownModules.js b/grunt/config/ownModules.js index 99320357..ea74dc13 100644 --- a/grunt/config/ownModules.js +++ b/grunt/config/ownModules.js @@ -1,7 +1,7 @@ module.exports = function(grunt) { grunt.config('redmicConfig.ownModules', [ - 'client-app/deps/templates', + 'client-app/dep/templates', 'client-app/style' ]); }; diff --git a/grunt/config/test.js b/grunt/config/test.js index 1e2cf763..de584f0d 100644 --- a/grunt/config/test.js +++ b/grunt/config/test.js @@ -11,7 +11,7 @@ module.exports = function(grunt) { rootPath = grunt.config('redmicConfig.rootPath'), srcPath = grunt.config('redmicConfig.srcPath'), - depsPath = grunt.config('redmicConfig.depsPath'), + depPath = grunt.config('redmicConfig.depPath'), testPath = grunt.config('redmicConfig.testPath'), outputPath = 'test_reports', @@ -86,7 +86,7 @@ module.exports = function(grunt) { testUnitRemotePath = path.join(absoluteTestsPath, 'intern-unit-remote'), testFunctionalLocalPath = path.join(absoluteTestsPath, 'intern-functional-local'), testFunctionalRemotePath = path.join(absoluteTestsPath, 'intern-functional-remote'), - dojoCommonBaseUrl = path.join(' ', depsPath, '*').trim(), + dojoCommonBaseUrl = path.join(' ', depPath, '*').trim(), ipGetterPath = path.join(absoluteTestsPath, 'IpGetter'), IpGetter = require(ipGetterPath)(), diff --git a/grunt/task/buildApp.js b/grunt/task/buildApp.js index 5d11c693..6f370f46 100644 --- a/grunt/task/buildApp.js +++ b/grunt/task/buildApp.js @@ -7,7 +7,7 @@ module.exports = function(grunt) { var path = require('path'), rootPath = grunt.config('redmicConfig.rootPath'), - depsPath = grunt.config('redmicConfig.depsPath'), + depPath = grunt.config('redmicConfig.depPath'), distPath = grunt.config('redmicConfig.distPath'), destDir = grunt.config('redmicConfig.destDir'), resourcesToClean = grunt.config('redmicConfig.resourcesToCleanInBuiltApp'), @@ -21,7 +21,7 @@ module.exports = function(grunt) { command: function() { var profile = pkg.dojoBuild, - scriptPath = path.join(depsPath, 'dojo/dojo.js'), + scriptPath = path.join(depPath, 'dojo/dojo.js'), releaseDir = path.join(rootPath, distPath), nodeParams = ' --optimize_for_size --max_old_space_size=3000 --gc_interval=100 ', buildParams = ' load=build --profile "' + profile + '" --releaseDir "' + releaseDir + '"'; diff --git a/server-app/views/layout.pug b/server-app/views/layout.pug index 00b081f8..acc24918 100644 --- a/server-app/views/layout.pug +++ b/server-app/views/layout.pug @@ -31,7 +31,7 @@ html const basePath = '/' + (env.useBuilt ? 'dist' : 'client-app'), dojoConfigPath = basePath + '/' + (env.useBuilt ? 'javascript' : 'src') + '/dojoConfig.js', - dojoJsPath = basePath + '/' + (env.useBuilt ? 'javascript' : 'deps') + '/dojo/dojo.js'; + dojoJsPath = basePath + '/' + (env.useBuilt ? 'javascript' : 'dep') + '/dojo/dojo.js'; meta(name = 'og:locale' content = locale) meta(name = 'og:locale:alternate' content = altLocale1) -- GitLab From 8382fd3a4491c17180ebeef11152b816fa1f23b7 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Tue, 30 Jul 2024 10:52:03 +0100 Subject: [PATCH 049/249] Corrige rutas hacia tests funcionales desde CI --- .gitlab-ci/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci/test.yml b/.gitlab-ci/test.yml index 1045dada..78e5e7cd 100644 --- a/.gitlab-ci/test.yml +++ b/.gitlab-ci/test.yml @@ -90,7 +90,7 @@ run-local-modules-functional-tests: - npm start & - > grunt test-functional-local - --functionalSuites=test/functional/modules/**/!\(*Script\).js + --functionalSuites=client-app/test/functional/modules/**/!\(*Script\).js --headless --browser=${TEST_BROWSER} --seleniumVersion=${LOCAL_SELENIUM_VERSION} @@ -106,7 +106,7 @@ run-local-modules-functional-tests: - npm start & - > grunt test-functional-remote - --functionalSuites=test/functional/modules/**/!\(*Script\).js + --functionalSuites=client-app/test/functional/modules/**/!\(*Script\).js --headless --browser=${TEST_BROWSER} --ownServerHost="${TEST_OWN_SERVER_HOST}" -- GitLab From caf313abc5e021fa507c20c47b93d5420d54bf23 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Tue, 30 Jul 2024 11:00:25 +0100 Subject: [PATCH 050/249] Renombra ruta de recursos y actualiza referencias --- .../{resources => res}/documents/ModeloLogico.pdf | Bin client-app/{resources => res}/images/bglogin.png | Bin .../{resources => res}/images/browsers/chrome.png | Bin .../{resources => res}/images/browsers/ff.png | Bin .../{resources => res}/images/browsers/ie.png | Bin .../{resources => res}/images/browsers/opera.png | Bin .../{resources => res}/images/browsers/safari.png | Bin client-app/{resources => res}/images/favicon.ico | Bin client-app/{resources => res}/images/loading.svg | 0 .../images/logos/gobcan-logos.png | Bin client-app/{resources => res}/images/logos/logo.svg | 0 .../images/logos/redmic-logo-1200x1200.jpg | Bin .../images/logos/redmic-logo-og.jpg | Bin .../images/logos/redmic-logo-og.png | Bin .../images/logos/redmicSimple.png | Bin .../images/logos/twitter-light.png | Bin .../{resources => res}/images/map/layer-eoc-map.png | Bin .../images/map/layer-ortofoto.png | Bin .../{resources => res}/images/map/layer-redmic.png | Bin .../images/map/layer-topografico.png | Bin client-app/{resources => res}/images/noIMG.png | Bin .../images/redmic_opciones_usuario.JPG | Bin .../images/redmic_tabla_geometrias.jpg | Bin client-app/src/component/base/Manager.js | 2 +- client-app/src/component/components/Topbar.js | 2 +- .../src/component/map/_StaticLayersManagement.js | 2 +- .../src/component/metaTags/metaTagsContent.js | 2 +- .../src/oldapp/user/views/InnerWhatIsRedmicView.js | 2 +- .../src/oldapp/user/views/templates/Login.html | 2 +- .../oldapp/user/views/templates/WhatIsRedmic.html | 2 +- .../oldapp/views/templates/NoSupportBrowser.html | 8 ++++---- client-app/style | 2 +- client-app/test/functional/common/Profile.js | 2 +- grunt/config/copy.js | 2 +- server-app/views/layout.pug | 2 +- 35 files changed, 15 insertions(+), 15 deletions(-) rename client-app/{resources => res}/documents/ModeloLogico.pdf (100%) rename client-app/{resources => res}/images/bglogin.png (100%) rename client-app/{resources => res}/images/browsers/chrome.png (100%) rename client-app/{resources => res}/images/browsers/ff.png (100%) rename client-app/{resources => res}/images/browsers/ie.png (100%) rename client-app/{resources => res}/images/browsers/opera.png (100%) rename client-app/{resources => res}/images/browsers/safari.png (100%) rename client-app/{resources => res}/images/favicon.ico (100%) rename client-app/{resources => res}/images/loading.svg (100%) rename client-app/{resources => res}/images/logos/gobcan-logos.png (100%) rename client-app/{resources => res}/images/logos/logo.svg (100%) rename client-app/{resources => res}/images/logos/redmic-logo-1200x1200.jpg (100%) rename client-app/{resources => res}/images/logos/redmic-logo-og.jpg (100%) rename client-app/{resources => res}/images/logos/redmic-logo-og.png (100%) rename client-app/{resources => res}/images/logos/redmicSimple.png (100%) rename client-app/{resources => res}/images/logos/twitter-light.png (100%) rename client-app/{resources => res}/images/map/layer-eoc-map.png (100%) rename client-app/{resources => res}/images/map/layer-ortofoto.png (100%) rename client-app/{resources => res}/images/map/layer-redmic.png (100%) rename client-app/{resources => res}/images/map/layer-topografico.png (100%) rename client-app/{resources => res}/images/noIMG.png (100%) rename client-app/{resources => res}/images/redmic_opciones_usuario.JPG (100%) rename client-app/{resources => res}/images/redmic_tabla_geometrias.jpg (100%) diff --git a/client-app/resources/documents/ModeloLogico.pdf b/client-app/res/documents/ModeloLogico.pdf similarity index 100% rename from client-app/resources/documents/ModeloLogico.pdf rename to client-app/res/documents/ModeloLogico.pdf diff --git a/client-app/resources/images/bglogin.png b/client-app/res/images/bglogin.png similarity index 100% rename from client-app/resources/images/bglogin.png rename to client-app/res/images/bglogin.png diff --git a/client-app/resources/images/browsers/chrome.png b/client-app/res/images/browsers/chrome.png similarity index 100% rename from client-app/resources/images/browsers/chrome.png rename to client-app/res/images/browsers/chrome.png diff --git a/client-app/resources/images/browsers/ff.png b/client-app/res/images/browsers/ff.png similarity index 100% rename from client-app/resources/images/browsers/ff.png rename to client-app/res/images/browsers/ff.png diff --git a/client-app/resources/images/browsers/ie.png b/client-app/res/images/browsers/ie.png similarity index 100% rename from client-app/resources/images/browsers/ie.png rename to client-app/res/images/browsers/ie.png diff --git a/client-app/resources/images/browsers/opera.png b/client-app/res/images/browsers/opera.png similarity index 100% rename from client-app/resources/images/browsers/opera.png rename to client-app/res/images/browsers/opera.png diff --git a/client-app/resources/images/browsers/safari.png b/client-app/res/images/browsers/safari.png similarity index 100% rename from client-app/resources/images/browsers/safari.png rename to client-app/res/images/browsers/safari.png diff --git a/client-app/resources/images/favicon.ico b/client-app/res/images/favicon.ico similarity index 100% rename from client-app/resources/images/favicon.ico rename to client-app/res/images/favicon.ico diff --git a/client-app/resources/images/loading.svg b/client-app/res/images/loading.svg similarity index 100% rename from client-app/resources/images/loading.svg rename to client-app/res/images/loading.svg diff --git a/client-app/resources/images/logos/gobcan-logos.png b/client-app/res/images/logos/gobcan-logos.png similarity index 100% rename from client-app/resources/images/logos/gobcan-logos.png rename to client-app/res/images/logos/gobcan-logos.png diff --git a/client-app/resources/images/logos/logo.svg b/client-app/res/images/logos/logo.svg similarity index 100% rename from client-app/resources/images/logos/logo.svg rename to client-app/res/images/logos/logo.svg diff --git a/client-app/resources/images/logos/redmic-logo-1200x1200.jpg b/client-app/res/images/logos/redmic-logo-1200x1200.jpg similarity index 100% rename from client-app/resources/images/logos/redmic-logo-1200x1200.jpg rename to client-app/res/images/logos/redmic-logo-1200x1200.jpg diff --git a/client-app/resources/images/logos/redmic-logo-og.jpg b/client-app/res/images/logos/redmic-logo-og.jpg similarity index 100% rename from client-app/resources/images/logos/redmic-logo-og.jpg rename to client-app/res/images/logos/redmic-logo-og.jpg diff --git a/client-app/resources/images/logos/redmic-logo-og.png b/client-app/res/images/logos/redmic-logo-og.png similarity index 100% rename from client-app/resources/images/logos/redmic-logo-og.png rename to client-app/res/images/logos/redmic-logo-og.png diff --git a/client-app/resources/images/logos/redmicSimple.png b/client-app/res/images/logos/redmicSimple.png similarity index 100% rename from client-app/resources/images/logos/redmicSimple.png rename to client-app/res/images/logos/redmicSimple.png diff --git a/client-app/resources/images/logos/twitter-light.png b/client-app/res/images/logos/twitter-light.png similarity index 100% rename from client-app/resources/images/logos/twitter-light.png rename to client-app/res/images/logos/twitter-light.png diff --git a/client-app/resources/images/map/layer-eoc-map.png b/client-app/res/images/map/layer-eoc-map.png similarity index 100% rename from client-app/resources/images/map/layer-eoc-map.png rename to client-app/res/images/map/layer-eoc-map.png diff --git a/client-app/resources/images/map/layer-ortofoto.png b/client-app/res/images/map/layer-ortofoto.png similarity index 100% rename from client-app/resources/images/map/layer-ortofoto.png rename to client-app/res/images/map/layer-ortofoto.png diff --git a/client-app/resources/images/map/layer-redmic.png b/client-app/res/images/map/layer-redmic.png similarity index 100% rename from client-app/resources/images/map/layer-redmic.png rename to client-app/res/images/map/layer-redmic.png diff --git a/client-app/resources/images/map/layer-topografico.png b/client-app/res/images/map/layer-topografico.png similarity index 100% rename from client-app/resources/images/map/layer-topografico.png rename to client-app/res/images/map/layer-topografico.png diff --git a/client-app/resources/images/noIMG.png b/client-app/res/images/noIMG.png similarity index 100% rename from client-app/resources/images/noIMG.png rename to client-app/res/images/noIMG.png diff --git a/client-app/resources/images/redmic_opciones_usuario.JPG b/client-app/res/images/redmic_opciones_usuario.JPG similarity index 100% rename from client-app/resources/images/redmic_opciones_usuario.JPG rename to client-app/res/images/redmic_opciones_usuario.JPG diff --git a/client-app/resources/images/redmic_tabla_geometrias.jpg b/client-app/res/images/redmic_tabla_geometrias.jpg similarity index 100% rename from client-app/resources/images/redmic_tabla_geometrias.jpg rename to client-app/res/images/redmic_tabla_geometrias.jpg diff --git a/client-app/src/component/base/Manager.js b/client-app/src/component/base/Manager.js index 5eb20452..7fa01119 100644 --- a/client-app/src/component/base/Manager.js +++ b/client-app/src/component/base/Manager.js @@ -127,7 +127,7 @@ function( var logosContainer = put(this.leftContainer, 'div.gobcan-logos'); - put(logosContainer, 'img[src=/resources/images/logos/gobcan-logos.png]'); + put(logosContainer, 'img[src=/res/images/logos/gobcan-logos.png]'); }, _checkDomainToAddMessage: function() { diff --git a/client-app/src/component/components/Topbar.js b/client-app/src/component/components/Topbar.js index b63c86a0..fffbd05f 100644 --- a/client-app/src/component/components/Topbar.js +++ b/client-app/src/component/components/Topbar.js @@ -36,7 +36,7 @@ define([ logoClass: 'topbarLogo', logoHref: '/home', - logoImgSrc: '/resources/images/logos/logo.svg' + logoImgSrc: '/res/images/logos/logo.svg' }; if (args && args.ecomarcan) { diff --git a/client-app/src/component/map/_StaticLayersManagement.js b/client-app/src/component/map/_StaticLayersManagement.js index a751fbc0..24e4d0e4 100644 --- a/client-app/src/component/map/_StaticLayersManagement.js +++ b/client-app/src/component/map/_StaticLayersManagement.js @@ -54,7 +54,7 @@ define([ // Código HTML de la etiqueta de la capa. var title = this.i18n[layerId] || layerId, - thumbPath = '/resources/images/map/layer-' + layerId + '.png', + thumbPath = '/res/images/map/layer-' + layerId + '.png', thumbAttr = 'style=background-image:url(' + thumbPath + ')', outerContainer = put('div.sharpContainer.layerThumbnailContainer.relativeContainer[' + thumbAttr + ']'), innerContainerClass = '.wrapContainer.hardTranslucentContainer.absoluteContainer.thumbCaption'; diff --git a/client-app/src/component/metaTags/metaTagsContent.js b/client-app/src/component/metaTags/metaTagsContent.js index 2ec56833..9ce06d14 100644 --- a/client-app/src/component/metaTags/metaTagsContent.js +++ b/client-app/src/component/metaTags/metaTagsContent.js @@ -2,7 +2,7 @@ define({ "default": { "title": "{i18n.metaDefaultTitle}", "description": "{i18n.metaDefaultDescription}.", - "image": "https://{hostname}/resources/images/logos/redmic-logo-og.jpg", + "image": "https://{hostname}/res/images/logos/redmic-logo-og.jpg", "image:alt": "{i18n.metaDefaultImageAlt}.", "image:type": "image/jpeg", "image:width": "1200", diff --git a/client-app/src/oldapp/user/views/InnerWhatIsRedmicView.js b/client-app/src/oldapp/user/views/InnerWhatIsRedmicView.js index 356f24a4..1dc215d9 100644 --- a/client-app/src/oldapp/user/views/InnerWhatIsRedmicView.js +++ b/client-app/src/oldapp/user/views/InnerWhatIsRedmicView.js @@ -55,7 +55,7 @@ define([ title: this.i18n.logicalDataModel, type: PDFViewer, props: { - urlPdf: '/resources/documents/ModeloLogico.pdf', + urlPdf: '/res/documents/ModeloLogico.pdf', roleGuestActive: true } },{ diff --git a/client-app/src/oldapp/user/views/templates/Login.html b/client-app/src/oldapp/user/views/templates/Login.html index fc6499cc..395127e4 100644 --- a/client-app/src/oldapp/user/views/templates/Login.html +++ b/client-app/src/oldapp/user/views/templates/Login.html @@ -3,7 +3,7 @@ data-dojo-attach-point="loginManagerNode">
- +

REDMIC

${i18n.subtitle}

diff --git a/client-app/src/oldapp/user/views/templates/WhatIsRedmic.html b/client-app/src/oldapp/user/views/templates/WhatIsRedmic.html index 85d5def6..781dfa60 100644 --- a/client-app/src/oldapp/user/views/templates/WhatIsRedmic.html +++ b/client-app/src/oldapp/user/views/templates/WhatIsRedmic.html @@ -1,6 +1,6 @@
- +

${i18n.redmicInfo}${i18n.here}.

${i18n.contact}: info@redmic.es

diff --git a/client-app/src/oldapp/views/templates/NoSupportBrowser.html b/client-app/src/oldapp/views/templates/NoSupportBrowser.html index 862abd11..42025a71 100644 --- a/client-app/src/oldapp/views/templates/NoSupportBrowser.html +++ b/client-app/src/oldapp/views/templates/NoSupportBrowser.html @@ -2,16 +2,16 @@

${i18n.noSupport}

- + - + - + - +
diff --git a/client-app/style b/client-app/style index 72b51a41..f41d7448 160000 --- a/client-app/style +++ b/client-app/style @@ -1 +1 @@ -Subproject commit 72b51a41bd183521a73908928945ac8a88ad30d8 +Subproject commit f41d7448bf50be031bdb845feb0e34245a965243 diff --git a/client-app/test/functional/common/Profile.js b/client-app/test/functional/common/Profile.js index b2cdea38..4e802a84 100644 --- a/client-app/test/functional/common/Profile.js +++ b/client-app/test/functional/common/Profile.js @@ -16,7 +16,7 @@ define([ userImageSelector = 'div' + Config.selector.notLoading + ' div.imageContainer img', newImageUrl = Config.env.cwd + '/tests/support/resources/profile.png', - emptyImageUrl = '/resources/images/noIMG.png', + emptyImageUrl = '/res/images/noIMG.png', goToProfile = function() { diff --git a/grunt/config/copy.js b/grunt/config/copy.js index 15c03791..ed8de3c3 100644 --- a/grunt/config/copy.js +++ b/grunt/config/copy.js @@ -8,7 +8,7 @@ module.exports = function(grunt) { destDir = grunt.config('redmicConfig.destDir'), publicPath = srcPath.split('/')[0], - resourcesPath = 'resources/**', + resourcesPath = 'res/**', stylesPath = publicPath + '/style', stylesDistPath = stylesPath + '/dist', diff --git a/server-app/views/layout.pug b/server-app/views/layout.pug index acc24918..168a45f4 100644 --- a/server-app/views/layout.pug +++ b/server-app/views/layout.pug @@ -43,7 +43,7 @@ html script(src = dojoConfigPath) script(src = dojoJsPath data-dojo-config = 'locale:"' + env.lang + '"') - link(rel='shortcut icon', href=basePath + '/resources/images/favicon.ico') + link(rel='shortcut icon', href=basePath + '/res/images/favicon.ico') body(class=['db']) //- Contenedor de carga de la aplicación -- GitLab From e6fcb14bc0d6f2ff4e061915e6dafc99d6765823 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Tue, 30 Jul 2024 11:51:53 +0100 Subject: [PATCH 051/249] Reorganiza configs y tasks de grunt --- grunt/config/buildApp.js | 29 +++++ grunt/config/buildStyles.js | 19 +++ grunt/config/cleanBuiltApp.js | 92 +++++++++++++- grunt/config/prepareDependences.js | 20 +++ grunt/config/testFunctionalLocalParallel.js | 85 +++++++++++++ grunt/task/buildApp.js | 114 ------------------ grunt/task/buildStyles.js | 17 --- .../test.js => task/defineTestConfig.js} | 0 grunt/task/prepareDependences.js | 18 --- grunt/task/test.js | 90 -------------- grunt/task/testFunctionalLocalParallel.js | 9 ++ 11 files changed, 253 insertions(+), 240 deletions(-) create mode 100644 grunt/config/buildApp.js create mode 100644 grunt/config/buildStyles.js create mode 100644 grunt/config/prepareDependences.js create mode 100644 grunt/config/testFunctionalLocalParallel.js rename grunt/{config/test.js => task/defineTestConfig.js} (100%) create mode 100644 grunt/task/testFunctionalLocalParallel.js diff --git a/grunt/config/buildApp.js b/grunt/config/buildApp.js new file mode 100644 index 00000000..5b13eabe --- /dev/null +++ b/grunt/config/buildApp.js @@ -0,0 +1,29 @@ +module.exports = function(grunt) { + + var path = require('path'), + + rootPath = grunt.config('redmicConfig.rootPath'), + depPath = grunt.config('redmicConfig.depPath'), + distPath = grunt.config('redmicConfig.distPath'), + pkg = grunt.config('pkg'); + + grunt.config('shell.buildApp', { + options: { + stdout: true + }, + command: function() { + + var profile = pkg.dojoBuild, + scriptPath = path.join(depPath, 'dojo/dojo.js'), + releaseDir = path.join(rootPath, distPath), + nodeParams = ' --optimize_for_size --max_old_space_size=3000 --gc_interval=100 ', + buildParams = ' load=build --profile "' + profile + '" --releaseDir "' + releaseDir + '"'; + + return [ + 'echo "\nBuilding application with ' + profile + ' to ' + releaseDir + '\n"', + 'node' + nodeParams + scriptPath + buildParams, + 'echo "\nBuild complete"' + ].join('; '); + } + }); +}; diff --git a/grunt/config/buildStyles.js b/grunt/config/buildStyles.js new file mode 100644 index 00000000..710fbdbb --- /dev/null +++ b/grunt/config/buildStyles.js @@ -0,0 +1,19 @@ +module.exports = function(grunt) { + + var srcPath = grunt.config('redmicConfig.srcPath'), + publicPath = srcPath.split('/')[0], + stylesPath = publicPath + '/style'; + + grunt.config('shell.buildStyles', { + options: { + stdout: true + }, + command: function() { + + return [ + 'cd ' + stylesPath, + 'grunt' + ].join('; '); + } + }); +}; diff --git a/grunt/config/cleanBuiltApp.js b/grunt/config/cleanBuiltApp.js index 95c4a866..547a10cb 100644 --- a/grunt/config/cleanBuiltApp.js +++ b/grunt/config/cleanBuiltApp.js @@ -23,10 +23,100 @@ module.exports = function(grunt) { 'leaflet/dist/images/*.png', 'src/app/App.js' ]; - grunt.config('redmicConfig.resourcesToCleanInBuiltApp', { + var resourcesToClean = { filesToKeep: filesToKeep, directories: directoriesToDelete, recursiveDirectories: recursiveDirectoriesToDelete, files: filesToDelete + }; + + var path = require('path'), + + distPath = grunt.config('redmicConfig.distPath'), + destDir = grunt.config('redmicConfig.destDir'), + destPath = path.join(distPath, destDir, '/'); + + grunt.config('shell.cleanBuiltApp', { + options: { + stdout: true + }, + command: function() { + + var filesToKeep = resourcesToClean.filesToKeep, + directoriesToClean = resourcesToClean.directories, + recursiveDirectoriesToClean = resourcesToClean.recursiveDirectories, + filesToClean = resourcesToClean.files, + + createDirectoriesToKeepFilesCmd = 'mkdir -p', + createDirectoriesToRestoreFilesCmd = 'mkdir -p', + keepFilesCmds = [], + restoreFilesCmds = [], + cleanDirectoriesCmd = 'rm -rf', + cleanRecursiveDirsCmd = 'find ' + destPath + ' -type d', + cleanFilesCmd = 'find ' + destPath + ' -type f', + temporalBasePath = path.join(destPath, '.temp'), + i; + + for (i = 0; i < filesToKeep.length; i++) { + var fileToKeep = filesToKeep[i], + fileName = path.basename(fileToKeep), + filePath = path.dirname(fileToKeep), + absoluteFileName = path.join(destPath, fileToKeep), + absoluteFilePath = path.join(destPath, filePath); + + createDirectoriesToRestoreFilesCmd += ' ' + absoluteFilePath; + + var absoluteTemporalPath = path.join(temporalBasePath, i.toString(), filePath), + absoluteTemporalFileName = path.join(absoluteTemporalPath, fileName); + + createDirectoriesToKeepFilesCmd += ' ' + absoluteTemporalPath; + + var keepCmd = 'mv ' + absoluteFileName + ' ' + absoluteTemporalPath, + restoreCmd = 'mv ' + absoluteTemporalFileName + ' ' + absoluteFilePath; + + keepFilesCmds.push(keepCmd); + restoreFilesCmds.push(restoreCmd); + } + + restoreFilesCmds.push('rm -r ' + temporalBasePath); + + for (i = 0; i < directoriesToClean.length; i++) { + var directory = directoriesToClean[i]; + + cleanDirectoriesCmd += ' ' + destPath + directory; + } + + var optionPrefix; + for (i = 0; i < recursiveDirectoriesToClean.length; i++) { + var recursiveDirectory = recursiveDirectoriesToClean[i]; + + optionPrefix = (!i ? '' : ' -o'); + + cleanRecursiveDirsCmd += optionPrefix + ' -name "' + recursiveDirectory + '" -exec rm -rf {} +'; + } + + for (i = 0; i < filesToClean.length; i++) { + var file = filesToClean[i]; + + optionPrefix = (!i ? '' : ' -o'); + + cleanFilesCmd += optionPrefix + ' -name "' + file + '" -delete'; + } + + var appDir = destPath + 'app', + cleanUnusedAppFilesCmd = 'find ' + appDir + ' -maxdepth 1 -type f -name "*.js" -delete'; + + return [ + 'echo "\nCleaning build and debug resources from built application at ' + destPath + '\n"', + createDirectoriesToKeepFilesCmd, + keepFilesCmds.join('; '), + cleanDirectoriesCmd, + cleanRecursiveDirsCmd, + createDirectoriesToRestoreFilesCmd, + restoreFilesCmds.join('; '), + cleanFilesCmd, + cleanUnusedAppFilesCmd + ].join('; '); + } }); }; diff --git a/grunt/config/prepareDependences.js b/grunt/config/prepareDependences.js new file mode 100644 index 00000000..3af1f8e6 --- /dev/null +++ b/grunt/config/prepareDependences.js @@ -0,0 +1,20 @@ +module.exports = function(grunt) { + + grunt.config('shell.checkGlobalDependences', { + options: { + stdout: true + }, + command: [ + 'type yarn' + ].join(' && ') + }); + + grunt.config('shell.installDependences', { + options: { + stdout: true + }, + command: [ + 'yarn install --prod=false' + ].join('; ') + }); +}; diff --git a/grunt/config/testFunctionalLocalParallel.js b/grunt/config/testFunctionalLocalParallel.js new file mode 100644 index 00000000..04248f6f --- /dev/null +++ b/grunt/config/testFunctionalLocalParallel.js @@ -0,0 +1,85 @@ +module.exports = function(grunt) { + + grunt.config('shell.test-functional-local-parallel', { + command: function() { + + var serverUrlParam = grunt.option('serverUrl'), + userParam = grunt.option('user'), + passParam = grunt.option('pass'), + serverPort = 9000, + gruntCommand = 'grunt test-functional-local --headless', + + publicZoneGroups = 'catalog,catalogDetails,viewers,products', + administrativeZoneGroup = 'administrative,!administrative/taxonomy', + taxonomyZoneGroup = 'administrative/taxonomy', + dataLoaderAndAdministrativeDetailsZoneGroup = 'administrativeDetails,dataLoader', + maintenanceAndAdminDomainsZoneGroup = 'maintenance,!maintenance/domains/taxon' + + ',!maintenance/domains/observations', + taxonAndObservationDomainsZoneGroup = 'maintenance/domains/observations,maintenance/domains/taxon', + + portParam = ' --ownServerPort=', + + guestCommonTestsParams = ' --role=guest --suitesGroups=', + + guestTestsParams = guestCommonTestsParams + publicZoneGroups, + + specificParamsList = [], + specificParams, + + userCommonTestsParams = ' --role=administrator --user=' + userParam + ' --pass=' + passParam + + ' --suitesGroups=', + + userZoneGroupsList = [ + publicZoneGroups, administrativeZoneGroup, taxonomyZoneGroup, + dataLoaderAndAdministrativeDetailsZoneGroup, maintenanceAndAdminDomainsZoneGroup, + taxonAndObservationDomainsZoneGroup + ], + + commonGuestZoneGroups = guestCommonTestsParams + 'common', + commonUserZoneGroups = userCommonTestsParams + 'common', + + cmds = [], + commandsGrunt = ''; + + if (serverUrlParam) { + gruntCommand += ' --serverUrl="' + serverUrlParam + '"'; + } + + for (var i = 0; i < userZoneGroupsList.length; i++) { + specificParamsList.push(userCommonTestsParams + userZoneGroupsList[i]); + } + + commandsGrunt = gruntCommand + commonGuestZoneGroups + portParam + serverPort + ' ; '; + serverPort += 3; + + commandsGrunt += gruntCommand + commonUserZoneGroups + portParam + serverPort + ' ; '; + serverPort += 3; + + commandsGrunt += gruntCommand + guestTestsParams + portParam + serverPort + ' ; '; + serverPort += 3; + + var firstPartSpecificParamsList = Math.floor(specificParamsList.length / 2); + + for (i = 0; i < firstPartSpecificParamsList; i++) { + specificParams = specificParamsList[i]; + + cmds.push(gruntCommand + specificParams + portParam + serverPort); + serverPort += 3; + } + + commandsGrunt += cmds.join(' & ') + ' ; '; + cmds = []; + + for (i = firstPartSpecificParamsList; i < specificParamsList.length; i++) { + specificParams = specificParamsList[i]; + + cmds.push(gruntCommand + specificParams + portParam + serverPort); + serverPort += 3; + } + + commandsGrunt += cmds.join(' & '); + + return commandsGrunt; + } + }); +}; diff --git a/grunt/task/buildApp.js b/grunt/task/buildApp.js index 6f370f46..d471b223 100644 --- a/grunt/task/buildApp.js +++ b/grunt/task/buildApp.js @@ -4,120 +4,6 @@ module.exports = function(grunt) { 'Construye los módulos de la aplicación con las herramientas de Dojo', function() { - var path = require('path'), - - rootPath = grunt.config('redmicConfig.rootPath'), - depPath = grunt.config('redmicConfig.depPath'), - distPath = grunt.config('redmicConfig.distPath'), - destDir = grunt.config('redmicConfig.destDir'), - resourcesToClean = grunt.config('redmicConfig.resourcesToCleanInBuiltApp'), - pkg = grunt.config('pkg'), - destPath = path.join(distPath, destDir, '/'); - - grunt.config('shell.buildApp', { - options: { - stdout: true - }, - command: function() { - - var profile = pkg.dojoBuild, - scriptPath = path.join(depPath, 'dojo/dojo.js'), - releaseDir = path.join(rootPath, distPath), - nodeParams = ' --optimize_for_size --max_old_space_size=3000 --gc_interval=100 ', - buildParams = ' load=build --profile "' + profile + '" --releaseDir "' + releaseDir + '"'; - - return [ - 'echo "\nBuilding application with ' + profile + ' to ' + releaseDir + '\n"', - 'node' + nodeParams + scriptPath + buildParams, - 'echo "\nBuild complete"' - ].join('; '); - } - }); - - grunt.config('shell.cleanBuiltApp', { - options: { - stdout: true - }, - command: function() { - - var filesToKeep = resourcesToClean.filesToKeep, - directoriesToClean = resourcesToClean.directories, - recursiveDirectoriesToClean = resourcesToClean.recursiveDirectories, - filesToClean = resourcesToClean.files, - - createDirectoriesToKeepFilesCmd = 'mkdir -p', - createDirectoriesToRestoreFilesCmd = 'mkdir -p', - keepFilesCmds = [], - restoreFilesCmds = [], - cleanDirectoriesCmd = 'rm -rf', - cleanRecursiveDirsCmd = 'find ' + destPath + ' -type d', - cleanFilesCmd = 'find ' + destPath + ' -type f', - temporalBasePath = path.join(destPath, '.temp'), - i; - - for (i = 0; i < filesToKeep.length; i++) { - var fileToKeep = filesToKeep[i], - fileName = path.basename(fileToKeep), - filePath = path.dirname(fileToKeep), - absoluteFileName = path.join(destPath, fileToKeep), - absoluteFilePath = path.join(destPath, filePath); - - createDirectoriesToRestoreFilesCmd += ' ' + absoluteFilePath; - - var absoluteTemporalPath = path.join(temporalBasePath, i.toString(), filePath), - absoluteTemporalFileName = path.join(absoluteTemporalPath, fileName); - - createDirectoriesToKeepFilesCmd += ' ' + absoluteTemporalPath; - - var keepCmd = 'mv ' + absoluteFileName + ' ' + absoluteTemporalPath, - restoreCmd = 'mv ' + absoluteTemporalFileName + ' ' + absoluteFilePath; - - keepFilesCmds.push(keepCmd); - restoreFilesCmds.push(restoreCmd); - } - - restoreFilesCmds.push('rm -r ' + temporalBasePath); - - for (i = 0; i < directoriesToClean.length; i++) { - var directory = directoriesToClean[i]; - - cleanDirectoriesCmd += ' ' + destPath + directory; - } - - var optionPrefix; - for (i = 0; i < recursiveDirectoriesToClean.length; i++) { - var recursiveDirectory = recursiveDirectoriesToClean[i]; - - optionPrefix = (!i ? '' : ' -o'); - - cleanRecursiveDirsCmd += optionPrefix + ' -name "' + recursiveDirectory + '" -exec rm -rf {} +'; - } - - for (i = 0; i < filesToClean.length; i++) { - var file = filesToClean[i]; - - optionPrefix = (!i ? '' : ' -o'); - - cleanFilesCmd += optionPrefix + ' -name "' + file + '" -delete'; - } - - var appDir = destPath + 'app', - cleanUnusedAppFilesCmd = 'find ' + appDir + ' -maxdepth 1 -type f -name "*.js" -delete'; - - return [ - 'echo "\nCleaning build and debug resources from built application at ' + destPath + '\n"', - createDirectoriesToKeepFilesCmd, - keepFilesCmds.join('; '), - cleanDirectoriesCmd, - cleanRecursiveDirsCmd, - createDirectoriesToRestoreFilesCmd, - restoreFilesCmds.join('; '), - cleanFilesCmd, - cleanUnusedAppFilesCmd - ].join('; '); - } - }); - grunt.task.run(['shell:buildApp', 'shell:cleanBuiltApp', 'uglify:dojoConfig']); }); }; diff --git a/grunt/task/buildStyles.js b/grunt/task/buildStyles.js index 250883d8..14db877f 100644 --- a/grunt/task/buildStyles.js +++ b/grunt/task/buildStyles.js @@ -4,23 +4,6 @@ module.exports = function(grunt) { 'Manda a construir el módulo de estilos y recoge el resultado', function() { - var srcPath = grunt.config('redmicConfig.srcPath'), - publicPath = srcPath.split('/')[0], - stylesPath = publicPath + '/style'; - - grunt.config('shell.buildStyles', { - options: { - stdout: true - }, - command: function() { - - return [ - 'cd ' + stylesPath, - 'grunt' - ].join('; '); - } - }); - grunt.task.run(['shell:buildStyles', 'copy:stylesDist']); }); }; diff --git a/grunt/config/test.js b/grunt/task/defineTestConfig.js similarity index 100% rename from grunt/config/test.js rename to grunt/task/defineTestConfig.js diff --git a/grunt/task/prepareDependences.js b/grunt/task/prepareDependences.js index 511b0cb2..00ce716a 100644 --- a/grunt/task/prepareDependences.js +++ b/grunt/task/prepareDependences.js @@ -4,24 +4,6 @@ module.exports = function(grunt) { 'Comprueba, limpia e instala las dependencias del proyecto', function() { - grunt.config('shell.checkGlobalDependences', { - options: { - stdout: true - }, - command: [ - 'type yarn' - ].join(' && ') - }); - - grunt.config('shell.installDependences', { - options: { - stdout: true - }, - command: [ - 'yarn install --prod=false' - ].join('; ') - }); - grunt.task.run(['shell:checkGlobalDependences', 'shell:installDependences']); }); }; diff --git a/grunt/task/test.js b/grunt/task/test.js index 4e3f5f07..606c8516 100644 --- a/grunt/task/test.js +++ b/grunt/task/test.js @@ -65,94 +65,4 @@ module.exports = function(grunt) { commonTasks.concat(['intern:test-functional-remote'])); grunt.registerTask('test', ['test-unit-local']); - - grunt.registerTask('test-functional-local-parallel', - 'Ejecuta los tests funcionales en entorno local de manera paralela', - function() { - - grunt.config('shell.test-functional-local-parallel', { - command: function() { - - var serverUrlParam = grunt.option('serverUrl'), - userParam = grunt.option('user'), - passParam = grunt.option('pass'), - serverPort = 9000, - gruntCommand = 'grunt test-functional-local --headless', - - publicZoneGroups = 'catalog,catalogDetails,viewers,products', - administrativeZoneGroup = 'administrative,!administrative/taxonomy', - taxonomyZoneGroup = 'administrative/taxonomy', - dataLoaderAndAdministrativeDetailsZoneGroup = 'administrativeDetails,dataLoader', - maintenanceAndAdminDomainsZoneGroup = 'maintenance,!maintenance/domains/taxon' + - ',!maintenance/domains/observations', - taxonAndObservationDomainsZoneGroup = 'maintenance/domains/observations,maintenance/domains/taxon', - - portParam = ' --ownServerPort=', - - guestCommonTestsParams = ' --role=guest --suitesGroups=', - - guestTestsParams = guestCommonTestsParams + publicZoneGroups, - - specificParamsList = [], - specificParams, - - userCommonTestsParams = ' --role=administrator --user=' + userParam + ' --pass=' + passParam + - ' --suitesGroups=', - - userZoneGroupsList = [ - publicZoneGroups, administrativeZoneGroup, taxonomyZoneGroup, - dataLoaderAndAdministrativeDetailsZoneGroup, maintenanceAndAdminDomainsZoneGroup, - taxonAndObservationDomainsZoneGroup - ], - - commonGuestZoneGroups = guestCommonTestsParams + 'common', - commonUserZoneGroups = userCommonTestsParams + 'common', - - cmds = [], - commandsGrunt = ''; - - if (serverUrlParam) { - gruntCommand += ' --serverUrl="' + serverUrlParam + '"'; - } - - for (var i = 0; i < userZoneGroupsList.length; i++) { - specificParamsList.push(userCommonTestsParams + userZoneGroupsList[i]); - } - - commandsGrunt = gruntCommand + commonGuestZoneGroups + portParam + serverPort + ' ; '; - serverPort += 3; - - commandsGrunt += gruntCommand + commonUserZoneGroups + portParam + serverPort + ' ; '; - serverPort += 3; - - commandsGrunt += gruntCommand + guestTestsParams + portParam + serverPort + ' ; '; - serverPort += 3; - - var firstPartSpecificParamsList = Math.floor(specificParamsList.length / 2); - - for (i = 0; i < firstPartSpecificParamsList; i++) { - specificParams = specificParamsList[i]; - - cmds.push(gruntCommand + specificParams + portParam + serverPort); - serverPort += 3; - } - - commandsGrunt += cmds.join(' & ') + ' ; '; - cmds = []; - - for (i = firstPartSpecificParamsList; i < specificParamsList.length; i++) { - specificParams = specificParamsList[i]; - - cmds.push(gruntCommand + specificParams + portParam + serverPort); - serverPort += 3; - } - - commandsGrunt += cmds.join(' & '); - - return commandsGrunt; - } - }); - - grunt.task.run('shell:test-functional-local-parallel'); - }); }; diff --git a/grunt/task/testFunctionalLocalParallel.js b/grunt/task/testFunctionalLocalParallel.js new file mode 100644 index 00000000..b9d5525f --- /dev/null +++ b/grunt/task/testFunctionalLocalParallel.js @@ -0,0 +1,9 @@ +module.exports = function(grunt) { + + grunt.registerTask('test-functional-local-parallel', + 'Ejecuta los tests funcionales en entorno local de manera paralela', + function() { + + grunt.task.run('shell:test-functional-local-parallel'); + }); +}; -- GitLab From f55bd215dc91c0575e6ccd8476f06f88c5c2e80e Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Tue, 30 Jul 2024 12:04:40 +0100 Subject: [PATCH 052/249] =?UTF-8?q?Actualiza=20subm=C3=B3dulo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client-app/style | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client-app/style b/client-app/style index f41d7448..e2793946 160000 --- a/client-app/style +++ b/client-app/style @@ -1 +1 @@ -Subproject commit f41d7448bf50be031bdb845feb0e34245a965243 +Subproject commit e279394690bd57092cba7d276d3bd6204dc9dc91 -- GitLab From 8c2ad0e6bc89144845a0f20096cface38c673c89 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Tue, 30 Jul 2024 13:17:20 +0100 Subject: [PATCH 053/249] Corrige ruta en artifacts CI de style --- .gitlab-ci/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci/build.yml b/.gitlab-ci/build.yml index f0a323aa..d0835606 100644 --- a/.gitlab-ci/build.yml +++ b/.gitlab-ci/build.yml @@ -29,7 +29,7 @@ prepare-unbuilt-version: - client-app/dep/templates/dist/ - client-app/style/style.styl - client-app/style/src/ - - client-app/style/submodules/ + - client-app/style/dep/ rules: - if: $CI_MERGE_REQUEST_ID || $CI_COMMIT_TAG || -- GitLab From cf500558d1fdb1072ccbde9485ecaaf680e3f6a9 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Tue, 30 Jul 2024 13:18:03 +0100 Subject: [PATCH 054/249] Empaqueta con comando npm pack, ajusta a salida MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit En lugar de crear el paquete comprimido de la aplicación compilada con un comando específico, se emplea la funcionalidad que provee npm con el subcomando 'pack', logrando el mismo resultado y con menos peso. --- .gitignore | 1 - .gitlab-ci/build.yml | 2 +- build/Dockerfile | 4 ++-- build/Dockerfile.dockerignore | 2 +- grunt/task/packageApp.js | 5 +---- package.json | 2 +- 6 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 7c8e46e9..3334fd7a 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,5 @@ dist test_reports .gitmodules.old build-report.txt -*.tar.gz *.tgz *.log diff --git a/.gitlab-ci/build.yml b/.gitlab-ci/build.yml index d0835606..7ddaf99a 100644 --- a/.gitlab-ci/build.yml +++ b/.gitlab-ci/build.yml @@ -48,7 +48,7 @@ prepare-built-version: name: ${CI_JOB_NAME}_${CI_COMMIT_REF_NAME} expire_in: 1 month paths: - - dist*.tar.gz + - redmic-project-web-*.tgz - build-report.txt rules: - if: $CI_MERGE_REQUEST_ID || diff --git a/build/Dockerfile b/build/Dockerfile index b497bb11..af595220 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -13,9 +13,9 @@ HEALTHCHECK --interval=30s --timeout=15s --start-period=1m --retries=3 \ CMD ["server-app", "-b"] -WORKDIR /redmic +ADD redmic-project-web-*.tgz / -ADD dist*.tar.gz ./ +WORKDIR /package RUN node -e 'const fs = require("fs"); \ const pkg = JSON.parse(fs.readFileSync("./package.json", "utf-8")); \ diff --git a/build/Dockerfile.dockerignore b/build/Dockerfile.dockerignore index d0295dc6..80cdadcf 100644 --- a/build/Dockerfile.dockerignore +++ b/build/Dockerfile.dockerignore @@ -1,2 +1,2 @@ * -!dist*.tar.gz +!redmic-project-web-*.tgz diff --git a/grunt/task/packageApp.js b/grunt/task/packageApp.js index 0f719a13..89fa368f 100644 --- a/grunt/task/packageApp.js +++ b/grunt/task/packageApp.js @@ -8,10 +8,7 @@ module.exports = function(grunt) { options: { stdout: true }, - command: [ - 'version=$(node -p "require(\'./package.json\').version")', - 'tar -acf dist-v$version.tar.gz dist/ server-app/ package.json yarn.lock README.md LICENSE' - ].join('; ') + command: 'npm pack' }); grunt.task.run(['shell:packageApp']); diff --git a/package.json b/package.json index e503399c..e040caa1 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,7 @@ "tv4": "1.3.0", "wicket": "1.3.8" }, - "files": ["dist"], + "files": ["dist", "yarn.lock"], "engines": { "node": ">=16.0", "npm": ">=8.19" -- GitLab From 7228a24acaff7158ac7d7970dc3b1304ac9656a5 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Tue, 30 Jul 2024 13:47:16 +0100 Subject: [PATCH 055/249] Corrige ruta CI a tests funcionales de componentes --- .gitlab-ci/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci/test.yml b/.gitlab-ci/test.yml index 78e5e7cd..92b6d08a 100644 --- a/.gitlab-ci/test.yml +++ b/.gitlab-ci/test.yml @@ -90,7 +90,7 @@ run-local-modules-functional-tests: - npm start & - > grunt test-functional-local - --functionalSuites=client-app/test/functional/modules/**/!\(*Script\).js + --functionalSuites=client-app/test/functional/component/**/!\(*Script\).js --headless --browser=${TEST_BROWSER} --seleniumVersion=${LOCAL_SELENIUM_VERSION} @@ -106,7 +106,7 @@ run-local-modules-functional-tests: - npm start & - > grunt test-functional-remote - --functionalSuites=client-app/test/functional/modules/**/!\(*Script\).js + --functionalSuites=client-app/test/functional/component/**/!\(*Script\).js --headless --browser=${TEST_BROWSER} --ownServerHost="${TEST_OWN_SERVER_HOST}" -- GitLab From 13d2ee319a96c8ba6678f6ea3ffe039b9719a53b Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Wed, 31 Jul 2024 13:22:53 +0100 Subject: [PATCH 056/249] Emplea scripts npm para tareas comunes, limpia MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adopta el uso de scripts a nivel de npm (definidos en el fichero package.json) ajustados al ciclo de vida establecido para realizar tareas recurrentes, como preparar la aplicación para ser lanzada, generar la salida compilada o lanzar tests. Estos a su vez se apoyan en las tareas gestionadas por Grunt, por lo que sólo se han reorganizado detalles y se han envuelto con esta capa estándar a nivel de npm. Ajusta tareas CI, tareas Grunt y documentación en README. --- .gitlab-ci/build.yml | 8 +++----- README.md | 26 +++++++++++++++++++++++--- grunt/config/prepareDependences.js | 2 +- grunt/task/build.js | 2 +- grunt/task/packageApp.js | 16 ---------------- grunt/task/preBuild.js | 2 +- package.json | 8 +++++++- 7 files changed, 36 insertions(+), 28 deletions(-) delete mode 100644 grunt/task/packageApp.js diff --git a/.gitlab-ci/build.yml b/.gitlab-ci/build.yml index 7ddaf99a..f94d1a28 100644 --- a/.gitlab-ci/build.yml +++ b/.gitlab-ci/build.yml @@ -5,8 +5,8 @@ WEB_BUILD_IMAGE_NAME: registry.gitlab.com/redmic-project/docker/web-build WEB_BUILD_IMAGE_TAG: latest before_script: - - type yarn grunt java - - yarn install + - type npm + - npm run install cache: paths: - node_modules/ @@ -16,8 +16,6 @@ prepare-unbuilt-version: extends: .web-build stage: pre-build - script: - - grunt preBuild dependencies: [] tags: - custom-runner @@ -42,7 +40,7 @@ prepare-built-version: extends: .web-build stage: build script: - - grunt + - npm pack dependencies: [] artifacts: name: ${CI_JOB_NAME}_${CI_COMMIT_REF_NAME} diff --git a/README.md b/README.md index b43ef710..a606517a 100644 --- a/README.md +++ b/README.md @@ -9,10 +9,10 @@ Cliente web de REDMIC. ## Entorno de desarrollo -Una vez clonado el repositorio en el entorno local de desarrollo y satisfechas las dependencias base del sistema, es posible instalar las dependencias necesarias que define el proyecto y arrancar el servicio: +Una vez clonado el repositorio del proyecto en el entorno local de desarrollo y satisfechas las dependencias base del sistema (`npm/Node.js`, `grunt-cli` y `Yarn`), es posible instalar sus dependencias y arrancar el servicio en modo de desarrollo: ```sh -yarn install +npm run install OAUTH_URL=https://redmic.grafcan.es/api/oauth \ OAUTH_CLIENT_ID=app \ @@ -33,12 +33,23 @@ Si todo ha ido correctamente, el servicio *REDMIC web* estará accesible en . +Para facilitar las tareas repetitivas, se han creado una serie de tareas ejecutables mediante **Grunt**, que a su vez se referencian desde comandos de **npm**. Más información en . ## Compilación Para optimizar la ejecución es necesario realizar un proceso de "compilación" de la aplicación. +Se puede generar la salida compilada simplemente lanzando los siguientes comandos (cuidado, es un proceso pesado): + +```sh +npm run install +npm pack +``` + +> Internamente se lanzarán otros comandos orquestados mediante **Grunt** (que también podrían ejecutarse de manera concreta si fuera necesario). + +Esto generará un directorio con el código compilado de salida (`dist/`) junto con un fichero comprimido que contiene dicha salida y otros recursos necesarios para lanzar la aplicación (`redmic-project-web-.tgz`). + Más información en . ## Páginas estáticas @@ -55,6 +66,15 @@ Por defecto, `Prerender` consultará al servicio mediante protocolo HTTP. Si no Se ha preparado una batería de pruebas, tanto unitarias como funcionales, que permiten evaluar el estado del proyecto a medida que se aplican cambios en la base de código. +Se puede comenzar la ejecución de tests lanzando los siguientes comandos: + +```sh +npm run install +npm test +``` + +> Internamente se lanzarán otros comandos orquestados mediante **Grunt** (que también podrían ejecutarse de manera concreta si fuera necesario). + Más información en . ### Ejemplos de ejecución de tests locales diff --git a/grunt/config/prepareDependences.js b/grunt/config/prepareDependences.js index 3af1f8e6..e6b68249 100644 --- a/grunt/config/prepareDependences.js +++ b/grunt/config/prepareDependences.js @@ -14,7 +14,7 @@ module.exports = function(grunt) { stdout: true }, command: [ - 'yarn install --prod=false' + 'yarn install --prod=false --ignore-optional --ignore-scripts' ].join('; ') }); }; diff --git a/grunt/task/build.js b/grunt/task/build.js index b4c7a38f..6e3eaaa8 100644 --- a/grunt/task/build.js +++ b/grunt/task/build.js @@ -1,5 +1,5 @@ module.exports = function(grunt) { grunt.registerTask('build', - ['buildStyles', 'copy:resources', 'copy:leaflet', 'copy:pdfjs', 'buildApp', 'packageApp']); + ['clean:build', 'buildStyles', 'copy:resources', 'copy:leaflet', 'copy:pdfjs', 'buildApp']); }; diff --git a/grunt/task/packageApp.js b/grunt/task/packageApp.js deleted file mode 100644 index 89fa368f..00000000 --- a/grunt/task/packageApp.js +++ /dev/null @@ -1,16 +0,0 @@ -module.exports = function(grunt) { - - grunt.registerTask('packageApp', - 'Empaqueta la aplicación construida con todo lo necesario para distribución', - function() { - - grunt.config('shell.packageApp', { - options: { - stdout: true - }, - command: 'npm pack' - }); - - grunt.task.run(['shell:packageApp']); - }); -}; diff --git a/grunt/task/preBuild.js b/grunt/task/preBuild.js index 53001017..2ae2b832 100644 --- a/grunt/task/preBuild.js +++ b/grunt/task/preBuild.js @@ -1,5 +1,5 @@ module.exports = function(grunt) { grunt.registerTask('preBuild', - ['prepareDependences', 'clean:build', 'addModules', 'buildModules', 'jshint']); + ['prepareDependences', 'addModules', 'buildModules', 'jshint']); }; diff --git a/package.json b/package.json index e040caa1..f1e1a156 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,13 @@ }, "private": true, "scripts": { - "start": "node server-app" + "preinstall": "type grunt", + "install": "grunt preBuild", + "start": "node server-app", + "prepack": "type grunt", + "prepare": "grunt build", + "pretest": "type grunt", + "test": "grunt test" }, "dependencies": { "commander": "11.1.0", -- GitLab From 26baa88c4fd07846c151254073155a25beee619b Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Thu, 1 Aug 2024 13:04:45 +0100 Subject: [PATCH 057/249] Corrige jobs CI y muestra versiones npm y node --- .gitlab-ci/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab-ci/build.yml b/.gitlab-ci/build.yml index f94d1a28..aeeef1c0 100644 --- a/.gitlab-ci/build.yml +++ b/.gitlab-ci/build.yml @@ -6,6 +6,7 @@ WEB_BUILD_IMAGE_TAG: latest before_script: - type npm + - npm -v - npm run install cache: paths: @@ -16,6 +17,8 @@ prepare-unbuilt-version: extends: .web-build stage: pre-build + script: + - node -v dependencies: [] tags: - custom-runner -- GitLab From 77729fd7e5e87c24c472f4d207d0f5436b17f4f8 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Thu, 1 Aug 2024 13:30:32 +0100 Subject: [PATCH 058/249] =?UTF-8?q?Migra=20dependencias=20problem=C3=A1tic?= =?UTF-8?q?as,=20traduce=20botones?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Un obstáculo a la hora de usar npm para gestionar las dependencias son aquellos proyectos que se importan directamente desde repositorio git pero que no aportan un fichero package.json, porque no son procesables. Para evitarlo, se han migrado 2 proyectos en esta situación para usar una versión provista desde el registro npm por alguien que ya tuvo este problema antes. Se ajustan importaciones y otros detalles para funcionar como antes pero con las nuevas dependencias. Se aplican traducciones a botones de leaflet, que hasta ahora no se habían traducido del inglés. Actualiza submódulo de estilos. --- client-app/app.profile.js | 6 +- client-app/dep/leaflet-awesome-markers | 1 - client-app/dep/leaflet-nav | 1 + client-app/dep/leaflet-navbar | 1 - client-app/dep/leaflet.awesome-markers | 1 + client-app/src/component/map/LeafletImpl.js | 1 + .../map/_LeafletWidgetsManagement.js | 22 +- client-app/src/dojoConfig.js | 4 +- client-app/src/oldapp/nls/es/translation.js | 6 + client-app/src/oldapp/nls/translation.js | 6 + client-app/style | 2 +- package.json | 10 +- yarn.lock | 1392 +++++++++-------- 13 files changed, 785 insertions(+), 668 deletions(-) delete mode 120000 client-app/dep/leaflet-awesome-markers create mode 120000 client-app/dep/leaflet-nav delete mode 120000 client-app/dep/leaflet-navbar create mode 120000 client-app/dep/leaflet.awesome-markers diff --git a/client-app/app.profile.js b/client-app/app.profile.js index 2df94482..e650f7c0 100644 --- a/client-app/app.profile.js +++ b/client-app/app.profile.js @@ -181,7 +181,7 @@ var profileObj = { } },{ name: 'awesome-markers', - location: 'dep/leaflet-awesome-markers/dist', + location: 'dep/leaflet.awesome-markers/dist', resourceTags: { ignore: ignoreTagger.bind(null, 'awesome-markers/leaflet.awesome-markers.min') } @@ -206,9 +206,9 @@ var profileObj = { } },{ name: 'L-navBar', - location: 'dep/leaflet-navbar/src', + location: 'dep/leaflet-nav', resourceTags: { - ignore: ignoreTagger.bind(null, 'L-navBar/Leaflet.NavBar') + ignore: ignoreTagger.bind(null, 'L-navBar/index') } },{ name: 'L-areaselect', diff --git a/client-app/dep/leaflet-awesome-markers b/client-app/dep/leaflet-awesome-markers deleted file mode 120000 index 38b8b21a..00000000 --- a/client-app/dep/leaflet-awesome-markers +++ /dev/null @@ -1 +0,0 @@ -../../node_modules/leaflet-awesome-markers \ No newline at end of file diff --git a/client-app/dep/leaflet-nav b/client-app/dep/leaflet-nav new file mode 120000 index 00000000..dca4f937 --- /dev/null +++ b/client-app/dep/leaflet-nav @@ -0,0 +1 @@ +../../node_modules/leaflet-nav \ No newline at end of file diff --git a/client-app/dep/leaflet-navbar b/client-app/dep/leaflet-navbar deleted file mode 120000 index e1101eac..00000000 --- a/client-app/dep/leaflet-navbar +++ /dev/null @@ -1 +0,0 @@ -../../node_modules/leaflet-navbar \ No newline at end of file diff --git a/client-app/dep/leaflet.awesome-markers b/client-app/dep/leaflet.awesome-markers new file mode 120000 index 00000000..1532789a --- /dev/null +++ b/client-app/dep/leaflet.awesome-markers @@ -0,0 +1 @@ +../../node_modules/leaflet.awesome-markers \ No newline at end of file diff --git a/client-app/src/component/map/LeafletImpl.js b/client-app/src/component/map/LeafletImpl.js index 546a0cb9..75eb1797 100644 --- a/client-app/src/component/map/LeafletImpl.js +++ b/client-app/src/component/map/LeafletImpl.js @@ -56,6 +56,7 @@ define([ this.map = L.map(this.mapNode, { crs: L.CRS.EPSG4326, doubleClickZoom: false, + zoomControl: false, minZoom: this.minZoom, maxZoom: this.maxZoom, attributionControl: true, diff --git a/client-app/src/component/map/_LeafletWidgetsManagement.js b/client-app/src/component/map/_LeafletWidgetsManagement.js index ad6da1d5..52f9628b 100644 --- a/client-app/src/component/map/_LeafletWidgetsManagement.js +++ b/client-app/src/component/map/_LeafletWidgetsManagement.js @@ -10,7 +10,7 @@ define([ , 'awesome-markers/leaflet.awesome-markers.min' , 'L-coordinates/Leaflet.Coordinates-0.1.5.min' - , 'L-navBar/Leaflet.NavBar' + , 'L-navBar/index' ], function( declare , lang @@ -31,6 +31,7 @@ define([ constructor: function(args) { this.config = { + zoomControl: true, layersSelector: true, coordinatesViewer: true, navBar: true, @@ -53,6 +54,7 @@ define([ _addMapWidgets: function() { + this._addZoomControl(); this._addLayersSelector(); this._addCoordinatesViewer(); this._addNavBar(); @@ -66,6 +68,18 @@ define([ this._addMeasureTools(measureToolsDfd); }, + _addZoomControl: function() { + + if (!this.zoomControl) { + return; + } + + L.control.zoom({ + zoomInTitle: this.i18n.leafletZoomInButton, + zoomOutTitle: this.i18n.leafletZoomOutButton + }).addTo(this.map); + }, + _addLayersSelector: function() { if (!this._layersSelectorInstance) { @@ -106,7 +120,11 @@ define([ return; } - L.control.navbar().addTo(this.map); + L.control.navbar({ + homeTitle: this.i18n.leafletHomeButton, + forwardTitle: this.i18n.leafletForwardButton, + backTitle: this.i18n.leafletBackButton + }).addTo(this.map); }, _addMiniMap: function() { diff --git a/client-app/src/dojoConfig.js b/client-app/src/dojoConfig.js index dd4b9ad4..43c043e6 100644 --- a/client-app/src/dojoConfig.js +++ b/client-app/src/dojoConfig.js @@ -40,7 +40,7 @@ dojoConfig = { location: '../leaflet-coordinates/dist' },{ name: 'L-navBar', - location: '../leaflet-navbar/src' + location: '../leaflet-nav' },{ name: 'L-areaselect', location: '../leaflet-areaselect/src' @@ -67,7 +67,7 @@ dojoConfig = { location: '../handlebars/dist' },{ name: 'awesome-markers', - location: '../leaflet-awesome-markers/dist' + location: '../leaflet.awesome-markers/dist' },{ name: 'pruneCluster', location: '../pruneCluster/dist' diff --git a/client-app/src/oldapp/nls/es/translation.js b/client-app/src/oldapp/nls/es/translation.js index d518e327..8b85c432 100644 --- a/client-app/src/oldapp/nls/es/translation.js +++ b/client-app/src/oldapp/nls/es/translation.js @@ -1329,6 +1329,12 @@ define({ , "selectFeatureOnMap": "Pulse sobre algún elemento del mapa para obtener información" + , "leafletZoomInButton": "Acercar" + , "leafletZoomOutButton": "Alejar" + , "leafletHomeButton": "Ir a la localización inicial" + , "leafletForwardButton": "Avanzar en el historial de localizaciones" + , "leafletBackButton": "Retroceder en el historial de localizaciones" + // Meta-tags , "metaDefaultTitle": "Repositorio de Datos Marinos Integrados de Canarias" , "metaDefaultDescription": "REDMIC es una infraestructura de datos marinos de caracter público, que ofrece información sobre el medio biofísico marino de Canarias" diff --git a/client-app/src/oldapp/nls/translation.js b/client-app/src/oldapp/nls/translation.js index 301adfbe..051fbf4e 100644 --- a/client-app/src/oldapp/nls/translation.js +++ b/client-app/src/oldapp/nls/translation.js @@ -1333,6 +1333,12 @@ define({ , "selectFeatureOnMap": "Click on any element of the map to get information" + , "leafletZoomInButton": "Zoom in" + , "leafletZoomOutButton": "Zoom out" + , "leafletHomeButton": "Go to initial location" + , "leafletForwardButton": "Go forward in location history" + , "leafletBackButton": "Go back in location history" + // Meta-tags , "metaDefaultTitle": "Repositorio de Datos Marinos Integrados de Canarias" , "metaDefaultDescription": "REDMIC is a public marine data infrastructure that offers information on the marine biophysical environment of the Canary Islands" diff --git a/client-app/style b/client-app/style index e2793946..6342614a 160000 --- a/client-app/style +++ b/client-app/style @@ -1 +1 @@ -Subproject commit e279394690bd57092cba7d276d3bd6204dc9dc91 +Subproject commit 6342614aca6ab9be072482316df0532c2d3a2693 diff --git a/package.json b/package.json index f1e1a156..69cc0343 100644 --- a/package.json +++ b/package.json @@ -21,11 +21,9 @@ "private": true, "scripts": { "preinstall": "type grunt", - "install": "grunt preBuild", + "postinstall": "grunt preBuild", "start": "node server-app", - "prepack": "type grunt", - "prepare": "grunt build", - "pretest": "type grunt", + "prepack": "grunt build", "test": "grunt test" }, "dependencies": { @@ -63,11 +61,11 @@ "json-schema-ref-parser": "6.1.0", "leaflet": "1.9.4", "@lweller/leaflet-areaselect": "1.3.0", - "leaflet-awesome-markers": "https://github.com/lennardv2/Leaflet.awesome-markers.git#2.0/develop", + "leaflet.awesome-markers": "2.0.5", "leaflet-draw": "1.0.4", "leaflet-measure": "3.1.0", "leaflet-minimap": "3.6.1", - "leaflet-navbar": "https://github.com/davidchouse/Leaflet.NavBar.git#v1.0.1", + "leaflet-nav": "1.0.3", "leaflet.coordinates": "0.1.5", "leaflet.nontiledlayer": "1.0.9", "load-grunt-tasks": "5.1.0", diff --git a/yarn.lock b/yarn.lock index 4e8b8e07..6275a950 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4,31 +4,31 @@ "@adobe/css-tools@~4.3.3": version "4.3.3" - resolved "https://registry.yarnpkg.com/@adobe/css-tools/-/css-tools-4.3.3.tgz#90749bde8b89cd41764224f5aac29cd4138f75ff" + resolved "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.3.tgz" integrity sha512-rE0Pygv0sEZ4vBWHlAgJLGDU7Pm8xoO6p3wsEceb7GYAjScrOHpEo8KK/eVkAcnSM+slAEtXjA2JpdjLp4fJQQ== "@ampproject/remapping@^2.1.0": version "2.1.2" - resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.1.2.tgz#4edca94973ded9630d20101cd8559cedb8d8bd34" + resolved "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.1.2.tgz" integrity sha512-hoyByceqwKirw7w3Z7gnIIZC3Wx3J484Y3L/cMpXFbr7d9ZQj2mODrirNzcJa+SM3UlpWXYvKV4RlRpFXlWgXg== dependencies: "@jridgewell/trace-mapping" "^0.3.0" "@babel/code-frame@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789" + resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz" integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg== dependencies: "@babel/highlight" "^7.16.7" "@babel/compat-data@^7.17.7": version "7.17.7" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.17.7.tgz#078d8b833fbbcc95286613be8c716cef2b519fa2" + resolved "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.7.tgz" integrity sha512-p8pdE6j0a29TNGebNm7NzYZWB3xVZJBZ7XGs42uAKzQo8VQ3F0By/cQCtUEABwIqw5zo6WA4NbmxsfzADzMKnQ== "@babel/core@^7.7.5": version "7.17.9" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.9.tgz#6bae81a06d95f4d0dec5bb9d74bbc1f58babdcfe" + resolved "https://registry.npmjs.org/@babel/core/-/core-7.17.9.tgz" integrity sha512-5ug+SfZCpDAkVp9SFIZAzlW18rlzsOcJGaetCjkySnrXXDUw9AR8cDUm1iByTmdWM6yxX6/zycaV76w3YTF2gw== dependencies: "@ampproject/remapping" "^2.1.0" @@ -49,7 +49,7 @@ "@babel/generator@^7.17.9": version "7.17.9" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.9.tgz#f4af9fd38fa8de143c29fce3f71852406fc1e2fc" + resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.17.9.tgz" integrity sha512-rAdDousTwxbIxbz5I7GEQ3lUip+xVCXooZNbsydCWs3xA7ZsYOv+CFRdzGxRX78BmQHu9B1Eso59AOZQOJDEdQ== dependencies: "@babel/types" "^7.17.0" @@ -58,7 +58,7 @@ "@babel/helper-compilation-targets@^7.17.7": version "7.17.7" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.7.tgz#a3c2924f5e5f0379b356d4cfb313d1414dc30e46" + resolved "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.7.tgz" integrity sha512-UFzlz2jjd8kroj0hmCFV5zr+tQPi1dpC2cRsDV/3IEW8bJfCPrPpmcSN6ZS8RqIq4LXcmpipCQFPddyFA5Yc7w== dependencies: "@babel/compat-data" "^7.17.7" @@ -68,14 +68,14 @@ "@babel/helper-environment-visitor@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz#ff484094a839bde9d89cd63cba017d7aae80ecd7" + resolved "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz" integrity sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag== dependencies: "@babel/types" "^7.16.7" "@babel/helper-function-name@^7.17.9": version "7.17.9" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz#136fcd54bc1da82fcb47565cf16fd8e444b1ff12" + resolved "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz" integrity sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg== dependencies: "@babel/template" "^7.16.7" @@ -83,21 +83,21 @@ "@babel/helper-hoist-variables@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz#86bcb19a77a509c7b77d0e22323ef588fa58c246" + resolved "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz" integrity sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg== dependencies: "@babel/types" "^7.16.7" "@babel/helper-module-imports@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz#25612a8091a999704461c8a222d0efec5d091437" + resolved "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz" integrity sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg== dependencies: "@babel/types" "^7.16.7" "@babel/helper-module-transforms@^7.17.7": version "7.17.7" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.17.7.tgz#3943c7f777139e7954a5355c815263741a9c1cbd" + resolved "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.17.7.tgz" integrity sha512-VmZD99F3gNTYB7fJRDTi+u6l/zxY0BE6OIxPSU7a50s6ZUQkHwSDmV92FfM+oCG0pZRVojGYhkR8I0OGeCVREw== dependencies: "@babel/helper-environment-visitor" "^7.16.7" @@ -111,36 +111,36 @@ "@babel/helper-simple-access@^7.17.7": version "7.17.7" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz#aaa473de92b7987c6dfa7ce9a7d9674724823367" + resolved "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz" integrity sha512-txyMCGroZ96i+Pxr3Je3lzEJjqwaRC9buMUgtomcrLe5Nd0+fk1h0LLA+ixUF5OW7AhHuQ7Es1WcQJZmZsz2XA== dependencies: "@babel/types" "^7.17.0" "@babel/helper-split-export-declaration@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz#0b648c0c42da9d3920d85ad585f2778620b8726b" + resolved "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz" integrity sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw== dependencies: "@babel/types" "^7.16.7" "@babel/helper-validator-identifier@^7.12.11": version "7.12.11" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed" + resolved "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz" integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw== "@babel/helper-validator-identifier@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz#e8c602438c4a8195751243da9031d1607d247cad" + resolved "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz" integrity sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw== "@babel/helper-validator-option@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz#b203ce62ce5fe153899b617c08957de860de4d23" + resolved "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz" integrity sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ== "@babel/helpers@^7.17.9": version "7.17.9" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.17.9.tgz#b2af120821bfbe44f9907b1826e168e819375a1a" + resolved "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.9.tgz" integrity sha512-cPCt915ShDWUEzEp3+UNRktO2n6v49l5RSnG9M5pS24hA+2FAc5si+Pn1i4VVbQQ+jh+bIZhPFQOJOzbrOYY1Q== dependencies: "@babel/template" "^7.16.7" @@ -149,7 +149,7 @@ "@babel/highlight@^7.16.7": version "7.17.9" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.17.9.tgz#61b2ee7f32ea0454612def4fccdae0de232b73e3" + resolved "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.9.tgz" integrity sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg== dependencies: "@babel/helper-validator-identifier" "^7.16.7" @@ -158,17 +158,17 @@ "@babel/parser@^7.16.7", "@babel/parser@^7.17.9": version "7.17.9" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.9.tgz#9c94189a6062f0291418ca021077983058e171ef" + resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.17.9.tgz" integrity sha512-vqUSBLP8dQHFPdPi9bc5GK9vRkYHJ49fsZdtoJ8EQ8ibpwk5rPKfvNIwChB0KVXcIjcepEBBd2VHC5r9Gy8ueg== "@babel/parser@^7.6.0", "@babel/parser@^7.9.6": version "7.13.15" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.15.tgz#8e66775fb523599acb6a289e12929fa5ab0954d8" + resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.13.15.tgz" integrity sha512-b9COtcAlVEQljy/9fbcMHpG+UIW9ReF+gpaxDHTlZd0c6/UU9ng8zdySAW9sRTzpvcdCHn6bUcbuYUgGzLAWVQ== "@babel/template@^7.16.7": version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.7.tgz#8d126c8701fde4d66b264b3eba3d96f07666d155" + resolved "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz" integrity sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w== dependencies: "@babel/code-frame" "^7.16.7" @@ -177,7 +177,7 @@ "@babel/traverse@^7.17.3", "@babel/traverse@^7.17.9": version "7.17.9" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.9.tgz#1f9b207435d9ae4a8ed6998b2b82300d83c37a0d" + resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.9.tgz" integrity sha512-PQO8sDIJ8SIwipTPiR71kJQCKQYB5NGImbOviK8K+kg5xkNSYXLBupuX9QhatFowrsvo9Hj8WgArg3W7ijNAQw== dependencies: "@babel/code-frame" "^7.16.7" @@ -193,7 +193,7 @@ "@babel/types@^7.16.7", "@babel/types@^7.17.0": version "7.17.0" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.17.0.tgz#a826e368bccb6b3d84acd76acad5c0d87342390b" + resolved "https://registry.npmjs.org/@babel/types/-/types-7.17.0.tgz" integrity sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw== dependencies: "@babel/helper-validator-identifier" "^7.16.7" @@ -201,7 +201,7 @@ "@babel/types@^7.6.1", "@babel/types@^7.9.6": version "7.13.14" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.13.14.tgz#c35a4abb15c7cd45a2746d78ab328e362cbace0d" + resolved "https://registry.npmjs.org/@babel/types/-/types-7.13.14.tgz" integrity sha512-A2aa3QTkWoyqsZZFl56MLUsfmh7O0gN41IPvXAE/++8ojpbz12SszD7JEGYVdn4f9Kt4amIei07swF1h4AqmmQ== dependencies: "@babel/helper-validator-identifier" "^7.12.11" @@ -210,17 +210,17 @@ "@colors/colors@1.5.0": version "1.5.0" - resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9" + resolved "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz" integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ== "@colors/colors@^1.6.0": version "1.6.0" - resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.6.0.tgz#ec6cd237440700bc23ca23087f513c75508958b0" + resolved "https://registry.npmjs.org/@colors/colors/-/colors-1.6.0.tgz" integrity sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA== "@dabh/diagnostics@^2.0.2": version "2.0.3" - resolved "https://registry.yarnpkg.com/@dabh/diagnostics/-/diagnostics-2.0.3.tgz#7f7e97ee9a725dffc7808d93668cc984e1dc477a" + resolved "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.3.tgz" integrity sha512-hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA== dependencies: colorspace "1.1.x" @@ -229,7 +229,7 @@ "@isaacs/cliui@^8.0.2": version "8.0.2" - resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550" + resolved "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz" integrity sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA== dependencies: string-width "^5.1.2" @@ -241,22 +241,22 @@ "@istanbuljs/schema@^0.1.2": version "0.1.3" - resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98" + resolved "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz" integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA== "@jridgewell/resolve-uri@^3.0.3": version "3.0.5" - resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz#68eb521368db76d040a6315cdb24bf2483037b9c" + resolved "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz" integrity sha512-VPeQ7+wH0itvQxnG+lIzWgkysKIr3L9sslimFW55rHMdGu/qCQ5z5h9zq4gI8uBtqkpHhsF4Z/OwExufUCThew== "@jridgewell/sourcemap-codec@^1.4.10": version "1.4.11" - resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz#771a1d8d744eeb71b6adb35808e1a6c7b9b8c8ec" + resolved "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz" integrity sha512-Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg== "@jridgewell/trace-mapping@^0.3.0": version "0.3.4" - resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.4.tgz#f6a0832dffd5b8a6aaa633b7d9f8e8e94c83a0c3" + resolved "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.4.tgz" integrity sha512-vFv9ttIedivx0ux3QSjhgtCVjPZd5l46ZOMDSCwnH1yUO2e964gO8LZGyv2QkqcgR6TnBU1v+1IFqmeoG+0UJQ== dependencies: "@jridgewell/resolve-uri" "^3.0.3" @@ -264,14 +264,14 @@ "@lweller/leaflet-areaselect@1.3.0": version "1.3.0" - resolved "https://registry.yarnpkg.com/@lweller/leaflet-areaselect/-/leaflet-areaselect-1.3.0.tgz#2b1c207e35c970a378674253f428af367e0a8749" + resolved "https://registry.npmjs.org/@lweller/leaflet-areaselect/-/leaflet-areaselect-1.3.0.tgz" integrity sha512-zdLHwkuARjzHTp+3mdkkpHjbsXwer9HJeZzc5IRgqv9fI3osD0+wwj5GCkefVfF1sAsmcEOm/nGoTSfUXewaug== dependencies: "@types/leaflet" "*" "@opentelemetry/api@^1.4.0": version "1.7.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.7.0.tgz#b139c81999c23e3c8d3c0a7234480e945920fc40" + resolved "https://registry.npmjs.org/@opentelemetry/api/-/api-1.7.0.tgz" integrity sha512-AdY5wvN0P2vXBi3b29hxZgSFvdhdxPB9+f0B6s//P9Q8nibRWeA3cHm8UmLpio9ABigkVHJ5NMPk+Mz8VCCyrw== "@pkgjs/parseargs@^0.11.0": @@ -281,7 +281,7 @@ "@theintern/common@~0.3.0": version "0.3.0" - resolved "https://registry.yarnpkg.com/@theintern/common/-/common-0.3.0.tgz#a8351b9ab815fa8b0d846e5373b626994a6e80ad" + resolved "https://registry.npmjs.org/@theintern/common/-/common-0.3.0.tgz" integrity sha512-VKSyZGEyzmicJPvV5Gxeavm8Xbcr0cETAAqMapWZzA9Q85YHMG8VSrmPFlMrDQ524qE0IqQsTi0IlH8NIaN+eQ== dependencies: axios "~0.21.1" @@ -289,7 +289,7 @@ "@theintern/digdug@~2.6.2": version "2.6.2" - resolved "https://registry.yarnpkg.com/@theintern/digdug/-/digdug-2.6.2.tgz#c03fab97cff3128108823d2eb2924bdf63a06a69" + resolved "https://registry.npmjs.org/@theintern/digdug/-/digdug-2.6.2.tgz" integrity sha512-r9P7zkIp8L2LYKOUfcKl+KOHUTWrIZ9X6Efsb7Tn+OtiIv4oRlXorcoj/5vmrRLO5JF8jFj26HyeSWBNQA2uwg== dependencies: "@theintern/common" "~0.3.0" @@ -299,7 +299,7 @@ "@theintern/leadfoot@~2.4.1": version "2.4.1" - resolved "https://registry.yarnpkg.com/@theintern/leadfoot/-/leadfoot-2.4.1.tgz#4f8f69d968503e5b8488c17d39e35be2cae4d10f" + resolved "https://registry.npmjs.org/@theintern/leadfoot/-/leadfoot-2.4.1.tgz" integrity sha512-WnmmMlSROXQc6sGJdQCcSXYbrRAni2HMmjjr2qtvXtLNCi7ZG6O/H7rJ+1fNdJckjE3kwF+Ag3Bh1WR7GkfG0Q== dependencies: "@theintern/common" "~0.3.0" @@ -308,27 +308,27 @@ "@tsconfig/node10@^1.0.7": version "1.0.8" - resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.8.tgz#c1e4e80d6f964fbecb3359c43bd48b40f7cadad9" + resolved "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.8.tgz" integrity sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg== "@tsconfig/node12@^1.0.7": version "1.0.9" - resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.9.tgz#62c1f6dee2ebd9aead80dc3afa56810e58e1a04c" + resolved "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.9.tgz" integrity sha512-/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw== "@tsconfig/node14@^1.0.0": version "1.0.1" - resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.1.tgz#95f2d167ffb9b8d2068b0b235302fafd4df711f2" + resolved "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.1.tgz" integrity sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg== "@tsconfig/node16@^1.0.1": version "1.0.2" - resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.2.tgz#423c77877d0569db20e1fc80885ac4118314010e" + resolved "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.2.tgz" integrity sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA== "@turf/area@^5.1.5": version "5.1.5" - resolved "https://registry.yarnpkg.com/@turf/area/-/area-5.1.5.tgz#efd899bfd260cdbd1541b2a3c155f8a5d2eefa1d" + resolved "https://registry.npmjs.org/@turf/area/-/area-5.1.5.tgz" integrity sha512-lz16gqtvoz+j1jD9y3zj0Z5JnGNd3YfS0h+DQY1EcZymvi75Frm9i5YbEyth0RfxYZeOVufY7YIS3LXbJlI57g== dependencies: "@turf/helpers" "^5.1.5" @@ -336,7 +336,7 @@ "@turf/distance@^5.1.5": version "5.1.5" - resolved "https://registry.yarnpkg.com/@turf/distance/-/distance-5.1.5.tgz#39cf18204bbf87587d707e609a60118909156409" + resolved "https://registry.npmjs.org/@turf/distance/-/distance-5.1.5.tgz" integrity sha512-sYCAgYZ2MjNKMtx17EijHlK9qHwpA0MuuQWbR4P30LTCl52UlG/reBfV899wKyF3HuDL9ux78IbILwOfeQ4zgA== dependencies: "@turf/helpers" "^5.1.5" @@ -344,19 +344,19 @@ "@turf/helpers@^5.1.5": version "5.1.5" - resolved "https://registry.yarnpkg.com/@turf/helpers/-/helpers-5.1.5.tgz#153405227ab933d004a5bb9641a9ed999fcbe0cf" + resolved "https://registry.npmjs.org/@turf/helpers/-/helpers-5.1.5.tgz" integrity sha512-/lF+JR+qNDHZ8bF9d+Cp58nxtZWJ3sqFe6n3u3Vpj+/0cqkjk4nXKYBSY0azm+GIYB5mWKxUXvuP/m0ZnKj1bw== "@turf/invariant@^5.1.5": version "5.2.0" - resolved "https://registry.yarnpkg.com/@turf/invariant/-/invariant-5.2.0.tgz#f0150ff7290b38577b73d088b7932c1ee0aa90a7" + resolved "https://registry.npmjs.org/@turf/invariant/-/invariant-5.2.0.tgz" integrity sha512-28RCBGvCYsajVkw2EydpzLdcYyhSA77LovuOvgCJplJWaNVyJYH6BOR3HR9w50MEkPqb/Vc/jdo6I6ermlRtQA== dependencies: "@turf/helpers" "^5.1.5" "@turf/length@^5.1.5": version "5.1.5" - resolved "https://registry.yarnpkg.com/@turf/length/-/length-5.1.5.tgz#f3a5f864c2b996a8bb471794535a1faf12eebefb" + resolved "https://registry.npmjs.org/@turf/length/-/length-5.1.5.tgz" integrity sha512-0ryx68h512wCoNfwyksLdabxEfwkGNTPg61/QiY+QfGFUOUNhHbP+QimViFpwF5hyX7qmroaSHVclLUqyLGRbg== dependencies: "@turf/distance" "^5.1.5" @@ -365,24 +365,24 @@ "@turf/meta@^5.1.5": version "5.2.0" - resolved "https://registry.yarnpkg.com/@turf/meta/-/meta-5.2.0.tgz#3b1ad485ee0c3b0b1775132a32c384d53e4ba53d" + resolved "https://registry.npmjs.org/@turf/meta/-/meta-5.2.0.tgz" integrity sha512-ZjQ3Ii62X9FjnK4hhdsbT+64AYRpaI8XMBMcyftEOGSmPMUVnkbvuv3C9geuElAXfQU7Zk1oWGOcrGOD9zr78Q== dependencies: "@turf/helpers" "^5.1.5" "@types/babel-types@*": version "7.0.0" - resolved "https://registry.yarnpkg.com/@types/babel-types/-/babel-types-7.0.0.tgz#4beb190e239fe05bac5e57e8d8376cab4f20c65c" + resolved "https://registry.npmjs.org/@types/babel-types/-/babel-types-7.0.0.tgz" integrity sha512-PyWcbX0W4r4GcgXLI0Vu4jyJ/Erueo3PwjgvQcOmWAOBW0ObhzBBciEX+sHvjkNE0umI6nqD192FDKvYZTL91A== "@types/benchmark@~2.1.1": version "2.1.1" - resolved "https://registry.yarnpkg.com/@types/benchmark/-/benchmark-2.1.1.tgz#d763df29717d93aa333eb11f421ef383a5df5673" + resolved "https://registry.npmjs.org/@types/benchmark/-/benchmark-2.1.1.tgz" integrity sha512-XmdNOarpSSxnb3DE2rRFOFsEyoqXLUL+7H8nSGS25vs+JS0018bd+cW5Ma9vdlkPmoTHSQ6e8EUFMFMxeE4l+g== "@types/body-parser@*": version "1.16.8" - resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.16.8.tgz#687ec34140624a3bec2b1a8ea9268478ae8f3be3" + resolved "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.16.8.tgz" integrity sha512-BdN2PXxOFnTXFcyONPW6t0fHjz2fvRZHVMFpaS0wYr+Y8fWEaNOs4V8LEu/fpzQlMx+ahdndgTaGTwPC+J/EeA== dependencies: "@types/express" "*" @@ -390,24 +390,24 @@ "@types/chai@~4.2.20": version "4.2.22" - resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.2.22.tgz#47020d7e4cf19194d43b5202f35f75bd2ad35ce7" + resolved "https://registry.npmjs.org/@types/chai/-/chai-4.2.22.tgz" integrity sha512-tFfcE+DSTzWAgifkjik9AySNqIyNoYwmR+uecPwwD/XRNfvOjmC/FjCxpiUGDkDVDphPfCUecSQVFw+lN3M3kQ== "@types/charm@~1.0.2": version "1.0.3" - resolved "https://registry.yarnpkg.com/@types/charm/-/charm-1.0.3.tgz#1dc44bcbf0a90ef4b6826094fb324796d229d502" + resolved "https://registry.npmjs.org/@types/charm/-/charm-1.0.3.tgz" integrity sha512-FpNoSOkloETr+ZJ0RsZpB+a/tqJkniIN+9Enn6uPIbhiNptOWtZzV7FkaqxTRjvvlHeUKMR331Wj9tOmqG10TA== dependencies: "@types/node" "*" "@types/events@*": version "1.1.0" - resolved "https://registry.yarnpkg.com/@types/events/-/events-1.1.0.tgz#93b1be91f63c184450385272c47b6496fd028e02" + resolved "https://registry.npmjs.org/@types/events/-/events-1.1.0.tgz" integrity sha512-y3bR98mzYOo0pAZuiLari+cQyiKk3UXRuT45h1RjhfeCzqkjaVsfZJNaxdgtk7/3tzOm1ozLTqEqMP3VbI48jw== "@types/express-serve-static-core@*": version "4.11.1" - resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.11.1.tgz#f6f7212382d59b19d696677bcaa48a37280f5d45" + resolved "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.11.1.tgz" integrity sha512-EehCl3tpuqiM8RUb+0255M8PhhSwTtLfmO7zBBdv0ay/VTd/zmrqDfQdZFsa5z/PVMbH2yCMZPXsnrImpATyIw== dependencies: "@types/events" "*" @@ -415,7 +415,7 @@ "@types/express-serve-static-core@^4.17.18": version "4.17.18" - resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.18.tgz#8371e260f40e0e1ca0c116a9afcd9426fa094c40" + resolved "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.18.tgz" integrity sha512-m4JTwx5RUBNZvky/JJ8swEJPKFd8si08pPF2PfizYjGZOKr/svUWPcoUmLow6MmPzhasphB7gSTINY67xn3JNA== dependencies: "@types/node" "*" @@ -424,7 +424,7 @@ "@types/express@*": version "4.11.0" - resolved "https://registry.yarnpkg.com/@types/express/-/express-4.11.0.tgz#234d65280af917cb290634b7a8d6bcac24aecbad" + resolved "https://registry.npmjs.org/@types/express/-/express-4.11.0.tgz" integrity sha512-N1Wdp3v4KmdO3W/CM7KXrDwM4xcVZjlHF2dAOs7sNrTUX8PY3G4n9NkaHlfjGFEfgFeHmRRjywoBd4VkujDs9w== dependencies: "@types/body-parser" "*" @@ -433,7 +433,7 @@ "@types/express@~4.17.13": version "4.17.13" - resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.13.tgz#a76e2995728999bab51a33fabce1d705a3709034" + resolved "https://registry.npmjs.org/@types/express/-/express-4.17.13.tgz" integrity sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA== dependencies: "@types/body-parser" "*" @@ -443,22 +443,22 @@ "@types/geojson@*": version "7946.0.8" - resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.8.tgz#30744afdb385e2945e22f3b033f897f76b1f12ca" + resolved "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.8.tgz" integrity sha512-1rkryxURpr6aWP7R786/UQOkJ3PcpQiWkAXBmdWc7ryFWqN6a4xfK7BtjXvFBKO9LjQ+MWQSWxYeZX1OApnArA== "@types/istanbul-lib-coverage@*": version "1.1.0" - resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-1.1.0.tgz#2cc2ca41051498382b43157c8227fea60363f94a" + resolved "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-1.1.0.tgz" integrity sha512-ohkhb9LehJy+PA40rDtGAji61NCgdtKLAlFoYp4cnuuQEswwdK3vz9SOIkkyc3wrk8dzjphQApNs56yyXLStaQ== "@types/istanbul-lib-coverage@~2.0.3": version "2.0.4" - resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz#8467d4b3c087805d63580480890791277ce35c44" + resolved "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz" integrity sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g== "@types/istanbul-lib-instrument@~1.7.4": version "1.7.4" - resolved "https://registry.yarnpkg.com/@types/istanbul-lib-instrument/-/istanbul-lib-instrument-1.7.4.tgz#474503169db59ada532dd863885c67b217ab67f1" + resolved "https://registry.npmjs.org/@types/istanbul-lib-instrument/-/istanbul-lib-instrument-1.7.4.tgz" integrity sha512-1i1VVkU2KrpZCmti+t5J/zBb2KLKxHgU1EYL+0QtnDnVyZ59aSKcpnG6J0I6BZGDON566YzPNIlNfk7m+9l1JA== dependencies: "@types/babel-types" "*" @@ -467,21 +467,21 @@ "@types/istanbul-lib-report@*": version "1.1.0" - resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-1.1.0.tgz#79e9b463f947e98dcc82272da51b908fc93e8aea" + resolved "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-1.1.0.tgz" integrity sha512-nW5QuzmMhr7fHPijtaGOemFFI8Ctrxb/dIXgouSlKmWT16RxWlGLEX/nGghIBOReKe9hPFZXoNh338nFQk2xcA== dependencies: "@types/istanbul-lib-coverage" "*" "@types/istanbul-lib-report@~3.0.0": version "3.0.0" - resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#c14c24f18ea8190c118ee7562b7ff99a36552686" + resolved "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz" integrity sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg== dependencies: "@types/istanbul-lib-coverage" "*" "@types/istanbul-lib-source-maps@~4.0.1": version "4.0.1" - resolved "https://registry.yarnpkg.com/@types/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz#8acb1f6230bf9d732e9fc30590e5ccaabbefec7b" + resolved "https://registry.npmjs.org/@types/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz" integrity sha512-WH6e5naLXI3vB2Px3whNeYxzDgm6S6sk3Ht8e3/BiWwEnzZi72wja3bWzWwcgbFTFp8hBLB7NT2p3lNJgxCxvA== dependencies: "@types/istanbul-lib-coverage" "*" @@ -489,46 +489,46 @@ "@types/istanbul-reports@~3.0.1": version "3.0.1" - resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz#9153fe98bba2bd565a63add9436d6f0d7f8468ff" + resolved "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz" integrity sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw== dependencies: "@types/istanbul-lib-report" "*" "@types/leaflet@*": version "1.7.9" - resolved "https://registry.yarnpkg.com/@types/leaflet/-/leaflet-1.7.9.tgz#7993d34f14cfa88c45b3d490daba39a3a1be9a2b" + resolved "https://registry.npmjs.org/@types/leaflet/-/leaflet-1.7.9.tgz" integrity sha512-H8vPgD49HKzqM41ArHGZM70g/tfhp8W+JcPxfnF+5H/Xvp+xiP+KQOUNWU8U89fqS1Jj3cpRY/+nbnaHFzwnFA== dependencies: "@types/geojson" "*" "@types/mime@*": version "2.0.0" - resolved "https://registry.yarnpkg.com/@types/mime/-/mime-2.0.0.tgz#5a7306e367c539b9f6543499de8dd519fac37a8b" + resolved "https://registry.npmjs.org/@types/mime/-/mime-2.0.0.tgz" integrity sha512-A2TAGbTFdBw9azHbpVd+/FkdW2T6msN1uct1O9bH3vTerEHKZhTXJUQXy+hNq1B0RagfU8U+KBdqiZpxjhOUQA== "@types/minimatch@^3.0.3": version "3.0.5" - resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40" + resolved "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz" integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ== "@types/node@*": version "9.3.0" - resolved "https://registry.yarnpkg.com/@types/node/-/node-9.3.0.tgz#3a129cda7c4e5df2409702626892cb4b96546dd5" + resolved "https://registry.npmjs.org/@types/node/-/node-9.3.0.tgz" integrity sha512-wNBfvNjzsJl4tswIZKXCFQY0lss9nKUyJnG6T94X/eqjRgI2jHZ4evdjhQYBSan/vGtF6XVXPApOmNH2rf0KKw== "@types/qs@*": version "6.9.5" - resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.5.tgz#434711bdd49eb5ee69d90c1d67c354a9a8ecb18b" + resolved "https://registry.npmjs.org/@types/qs/-/qs-6.9.5.tgz" integrity sha512-/JHkVHtx/REVG0VVToGRGH2+23hsYLHdyG+GrvoUGlGAd0ErauXDyvHtRI/7H7mzLm+tBCKA7pfcpkQ1lf58iQ== "@types/range-parser@*": version "1.2.3" - resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.3.tgz#7ee330ba7caafb98090bece86a5ee44115904c2c" + resolved "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.3.tgz" integrity sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA== "@types/serve-static@*": version "1.13.1" - resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.1.tgz#1d2801fa635d274cd97d4ec07e26b21b44127492" + resolved "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.1.tgz" integrity sha512-jDMH+3BQPtvqZVIcsH700Dfi8Q3MIcEx16g/VdxjoqiGR/NntekB10xdBpirMKnPe9z2C5cBmL0vte0YttOr3Q== dependencies: "@types/express-serve-static-core" "*" @@ -536,19 +536,19 @@ "@types/ws@7.4.6": version "7.4.6" - resolved "https://registry.yarnpkg.com/@types/ws/-/ws-7.4.6.tgz#c4320845e43d45a7129bb32905e28781c71c1fff" + resolved "https://registry.npmjs.org/@types/ws/-/ws-7.4.6.tgz" integrity sha512-ijZ1vzRawI7QoWnTNL8KpHixd2b2XVb9I9HAqI3triPsh1EC0xH0Eg6w2O3TKbDCgiNNlJqfrof6j4T2I+l9vw== dependencies: "@types/node" "*" abbrev@1: version "1.1.1" - resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" + resolved "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz" integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== accepts@~1.3.7: version "1.3.7" - resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd" + resolved "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz" integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA== dependencies: mime-types "~2.1.24" @@ -556,7 +556,7 @@ accepts@~1.3.7: accepts@~1.3.8: version "1.3.8" - resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e" + resolved "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz" integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw== dependencies: mime-types "~2.1.34" @@ -564,161 +564,161 @@ accepts@~1.3.8: acorn@^7.1.1: version "7.4.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" + resolved "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== alertifyjs@1.14.0: version "1.14.0" - resolved "https://registry.yarnpkg.com/alertifyjs/-/alertifyjs-1.14.0.tgz#b6690580007d6cca2407d5a61e68aadc820e13e3" + resolved "https://registry.npmjs.org/alertifyjs/-/alertifyjs-1.14.0.tgz" integrity sha512-jUxJTcNYhJ2P1Wal73nmyTwMkaPim4PjZP9CAG+S8SK2SinraXxvOxnPrEY81/wc2iBPDFBP7mdg61db4WsuHQ== ansi-regex@^2.0.0: version "2.1.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" + resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz" integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8= ansi-regex@^4.1.0: version "4.1.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.1.tgz#164daac87ab2d6f6db3a29875e2d1766582dabed" + resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz" integrity sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g== ansi-regex@^5.0.1: version "5.0.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" + resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz" integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== ansi-regex@^6.0.1: version "6.0.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a" + resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz" integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA== ansi-styles@^2.2.1: version "2.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" + resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz" integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= ansi-styles@^3.2.1: version "3.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" + resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz" integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== dependencies: color-convert "^1.9.0" ansi-styles@^4.0.0, ansi-styles@^4.1.0: version "4.3.0" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" + resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz" integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== dependencies: color-convert "^2.0.1" ansi-styles@^6.1.0: version "6.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5" + resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz" integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug== append-transform@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-2.0.0.tgz#99d9d29c7b38391e6f428d28ce136551f0b77e12" + resolved "https://registry.npmjs.org/append-transform/-/append-transform-2.0.0.tgz" integrity sha512-7yeyCEurROLQJFv5Xj4lEGTy0borxepjFv1g22oAdqFu//SrAlDl1O1Nxx15SH1RoliUml6p8dwJW9jvZughhg== dependencies: default-require-extensions "^3.0.0" arg@^4.1.0: version "4.1.3" - resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089" + resolved "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz" integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA== argparse@^1.0.7: version "1.0.9" - resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86" + resolved "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz" integrity sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY= dependencies: sprintf-js "~1.0.2" array-differ@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-3.0.0.tgz#3cbb3d0f316810eafcc47624734237d6aee4ae6b" + resolved "https://registry.npmjs.org/array-differ/-/array-differ-3.0.0.tgz" integrity sha512-THtfYS6KtME/yIAhKjZ2ul7XI96lQGHRputJQHO80LAWQnuGP4iCIN8vdMRboGbIEYBwU33q8Tch1os2+X0kMg== array-each@^1.0.1: version "1.0.1" - resolved "https://registry.yarnpkg.com/array-each/-/array-each-1.0.1.tgz#a794af0c05ab1752846ee753a1f211a05ba0c44f" + resolved "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz" integrity sha1-p5SvDAWrF1KEbudTofIRoFugxE8= array-flatten@1.1.1: version "1.1.1" - resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" + resolved "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz" integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= array-slice@^1.0.0: version "1.1.0" - resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-1.1.0.tgz#e368ea15f89bc7069f7ffb89aec3a6c7d4ac22d4" + resolved "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz" integrity sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w== array-union@^2.1.0: version "2.1.0" - resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" + resolved "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz" integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== arrify@^2.0.1: version "2.0.1" - resolved "https://registry.yarnpkg.com/arrify/-/arrify-2.0.1.tgz#c9655e9331e0abcd588d2a7cad7e9956f66701fa" + resolved "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz" integrity sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug== asap@~2.0.3: version "2.0.6" - resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" + resolved "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz" integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY= assert-never@^1.2.1: version "1.2.1" - resolved "https://registry.yarnpkg.com/assert-never/-/assert-never-1.2.1.tgz#11f0e363bf146205fb08193b5c7b90f4d1cf44fe" + resolved "https://registry.npmjs.org/assert-never/-/assert-never-1.2.1.tgz" integrity sha512-TaTivMB6pYI1kXwrFlEhLeGfOqoDNdTxjCdwRfFFkEA30Eu+k48W34nlok2EYWJfFFzqaEmichdNM7th6M5HNw== assertion-error@^1.1.0: version "1.1.0" - resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.1.0.tgz#e60b6b0e8f301bd97e5375215bda406c85118c0b" + resolved "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz" integrity sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw== async@^3.2.3, async@~3.2.0: version "3.2.3" - resolved "https://registry.yarnpkg.com/async/-/async-3.2.3.tgz#ac53dafd3f4720ee9e8a160628f18ea91df196c9" + resolved "https://registry.npmjs.org/async/-/async-3.2.3.tgz" integrity sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g== axios@~0.21.1: version "0.21.4" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575" + resolved "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz" integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg== dependencies: follow-redirects "^1.14.0" babel-walk@3.0.0-canary-5: version "3.0.0-canary-5" - resolved "https://registry.yarnpkg.com/babel-walk/-/babel-walk-3.0.0-canary-5.tgz#f66ecd7298357aee44955f235a6ef54219104b11" + resolved "https://registry.npmjs.org/babel-walk/-/babel-walk-3.0.0-canary-5.tgz" integrity sha512-GAwkz0AihzY5bkwIY5QDR+LvsRQgB/B+1foMPvi0FZPMl5fjD7ICiznUiBdLYMH1QYe6vqu4gWYytZOccLouFw== dependencies: "@babel/types" "^7.9.6" balanced-match@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" + resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz" integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= base64-js@0.0.8: version "0.0.8" - resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-0.0.8.tgz#1101e9544f4a76b1bc3b26d452ca96d7a35e7978" + resolved "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz" integrity sha1-EQHpVE9KdrG8OybUUsqW16NeeXg= basic-auth@~2.0.1: version "2.0.1" - resolved "https://registry.yarnpkg.com/basic-auth/-/basic-auth-2.0.1.tgz#b998279bf47ce38344b4f3cf916d4679bbf51e3a" + resolved "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz" integrity sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg== dependencies: safe-buffer "5.1.2" benchmark@~2.1.4: version "2.1.4" - resolved "https://registry.yarnpkg.com/benchmark/-/benchmark-2.1.4.tgz#09f3de31c916425d498cc2ee565a0ebf3c2a5629" + resolved "https://registry.npmjs.org/benchmark/-/benchmark-2.1.4.tgz" integrity sha1-CfPeMckWQl1JjMLuVloOvzwqVik= dependencies: lodash "^4.17.4" @@ -726,19 +726,19 @@ benchmark@~2.1.4: bintrees@1.0.1: version "1.0.1" - resolved "https://registry.yarnpkg.com/bintrees/-/bintrees-1.0.1.tgz#0e655c9b9c2435eaab68bf4027226d2b55a34524" + resolved "https://registry.npmjs.org/bintrees/-/bintrees-1.0.1.tgz" integrity sha1-DmVcm5wkNeqraL9AJyJtK1WjRSQ= bl@^1.0.0: version "1.2.1" - resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.1.tgz#cac328f7bee45730d404b692203fcb590e172d5e" + resolved "https://registry.npmjs.org/bl/-/bl-1.2.1.tgz" integrity sha1-ysMo977kVzDUBLaSID/LWQ4XLV4= dependencies: readable-stream "^2.0.5" body-parser@1.19.0, body-parser@~1.19.0: version "1.19.0" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a" + resolved "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz" integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw== dependencies: bytes "3.1.0" @@ -754,7 +754,7 @@ body-parser@1.19.0, body-parser@~1.19.0: body-parser@1.20.2: version "1.20.2" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.2.tgz#6feb0e21c4724d06de7ff38da36dad4f57a747fd" + resolved "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz" integrity sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA== dependencies: bytes "3.1.2" @@ -772,7 +772,7 @@ body-parser@1.20.2: brace-expansion@^1.1.7: version "1.1.8" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292" + resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz" integrity sha1-wHshHHyVLsH479Uad+8NHTmQopI= dependencies: balanced-match "^1.0.0" @@ -780,21 +780,21 @@ brace-expansion@^1.1.7: brace-expansion@^2.0.1: version "2.0.1" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae" + resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz" integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA== dependencies: balanced-match "^1.0.0" braces@^3.0.2: version "3.0.2" - resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" + resolved "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz" integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== dependencies: fill-range "^7.0.1" browserslist@^4.17.5: version "4.20.2" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.20.2.tgz#567b41508757ecd904dab4d1c646c612cd3d4f88" + resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.20.2.tgz" integrity sha512-CQOBCqp/9pDvDbx3xfMi+86pr4KXIf2FDkTTdeuYw8OxS9t898LA1Khq57gtufFILXpfgsSx5woNgsBgvGjpsA== dependencies: caniuse-lite "^1.0.30001317" @@ -805,36 +805,43 @@ browserslist@^4.17.5: buffer-crc32@~0.2.3: version "0.2.13" - resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" + resolved "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz" integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI= buffer-from@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.0.0.tgz#4cb8832d23612589b0406e9e2956c17f06fdf531" + resolved "https://registry.npmjs.org/buffer-from/-/buffer-from-1.0.0.tgz" integrity sha512-83apNb8KK0Se60UE1+4Ukbe3HbfELJ6UlI4ldtOGs7So4KD26orJM8hIY9lxdzP+UpItH1Yh/Y8GUvNFWFFRxA== buffer@^3.0.1: version "3.6.0" - resolved "https://registry.yarnpkg.com/buffer/-/buffer-3.6.0.tgz#a72c936f77b96bf52f5f7e7b467180628551defb" + resolved "https://registry.npmjs.org/buffer/-/buffer-3.6.0.tgz" integrity sha1-pyyTb3e5a/UvX357RnGAYoVR3vs= dependencies: base64-js "0.0.8" ieee754 "^1.1.4" isarray "^1.0.0" +bufferutil@^4.0.1: + version "4.0.8" + resolved "https://registry.yarnpkg.com/bufferutil/-/bufferutil-4.0.8.tgz#1de6a71092d65d7766c4d8a522b261a6e787e8ea" + integrity sha512-4T53u4PdgsXqKaIctwF8ifXlRTTmEPJ8iEPWFdGZvcf7sbwYo6FKFEX9eNNAnzFZ7EzJAQ3CJeOtCRA4rDp7Pw== + dependencies: + node-gyp-build "^4.3.0" + bytes@3.1.0: version "3.1.0" - resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" + resolved "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz" integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg== bytes@3.1.2: version "3.1.2" - resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5" + resolved "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz" integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg== call-bind@^1.0.0: version "1.0.2" - resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" + resolved "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz" integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA== dependencies: function-bind "^1.1.1" @@ -842,24 +849,24 @@ call-bind@^1.0.0: call-me-maybe@^1.0.1: version "1.0.1" - resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b" + resolved "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz" integrity sha1-JtII6onje1y95gJQoV8DHBak1ms= caniuse-lite@^1.0.30001317: version "1.0.30001331" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001331.tgz#41048f2a5cf0c3c6198f40207cd323388b3d4399" + resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001331.tgz" integrity sha512-Y1xk6paHpUXKP/P6YjQv1xqyTbgAP05ycHBcRdQjTcyXlWol868sJJPlmk5ylOekw2BrucWes5jk+LvVd7WZ5Q== "cbtree@https://github.com/pjekel/cbtree.git#master": version "0.9.4" - resolved "https://github.com/pjekel/cbtree.git#cc60155a14dd8ecad95a4e8e2b0ce6358cc22066" + resolved "git+ssh://git@github.com/pjekel/cbtree.git#cc60155a14dd8ecad95a4e8e2b0ce6358cc22066" dependencies: dijit "1.8" dojo "1.8" chai@~4.3.4: version "4.3.6" - resolved "https://registry.yarnpkg.com/chai/-/chai-4.3.6.tgz#ffe4ba2d9fa9d6680cc0b370adae709ec9011e9c" + resolved "https://registry.npmjs.org/chai/-/chai-4.3.6.tgz" integrity sha512-bbcp3YfHCUzMOvKqsztczerVgBKSsEijCySNlHHbX3VG1nskvqjz5Rfso1gGwD6w6oOV3eI60pKuMOV5MV7p3Q== dependencies: assertion-error "^1.1.0" @@ -872,7 +879,7 @@ chai@~4.3.4: chalk@^1.1.1: version "1.1.3" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" + resolved "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz" integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= dependencies: ansi-styles "^2.2.1" @@ -883,7 +890,7 @@ chalk@^1.1.1: chalk@^2.0.0, chalk@^2.4.1: version "2.4.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" + resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== dependencies: ansi-styles "^3.2.1" @@ -892,7 +899,7 @@ chalk@^2.0.0, chalk@^2.4.1: chalk@^4.1.0, chalk@^4.1.2, chalk@~4.1.0, chalk@~4.1.2: version "4.1.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" + resolved "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz" integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== dependencies: ansi-styles "^4.1.0" @@ -900,26 +907,26 @@ chalk@^4.1.0, chalk@^4.1.2, chalk@~4.1.0, chalk@~4.1.2: character-parser@^2.2.0: version "2.2.0" - resolved "https://registry.yarnpkg.com/character-parser/-/character-parser-2.2.0.tgz#c7ce28f36d4bcd9744e5ffc2c5fcde1c73261fc0" + resolved "https://registry.npmjs.org/character-parser/-/character-parser-2.2.0.tgz" integrity sha1-x84o821LzZdE5f/CxfzeHHMmH8A= dependencies: is-regex "^1.0.3" charm@~1.0.2: version "1.0.2" - resolved "https://registry.yarnpkg.com/charm/-/charm-1.0.2.tgz#8add367153a6d9a581331052c4090991da995e35" + resolved "https://registry.npmjs.org/charm/-/charm-1.0.2.tgz" integrity sha1-it02cVOm2aWBMxBSxAkJkdqZXjU= dependencies: inherits "^2.0.1" check-error@^1.0.2: version "1.0.2" - resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82" + resolved "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz" integrity sha1-V00xLt2Iu13YkS6Sht1sCu1KrII= cli@~1.0.0: version "1.0.1" - resolved "https://registry.yarnpkg.com/cli/-/cli-1.0.1.tgz#22817534f24bfa4950c34d532d48ecbc621b8c14" + resolved "https://registry.npmjs.org/cli/-/cli-1.0.1.tgz" integrity sha1-IoF1NPJL+klQw01TLUjsvGIbjBQ= dependencies: exit "0.1.2" @@ -927,36 +934,36 @@ cli@~1.0.0: color-convert@^1.9.0, color-convert@^1.9.3: version "1.9.3" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" + resolved "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz" integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== dependencies: color-name "1.1.3" color-convert@^2.0.1: version "2.0.1" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" + resolved "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz" integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== dependencies: color-name "~1.1.4" color-js@1.0.5: version "1.0.5" - resolved "https://registry.yarnpkg.com/color-js/-/color-js-1.0.5.tgz#698cb41fb51d7fd745b16f9e0c939933a8c7abea" + resolved "https://registry.npmjs.org/color-js/-/color-js-1.0.5.tgz" integrity sha512-KgOTVz7fupb3lOXu4lixP6BR2CdMaTtCnGmLfHZWhq8NU3MABd6U9KjWtJVuYChGS/gIaoA8LakKKQfWhQgwYQ== color-name@1.1.3, color-name@^1.0.0: version "1.1.3" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" + resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz" integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= color-name@~1.1.4: version "1.1.4" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" + resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== color-string@^1.6.0: version "1.9.1" - resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.9.1.tgz#4467f9146f036f855b764dfb5bf8582bf342c7a4" + resolved "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz" integrity sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg== dependencies: color-name "^1.0.0" @@ -964,7 +971,7 @@ color-string@^1.6.0: color@^3.1.3: version "3.2.1" - resolved "https://registry.yarnpkg.com/color/-/color-3.2.1.tgz#3544dc198caf4490c3ecc9a790b54fe9ff45e164" + resolved "https://registry.npmjs.org/color/-/color-3.2.1.tgz" integrity sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA== dependencies: color-convert "^1.9.3" @@ -972,12 +979,12 @@ color@^3.1.3: colors@~1.1.2: version "1.1.2" - resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63" + resolved "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz" integrity sha1-FopHAXVran9RoSzgyXv6KMCE7WM= colorspace@1.1.x: version "1.1.4" - resolved "https://registry.yarnpkg.com/colorspace/-/colorspace-1.1.4.tgz#8d442d1186152f60453bf8070cd66eb364e59243" + resolved "https://registry.npmjs.org/colorspace/-/colorspace-1.1.4.tgz" integrity sha512-BgvKJiuVu1igBUF2kEjRCZXol6wiiGbY5ipL/oVPwm0BL9sIpMIzM8IK7vwuxIIzOXMV3Ey5w+vxhm0rR/TN8w== dependencies: color "^3.1.3" @@ -985,46 +992,46 @@ colorspace@1.1.x: command-exists@~1.2.9: version "1.2.9" - resolved "https://registry.yarnpkg.com/command-exists/-/command-exists-1.2.9.tgz#c50725af3808c8ab0260fd60b01fbfa25b954f69" + resolved "https://registry.npmjs.org/command-exists/-/command-exists-1.2.9.tgz" integrity sha512-LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w== commander@11.1.0: version "11.1.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-11.1.0.tgz#62fdce76006a68e5c1ab3314dc92e800eb83d906" + resolved "https://registry.npmjs.org/commander/-/commander-11.1.0.tgz" integrity sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ== commander@7: version "7.2.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" + resolved "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz" integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== commander@~2.8.1: version "2.8.1" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4" + resolved "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz" integrity sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ= dependencies: graceful-readlink ">= 1.0.0" concat-map@0.0.1: version "0.0.1" - resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + resolved "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz" integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= concurrent@~0.3.2: version "0.3.2" - resolved "https://registry.yarnpkg.com/concurrent/-/concurrent-0.3.2.tgz#0eaa0011a15798c56351128f22247f6e2317f50e" + resolved "https://registry.npmjs.org/concurrent/-/concurrent-0.3.2.tgz" integrity sha1-DqoAEaFXmMVjURKPIiR/biMX9Q4= console-browserify@1.1.x: version "1.1.0" - resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10" + resolved "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz" integrity sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA= dependencies: date-now "^0.1.4" constantinople@^4.0.1: version "4.0.1" - resolved "https://registry.yarnpkg.com/constantinople/-/constantinople-4.0.1.tgz#0def113fa0e4dc8de83331a5cf79c8b325213151" + resolved "https://registry.npmjs.org/constantinople/-/constantinople-4.0.1.tgz" integrity sha512-vCrqcSIq4//Gx74TXXCGnHpulY1dskqLTFGDmhrGxzeXL8lF8kvXv6mpNWlJj1uD4DW23D4ljAqbY4RRaaUZIw== dependencies: "@babel/parser" "^7.6.0" @@ -1032,63 +1039,63 @@ constantinople@^4.0.1: content-disposition@0.5.3: version "0.5.3" - resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd" + resolved "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz" integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g== dependencies: safe-buffer "5.1.2" content-disposition@0.5.4: version "0.5.4" - resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe" + resolved "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz" integrity sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ== dependencies: safe-buffer "5.2.1" content-type@~1.0.4: version "1.0.4" - resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" + resolved "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz" integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== content-type@~1.0.5: version "1.0.5" - resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918" + resolved "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz" integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA== convert-source-map@^1.7.0: version "1.8.0" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369" + resolved "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz" integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA== dependencies: safe-buffer "~5.1.1" cookie-signature@1.0.6: version "1.0.6" - resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" + resolved "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz" integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw= cookie@0.4.0: version "0.4.0" - resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba" + resolved "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz" integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg== cookie@0.6.0: version "0.6.0" - resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.6.0.tgz#2798b04b071b0ecbff0dbb62a505a8efa4e19051" + resolved "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz" integrity sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw== core-util-is@~1.0.0: version "1.0.2" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" + resolved "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz" integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= create-require@^1.1.0: version "1.1.1" - resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333" + resolved "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz" integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ== cross-spawn@^7.0.0: version "7.0.3" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" + resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz" integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== dependencies: path-key "^3.1.0" @@ -1097,26 +1104,26 @@ cross-spawn@^7.0.0: "d3-array@2 - 3", "d3-array@2.10.0 - 3", "d3-array@2.5.0 - 3", d3-array@3: version "3.1.6" - resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-3.1.6.tgz#0342c835925826f49b4d16eb7027aec334ffc97d" + resolved "https://registry.npmjs.org/d3-array/-/d3-array-3.1.6.tgz" integrity sha512-DCbBBNuKOeiR9h04ySRBMW52TFVc91O9wJziuyXw6Ztmy8D3oZbmCkOO3UHKC7ceNJsN2Mavo9+vwV8EAEUXzA== dependencies: internmap "1 - 2" d3-array@^3.2.0: version "3.2.4" - resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-3.2.4.tgz#15fec33b237f97ac5d7c986dc77da273a8ed0bb5" + resolved "https://registry.npmjs.org/d3-array/-/d3-array-3.2.4.tgz" integrity sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg== dependencies: internmap "1 - 2" d3-axis@3: version "3.0.0" - resolved "https://registry.yarnpkg.com/d3-axis/-/d3-axis-3.0.0.tgz#c42a4a13e8131d637b745fc2973824cfeaf93322" + resolved "https://registry.npmjs.org/d3-axis/-/d3-axis-3.0.0.tgz" integrity sha512-IH5tgjV4jE/GhHkRV0HiVYPDtvfjHQlQfJHs0usq7M30XcSBvOotpmH1IgkcXsO/5gEQZD43B//fc7SRT5S+xw== d3-brush@3: version "3.0.0" - resolved "https://registry.yarnpkg.com/d3-brush/-/d3-brush-3.0.0.tgz#6f767c4ed8dcb79de7ede3e1c0f89e63ef64d31c" + resolved "https://registry.npmjs.org/d3-brush/-/d3-brush-3.0.0.tgz" integrity sha512-ALnjWlVYkXsVIGlOsuWH1+3udkYFI48Ljihfnh8FZPF2QS9o+PzGLBslO0PjzVoHLZ2KCVgAM8NVkXPJB2aNnQ== dependencies: d3-dispatch "1 - 3" @@ -1127,38 +1134,38 @@ d3-brush@3: d3-chord@3: version "3.0.1" - resolved "https://registry.yarnpkg.com/d3-chord/-/d3-chord-3.0.1.tgz#d156d61f485fce8327e6abf339cb41d8cbba6966" + resolved "https://registry.npmjs.org/d3-chord/-/d3-chord-3.0.1.tgz" integrity sha512-VE5S6TNa+j8msksl7HwjxMHDM2yNK3XCkusIlpX5kwauBfXuyLAtNg9jCp/iHH61tgI4sb6R/EIMWCqEIdjT/g== dependencies: d3-path "1 - 3" "d3-color@1 - 3", d3-color@3: version "3.1.0" - resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-3.1.0.tgz#395b2833dfac71507f12ac2f7af23bf819de24e2" + resolved "https://registry.npmjs.org/d3-color/-/d3-color-3.1.0.tgz" integrity sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA== d3-contour@4: version "4.0.2" - resolved "https://registry.yarnpkg.com/d3-contour/-/d3-contour-4.0.2.tgz#bb92063bc8c5663acb2422f99c73cbb6c6ae3bcc" + resolved "https://registry.npmjs.org/d3-contour/-/d3-contour-4.0.2.tgz" integrity sha512-4EzFTRIikzs47RGmdxbeUvLWtGedDUNkTcmzoeyg4sP/dvCexO47AaQL7VKy/gul85TOxw+IBgA8US2xwbToNA== dependencies: d3-array "^3.2.0" d3-delaunay@6: version "6.0.2" - resolved "https://registry.yarnpkg.com/d3-delaunay/-/d3-delaunay-6.0.2.tgz#7fd3717ad0eade2fc9939f4260acfb503f984e92" + resolved "https://registry.npmjs.org/d3-delaunay/-/d3-delaunay-6.0.2.tgz" integrity sha512-IMLNldruDQScrcfT+MWnazhHbDJhcRJyOEBAJfwQnHle1RPh6WDuLvxNArUju2VSMSUuKlY5BGHRJ2cYyoFLQQ== dependencies: delaunator "5" "d3-dispatch@1 - 3", d3-dispatch@3: version "3.0.1" - resolved "https://registry.yarnpkg.com/d3-dispatch/-/d3-dispatch-3.0.1.tgz#5fc75284e9c2375c36c839411a0cf550cbfc4d5e" + resolved "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-3.0.1.tgz" integrity sha512-rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg== "d3-drag@2 - 3", d3-drag@3: version "3.0.0" - resolved "https://registry.yarnpkg.com/d3-drag/-/d3-drag-3.0.0.tgz#994aae9cd23c719f53b5e10e3a0a6108c69607ba" + resolved "https://registry.npmjs.org/d3-drag/-/d3-drag-3.0.0.tgz" integrity sha512-pWbUJLdETVA8lQNJecMxoXfH6x+mO2UQo8rSmZ+QqxcbyA3hfeprFgIT//HW2nlHChWeIIMwS2Fq+gEARkhTkg== dependencies: d3-dispatch "1 - 3" @@ -1166,7 +1173,7 @@ d3-delaunay@6: "d3-dsv@1 - 3", d3-dsv@3: version "3.0.1" - resolved "https://registry.yarnpkg.com/d3-dsv/-/d3-dsv-3.0.1.tgz#c63af978f4d6a0d084a52a673922be2160789b73" + resolved "https://registry.npmjs.org/d3-dsv/-/d3-dsv-3.0.1.tgz" integrity sha512-UG6OvdI5afDIFP9w4G0mNq50dSOsXHJaRE8arAS5o9ApWnIElp8GZw1Dun8vP8OyHOZ/QJUKUJwxiiCCnUwm+Q== dependencies: commander "7" @@ -1175,19 +1182,19 @@ d3-delaunay@6: "d3-ease@1 - 3", d3-ease@3: version "3.0.1" - resolved "https://registry.yarnpkg.com/d3-ease/-/d3-ease-3.0.1.tgz#9658ac38a2140d59d346160f1f6c30fda0bd12f4" + resolved "https://registry.npmjs.org/d3-ease/-/d3-ease-3.0.1.tgz" integrity sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w== d3-fetch@3: version "3.0.1" - resolved "https://registry.yarnpkg.com/d3-fetch/-/d3-fetch-3.0.1.tgz#83141bff9856a0edb5e38de89cdcfe63d0a60a22" + resolved "https://registry.npmjs.org/d3-fetch/-/d3-fetch-3.0.1.tgz" integrity sha512-kpkQIM20n3oLVBKGg6oHrUchHM3xODkTzjMoj7aWQFq5QEM+R6E4WkzT5+tojDY7yjez8KgCBRoj4aEr99Fdqw== dependencies: d3-dsv "1 - 3" d3-force@3: version "3.0.0" - resolved "https://registry.yarnpkg.com/d3-force/-/d3-force-3.0.0.tgz#3e2ba1a61e70888fe3d9194e30d6d14eece155c4" + resolved "https://registry.npmjs.org/d3-force/-/d3-force-3.0.0.tgz" integrity sha512-zxV/SsA+U4yte8051P4ECydjD/S+qeYtnaIyAs9tgHCqfguma/aAQDjo85A9Z6EKhBirHRJHXIgJUlffT4wdLg== dependencies: d3-dispatch "1 - 3" @@ -1196,51 +1203,51 @@ d3-force@3: "d3-format@1 - 3", d3-format@3: version "3.1.0" - resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-3.1.0.tgz#9260e23a28ea5cb109e93b21a06e24e2ebd55641" + resolved "https://registry.npmjs.org/d3-format/-/d3-format-3.1.0.tgz" integrity sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA== d3-geo@3: version "3.0.1" - resolved "https://registry.yarnpkg.com/d3-geo/-/d3-geo-3.0.1.tgz#4f92362fd8685d93e3b1fae0fd97dc8980b1ed7e" + resolved "https://registry.npmjs.org/d3-geo/-/d3-geo-3.0.1.tgz" integrity sha512-Wt23xBych5tSy9IYAM1FR2rWIBFWa52B/oF/GYe5zbdHrg08FU8+BuI6X4PvTwPDdqdAdq04fuWJpELtsaEjeA== dependencies: d3-array "2.5.0 - 3" d3-hierarchy@3: version "3.1.2" - resolved "https://registry.yarnpkg.com/d3-hierarchy/-/d3-hierarchy-3.1.2.tgz#b01cd42c1eed3d46db77a5966cf726f8c09160c6" + resolved "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-3.1.2.tgz" integrity sha512-FX/9frcub54beBdugHjDCdikxThEqjnR93Qt7PvQTOHxyiNCAlvMrHhclk3cD5VeAaq9fxmfRp+CnWw9rEMBuA== "d3-interpolate@1 - 3", "d3-interpolate@1.2.0 - 3", d3-interpolate@3: version "3.0.1" - resolved "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-3.0.1.tgz#3c47aa5b32c5b3dfb56ef3fd4342078a632b400d" + resolved "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz" integrity sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g== dependencies: d3-color "1 - 3" "d3-path@1 - 3", d3-path@3: version "3.0.1" - resolved "https://registry.yarnpkg.com/d3-path/-/d3-path-3.0.1.tgz#f09dec0aaffd770b7995f1a399152bf93052321e" + resolved "https://registry.npmjs.org/d3-path/-/d3-path-3.0.1.tgz" integrity sha512-gq6gZom9AFZby0YLduxT1qmrp4xpBA1YZr19OI717WIdKE2OM5ETq5qrHLb301IgxhLwcuxvGZVLeeWc/k1I6w== d3-polygon@3: version "3.0.1" - resolved "https://registry.yarnpkg.com/d3-polygon/-/d3-polygon-3.0.1.tgz#0b45d3dd1c48a29c8e057e6135693ec80bf16398" + resolved "https://registry.npmjs.org/d3-polygon/-/d3-polygon-3.0.1.tgz" integrity sha512-3vbA7vXYwfe1SYhED++fPUQlWSYTTGmFmQiany/gdbiWgU/iEyQzyymwL9SkJjFFuCS4902BSzewVGsHHmHtXg== "d3-quadtree@1 - 3", d3-quadtree@3: version "3.0.1" - resolved "https://registry.yarnpkg.com/d3-quadtree/-/d3-quadtree-3.0.1.tgz#6dca3e8be2b393c9a9d514dabbd80a92deef1a4f" + resolved "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-3.0.1.tgz" integrity sha512-04xDrxQTDTCFwP5H6hRhsRcb9xxv2RzkcsygFzmkSIOJy3PeRJP7sNk3VRIbKXcog561P9oU0/rVH6vDROAgUw== d3-random@3: version "3.0.1" - resolved "https://registry.yarnpkg.com/d3-random/-/d3-random-3.0.1.tgz#d4926378d333d9c0bfd1e6fa0194d30aebaa20f4" + resolved "https://registry.npmjs.org/d3-random/-/d3-random-3.0.1.tgz" integrity sha512-FXMe9GfxTxqd5D6jFsQ+DJ8BJS4E/fT5mqqdjovykEB2oFbTMDVdg1MGFxfQW+FBOGoB++k8swBrgwSHT1cUXQ== d3-scale-chromatic@3: version "3.0.0" - resolved "https://registry.yarnpkg.com/d3-scale-chromatic/-/d3-scale-chromatic-3.0.0.tgz#15b4ceb8ca2bb0dcb6d1a641ee03d59c3b62376a" + resolved "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-3.0.0.tgz" integrity sha512-Lx9thtxAKrO2Pq6OO2Ua474opeziKr279P/TKZsMAhYyNDD3EnCffdbgeSYN5O7m2ByQsxtuP2CSDczNUIZ22g== dependencies: d3-color "1 - 3" @@ -1248,7 +1255,7 @@ d3-scale-chromatic@3: d3-scale@4: version "4.0.2" - resolved "https://registry.yarnpkg.com/d3-scale/-/d3-scale-4.0.2.tgz#82b38e8e8ff7080764f8dcec77bd4be393689396" + resolved "https://registry.npmjs.org/d3-scale/-/d3-scale-4.0.2.tgz" integrity sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ== dependencies: d3-array "2.10.0 - 3" @@ -1259,43 +1266,43 @@ d3-scale@4: d3-selection@2: version "2.0.0" - resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-2.0.0.tgz#94a11638ea2141b7565f883780dabc7ef6a61066" + resolved "https://registry.npmjs.org/d3-selection/-/d3-selection-2.0.0.tgz" integrity sha512-XoGGqhLUN/W14NmaqcO/bb1nqjDAw5WtSYb2X8wiuQWvSZUsUVYsOSkOybUrNvcBjaywBdYPy03eXHMXjk9nZA== "d3-selection@2 - 3", d3-selection@3: version "3.0.0" - resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-3.0.0.tgz#c25338207efa72cc5b9bd1458a1a41901f1e1b31" + resolved "https://registry.npmjs.org/d3-selection/-/d3-selection-3.0.0.tgz" integrity sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ== d3-shape@3: version "3.1.0" - resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-3.1.0.tgz#c8a495652d83ea6f524e482fca57aa3f8bc32556" + resolved "https://registry.npmjs.org/d3-shape/-/d3-shape-3.1.0.tgz" integrity sha512-tGDh1Muf8kWjEDT/LswZJ8WF85yDZLvVJpYU9Nq+8+yW1Z5enxrmXOhTArlkaElU+CTn0OTVNli+/i+HP45QEQ== dependencies: d3-path "1 - 3" "d3-time-format@2 - 4", d3-time-format@4: version "4.1.0" - resolved "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-4.1.0.tgz#7ab5257a5041d11ecb4fe70a5c7d16a195bb408a" + resolved "https://registry.npmjs.org/d3-time-format/-/d3-time-format-4.1.0.tgz" integrity sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg== dependencies: d3-time "1 - 3" "d3-time@1 - 3", "d3-time@2.1.1 - 3", d3-time@3: version "3.0.0" - resolved "https://registry.yarnpkg.com/d3-time/-/d3-time-3.0.0.tgz#65972cb98ae2d4954ef5c932e8704061335d4975" + resolved "https://registry.npmjs.org/d3-time/-/d3-time-3.0.0.tgz" integrity sha512-zmV3lRnlaLI08y9IMRXSDshQb5Nj77smnfpnd2LrBa/2K281Jijactokeak14QacHs/kKq0AQ121nidNYlarbQ== dependencies: d3-array "2 - 3" "d3-timer@1 - 3", d3-timer@3: version "3.0.1" - resolved "https://registry.yarnpkg.com/d3-timer/-/d3-timer-3.0.1.tgz#6284d2a2708285b1abb7e201eda4380af35e63b0" + resolved "https://registry.npmjs.org/d3-timer/-/d3-timer-3.0.1.tgz" integrity sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA== "d3-transition@2 - 3", d3-transition@3: version "3.0.1" - resolved "https://registry.yarnpkg.com/d3-transition/-/d3-transition-3.0.1.tgz#6869fdde1448868077fdd5989200cb61b2a1645f" + resolved "https://registry.npmjs.org/d3-transition/-/d3-transition-3.0.1.tgz" integrity sha512-ApKvfjsSR6tg06xrL434C0WydLr7JewBB3V+/39RMHsaXTOG0zmt/OAXeng5M5LBm0ojmxJrpomQVZ1aPvBL4w== dependencies: d3-color "1 - 3" @@ -1306,14 +1313,14 @@ d3-shape@3: d3-v6-tip@1.0.9: version "1.0.9" - resolved "https://registry.yarnpkg.com/d3-v6-tip/-/d3-v6-tip-1.0.9.tgz#0fcc0647ceb1070a3142166fad748298a3d6c835" + resolved "https://registry.npmjs.org/d3-v6-tip/-/d3-v6-tip-1.0.9.tgz" integrity sha512-XU7Ks7aA8GX8X9v4vbBh7r7I7oJ2YwJULkN2mQA5nT+7jxJnTN47WVa1aBPTv2qPMQkh91YECN1mkevnWG0zEw== dependencies: d3-selection "2" d3-zoom@3: version "3.0.0" - resolved "https://registry.yarnpkg.com/d3-zoom/-/d3-zoom-3.0.0.tgz#d13f4165c73217ffeaa54295cd6969b3e7aee8f3" + resolved "https://registry.npmjs.org/d3-zoom/-/d3-zoom-3.0.0.tgz" integrity sha512-b8AmV3kfQaqWAuacbPuNbL6vahnOJflOhexLzMMNLga62+/nh0JzvJ0aO/5a5MVgUFGS7Hu1P9P03o3fJkDCyw== dependencies: d3-dispatch "1 - 3" @@ -1324,7 +1331,7 @@ d3-zoom@3: d3@7.9.0: version "7.9.0" - resolved "https://registry.yarnpkg.com/d3/-/d3-7.9.0.tgz#579e7acb3d749caf8860bd1741ae8d371070cd5d" + resolved "https://registry.npmjs.org/d3/-/d3-7.9.0.tgz" integrity sha512-e1U46jVP+w7Iut8Jt8ri1YsPOvFpg46k+K8TpCb0P+zjCkjkPnV7WzfDJzMHy1LnA+wj5pLT1wjO901gLXeEhA== dependencies: d3-array "3" @@ -1358,47 +1365,55 @@ d3@7.9.0: d3-transition "3" d3-zoom "3" +d@1, d@^1.0.1, d@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/d/-/d-1.0.2.tgz#2aefd554b81981e7dccf72d6842ae725cb17e5de" + integrity sha512-MOqHvMWF9/9MX6nza0KgvFH4HpMU0EF5uUDXqX/BtxtU8NfB0QzRtJ8Oe/6SuS4kbhyzVJwjd97EA4PKrzJ8bw== + dependencies: + es5-ext "^0.10.64" + type "^2.7.2" + date-now@^0.1.4: version "0.1.4" - resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b" + resolved "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz" integrity sha1-6vQ5/U1ISK105cx9vvIAZyueNFs= dateformat@~4.6.2: version "4.6.3" - resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-4.6.3.tgz#556fa6497e5217fedb78821424f8a1c22fa3f4b5" + resolved "https://registry.npmjs.org/dateformat/-/dateformat-4.6.3.tgz" integrity sha512-2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA== debug@2.6.9, debug@^2.2.0: version "2.6.9" - resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" + resolved "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz" integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== dependencies: ms "2.0.0" debug@^3.2.7: version "3.2.7" - resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" + resolved "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz" integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== dependencies: ms "^2.1.1" debug@^4.1.0, debug@^4.1.1: version "4.3.1" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" + resolved "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz" integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== dependencies: ms "2.1.2" debug@^4.3.2: version "4.3.4" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" + resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== dependencies: ms "2.1.2" decompress-tar@^4.0.0, decompress-tar@^4.1.0, decompress-tar@^4.1.1: version "4.1.1" - resolved "https://registry.yarnpkg.com/decompress-tar/-/decompress-tar-4.1.1.tgz#718cbd3fcb16209716e70a26b84e7ba4592e5af1" + resolved "https://registry.npmjs.org/decompress-tar/-/decompress-tar-4.1.1.tgz" integrity sha512-JdJMaCrGpB5fESVyxwpCx4Jdj2AagLmv3y58Qy4GE6HMVjWz1FeVQk1Ct4Kye7PftcdOo/7U7UKzYBJgqnGeUQ== dependencies: file-type "^5.2.0" @@ -1407,7 +1422,7 @@ decompress-tar@^4.0.0, decompress-tar@^4.1.0, decompress-tar@^4.1.1: decompress-tarbz2@^4.0.0: version "4.1.1" - resolved "https://registry.yarnpkg.com/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz#3082a5b880ea4043816349f378b56c516be1a39b" + resolved "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz" integrity sha512-s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A== dependencies: decompress-tar "^4.1.0" @@ -1418,7 +1433,7 @@ decompress-tarbz2@^4.0.0: decompress-targz@^4.0.0: version "4.1.1" - resolved "https://registry.yarnpkg.com/decompress-targz/-/decompress-targz-4.1.1.tgz#c09bc35c4d11f3de09f2d2da53e9de23e7ce1eee" + resolved "https://registry.npmjs.org/decompress-targz/-/decompress-targz-4.1.1.tgz" integrity sha512-4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w== dependencies: decompress-tar "^4.1.1" @@ -1427,7 +1442,7 @@ decompress-targz@^4.0.0: decompress-unzip@^4.0.1: version "4.0.1" - resolved "https://registry.yarnpkg.com/decompress-unzip/-/decompress-unzip-4.0.1.tgz#deaaccdfd14aeaf85578f733ae8210f9b4848f69" + resolved "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-4.0.1.tgz" integrity sha1-3qrM39FK6vhVePczroIQ+bSEj2k= dependencies: file-type "^3.8.0" @@ -1437,7 +1452,7 @@ decompress-unzip@^4.0.1: decompress@~4.2.1: version "4.2.1" - resolved "https://registry.yarnpkg.com/decompress/-/decompress-4.2.1.tgz#007f55cc6a62c055afa37c07eb6a4ee1b773f118" + resolved "https://registry.npmjs.org/decompress/-/decompress-4.2.1.tgz" integrity sha512-e48kc2IjU+2Zw8cTb6VZcJQ3lgVbS4uuB1TfCHbiZIP/haNXm+SVyhu+87jts5/3ROpd82GSVCoNs/z8l4ZOaQ== dependencies: decompress-tar "^4.0.0" @@ -1451,107 +1466,107 @@ decompress@~4.2.1: deep-eql@^3.0.1: version "3.0.1" - resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-3.0.1.tgz#dfc9404400ad1c8fe023e7da1df1c147c4b444df" + resolved "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz" integrity sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw== dependencies: type-detect "^4.0.0" deepmerge@4.2.0: version "4.2.0" - resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.0.tgz#77a97af6746882cd1ed85d4b925be8cd4120b630" + resolved "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.0.tgz" integrity sha512-/pED+kD8V9n15L1lon8DXEiWLQMW4tTiegn1kIWIQ+DBudOkFitz1cfjWQiSeKMPBQOknT3LpueyAmMVJ1Ho2g== default-require-extensions@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-3.0.0.tgz#e03f93aac9b2b6443fc52e5e4a37b3ad9ad8df96" + resolved "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-3.0.0.tgz" integrity sha512-ek6DpXq/SCpvjhpFsLFRVtIxJCRw6fUR42lYMVZuUMK7n8eMz4Uh5clckdBjEpLhn/gEBZo7hDJnJcwdKLKQjg== dependencies: strip-bom "^4.0.0" delaunator@5: version "5.0.0" - resolved "https://registry.yarnpkg.com/delaunator/-/delaunator-5.0.0.tgz#60f052b28bd91c9b4566850ebf7756efe821d81b" + resolved "https://registry.npmjs.org/delaunator/-/delaunator-5.0.0.tgz" integrity sha512-AyLvtyJdbv/U1GkiS6gUUzclRoAY4Gs75qkMygJJhU75LW4DNuSF2RMzpxs9jw9Oz1BobHjTdkG3zdP55VxAqw== dependencies: robust-predicates "^3.0.0" depd@2.0.0, depd@~2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df" + resolved "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz" integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== depd@~1.1.0, depd@~1.1.2: version "1.1.2" - resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" + resolved "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz" integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= desandro-matches-selector@^2.0.0: version "2.0.2" - resolved "https://registry.yarnpkg.com/desandro-matches-selector/-/desandro-matches-selector-2.0.2.tgz#717beed4dc13e7d8f3762f707a6d58a6774218e1" + resolved "https://registry.npmjs.org/desandro-matches-selector/-/desandro-matches-selector-2.0.2.tgz" integrity sha1-cXvu1NwT59jzdi9wem1YpndCGOE= destroy@1.2.0: version "1.2.0" - resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015" + resolved "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz" integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg== destroy@~1.0.4: version "1.0.4" - resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" + resolved "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz" integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= detect-file@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7" + resolved "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz" integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc= diff@^4.0.1: version "4.0.2" - resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d" + resolved "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz" integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A== diff@~5.0.0: version "5.0.0" - resolved "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz#7ed6ad76d859d030787ec35855f5b1daf31d852b" + resolved "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz" integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w== dijit@1.17.3: version "1.17.3" - resolved "https://registry.yarnpkg.com/dijit/-/dijit-1.17.3.tgz#970a578546381cfede92cdce62ee404cb1272c5b" + resolved "https://registry.npmjs.org/dijit/-/dijit-1.17.3.tgz" integrity sha512-QS+1bNhPT+BF9E+iomQSi5qI+o3oUNSx1r5TF8WlGH4LybGZP+IIGJBOO5/41YduBPljVXhY7vaPsgrycxC6UQ== dependencies: dojo "1.17.3" dijit@1.8: version "1.8.14" - resolved "https://registry.yarnpkg.com/dijit/-/dijit-1.8.14.tgz#d5c651b0d0894c9317d0b7182e309b2abe019003" + resolved "https://registry.npmjs.org/dijit/-/dijit-1.8.14.tgz" integrity sha1-1cZRsNCJTJMX0LcYLjCbKr4BkAM= dependencies: dojo "1.8.14" doctypes@^1.1.0: version "1.1.0" - resolved "https://registry.yarnpkg.com/doctypes/-/doctypes-1.1.0.tgz#ea80b106a87538774e8a3a4a5afe293de489e0a9" + resolved "https://registry.npmjs.org/doctypes/-/doctypes-1.1.0.tgz" integrity sha1-6oCxBqh1OHdOijpKWv4pPeSJ4Kk= dojo-util@1.17.3: version "1.17.3" - resolved "https://registry.yarnpkg.com/dojo-util/-/dojo-util-1.17.3.tgz#1b2a8aaed5f932d93ab376fc2f4a7d096c6e7f5f" + resolved "https://registry.npmjs.org/dojo-util/-/dojo-util-1.17.3.tgz" integrity sha512-3hZMwVh9XmofCJh3v3epTlODTnk3FJoGHZiZKVlbhvYLtRC8pkLg6zitOpT2Zg4Jn5URYmPrMmAdwxRHrG736A== dojo@1.17.3: version "1.17.3" - resolved "https://registry.yarnpkg.com/dojo/-/dojo-1.17.3.tgz#053bd5fbd846a04a84cae1f552d54f7d3a5a9267" + resolved "https://registry.npmjs.org/dojo/-/dojo-1.17.3.tgz" integrity sha512-iWDx1oSfCEDnIrs8cMW7Zh9Fbjgxu8iRagFz+Qi2eya3MXIAxFXKhv2A7dpi+bfpMpFozLwcsLV8URLw6BsHsA== dojo@1.8, dojo@1.8.14: version "1.8.14" - resolved "https://registry.yarnpkg.com/dojo/-/dojo-1.8.14.tgz#8c239dd321e85e6a55d03329b97bb88bba53fb33" + resolved "https://registry.npmjs.org/dojo/-/dojo-1.8.14.tgz" integrity sha1-jCOd0yHoXmpV0DMpuXu4i7pT+zM= dojox@1.17.3: version "1.17.3" - resolved "https://registry.yarnpkg.com/dojox/-/dojox-1.17.3.tgz#4c782da01bb97d18514be6363d41a5b9862adaf8" + resolved "https://registry.npmjs.org/dojox/-/dojox-1.17.3.tgz" integrity sha512-n2SvGoVTZlOQUQmoqEfW6oGAfmyBtjl4DzWkxoojdTxBq8O0r7pDKBrW3nRrpQW9uZFHfB1XIA3BXS0cnrue/Q== dependencies: dijit "1.17.3" @@ -1559,7 +1574,7 @@ dojox@1.17.3: dom-serializer@0: version "0.1.0" - resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.0.tgz#073c697546ce0780ce23be4a28e293e40bc30c82" + resolved "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz" integrity sha1-BzxpdUbOB4DOI75KKOKT5AvDDII= dependencies: domelementtype "~1.1.1" @@ -1567,24 +1582,24 @@ dom-serializer@0: domelementtype@1: version "1.3.0" - resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2" + resolved "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz" integrity sha1-sXrtguirWeUt2cGbF1bg/BhyBMI= domelementtype@~1.1.1: version "1.1.3" - resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b" + resolved "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz" integrity sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs= domhandler@2.3: version "2.3.0" - resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.3.0.tgz#2de59a0822d5027fabff6f032c2b25a2a8abe738" + resolved "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz" integrity sha1-LeWaCCLVAn+r/28DLCsloqir5zg= dependencies: domelementtype "1" domutils@1.5: version "1.5.1" - resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf" + resolved "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz" integrity sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8= dependencies: dom-serializer "0" @@ -1592,7 +1607,7 @@ domutils@1.5: draggabilly@2.4.1: version "2.4.1" - resolved "https://registry.yarnpkg.com/draggabilly/-/draggabilly-2.4.1.tgz#df02b9e2c3a837d42591af807a0d250b3816887f" + resolved "https://registry.npmjs.org/draggabilly/-/draggabilly-2.4.1.tgz" integrity sha512-HHHLPEPZqRXIDQDFRFdK7RONZausNlJ4WkA73ST7Z6O2HPWttxFHVwHo8nccuDLzXWwiVKRVuc6fTkW+CQA++A== dependencies: get-size "^2.0.2" @@ -1600,121 +1615,166 @@ draggabilly@2.4.1: dropzone@5.9.3: version "5.9.3" - resolved "https://registry.yarnpkg.com/dropzone/-/dropzone-5.9.3.tgz#b3070ae090fa48cbc04c17535635537ca72d70d6" + resolved "https://registry.npmjs.org/dropzone/-/dropzone-5.9.3.tgz" integrity sha512-Azk8kD/2/nJIuVPK+zQ9sjKMRIpRvNyqn9XwbBHNq+iNuSccbJS6hwm1Woy0pMST0erSo0u4j+KJaodndDk4vA== duplexer@^0.1.1: version "0.1.1" - resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1" + resolved "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz" integrity sha1-rOb/gIwc5mtX0ev5eXessCM0z8E= eastasianwidth@^0.2.0: version "0.2.0" - resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb" + resolved "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz" integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA== ee-first@1.1.1: version "1.1.1" - resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" + resolved "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz" integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= electron-to-chromium@^1.4.84: version "1.4.107" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.107.tgz#564257014ab14033b4403a309c813123c58a3fb9" + resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.107.tgz" integrity sha512-Huen6taaVrUrSy8o7mGStByba8PfOWWluHNxSHGBrCgEdFVLtvdQDBr9LBCF9Uci8SYxh28QNNMO0oC17wbGAg== emoji-regex@^8.0.0: version "8.0.0" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" + resolved "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz" integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== emoji-regex@^9.2.2: version "9.2.2" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72" + resolved "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz" integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg== enabled@2.0.x: version "2.0.0" - resolved "https://registry.yarnpkg.com/enabled/-/enabled-2.0.0.tgz#f9dd92ec2d6f4bbc0d5d1e64e21d61cd4665e7c2" + resolved "https://registry.npmjs.org/enabled/-/enabled-2.0.0.tgz" integrity sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ== encodeurl@~1.0.2: version "1.0.2" - resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" + resolved "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz" integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= end-of-stream@^1.0.0: version "1.4.1" - resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43" + resolved "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz" integrity sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q== dependencies: once "^1.4.0" entities@1.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/entities/-/entities-1.0.0.tgz#b2987aa3821347fcde642b24fdfc9e4fb712bf26" + resolved "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz" integrity sha1-sph6o4ITR/zeZCsk/fyeT7cSvyY= entities@~1.1.1: version "1.1.1" - resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0" + resolved "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz" integrity sha1-blwtClYhtdra7O+AuQ7ftc13cvA= +es5-ext@^0.10.35, es5-ext@^0.10.62, es5-ext@^0.10.63, es5-ext@^0.10.64, es5-ext@~0.10.14: + version "0.10.64" + resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.64.tgz#12e4ffb48f1ba2ea777f1fcdd1918ef73ea21714" + integrity sha512-p2snDhiLaXe6dahss1LddxqEm+SkuDvV8dnIQG0MWjyHpcMNfXKPE+/Cc0y+PhxJX3A4xGNeFCj5oc0BUh6deg== + dependencies: + es6-iterator "^2.0.3" + es6-symbol "^3.1.3" + esniff "^2.0.1" + next-tick "^1.1.0" + +es6-iterator@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7" + integrity sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g== + dependencies: + d "1" + es5-ext "^0.10.35" + es6-symbol "^3.1.1" + +es6-symbol@^3.1.1, es6-symbol@^3.1.3: + version "3.1.4" + resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.4.tgz#f4e7d28013770b4208ecbf3e0bf14d3bcb557b8c" + integrity sha512-U9bFFjX8tFiATgtkJ1zg25+KviIXpgRvRHS8sau3GfhVzThRQrOeksPeT0BWW2MNZs1OEWJ1DPXOQMn0KKRkvg== + dependencies: + d "^1.0.2" + ext "^1.7.0" + escalade@^3.1.1: version "3.1.1" - resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" + resolved "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz" integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== escape-html@~1.0.3: version "1.0.3" - resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" + resolved "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz" integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: version "1.0.5" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" + resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= +esniff@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/esniff/-/esniff-2.0.1.tgz#a4d4b43a5c71c7ec51c51098c1d8a29081f9b308" + integrity sha512-kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg== + dependencies: + d "^1.0.1" + es5-ext "^0.10.62" + event-emitter "^0.3.5" + type "^2.7.2" + esprima@^4.0.0: version "4.0.0" - resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804" + resolved "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz" integrity sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw== etag@~1.8.1: version "1.8.1" - resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" + resolved "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz" integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= ev-emitter@^1.0.0, ev-emitter@^1.0.1: version "1.1.1" - resolved "https://registry.yarnpkg.com/ev-emitter/-/ev-emitter-1.1.1.tgz#8f18b0ce5c76a5d18017f71c0a795c65b9138f2a" + resolved "https://registry.npmjs.org/ev-emitter/-/ev-emitter-1.1.1.tgz" integrity sha512-ipiDYhdQSCZ4hSbX4rMW+XzNKMD1prg/sTvoVmSLkuQ1MVlwjJQQA+sW8tMYR3BLUr9KjodFV4pvzunvRhd33Q== +event-emitter@^0.3.5: + version "0.3.5" + resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39" + integrity sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA== + dependencies: + d "1" + es5-ext "~0.10.14" + eventemitter2@~0.4.13: version "0.4.14" - resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-0.4.14.tgz#8f61b75cde012b2e9eb284d4545583b5643b61ab" + resolved "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz" integrity sha1-j2G3XN4BKy6esoTUVFWDtWQ7Yas= eventsource@^2.0.2: version "2.0.2" - resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-2.0.2.tgz#76dfcc02930fb2ff339520b6d290da573a9e8508" + resolved "https://registry.npmjs.org/eventsource/-/eventsource-2.0.2.tgz" integrity sha512-IzUmBGPR3+oUG9dUeXynyNmf91/3zUSJg1lCktzKw47OXuhco54U3r9B7O4XX+Rb1Itm9OZ2b0RkTs10bICOxA== exit@0.1.2, exit@0.1.x, exit@~0.1.2: version "0.1.2" - resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c" + resolved "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz" integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw= expand-tilde@^2.0.0, expand-tilde@^2.0.2: version "2.0.2" - resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502" + resolved "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz" integrity sha1-l+gBqgUt8CRU3kawK/YhZCzchQI= dependencies: homedir-polyfill "^1.0.1" express@4.19.2: version "4.19.2" - resolved "https://registry.yarnpkg.com/express/-/express-4.19.2.tgz#e25437827a3aa7f2a827bc8171bbbb664a356465" + resolved "https://registry.npmjs.org/express/-/express-4.19.2.tgz" integrity sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q== dependencies: accepts "~1.3.8" @@ -1751,7 +1811,7 @@ express@4.19.2: express@~4.17.1: version "4.17.1" - resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134" + resolved "https://registry.npmjs.org/express/-/express-4.17.1.tgz" integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g== dependencies: accepts "~1.3.7" @@ -1785,67 +1845,74 @@ express@~4.17.1: utils-merge "1.0.1" vary "~1.1.2" +ext@^1.7.0: + version "1.7.0" + resolved "https://registry.yarnpkg.com/ext/-/ext-1.7.0.tgz#0ea4383c0103d60e70be99e9a7f11027a33c4f5f" + integrity sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw== + dependencies: + type "^2.7.2" + extend@^3.0.2: version "3.0.2" - resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" + resolved "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz" integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== faye-websocket@^0.11.4: version "0.11.4" - resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.4.tgz#7f0d9275cfdd86a1c963dc8b65fcc451edcbb1da" + resolved "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz" integrity sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g== dependencies: websocket-driver ">=0.5.1" fd-slicer@~1.0.1: version "1.0.1" - resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.0.1.tgz#8b5bcbd9ec327c5041bf9ab023fd6750f1177e65" + resolved "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz" integrity sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU= dependencies: pend "~1.2.0" fecha@^4.2.0: version "4.2.3" - resolved "https://registry.yarnpkg.com/fecha/-/fecha-4.2.3.tgz#4d9ccdbc61e8629b259fdca67e65891448d569fd" + resolved "https://registry.npmjs.org/fecha/-/fecha-4.2.3.tgz" integrity sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw== figures@^3.2.0: version "3.2.0" - resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af" + resolved "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz" integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg== dependencies: escape-string-regexp "^1.0.5" file-sync-cmp@^0.1.0: version "0.1.1" - resolved "https://registry.yarnpkg.com/file-sync-cmp/-/file-sync-cmp-0.1.1.tgz#a5e7a8ffbfa493b43b923bbd4ca89a53b63b612b" + resolved "https://registry.npmjs.org/file-sync-cmp/-/file-sync-cmp-0.1.1.tgz" integrity sha1-peeo/7+kk7Q7kju9TKiaU7Y7YSs= file-type@^3.8.0: version "3.9.0" - resolved "https://registry.yarnpkg.com/file-type/-/file-type-3.9.0.tgz#257a078384d1db8087bc449d107d52a52672b9e9" + resolved "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz" integrity sha1-JXoHg4TR24CHvESdEH1SpSZyuek= file-type@^5.2.0: version "5.2.0" - resolved "https://registry.yarnpkg.com/file-type/-/file-type-5.2.0.tgz#2ddbea7c73ffe36368dfae49dc338c058c2b8ad6" + resolved "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz" integrity sha1-LdvqfHP/42No365J3DOMBYwritY= file-type@^6.1.0: version "6.2.0" - resolved "https://registry.yarnpkg.com/file-type/-/file-type-6.2.0.tgz#e50cd75d356ffed4e306dc4f5bcf52a79903a919" + resolved "https://registry.npmjs.org/file-type/-/file-type-6.2.0.tgz" integrity sha512-YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg== fill-range@^7.0.1: version "7.0.1" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" + resolved "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz" integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== dependencies: to-regex-range "^5.0.1" finalhandler@1.2.0: version "1.2.0" - resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.2.0.tgz#7d23fe5731b207b4640e4fcd00aec1f9207a7b32" + resolved "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz" integrity sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg== dependencies: debug "2.6.9" @@ -1858,7 +1925,7 @@ finalhandler@1.2.0: finalhandler@~1.1.2: version "1.1.2" - resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" + resolved "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz" integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA== dependencies: debug "2.6.9" @@ -1871,14 +1938,14 @@ finalhandler@~1.1.2: find-up@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" + resolved "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz" integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg== dependencies: locate-path "^3.0.0" findup-sync@^4.0.0: version "4.0.0" - resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-4.0.0.tgz#956c9cdde804052b881b428512905c4a5f2cdef0" + resolved "https://registry.npmjs.org/findup-sync/-/findup-sync-4.0.0.tgz" integrity sha512-6jvvn/12IC4quLBL1KNokxC7wWTvYncaVUYSoxWw7YykPLuRrnv4qdHcSOywOI5RpkOVGeQRtWM8/q+G6W6qfQ== dependencies: detect-file "^1.0.0" @@ -1888,7 +1955,7 @@ findup-sync@^4.0.0: findup-sync@~5.0.0: version "5.0.0" - resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-5.0.0.tgz#54380ad965a7edca00cc8f63113559aadc541bd2" + resolved "https://registry.npmjs.org/findup-sync/-/findup-sync-5.0.0.tgz" integrity sha512-MzwXju70AuyflbgeOhzvQWAvvQdo1XL0A9bVvlXsYcFEBM87WR4OakL4OfZq+QRmr+duJubio+UtNQCPsVESzQ== dependencies: detect-file "^1.0.0" @@ -1898,7 +1965,7 @@ findup-sync@~5.0.0: fined@^1.2.0: version "1.2.0" - resolved "https://registry.yarnpkg.com/fined/-/fined-1.2.0.tgz#d00beccf1aa2b475d16d423b0238b713a2c4a37b" + resolved "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz" integrity sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng== dependencies: expand-tilde "^2.0.2" @@ -1909,41 +1976,41 @@ fined@^1.2.0: fizzy-ui-utils@^2.0.0: version "2.0.6" - resolved "https://registry.yarnpkg.com/fizzy-ui-utils/-/fizzy-ui-utils-2.0.6.tgz#9c75e313fb273e68ed80d7443ae751e1c241c6cc" + resolved "https://registry.npmjs.org/fizzy-ui-utils/-/fizzy-ui-utils-2.0.6.tgz" integrity sha512-aci2W7ZZ/MKLMuQkFKtCN/GXvheT9lLJW6zWNhjMzpwoWJGMNidxHSJYWQVegXQZMGE+XyO5KFqOTAzz1GVT6Q== dependencies: desandro-matches-selector "^2.0.0" flagged-respawn@^1.0.1: version "1.0.1" - resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-1.0.1.tgz#e7de6f1279ddd9ca9aac8a5971d618606b3aab41" + resolved "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz" integrity sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q== fn.name@1.x.x: version "1.1.0" - resolved "https://registry.yarnpkg.com/fn.name/-/fn.name-1.1.0.tgz#26cad8017967aea8731bc42961d04a3d5988accc" + resolved "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz" integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw== follow-redirects@^1.14.0: version "1.14.9" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.9.tgz#dd4ea157de7bfaf9ea9b3fbd85aa16951f78d8d7" + resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz" integrity sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w== for-in@^1.0.1: version "1.0.2" - resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" + resolved "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz" integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA= for-own@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b" + resolved "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz" integrity sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs= dependencies: for-in "^1.0.1" foreground-child@^3.1.0: version "3.1.1" - resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.1.1.tgz#1d173e776d75d2772fed08efe4a0de1ea1b12d0d" + resolved "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz" integrity sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg== dependencies: cross-spawn "^7.0.0" @@ -1951,47 +2018,47 @@ foreground-child@^3.1.0: format-util@^1.0.3: version "1.0.5" - resolved "https://registry.yarnpkg.com/format-util/-/format-util-1.0.5.tgz#1ffb450c8a03e7bccffe40643180918cc297d271" + resolved "https://registry.npmjs.org/format-util/-/format-util-1.0.5.tgz" integrity sha512-varLbTj0e0yVyRpqQhuWV+8hlePAgaoFRhNFj50BNjEIrw1/DphHSObtqwskVCPWNgzwPoQrZAbfa/SBiicNeg== forwarded@0.2.0: version "0.2.0" - resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811" + resolved "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz" integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow== forwarded@~0.1.2: version "0.1.2" - resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84" + resolved "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz" integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ= fresh@0.5.2: version "0.5.2" - resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" + resolved "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz" integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac= fs.realpath@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" + resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz" integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= function-bind@^1.0.2, function-bind@^1.1.1: version "1.1.1" - resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" + resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz" integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== gensync@^1.0.0-beta.2: version "1.0.0-beta.2" - resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0" + resolved "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz" integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg== get-func-name@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41" + resolved "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz" integrity sha1-6td0q+5y4gQJQzoGY2YCPdaIekE= get-intrinsic@^1.0.2: version "1.1.1" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6" + resolved "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz" integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q== dependencies: function-bind "^1.1.1" @@ -2000,12 +2067,12 @@ get-intrinsic@^1.0.2: get-size@^2.0.2: version "2.0.2" - resolved "https://registry.yarnpkg.com/get-size/-/get-size-2.0.2.tgz#555ea98ab8732e0c021e9e23e2219adcbe398e98" + resolved "https://registry.npmjs.org/get-size/-/get-size-2.0.2.tgz" integrity sha1-VV6pirhzLgwCHp4j4iGa3L45jpg= get-stream@^2.2.0: version "2.3.1" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-2.3.1.tgz#5f38f93f346009666ee0150a054167f91bdd95de" + resolved "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz" integrity sha1-Xzj5PzRgCWZu4BUKBUFn+Rvdld4= dependencies: object-assign "^4.0.1" @@ -2013,12 +2080,12 @@ get-stream@^2.2.0: getobject@~1.0.0: version "1.0.2" - resolved "https://registry.yarnpkg.com/getobject/-/getobject-1.0.2.tgz#25ec87a50370f6dcc3c6ba7ef43c4c16215c4c89" + resolved "https://registry.npmjs.org/getobject/-/getobject-1.0.2.tgz" integrity sha512-2zblDBaFcb3rB4rF77XVnuINOE2h2k/OnqXAiy0IrTxUfV1iFp3la33oAQVY9pCpWU268WFYVt2t71hlMuLsOg== glob@10.4.1: version "10.4.1" - resolved "https://registry.yarnpkg.com/glob/-/glob-10.4.1.tgz#0cfb01ab6a6b438177bfe6a58e2576f6efe909c2" + resolved "https://registry.npmjs.org/glob/-/glob-10.4.1.tgz" integrity sha512-2jelhlq3E4ho74ZyVLN03oKdAZVUa6UDZzFLVH1H7dnoax+y9qyaq8zBkfDIggjniU19z0wU18y16jMB2eyVIw== dependencies: foreground-child "^3.1.0" @@ -2029,7 +2096,7 @@ glob@10.4.1: glob@^7.1.1: version "7.1.2" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15" + resolved "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz" integrity sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ== dependencies: fs.realpath "^1.0.0" @@ -2041,7 +2108,7 @@ glob@^7.1.1: glob@^7.1.3: version "7.2.0" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" + resolved "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz" integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== dependencies: fs.realpath "^1.0.0" @@ -2053,7 +2120,7 @@ glob@^7.1.3: glob@^7.1.6: version "7.1.6" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" + resolved "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz" integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== dependencies: fs.realpath "^1.0.0" @@ -2065,7 +2132,7 @@ glob@^7.1.6: glob@~7.1.6, glob@~7.1.7: version "7.1.7" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90" + resolved "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz" integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ== dependencies: fs.realpath "^1.0.0" @@ -2077,7 +2144,7 @@ glob@~7.1.6, glob@~7.1.7: global-modules@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea" + resolved "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz" integrity sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg== dependencies: global-prefix "^1.0.1" @@ -2086,7 +2153,7 @@ global-modules@^1.0.0: global-prefix@^1.0.1: version "1.0.2" - resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe" + resolved "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz" integrity sha1-2/dDxsFJklk8ZVVoy2btMsASLr4= dependencies: expand-tilde "^2.0.2" @@ -2097,22 +2164,22 @@ global-prefix@^1.0.1: globals@^11.1.0: version "11.12.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" + resolved "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz" integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== graceful-fs@^4.1.10: version "4.1.11" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658" + resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz" integrity sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg= "graceful-readlink@>= 1.0.0": version "1.0.1" - resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725" + resolved "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz" integrity sha1-TK+tdrxi8C+gObL5Tpo906ORpyU= grunt-cli@~1.4.3: version "1.4.3" - resolved "https://registry.yarnpkg.com/grunt-cli/-/grunt-cli-1.4.3.tgz#22c9f1a3d2780bf9b0d206e832e40f8f499175ff" + resolved "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.4.3.tgz" integrity sha512-9Dtx/AhVeB4LYzsViCjUQkd0Kw0McN2gYpdmGYKtE2a5Yt7v1Q+HYZVWhqXc/kGnxlMtqKDxSwotiGeFmkrCoQ== dependencies: grunt-known-options "~2.0.0" @@ -2123,7 +2190,7 @@ grunt-cli@~1.4.3: grunt-contrib-clean@2.0.1: version "2.0.1" - resolved "https://registry.yarnpkg.com/grunt-contrib-clean/-/grunt-contrib-clean-2.0.1.tgz#062e8019d31bfca35af8929a2ee1063c6c46dd2d" + resolved "https://registry.npmjs.org/grunt-contrib-clean/-/grunt-contrib-clean-2.0.1.tgz" integrity sha512-uRvnXfhiZt8akb/ZRDHJpQQtkkVkqc/opWO4Po/9ehC2hPxgptB9S6JHDC/Nxswo4CJSM0iFPT/Iym3cEMWzKA== dependencies: async "^3.2.3" @@ -2131,7 +2198,7 @@ grunt-contrib-clean@2.0.1: grunt-contrib-copy@1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/grunt-contrib-copy/-/grunt-contrib-copy-1.0.0.tgz#7060c6581e904b8ab0d00f076e0a8f6e3e7c3573" + resolved "https://registry.npmjs.org/grunt-contrib-copy/-/grunt-contrib-copy-1.0.0.tgz" integrity sha1-cGDGWB6QS4qw0A8HbgqPbj58NXM= dependencies: chalk "^1.1.1" @@ -2139,7 +2206,7 @@ grunt-contrib-copy@1.0.0: grunt-contrib-jshint@3.2.0: version "3.2.0" - resolved "https://registry.yarnpkg.com/grunt-contrib-jshint/-/grunt-contrib-jshint-3.2.0.tgz#d97c125ce6dafef1b0cc766cd87201ae0fb7b408" + resolved "https://registry.npmjs.org/grunt-contrib-jshint/-/grunt-contrib-jshint-3.2.0.tgz" integrity sha512-pcXWCSZWfoMSvcV4BwH21TUtLtcX0Ms8IGuOPIcLeXK3fud9KclY7iqMKY94jFx8TxZzh028YYtpR+io8DiEaQ== dependencies: chalk "~4.1.2" @@ -2148,7 +2215,7 @@ grunt-contrib-jshint@3.2.0: grunt-contrib-uglify@5.2.2: version "5.2.2" - resolved "https://registry.yarnpkg.com/grunt-contrib-uglify/-/grunt-contrib-uglify-5.2.2.tgz#447c0b58451a1fca20768371e07e723a870dfe98" + resolved "https://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-5.2.2.tgz" integrity sha512-ITxiWxrjjP+RZu/aJ5GLvdele+sxlznh+6fK9Qckio5ma8f7Iv8woZjRkGfafvpuygxNefOJNc+hfjjBayRn2Q== dependencies: chalk "^4.1.2" @@ -2158,12 +2225,12 @@ grunt-contrib-uglify@5.2.2: grunt-known-options@~2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/grunt-known-options/-/grunt-known-options-2.0.0.tgz#cac641e897f9a0a680b8c9839803d35f3325103c" + resolved "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-2.0.0.tgz" integrity sha512-GD7cTz0I4SAede1/+pAbmJRG44zFLPipVtdL9o3vqx9IEyb7b4/Y3s7r6ofI3CchR5GvYJ+8buCSioDv5dQLiA== grunt-legacy-log-utils@~2.1.0: version "2.1.0" - resolved "https://registry.yarnpkg.com/grunt-legacy-log-utils/-/grunt-legacy-log-utils-2.1.0.tgz#49a8c7dc74051476dcc116c32faf9db8646856ef" + resolved "https://registry.npmjs.org/grunt-legacy-log-utils/-/grunt-legacy-log-utils-2.1.0.tgz" integrity sha512-lwquaPXJtKQk0rUM1IQAop5noEpwFqOXasVoedLeNzaibf/OPWjKYvvdqnEHNmU+0T0CaReAXIbGo747ZD+Aaw== dependencies: chalk "~4.1.0" @@ -2171,7 +2238,7 @@ grunt-legacy-log-utils@~2.1.0: grunt-legacy-log@~3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/grunt-legacy-log/-/grunt-legacy-log-3.0.0.tgz#1c6eaf92371ea415af31ea84ce50d434ef6d39c4" + resolved "https://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-3.0.0.tgz" integrity sha512-GHZQzZmhyq0u3hr7aHW4qUH0xDzwp2YXldLPZTCjlOeGscAOWWPftZG3XioW8MasGp+OBRIu39LFx14SLjXRcA== dependencies: colors "~1.1.2" @@ -2181,7 +2248,7 @@ grunt-legacy-log@~3.0.0: grunt-legacy-util@~2.0.1: version "2.0.1" - resolved "https://registry.yarnpkg.com/grunt-legacy-util/-/grunt-legacy-util-2.0.1.tgz#0f929d13a2faf9988c9917c82bff609e2d9ba255" + resolved "https://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-2.0.1.tgz" integrity sha512-2bQiD4fzXqX8rhNdXkAywCadeqiPiay0oQny77wA2F3WF4grPJXCvAcyoWUJV+po/b15glGkxuSiQCK299UC2w== dependencies: async "~3.2.0" @@ -2194,7 +2261,7 @@ grunt-legacy-util@~2.0.1: grunt-shell@3.0.1: version "3.0.1" - resolved "https://registry.yarnpkg.com/grunt-shell/-/grunt-shell-3.0.1.tgz#24e783901543c7269980d534902bedfb94e7ec9f" + resolved "https://registry.npmjs.org/grunt-shell/-/grunt-shell-3.0.1.tgz" integrity sha512-C8eR4frw/NmIFIwSvzSLS4wOQBUzC+z6QhrKPzwt/tlaIqlzH35i/O2MggVOBj2Sh1tbaAqpASWxGiGsi4JMIQ== dependencies: chalk "^2.4.1" @@ -2203,7 +2270,7 @@ grunt-shell@3.0.1: grunt@1.6.1: version "1.6.1" - resolved "https://registry.yarnpkg.com/grunt/-/grunt-1.6.1.tgz#0b4dd1524f26676dcf45d8f636b8d9061a8ede16" + resolved "https://registry.npmjs.org/grunt/-/grunt-1.6.1.tgz" integrity sha512-/ABUy3gYWu5iBmrUSRBP97JLpQUm0GgVveDCp6t3yRNIoltIYw7rEj3g5y1o2PGPR2vfTRGa7WC/LZHLTXnEzA== dependencies: dateformat "~4.6.2" @@ -2222,7 +2289,7 @@ grunt@1.6.1: gzip-size@^5.1.1: version "5.1.1" - resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-5.1.1.tgz#cb9bee692f87c0612b232840a873904e4c135274" + resolved "https://registry.npmjs.org/gzip-size/-/gzip-size-5.1.1.tgz" integrity sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA== dependencies: duplexer "^0.1.1" @@ -2230,7 +2297,7 @@ gzip-size@^5.1.1: handlebars@4.7.8: version "4.7.8" - resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.8.tgz#41c42c18b1be2365439188c77c6afae71c0cd9e9" + resolved "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz" integrity sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ== dependencies: minimist "^1.2.5" @@ -2242,60 +2309,60 @@ handlebars@4.7.8: has-ansi@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" + resolved "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz" integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE= dependencies: ansi-regex "^2.0.0" has-flag@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" + resolved "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz" integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= has-flag@^4.0.0: version "4.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" + resolved "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz" integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== has-symbols@^1.0.1: version "1.0.3" - resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" + resolved "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz" integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== has@^1.0.1: version "1.0.1" - resolved "https://registry.yarnpkg.com/has/-/has-1.0.1.tgz#8461733f538b0837c9361e39a9ab9e9704dc2f28" + resolved "https://registry.npmjs.org/has/-/has-1.0.1.tgz" integrity sha1-hGFzP1OLCDfJNh45qauelwTcLyg= dependencies: function-bind "^1.0.2" has@^1.0.3: version "1.0.3" - resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" + resolved "https://registry.npmjs.org/has/-/has-1.0.3.tgz" integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== dependencies: function-bind "^1.1.1" homedir-polyfill@^1.0.1: version "1.0.3" - resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8" + resolved "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz" integrity sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA== dependencies: parse-passwd "^1.0.0" hooker@^0.2.3, hooker@~0.2.3: version "0.2.3" - resolved "https://registry.yarnpkg.com/hooker/-/hooker-0.2.3.tgz#b834f723cc4a242aa65963459df6d984c5d3d959" + resolved "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz" integrity sha1-uDT3I8xKJCqmWWNFnfbZhMXT2Vk= html-escaper@^2.0.0: version "2.0.2" - resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453" + resolved "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz" integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg== htmlparser2@3.8.x: version "3.8.3" - resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.8.3.tgz#996c28b191516a8be86501a7d79757e5c70c1068" + resolved "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz" integrity sha1-mWwosZFRaovoZQGn15dX5ccMEGg= dependencies: domelementtype "1" @@ -2306,7 +2373,7 @@ htmlparser2@3.8.x: http-errors@1.7.2: version "1.7.2" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f" + resolved "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz" integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg== dependencies: depd "~1.1.2" @@ -2317,7 +2384,7 @@ http-errors@1.7.2: http-errors@2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3" + resolved "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz" integrity sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ== dependencies: depd "2.0.0" @@ -2328,7 +2395,7 @@ http-errors@2.0.0: http-errors@~1.7.2: version "1.7.3" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06" + resolved "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz" integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw== dependencies: depd "~1.1.2" @@ -2339,7 +2406,7 @@ http-errors@~1.7.2: http-errors@~1.8.0: version "1.8.1" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.1.tgz#7c3f28577cbc8a207388455dbd62295ed07bd68c" + resolved "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz" integrity sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g== dependencies: depd "~1.1.2" @@ -2350,36 +2417,36 @@ http-errors@~1.8.0: http-parser-js@>=0.4.0: version "0.4.9" - resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.9.tgz#ea1a04fb64adff0242e9974f297dd4c3cad271e1" + resolved "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.9.tgz" integrity sha1-6hoE+2St/wJC6ZdPKX3Uw8rSceE= iconv-lite@0.4.24: version "0.4.24" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" + resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz" integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== dependencies: safer-buffer ">= 2.1.2 < 3" iconv-lite@0.6, iconv-lite@~0.6.3: version "0.6.3" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501" + resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz" integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== dependencies: safer-buffer ">= 2.1.2 < 3.0.0" ieee754@^1.1.4: version "1.1.8" - resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4" + resolved "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz" integrity sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q= immediate@~3.0.5: version "3.0.6" - resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b" + resolved "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz" integrity sha1-nbHb0Pr43m++D13V5Wu2BigN5ps= inflight@^1.0.4: version "1.0.6" - resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" + resolved "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz" integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= dependencies: once "^1.3.0" @@ -2387,22 +2454,22 @@ inflight@^1.0.4: inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3: version "2.0.3" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" + resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz" integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= inherits@2.0.4, inherits@^2.0.4: version "2.0.4" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== ini@^1.3.4: version "1.3.5" - resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" + resolved "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz" integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw== intern@4.10.1: version "4.10.1" - resolved "https://registry.yarnpkg.com/intern/-/intern-4.10.1.tgz#4dfba51d70d8c4eaf795f1006b5aeb4d6bef1747" + resolved "https://registry.npmjs.org/intern/-/intern-4.10.1.tgz" integrity sha512-GyUmdpdKGoEu1hRMNYeldPF11lFZlC1Pbq28ImzEY+7OHRDinMU9c8jwGxY7eAaUe15oy0Y7cocdjC/mzUuOng== dependencies: "@theintern/common" "~0.3.0" @@ -2446,22 +2513,22 @@ intern@4.10.1: "internmap@1 - 2": version "2.0.3" - resolved "https://registry.yarnpkg.com/internmap/-/internmap-2.0.3.tgz#6685f23755e43c524e251d29cbc97248e3061009" + resolved "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz" integrity sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg== interpret@~1.1.0: version "1.1.0" - resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614" + resolved "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz" integrity sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ= ipaddr.js@1.9.1: version "1.9.1" - resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" + resolved "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz" integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g== is-absolute@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576" + resolved "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz" integrity sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA== dependencies: is-relative "^1.0.0" @@ -2469,26 +2536,26 @@ is-absolute@^1.0.0: is-arrayish@^0.3.1: version "0.3.2" - resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03" + resolved "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz" integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ== is-core-module@^2.2.0: version "2.2.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a" + resolved "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz" integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ== dependencies: has "^1.0.3" is-core-module@^2.8.1: version "2.9.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.9.0.tgz#e1c34429cd51c6dd9e09e0799e396e27b19a9c69" + resolved "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz" integrity sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A== dependencies: has "^1.0.3" is-expression@^4.0.0: version "4.0.0" - resolved "https://registry.yarnpkg.com/is-expression/-/is-expression-4.0.0.tgz#c33155962abf21d0afd2552514d67d2ec16fd2ab" + resolved "https://registry.npmjs.org/is-expression/-/is-expression-4.0.0.tgz" integrity sha512-zMIXX63sxzG3XrkHkrAPvm/OVZVSCPNkwMHU8oTX7/U3AL78I0QXCEICXUM13BIa8TYGZ68PiTKfQz3yaTNr4A== dependencies: acorn "^7.1.1" @@ -2496,131 +2563,131 @@ is-expression@^4.0.0: is-extglob@^2.1.1: version "2.1.1" - resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" + resolved "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz" integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= is-fullwidth-code-point@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" + resolved "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz" integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== is-glob@^4.0.0: version "4.0.1" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc" + resolved "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz" integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg== dependencies: is-extglob "^2.1.1" is-glob@^4.0.3: version "4.0.3" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" + resolved "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz" integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg== dependencies: is-extglob "^2.1.1" is-natural-number@^4.0.1: version "4.0.1" - resolved "https://registry.yarnpkg.com/is-natural-number/-/is-natural-number-4.0.1.tgz#ab9d76e1db4ced51e35de0c72ebecf09f734cde8" + resolved "https://registry.npmjs.org/is-natural-number/-/is-natural-number-4.0.1.tgz" integrity sha1-q5124dtM7VHjXeDHLr7PCfc0zeg= is-number@^7.0.0: version "7.0.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" + resolved "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz" integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== is-plain-object@^2.0.3, is-plain-object@^2.0.4: version "2.0.4" - resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" + resolved "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz" integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og== dependencies: isobject "^3.0.1" is-promise@^2.0.0: version "2.1.0" - resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa" + resolved "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz" integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o= is-regex@^1.0.3: version "1.0.4" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491" + resolved "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz" integrity sha1-VRdIm1RwkbCTDglWVM7SXul+lJE= dependencies: has "^1.0.1" is-relative@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d" + resolved "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz" integrity sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA== dependencies: is-unc-path "^1.0.0" is-stream@^1.1.0: version "1.1.0" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" + resolved "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz" integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ= is-stream@^2.0.0: version "2.0.1" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" + resolved "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz" integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg== is-typedarray@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" - integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= + integrity sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA== is-unc-path@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz#d731e8898ed090a12c352ad2eaed5095ad322c9d" + resolved "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz" integrity sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ== dependencies: unc-path-regex "^0.1.2" is-windows@^1.0.1: version "1.0.2" - resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" + resolved "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz" integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA== isarray@0.0.1: version "0.0.1" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" + resolved "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8= isarray@^1.0.0, isarray@~1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" + resolved "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz" integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= isexe@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" + resolved "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz" integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= isobject@^3.0.0, isobject@^3.0.1: version "3.0.1" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" + resolved "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz" integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= istanbul-lib-coverage@^3.0.0: version "3.2.0" - resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz#189e7909d0a39fa5a3dfad5b03f71947770191d3" + resolved "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz" integrity sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw== istanbul-lib-coverage@~3.0.0: version "3.0.2" - resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.2.tgz#36786d4d82aad2ea5911007e255e2da6b5f80d86" + resolved "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.2.tgz" integrity sha512-o5+eTUYzCJ11/+JhW5/FUCdfsdoYVdQ/8I/OveE2XsjehYn5DdeSnNQAbjYaO8gQ6hvGTN6GM6ddQqpTVG5j8g== istanbul-lib-hook@~3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-3.0.0.tgz#8f84c9434888cc6b1d0a9d7092a76d239ebf0cc6" + resolved "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-3.0.0.tgz" integrity sha512-Pt/uge1Q9s+5VAZ+pCo16TYMWPBIl+oaNIjgLQxcX0itS6ueeaA+pEfThZpH8WxhFgCiEb8sAJY6MdUKgiIWaQ== dependencies: append-transform "^2.0.0" istanbul-lib-instrument@~4.0.3: version "4.0.3" - resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz#873c6fff897450118222774696a3f28902d77c1d" + resolved "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz" integrity sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ== dependencies: "@babel/core" "^7.7.5" @@ -2630,7 +2697,7 @@ istanbul-lib-instrument@~4.0.3: istanbul-lib-report@^3.0.0, istanbul-lib-report@~3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#7518fe52ea44de372f460a76b5ecda9ffb73d8a6" + resolved "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz" integrity sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw== dependencies: istanbul-lib-coverage "^3.0.0" @@ -2639,7 +2706,7 @@ istanbul-lib-report@^3.0.0, istanbul-lib-report@~3.0.0: istanbul-lib-source-maps@~4.0.0: version "4.0.1" - resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz#895f3a709fcfba34c6de5a42939022f3e4358551" + resolved "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz" integrity sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw== dependencies: debug "^4.1.1" @@ -2648,7 +2715,7 @@ istanbul-lib-source-maps@~4.0.0: istanbul-reports@~3.0.2: version "3.0.5" - resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.0.5.tgz#a2580107e71279ea6d661ddede929ffc6d693384" + resolved "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.5.tgz" integrity sha512-5+19PlhnGabNWB7kOFnuxT8H3T/iIyQzIbQMxXsURmmvKg86P2sbkrGOT77VnHw0Qr0gc2XzRaRfMZYYbSQCJQ== dependencies: html-escaper "^2.0.0" @@ -2656,7 +2723,7 @@ istanbul-reports@~3.0.2: jackspeak@^3.1.2: version "3.4.0" - resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-3.4.0.tgz#a75763ff36ad778ede6a156d8ee8b124de445b4a" + resolved "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.0.tgz" integrity sha512-JVYhQnN59LVPFCEcVa2C3CrEKYacvjRfqIQl+h8oi91aLYQVWRYbxjPcv1bUiUy/kLmQaANrYfNMCO3kuEDHfw== dependencies: "@isaacs/cliui" "^8.0.2" @@ -2665,17 +2732,17 @@ jackspeak@^3.1.2: js-stringify@^1.0.2: version "1.0.2" - resolved "https://registry.yarnpkg.com/js-stringify/-/js-stringify-1.0.2.tgz#1736fddfd9724f28a3682adc6230ae7e4e9679db" + resolved "https://registry.npmjs.org/js-stringify/-/js-stringify-1.0.2.tgz" integrity sha1-Fzb939lyTyijaCrcYjCufk6Weds= js-tokens@^4.0.0: version "4.0.0" - resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" + resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz" integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== js-yaml@^3.12.1, js-yaml@~3.14.0: version "3.14.1" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" + resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz" integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== dependencies: argparse "^1.0.7" @@ -2683,12 +2750,12 @@ js-yaml@^3.12.1, js-yaml@~3.14.0: jsesc@^2.5.1: version "2.5.2" - resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" + resolved "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz" integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA== jshint@~2.13.4: version "2.13.4" - resolved "https://registry.yarnpkg.com/jshint/-/jshint-2.13.4.tgz#cee025a57c3f393d5455532d9ec7ccb018f890db" + resolved "https://registry.npmjs.org/jshint/-/jshint-2.13.4.tgz" integrity sha512-HO3bosL84b2qWqI0q+kpT/OpRJwo0R4ivgmxaO848+bo10rc50SkPnrtwSFXttW0ym4np8jbJvLwk5NziB7jIw== dependencies: cli "~1.0.0" @@ -2701,7 +2768,7 @@ jshint@~2.13.4: json-schema-ref-parser@6.1.0: version "6.1.0" - resolved "https://registry.yarnpkg.com/json-schema-ref-parser/-/json-schema-ref-parser-6.1.0.tgz#30af34aeab5bee0431da805dac0eb21b574bf63d" + resolved "https://registry.npmjs.org/json-schema-ref-parser/-/json-schema-ref-parser-6.1.0.tgz" integrity sha512-pXe9H1m6IgIpXmE5JSb8epilNTGsmTb2iPohAXpOdhqGFbQjNeHHsZxU+C8w6T81GZxSPFLeUoqDJmzxx5IGuw== dependencies: call-me-maybe "^1.0.1" @@ -2710,12 +2777,12 @@ json-schema-ref-parser@6.1.0: json5@^2.2.1: version "2.2.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c" + resolved "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz" integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA== jstransformer@1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/jstransformer/-/jstransformer-1.0.0.tgz#ed8bf0921e2f3f1ed4d5c1a44f68709ed24722c3" + resolved "https://registry.npmjs.org/jstransformer/-/jstransformer-1.0.0.tgz" integrity sha1-7Yvwkh4vPx7U1cGkT2hwntJHIsM= dependencies: is-promise "^2.0.0" @@ -2723,7 +2790,7 @@ jstransformer@1.0.0: jszip@~3.7.1: version "3.7.1" - resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.7.1.tgz#bd63401221c15625a1228c556ca8a68da6fda3d9" + resolved "https://registry.npmjs.org/jszip/-/jszip-3.7.1.tgz" integrity sha512-ghL0tz1XG9ZEmRMcEN2vt7xabrDdqHHeykgARpmZ0BiIctWxM47Vt63ZO2dnp4QYt/xJVLLy5Zv1l/xRdh2byg== dependencies: lie "~3.3.0" @@ -2733,26 +2800,22 @@ jszip@~3.7.1: kind-of@^6.0.2: version "6.0.3" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" + resolved "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz" integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== kuler@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/kuler/-/kuler-2.0.0.tgz#e2c570a3800388fb44407e851531c1d670b061b3" + resolved "https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz" integrity sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A== -"leaflet-awesome-markers@https://github.com/lennardv2/Leaflet.awesome-markers.git#2.0/develop": - version "0.0.0" - resolved "https://github.com/lennardv2/Leaflet.awesome-markers.git#b17993e25db48db7bedd9f613b89d0ac0d733e32" - leaflet-draw@1.0.4: version "1.0.4" - resolved "https://registry.yarnpkg.com/leaflet-draw/-/leaflet-draw-1.0.4.tgz#45be92f378ed253e7202fdeda1fcc71885198d46" + resolved "https://registry.npmjs.org/leaflet-draw/-/leaflet-draw-1.0.4.tgz" integrity sha512-rsQ6saQO5ST5Aj6XRFylr5zvarWgzWnrg46zQ1MEOEIHsppdC/8hnN8qMoFvACsPvTioAuysya/TVtog15tyAQ== leaflet-measure@3.1.0: version "3.1.0" - resolved "https://registry.yarnpkg.com/leaflet-measure/-/leaflet-measure-3.1.0.tgz#97777c206a1f8e1ee5a260ffb4128db18fce9cd0" + resolved "https://registry.npmjs.org/leaflet-measure/-/leaflet-measure-3.1.0.tgz" integrity sha512-ln5c9UNaWDEd24tIzDt9hwnpb8OaCPBfSWNBg2H8rb9SA3cbXW9+NqohA6/8TdsNDGJZr36woXMrqRq07Pcl3w== dependencies: "@turf/area" "^5.1.5" @@ -2761,45 +2824,51 @@ leaflet-measure@3.1.0: leaflet-minimap@3.6.1: version "3.6.1" - resolved "https://registry.yarnpkg.com/leaflet-minimap/-/leaflet-minimap-3.6.1.tgz#2a43ff3b3d947a45a0acf4bdefc96505b673a6c6" + resolved "https://registry.npmjs.org/leaflet-minimap/-/leaflet-minimap-3.6.1.tgz" integrity sha1-KkP/Oz2UekWgrPS978llBbZzpsY= -"leaflet-navbar@https://github.com/davidchouse/Leaflet.NavBar.git#v1.0.1": - version "0.0.0" - resolved "https://github.com/davidchouse/Leaflet.NavBar.git#c913f6ce99a3b204485194265c088edd03ad37a4" +leaflet-nav@1.0.3: + version "1.0.3" + resolved "https://registry.npmjs.org/leaflet-nav/-/leaflet-nav-1.0.3.tgz" + integrity sha512-0PmK4Khb1MY1yZQk4wal0+pkvWWAGCUK8vXu+8FjttF3qq+D3Sktd8qus6DMvqVvte9pnqKHvWE2JqdhG6by7A== + +leaflet.awesome-markers@2.0.5: + version "2.0.5" + resolved "https://registry.npmjs.org/leaflet.awesome-markers/-/leaflet.awesome-markers-2.0.5.tgz" + integrity sha512-Ne/xDjkGyaujwNVVkv2tyXQUV0ZW7gZ0Mo0FuQY4jp2qWrvXi0hwDBvmZyF/8YOvybyMabTMM/mFWCTd1jZIQA== leaflet.coordinates@0.1.5: version "0.1.5" - resolved "https://registry.yarnpkg.com/leaflet.coordinates/-/leaflet.coordinates-0.1.5.tgz#a0717b643b08398d1f3c2ffa0ec62813d4cf87aa" + resolved "https://registry.npmjs.org/leaflet.coordinates/-/leaflet.coordinates-0.1.5.tgz" integrity sha1-oHF7ZDsIOY0fPC/6DsYoE9TPh6o= leaflet.nontiledlayer@1.0.9: version "1.0.9" - resolved "https://registry.yarnpkg.com/leaflet.nontiledlayer/-/leaflet.nontiledlayer-1.0.9.tgz#ed50e894579285f088a9939b131f9806b03ee419" + resolved "https://registry.npmjs.org/leaflet.nontiledlayer/-/leaflet.nontiledlayer-1.0.9.tgz" integrity sha512-w4yeTLNFhTToAmGQ7P9cAiGFVwVLJzuO3A/tFNMWRVYl1BLvrvlqY7hKE33pmmeoQ6m5ZsWd0qbdYq/d+zBuUQ== dependencies: leaflet "^1.6.0" leaflet@1.9.4: version "1.9.4" - resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.9.4.tgz#23fae724e282fa25745aff82ca4d394748db7d8d" + resolved "https://registry.npmjs.org/leaflet/-/leaflet-1.9.4.tgz" integrity sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA== leaflet@^1.6.0: version "1.7.1" - resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.7.1.tgz#10d684916edfe1bf41d688a3b97127c0322a2a19" + resolved "https://registry.npmjs.org/leaflet/-/leaflet-1.7.1.tgz" integrity sha512-/xwPEBidtg69Q3HlqPdU3DnrXQOvQU/CCHA1tcDQVzOwm91YMYaILjNp7L4Eaw5Z4sOYdbBz6koWyibppd8Zqw== lie@~3.3.0: version "3.3.0" - resolved "https://registry.yarnpkg.com/lie/-/lie-3.3.0.tgz#dcf82dee545f46074daf200c7c1c5a08e0f40f6a" + resolved "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz" integrity sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ== dependencies: immediate "~3.0.5" liftup@~3.0.1: version "3.0.1" - resolved "https://registry.yarnpkg.com/liftup/-/liftup-3.0.1.tgz#1cb81aff0f368464ed3a5f1a7286372d6b1a60ce" + resolved "https://registry.npmjs.org/liftup/-/liftup-3.0.1.tgz" integrity sha512-yRHaiQDizWSzoXk3APcA71eOI/UuhEkNN9DiW2Tt44mhYzX4joFoCZlxsSOF7RyeLlfqzFLQI1ngFq3ggMPhOw== dependencies: extend "^3.0.2" @@ -2813,7 +2882,7 @@ liftup@~3.0.1: load-grunt-tasks@5.1.0: version "5.1.0" - resolved "https://registry.yarnpkg.com/load-grunt-tasks/-/load-grunt-tasks-5.1.0.tgz#14894c27a7e34ebbef9937c39cc35c573cd04c1c" + resolved "https://registry.npmjs.org/load-grunt-tasks/-/load-grunt-tasks-5.1.0.tgz" integrity sha512-oNj0Jlka1TsfDe+9He0kcA1cRln+TMoTsEByW7ij6kyktNLxBKJtslCFEvFrLC2Dj0S19IWJh3fOCIjLby2Xrg== dependencies: arrify "^2.0.1" @@ -2823,7 +2892,7 @@ load-grunt-tasks@5.1.0: locate-path@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e" + resolved "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz" integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A== dependencies: p-locate "^3.0.0" @@ -2831,22 +2900,22 @@ locate-path@^3.0.0: lodash@^4.17.19, lodash@~4.17.15: version "4.17.20" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52" + resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz" integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA== lodash@^4.17.4: version "4.17.4" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae" + resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz" integrity sha1-eCA6TRwyiuHYbcpkYONptX9AVa4= lodash@^4.17.5, lodash@~4.17.19, lodash@~4.17.21: version "4.17.21" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" + resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== logform@^2.3.2, logform@^2.4.0: version "2.4.0" - resolved "https://registry.yarnpkg.com/logform/-/logform-2.4.0.tgz#131651715a17d50f09c2a2c1a524ff1a4164bcfe" + resolved "https://registry.npmjs.org/logform/-/logform-2.4.0.tgz" integrity sha512-CPSJw4ftjf517EhXZGGvTHHkYobo7ZCc0kvwUoOYcjfR2UVrI66RHj8MCrfAdEitdmFqbu2BYdYs8FHHZSb6iw== dependencies: "@colors/colors" "1.5.0" @@ -2857,50 +2926,50 @@ logform@^2.3.2, logform@^2.4.0: loupe@^2.3.1: version "2.3.4" - resolved "https://registry.yarnpkg.com/loupe/-/loupe-2.3.4.tgz#7e0b9bffc76f148f9be769cb1321d3dcf3cb25f3" + resolved "https://registry.npmjs.org/loupe/-/loupe-2.3.4.tgz" integrity sha512-OvKfgCC2Ndby6aSTREl5aCCPTNIzlDfQZvZxNUrBrihDhL3xcrYegTblhmEiCrg2kKQz4XsFIaemE5BF4ybSaQ== dependencies: get-func-name "^2.0.0" lru-cache@^10.2.0: version "10.2.2" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.2.2.tgz#48206bc114c1252940c41b25b41af5b545aca878" + resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.2.tgz" integrity sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ== make-dir@^1.0.0: version "1.1.0" - resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.1.0.tgz#19b4369fe48c116f53c2af95ad102c0e39e85d51" + resolved "https://registry.npmjs.org/make-dir/-/make-dir-1.1.0.tgz" integrity sha512-0Pkui4wLJ7rxvmfUvs87skoEaxmu0hCUApF8nonzpl7q//FWp9zu8W61Scz4sd/kUiqDxvUhtoam2efDyiBzcA== dependencies: pify "^3.0.0" make-dir@^3.0.0: version "3.1.0" - resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" + resolved "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz" integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== dependencies: semver "^6.0.0" make-error@^1.1.1: version "1.3.6" - resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2" + resolved "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz" integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw== make-iterator@^1.0.0: version "1.0.1" - resolved "https://registry.yarnpkg.com/make-iterator/-/make-iterator-1.0.1.tgz#29b33f312aa8f547c4a5e490f56afcec99133ad6" + resolved "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz" integrity sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw== dependencies: kind-of "^6.0.2" map-cache@^0.2.0: version "0.2.2" - resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" + resolved "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz" integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8= maxmin@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/maxmin/-/maxmin-3.0.0.tgz#3ee9acc8a2b9f2b5416e94f5705319df8a9c71e6" + resolved "https://registry.npmjs.org/maxmin/-/maxmin-3.0.0.tgz" integrity sha512-wcahMInmGtg/7c6a75fr21Ch/Ks1Tb+Jtoan5Ft4bAI0ZvJqyOw8kkM7e7p8hDSzY805vmxwHT50KcjGwKyJ0g== dependencies: chalk "^4.1.0" @@ -2910,32 +2979,32 @@ maxmin@^3.0.0: media-typer@0.3.0: version "0.3.0" - resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" + resolved "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz" integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= mediator-js@0.11.0: version "0.11.0" - resolved "https://registry.yarnpkg.com/mediator-js/-/mediator-js-0.11.0.tgz#254a29c8ab1e1889122e4157518ec19ded48e331" + resolved "https://registry.npmjs.org/mediator-js/-/mediator-js-0.11.0.tgz" integrity sha512-ehVcM3bSkr79E5yXUIyOPxw9xqhmvtTMkws5+lT8vl52awVkL/8rfDd8njmVxNldGmqKvFWSOvfppxG2AHM0TQ== merge-descriptors@1.0.1: version "1.0.1" - resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" + resolved "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz" integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E= methods@~1.1.2: version "1.1.2" - resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" + resolved "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz" integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= mgrs@1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/mgrs/-/mgrs-1.0.0.tgz#fb91588e78c90025672395cb40b25f7cd6ad1829" + resolved "https://registry.npmjs.org/mgrs/-/mgrs-1.0.0.tgz" integrity sha1-+5FYjnjJACVnI5XLQLJffNatGCk= micromatch@^4.0.2, micromatch@^4.0.4: version "4.0.5" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" + resolved "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz" integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== dependencies: braces "^3.0.2" @@ -2943,70 +3012,70 @@ micromatch@^4.0.2, micromatch@^4.0.4: mime-db@1.45.0: version "1.45.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.45.0.tgz#cceeda21ccd7c3a745eba2decd55d4b73e7879ea" + resolved "https://registry.npmjs.org/mime-db/-/mime-db-1.45.0.tgz" integrity sha512-CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w== mime-db@1.52.0: version "1.52.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" + resolved "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz" integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== mime-types@~2.1.24: version "2.1.28" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.28.tgz#1160c4757eab2c5363888e005273ecf79d2a0ecd" + resolved "https://registry.npmjs.org/mime-types/-/mime-types-2.1.28.tgz" integrity sha512-0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ== dependencies: mime-db "1.45.0" mime-types@~2.1.31, mime-types@~2.1.34: version "2.1.35" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" + resolved "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz" integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== dependencies: mime-db "1.52.0" mime@1.6.0: version "1.6.0" - resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" + resolved "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz" integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== minimatch@^3.0.4, minimatch@~3.0.2, minimatch@~3.0.4: version "3.0.4" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" + resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz" integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== dependencies: brace-expansion "^1.1.7" minimatch@^9.0.4: version "9.0.4" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.4.tgz#8e49c731d1749cbec05050ee5145147b32496a51" + resolved "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz" integrity sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw== dependencies: brace-expansion "^2.0.1" minimist@^1.2.5: version "1.2.6" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" + resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz" integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== "minipass@^5.0.0 || ^6.0.2 || ^7.0.0": version "7.0.4" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.4.tgz#dbce03740f50a4786ba994c1fb908844d27b038c" + resolved "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz" integrity sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ== minipass@^7.1.2: version "7.1.2" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.2.tgz#93a9626ce5e5e66bd4db86849e7515e92340a707" + resolved "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz" integrity sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw== moment@2.30.1: version "2.30.1" - resolved "https://registry.yarnpkg.com/moment/-/moment-2.30.1.tgz#f8c91c07b7a786e30c59926df530b4eac96974ae" + resolved "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz" integrity sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how== morgan@1.10.0: version "1.10.0" - resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.10.0.tgz#091778abc1fc47cd3509824653dae1faab6b17d7" + resolved "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz" integrity sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ== dependencies: basic-auth "~2.0.1" @@ -3017,27 +3086,27 @@ morgan@1.10.0: ms@2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" + resolved "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz" integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= ms@2.1.1: version "2.1.1" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" + resolved "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz" integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg== ms@2.1.2: version "2.1.2" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" + resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== ms@2.1.3, ms@^2.1.1: version "2.1.3" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" + resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== multimatch@^4.0.0: version "4.0.0" - resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-4.0.0.tgz#8c3c0f6e3e8449ada0af3dd29efb491a375191b3" + resolved "https://registry.npmjs.org/multimatch/-/multimatch-4.0.0.tgz" integrity sha512-lDmx79y1z6i7RNx0ZGCPq1bzJ6ZoDDKbvh7jxr9SJcWLkShMzXrHbYVpTdnhNM5MXpDUxCQ4DgqVttVXlBgiBQ== dependencies: "@types/minimatch" "^3.0.3" @@ -3046,46 +3115,51 @@ multimatch@^4.0.0: arrify "^2.0.1" minimatch "^3.0.4" -nan@^2.3.3: - version "2.8.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.8.0.tgz#ed715f3fe9de02b57a5e6252d90a96675e1f085a" - integrity sha1-7XFfP+neArV6XmJS2QqWZ14fCFo= - negotiator@0.6.2: version "0.6.2" - resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" + resolved "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz" integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== negotiator@0.6.3: version "0.6.3" - resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" + resolved "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz" integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== neo-async@^2.6.2: version "2.6.2" - resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" + resolved "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz" integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== +next-tick@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.1.0.tgz#1836ee30ad56d67ef281b22bd199f709449b35eb" + integrity sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ== + nib@1.2.0: version "1.2.0" - resolved "https://registry.yarnpkg.com/nib/-/nib-1.2.0.tgz#cf650a975307edaa8683470430f82ba132bf9f7b" + resolved "https://registry.npmjs.org/nib/-/nib-1.2.0.tgz" integrity sha512-7HgrnMl/3yOmWykueO8/D0q+0iWwe7Z+CK2Eaq/xQV8w1hK80WN1oReRQkfkrztbAAnp/nTHkUSl5EcVkor6JQ== +node-gyp-build@^4.3.0: + version "4.8.1" + resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.8.1.tgz#976d3ad905e71b76086f4f0b0d3637fe79b6cda5" + integrity sha512-OSs33Z9yWr148JZcbZd5WiAXhh/n9z8TxQcdMhIOlpN9AhWpLfvVFO73+m77bBABQMaY9XSvIa+qk0jlI7Gcaw== + node-releases@^2.0.2: version "2.0.3" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.3.tgz#225ee7488e4a5e636da8da52854844f9d716ca96" + resolved "https://registry.npmjs.org/node-releases/-/node-releases-2.0.3.tgz" integrity sha512-maHFz6OLqYxz+VQyCAtA3PTX4UP/53pa05fyDNc9CwjvJ0yEh6+xBwKsgCxMNhS8taUKBFYxfuiaD9U/55iFaw== nopt@~3.0.6: version "3.0.6" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" + resolved "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz" integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k= dependencies: abbrev "1" nopt@~4.0.1: version "4.0.3" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz#a375cad9d02fd921278d954c2254d5aa57e15e48" + resolved "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz" integrity sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg== dependencies: abbrev "1" @@ -3093,24 +3167,24 @@ nopt@~4.0.1: npm-run-path@^2.0.0: version "2.0.2" - resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" + resolved "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz" integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8= dependencies: path-key "^2.0.0" object-assign@^4.0.1, object-assign@^4.1.1: version "4.1.1" - resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + resolved "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz" integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= object-inspect@^1.9.0: version "1.12.0" - resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.0.tgz#6e2c120e868fd1fd18cb4f18c31741d0d6e776f0" + resolved "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz" integrity sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g== object.defaults@^1.1.0: version "1.1.0" - resolved "https://registry.yarnpkg.com/object.defaults/-/object.defaults-1.1.0.tgz#3a7f868334b407dea06da16d88d5cd29e435fecf" + resolved "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz" integrity sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8= dependencies: array-each "^1.0.1" @@ -3120,7 +3194,7 @@ object.defaults@^1.1.0: object.map@^1.0.1: version "1.0.1" - resolved "https://registry.yarnpkg.com/object.map/-/object.map-1.0.1.tgz#cf83e59dc8fcc0ad5f4250e1f78b3b81bd801d37" + resolved "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz" integrity sha1-z4Plncj8wK1fQlDh94s7gb2AHTc= dependencies: for-own "^1.0.0" @@ -3128,69 +3202,69 @@ object.map@^1.0.1: object.pick@^1.2.0: version "1.3.0" - resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747" + resolved "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz" integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c= dependencies: isobject "^3.0.1" on-finished@2.4.1: version "2.4.1" - resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f" + resolved "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz" integrity sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg== dependencies: ee-first "1.1.1" on-finished@~2.3.0: version "2.3.0" - resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" + resolved "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz" integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc= dependencies: ee-first "1.1.1" on-headers@~1.0.1: version "1.0.1" - resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.1.tgz#928f5d0f470d49342651ea6794b0857c100693f7" + resolved "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz" integrity sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c= on-headers@~1.0.2: version "1.0.2" - resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f" + resolved "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz" integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA== once@^1.3.0, once@^1.4.0: version "1.4.0" - resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" + resolved "https://registry.npmjs.org/once/-/once-1.4.0.tgz" integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= dependencies: wrappy "1" one-time@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/one-time/-/one-time-1.0.0.tgz#e06bc174aed214ed58edede573b433bbf827cb45" + resolved "https://registry.npmjs.org/one-time/-/one-time-1.0.0.tgz" integrity sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g== dependencies: fn.name "1.x.x" ono@^4.0.11: version "4.0.11" - resolved "https://registry.yarnpkg.com/ono/-/ono-4.0.11.tgz#c7f4209b3e396e8a44ef43b9cedc7f5d791d221d" + resolved "https://registry.npmjs.org/ono/-/ono-4.0.11.tgz" integrity sha512-jQ31cORBFE6td25deYeD80wxKBMj+zBmHTrVxnc6CKhx8gho6ipmWM5zj/oeoqioZ99yqBls9Z/9Nss7J26G2g== dependencies: format-util "^1.0.3" os-homedir@^1.0.0: version "1.0.2" - resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" + resolved "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz" integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M= os-tmpdir@^1.0.0: version "1.0.2" - resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" + resolved "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz" integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= osenv@^0.1.4: version "0.1.5" - resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" + resolved "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz" integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g== dependencies: os-homedir "^1.0.0" @@ -3198,7 +3272,7 @@ osenv@^0.1.4: outlayer@^2.0.0: version "2.1.1" - resolved "https://registry.yarnpkg.com/outlayer/-/outlayer-2.1.1.tgz#29863b6de10ea5dadfffcadfa0d728907387e9a2" + resolved "https://registry.npmjs.org/outlayer/-/outlayer-2.1.1.tgz" integrity sha1-KYY7beEOpdrf/8rfoNcokHOH6aI= dependencies: ev-emitter "^1.0.0" @@ -3207,26 +3281,26 @@ outlayer@^2.0.0: p-limit@^2.0.0: version "2.3.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" + resolved "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz" integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== dependencies: p-try "^2.0.0" p-locate@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4" + resolved "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz" integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ== dependencies: p-limit "^2.0.0" p-try@^2.0.0: version "2.2.0" - resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" + resolved "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz" integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== packery@2.1.2: version "2.1.2" - resolved "https://registry.yarnpkg.com/packery/-/packery-2.1.2.tgz#92a3cc3303e781f151d93ee34d13325790c4f13f" + resolved "https://registry.npmjs.org/packery/-/packery-2.1.2.tgz" integrity sha512-Coc+8Atz03c0iu1RK0PZIJMKcKrE4i9Z8UBBywqz7Dhy40mMPM5wMQfqO9P2eqFP+lxKjGMTHgRAwjBQc+AQ5w== dependencies: get-size "^2.0.2" @@ -3234,12 +3308,12 @@ packery@2.1.2: pako@~1.0.2: version "1.0.6" - resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258" + resolved "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz" integrity sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg== parse-filepath@^1.0.1: version "1.0.2" - resolved "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.2.tgz#a632127f53aaf3d15876f5872f3ffac763d6c891" + resolved "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz" integrity sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE= dependencies: is-absolute "^1.0.0" @@ -3248,59 +3322,59 @@ parse-filepath@^1.0.1: parse-passwd@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6" + resolved "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz" integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY= parseurl@~1.3.3: version "1.3.3" - resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" + resolved "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz" integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== path-exists@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" + resolved "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz" integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU= path-is-absolute@^1.0.0: version "1.0.1" - resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" + resolved "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz" integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= path-key@^2.0.0: version "2.0.1" - resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" + resolved "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz" integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= path-key@^3.1.0: version "3.1.1" - resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" + resolved "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz" integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== path-parse@^1.0.6: version "1.0.6" - resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c" + resolved "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz" integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw== path-parse@^1.0.7: version "1.0.7" - resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" + resolved "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz" integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== path-root-regex@^0.1.0: version "0.1.2" - resolved "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz#bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d" + resolved "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz" integrity sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0= path-root@^0.1.1: version "0.1.1" - resolved "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz#9a4a6814cac1c0cd73360a95f32083c8ea4745b7" + resolved "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz" integrity sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc= dependencies: path-root-regex "^0.1.0" path-scurry@^1.11.1: version "1.11.1" - resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.11.1.tgz#7960a668888594a0720b12a911d1a742ab9f11d2" + resolved "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz" integrity sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA== dependencies: lru-cache "^10.2.0" @@ -3308,101 +3382,101 @@ path-scurry@^1.11.1: path-to-regexp@0.1.7: version "0.1.7" - resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" + resolved "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz" integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= pathval@^1.1.1: version "1.1.1" - resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.1.tgz#8534e77a77ce7ac5a2512ea21e0fdb8fcf6c3d8d" + resolved "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz" integrity sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ== pdfjs-dist-viewer-min@2.12.313: version "2.12.313" - resolved "https://registry.yarnpkg.com/pdfjs-dist-viewer-min/-/pdfjs-dist-viewer-min-2.12.313.tgz#315deba8ed44442001d3cefc310422fb70b82a40" + resolved "https://registry.npmjs.org/pdfjs-dist-viewer-min/-/pdfjs-dist-viewer-min-2.12.313.tgz" integrity sha512-Li6SwOH5hj9G4hn7EsepVe/BWy+xKfMRmwJ6EbdIcmFUHDuoB6ISGJNBH7QsYk8fY8mGMZlFzP4B892u59YeGw== pend@~1.2.0: version "1.2.0" - resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" + resolved "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz" integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA= picocolors@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" + resolved "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz" integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== picomatch@^2.3.1: version "2.3.1" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" + resolved "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz" integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== pify@^2.3.0: version "2.3.0" - resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" + resolved "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz" integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw= pify@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176" + resolved "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz" integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY= pify@^4.0.1: version "4.0.1" - resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231" + resolved "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz" integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g== pinkie-promise@^2.0.0: version "2.0.1" - resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa" + resolved "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz" integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o= dependencies: pinkie "^2.0.0" pinkie@^2.0.0: version "2.0.4" - resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" + resolved "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz" integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA= pkg-up@^3.1.0: version "3.1.0" - resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5" + resolved "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz" integrity sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA== dependencies: find-up "^3.0.0" platform@^1.3.3: version "1.3.5" - resolved "https://registry.yarnpkg.com/platform/-/platform-1.3.5.tgz#fb6958c696e07e2918d2eeda0f0bc9448d733444" + resolved "https://registry.npmjs.org/platform/-/platform-1.3.5.tgz" integrity sha512-TuvHS8AOIZNAlE77WUDiR4rySV/VMptyMfcfeoMgs4P8apaZM3JrnbzBiixKUv+XR6i+BXrQh8WAnjaSPFO65Q== platform@~1.3.6: version "1.3.6" - resolved "https://registry.yarnpkg.com/platform/-/platform-1.3.6.tgz#48b4ce983164b209c2d45a107adb31f473a6e7a7" + resolved "https://registry.npmjs.org/platform/-/platform-1.3.6.tgz" integrity sha512-fnWVljUchTro6RiCFvCXBbNhJc2NijN7oIQxbwsyL0buWJPG85v81ehlHI9fXrJsMNgTofEoWIQeClKpgxFLrg== prerender-node@3.8.0: version "3.8.0" - resolved "https://registry.yarnpkg.com/prerender-node/-/prerender-node-3.8.0.tgz#446061cded637994abdb56e2b06b9acc6a9c048f" + resolved "https://registry.npmjs.org/prerender-node/-/prerender-node-3.8.0.tgz" integrity sha512-MJcdr/RePzCaYw30XQ2H64rXAkGuHDGitHmx2D1OPsNxEDMho5ha8GfwJVLxstPdj49vgerwZqnsE+2M/4Ov2A== pretty-bytes@^5.3.0: version "5.6.0" - resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.6.0.tgz#356256f643804773c82f64723fe78c92c62beaeb" + resolved "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz" integrity sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg== process-nextick-args@~1.0.6: version "1.0.7" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3" + resolved "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz" integrity sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M= process-nextick-args@~2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa" + resolved "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz" integrity sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw== proj4@2.11.0: version "2.11.0" - resolved "https://registry.yarnpkg.com/proj4/-/proj4-2.11.0.tgz#795a5790aed30a7535d6a4c5775c0ce2a763cc41" + resolved "https://registry.npmjs.org/proj4/-/proj4-2.11.0.tgz" integrity sha512-SasuTkAx8HnWQHfIyhkdUNJorSJqINHAN3EyMWYiQRVorftz9DHz650YraFgczwgtHOxqnfuDxSNv3C8MUnHeg== dependencies: mgrs "1.0.0" @@ -3410,7 +3484,7 @@ proj4@2.11.0: prom-client@15.1.2: version "15.1.2" - resolved "https://registry.yarnpkg.com/prom-client/-/prom-client-15.1.2.tgz#78d79f12c35d395ca97edf7111c18210cf07f815" + resolved "https://registry.npmjs.org/prom-client/-/prom-client-15.1.2.tgz" integrity sha512-on3h1iXb04QFLLThrmVYg1SChBQ9N1c+nKAjebBjokBqipddH3uxmOUcEkTnzmJ8Jh/5TSUnUqS40i2QB2dJHQ== dependencies: "@opentelemetry/api" "^1.4.0" @@ -3418,14 +3492,14 @@ prom-client@15.1.2: promise@^7.0.1: version "7.3.1" - resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf" + resolved "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz" integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg== dependencies: asap "~2.0.3" proxy-addr@~2.0.5: version "2.0.6" - resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.6.tgz#fdc2336505447d3f2f2c638ed272caf614bbb2bf" + resolved "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz" integrity sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw== dependencies: forwarded "~0.1.2" @@ -3433,7 +3507,7 @@ proxy-addr@~2.0.5: proxy-addr@~2.0.7: version "2.0.7" - resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" + resolved "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz" integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg== dependencies: forwarded "0.2.0" @@ -3441,11 +3515,11 @@ proxy-addr@~2.0.7: "prunecluster@https://github.com/pedroetb/PruneCluster.git": version "2.1.0" - resolved "https://github.com/pedroetb/PruneCluster.git#5430b605050f181d02fa7ef8cd8ef43d25b422d8" + resolved "git+ssh://git@github.com/pedroetb/PruneCluster.git#5430b605050f181d02fa7ef8cd8ef43d25b422d8" pug-attrs@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/pug-attrs/-/pug-attrs-3.0.0.tgz#b10451e0348165e31fad1cc23ebddd9dc7347c41" + resolved "https://registry.npmjs.org/pug-attrs/-/pug-attrs-3.0.0.tgz" integrity sha512-azINV9dUtzPMFQktvTXciNAfAuVh/L/JCl0vtPCwvOA21uZrC08K/UnmrL+SXGEVc1FwzjW62+xw5S/uaLj6cA== dependencies: constantinople "^4.0.1" @@ -3454,7 +3528,7 @@ pug-attrs@^3.0.0: pug-code-gen@^3.0.3: version "3.0.3" - resolved "https://registry.yarnpkg.com/pug-code-gen/-/pug-code-gen-3.0.3.tgz#58133178cb423fe1716aece1c1da392a75251520" + resolved "https://registry.npmjs.org/pug-code-gen/-/pug-code-gen-3.0.3.tgz" integrity sha512-cYQg0JW0w32Ux+XTeZnBEeuWrAY7/HNE6TWnhiHGnnRYlCgyAUPoyh9KzCMa9WhcJlJ1AtQqpEYHc+vbCzA+Aw== dependencies: constantinople "^4.0.1" @@ -3468,17 +3542,17 @@ pug-code-gen@^3.0.3: pug-error@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/pug-error/-/pug-error-2.0.0.tgz#5c62173cb09c34de2a2ce04f17b8adfec74d8ca5" + resolved "https://registry.npmjs.org/pug-error/-/pug-error-2.0.0.tgz" integrity sha512-sjiUsi9M4RAGHktC1drQfCr5C5eriu24Lfbt4s+7SykztEOwVZtbFk1RRq0tzLxcMxMYTBR+zMQaG07J/btayQ== pug-error@^2.1.0: version "2.1.0" - resolved "https://registry.yarnpkg.com/pug-error/-/pug-error-2.1.0.tgz#17ea37b587b6443d4b8f148374ec27b54b406e55" + resolved "https://registry.npmjs.org/pug-error/-/pug-error-2.1.0.tgz" integrity sha512-lv7sU9e5Jk8IeUheHata6/UThZ7RK2jnaaNztxfPYUY+VxZyk/ePVaNZ/vwmH8WqGvDz3LrNYt/+gA55NDg6Pg== pug-filters@^4.0.0: version "4.0.0" - resolved "https://registry.yarnpkg.com/pug-filters/-/pug-filters-4.0.0.tgz#d3e49af5ba8472e9b7a66d980e707ce9d2cc9b5e" + resolved "https://registry.npmjs.org/pug-filters/-/pug-filters-4.0.0.tgz" integrity sha512-yeNFtq5Yxmfz0f9z2rMXGw/8/4i1cCFecw/Q7+D0V2DdtII5UvqE12VaZ2AY7ri6o5RNXiweGH79OCq+2RQU4A== dependencies: constantinople "^4.0.1" @@ -3489,7 +3563,7 @@ pug-filters@^4.0.0: pug-lexer@^5.0.1: version "5.0.1" - resolved "https://registry.yarnpkg.com/pug-lexer/-/pug-lexer-5.0.1.tgz#ae44628c5bef9b190b665683b288ca9024b8b0d5" + resolved "https://registry.npmjs.org/pug-lexer/-/pug-lexer-5.0.1.tgz" integrity sha512-0I6C62+keXlZPZkOJeVam9aBLVP2EnbeDw3An+k0/QlqdwH6rv8284nko14Na7c0TtqtogfWXcRoFE4O4Ff20w== dependencies: character-parser "^2.2.0" @@ -3498,7 +3572,7 @@ pug-lexer@^5.0.1: pug-linker@^4.0.0: version "4.0.0" - resolved "https://registry.yarnpkg.com/pug-linker/-/pug-linker-4.0.0.tgz#12cbc0594fc5a3e06b9fc59e6f93c146962a7708" + resolved "https://registry.npmjs.org/pug-linker/-/pug-linker-4.0.0.tgz" integrity sha512-gjD1yzp0yxbQqnzBAdlhbgoJL5qIFJw78juN1NpTLt/mfPJ5VgC4BvkoD3G23qKzJtIIXBbcCt6FioLSFLOHdw== dependencies: pug-error "^2.0.0" @@ -3506,7 +3580,7 @@ pug-linker@^4.0.0: pug-load@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/pug-load/-/pug-load-3.0.0.tgz#9fd9cda52202b08adb11d25681fb9f34bd41b662" + resolved "https://registry.npmjs.org/pug-load/-/pug-load-3.0.0.tgz" integrity sha512-OCjTEnhLWZBvS4zni/WUMjH2YSUosnsmjGBB1An7CsKQarYSWQ0GCVyd4eQPMFJqZ8w9xgs01QdiZXKVjk92EQ== dependencies: object-assign "^4.1.1" @@ -3514,7 +3588,7 @@ pug-load@^3.0.0: pug-parser@^6.0.0: version "6.0.0" - resolved "https://registry.yarnpkg.com/pug-parser/-/pug-parser-6.0.0.tgz#a8fdc035863a95b2c1dc5ebf4ecf80b4e76a1260" + resolved "https://registry.npmjs.org/pug-parser/-/pug-parser-6.0.0.tgz" integrity sha512-ukiYM/9cH6Cml+AOl5kETtM9NR3WulyVP2y4HOU45DyMim1IeP/OOiyEWRr6qk5I5klpsBnbuHpwKmTx6WURnw== dependencies: pug-error "^2.0.0" @@ -3522,24 +3596,24 @@ pug-parser@^6.0.0: pug-runtime@^3.0.0, pug-runtime@^3.0.1: version "3.0.1" - resolved "https://registry.yarnpkg.com/pug-runtime/-/pug-runtime-3.0.1.tgz#f636976204723f35a8c5f6fad6acda2a191b83d7" + resolved "https://registry.npmjs.org/pug-runtime/-/pug-runtime-3.0.1.tgz" integrity sha512-L50zbvrQ35TkpHwv0G6aLSuueDRwc/97XdY8kL3tOT0FmhgG7UypU3VztfV/LATAvmUfYi4wNxSajhSAeNN+Kg== pug-strip-comments@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/pug-strip-comments/-/pug-strip-comments-2.0.0.tgz#f94b07fd6b495523330f490a7f554b4ff876303e" + resolved "https://registry.npmjs.org/pug-strip-comments/-/pug-strip-comments-2.0.0.tgz" integrity sha512-zo8DsDpH7eTkPHCXFeAk1xZXJbyoTfdPlNR0bK7rpOMuhBYb0f5qUVCO1xlsitYd3w5FQTK7zpNVKb3rZoUrrQ== dependencies: pug-error "^2.0.0" pug-walk@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/pug-walk/-/pug-walk-2.0.0.tgz#417aabc29232bb4499b5b5069a2b2d2a24d5f5fe" + resolved "https://registry.npmjs.org/pug-walk/-/pug-walk-2.0.0.tgz" integrity sha512-yYELe9Q5q9IQhuvqsZNwA5hfPkMJ8u92bQLIMcsMxf/VADjNtEYptU+inlufAFYcWdHlwNfZOEnOOQrZrcyJCQ== pug@3.0.3: version "3.0.3" - resolved "https://registry.yarnpkg.com/pug/-/pug-3.0.3.tgz#e18324a314cd022883b1e0372b8af3a1a99f7597" + resolved "https://registry.npmjs.org/pug/-/pug-3.0.3.tgz" integrity sha512-uBi6kmc9f3SZ3PXxqcHiUZLmIXgfgWooKWXcwSGwQd2Zi5Rb0bT14+8CJjJgI8AB+nndLaNgHGrcc6bPIB665g== dependencies: pug-code-gen "^3.0.3" @@ -3553,34 +3627,34 @@ pug@3.0.3: put-selector@0.3.6: version "0.3.6" - resolved "https://registry.yarnpkg.com/put-selector/-/put-selector-0.3.6.tgz#172e8f8d978d55072b2757a1645776d685c80fa2" + resolved "https://registry.npmjs.org/put-selector/-/put-selector-0.3.6.tgz" integrity sha1-Fy6PjZeNVQcrJ1ehZFd21oXID6I= qs@6.11.0: version "6.11.0" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a" + resolved "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz" integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q== dependencies: side-channel "^1.0.4" qs@6.7.0: version "6.7.0" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc" + resolved "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz" integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ== querystringify@^2.1.1: version "2.2.0" - resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6" + resolved "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz" integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ== range-parser@~1.2.1: version "1.2.1" - resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" + resolved "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz" integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== raw-body@2.4.0: version "2.4.0" - resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332" + resolved "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz" integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q== dependencies: bytes "3.1.0" @@ -3590,7 +3664,7 @@ raw-body@2.4.0: raw-body@2.5.2: version "2.5.2" - resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.2.tgz#99febd83b90e08975087e8f1f9419a149366b68a" + resolved "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz" integrity sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA== dependencies: bytes "3.1.2" @@ -3600,7 +3674,7 @@ raw-body@2.5.2: readable-stream@1.1: version "1.1.13" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.13.tgz#f6eef764f514c89e2b9e23146a75ba106756d23e" + resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz" integrity sha1-9u73ZPUUyJ4rniMUanW6EGdW0j4= dependencies: core-util-is "~1.0.0" @@ -3610,7 +3684,7 @@ readable-stream@1.1: readable-stream@^2.0.0, readable-stream@^2.0.5: version "2.3.3" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c" + resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz" integrity sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ== dependencies: core-util-is "~1.0.0" @@ -3623,7 +3697,7 @@ readable-stream@^2.0.0, readable-stream@^2.0.5: readable-stream@^3.4.0, readable-stream@^3.6.0: version "3.6.0" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" + resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz" integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== dependencies: inherits "^2.0.3" @@ -3632,7 +3706,7 @@ readable-stream@^3.4.0, readable-stream@^3.6.0: readable-stream@~2.3.6: version "2.3.7" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" + resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz" integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== dependencies: core-util-is "~1.0.0" @@ -3645,19 +3719,19 @@ readable-stream@~2.3.6: rechoir@^0.7.0: version "0.7.1" - resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.1.tgz#9478a96a1ca135b5e88fc027f03ee92d6c645686" + resolved "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz" integrity sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg== dependencies: resolve "^1.9.0" requires-port@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" + resolved "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz" integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8= resolve-dir@^1.0.0, resolve-dir@^1.0.1: version "1.0.1" - resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43" + resolved "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz" integrity sha1-eaQGRMNivoLybv/nOcm7U4IEb0M= dependencies: expand-tilde "^2.0.0" @@ -3665,19 +3739,19 @@ resolve-dir@^1.0.0, resolve-dir@^1.0.1: resolve-from@^5.0.0: version "5.0.0" - resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" + resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz" integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== resolve-pkg@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/resolve-pkg/-/resolve-pkg-2.0.0.tgz#ac06991418a7623edc119084edc98b0e6bf05a41" + resolved "https://registry.npmjs.org/resolve-pkg/-/resolve-pkg-2.0.0.tgz" integrity sha512-+1lzwXehGCXSeryaISr6WujZzowloigEofRB+dj75y9RRa/obVcYgbHJd53tdYw8pvZj8GojXaaENws8Ktw/hQ== dependencies: resolve-from "^5.0.0" resolve@^1.15.1, resolve@~1.20.0: version "1.20.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" + resolved "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz" integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== dependencies: is-core-module "^2.2.0" @@ -3685,7 +3759,7 @@ resolve@^1.15.1, resolve@~1.20.0: resolve@^1.19.0, resolve@^1.9.0: version "1.22.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198" + resolved "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz" integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw== dependencies: is-core-module "^2.8.1" @@ -3694,7 +3768,7 @@ resolve@^1.19.0, resolve@^1.9.0: response-time@2.3.2: version "2.3.2" - resolved "https://registry.yarnpkg.com/response-time/-/response-time-2.3.2.tgz#ffa71bab952d62f7c1d49b7434355fbc68dffc5a" + resolved "https://registry.npmjs.org/response-time/-/response-time-2.3.2.tgz" integrity sha1-/6cbq5UtYvfB1Jt0NDVfvGjf/Fo= dependencies: depd "~1.1.0" @@ -3702,66 +3776,66 @@ response-time@2.3.2: rimraf@^2.6.2: version "2.7.1" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" + resolved "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz" integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== dependencies: glob "^7.1.3" robust-predicates@^3.0.0: version "3.0.1" - resolved "https://registry.yarnpkg.com/robust-predicates/-/robust-predicates-3.0.1.tgz#ecde075044f7f30118682bd9fb3f123109577f9a" + resolved "https://registry.npmjs.org/robust-predicates/-/robust-predicates-3.0.1.tgz" integrity sha512-ndEIpszUHiG4HtDsQLeIuMvRsDnn8c8rYStabochtUeCvfuvNptb5TUbVD68LRAILPX7p9nqQGh4xJgn3EHS/g== rw@1: version "1.3.3" - resolved "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz#3f862dfa91ab766b14885ef4d01124bfda074fb4" + resolved "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz" integrity sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q= safe-buffer@5.1.2: version "5.1.2" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" + resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== safe-buffer@5.2.1, safe-buffer@~5.2.0: version "5.2.1" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" + resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.1" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853" + resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz" integrity sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg== safe-stable-stringify@^2.3.1: version "2.3.1" - resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.3.1.tgz#ab67cbe1fe7d40603ca641c5e765cb942d04fc73" + resolved "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.3.1.tgz" integrity sha512-kYBSfT+troD9cDA85VDnHZ1rpHC50O0g1e6WlGHVCz/g+JS+9WKLj+XwFYyR8UbrZN8ll9HUpDAAddY58MGisg== "safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0": version "2.1.2" - resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" + resolved "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== sax@~1.3.0: version "1.3.0" - resolved "https://registry.yarnpkg.com/sax/-/sax-1.3.0.tgz#a5dbe77db3be05c9d1ee7785dbd3ea9de51593d0" + resolved "https://registry.npmjs.org/sax/-/sax-1.3.0.tgz" integrity sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA== seek-bzip@^1.0.5: version "1.0.5" - resolved "https://registry.yarnpkg.com/seek-bzip/-/seek-bzip-1.0.5.tgz#cfe917cb3d274bcffac792758af53173eb1fabdc" + resolved "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.5.tgz" integrity sha1-z+kXyz0nS8/6x5J1ivUxc+sfq9w= dependencies: commander "~2.8.1" semver@^6.0.0, semver@^6.3.0: version "6.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" + resolved "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== send@0.17.1: version "0.17.1" - resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8" + resolved "https://registry.npmjs.org/send/-/send-0.17.1.tgz" integrity sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg== dependencies: debug "2.6.9" @@ -3780,7 +3854,7 @@ send@0.17.1: send@0.18.0: version "0.18.0" - resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be" + resolved "https://registry.npmjs.org/send/-/send-0.18.0.tgz" integrity sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg== dependencies: debug "2.6.9" @@ -3799,7 +3873,7 @@ send@0.18.0: serve-static@1.14.1: version "1.14.1" - resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9" + resolved "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz" integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg== dependencies: encodeurl "~1.0.2" @@ -3809,7 +3883,7 @@ serve-static@1.14.1: serve-static@1.15.0: version "1.15.0" - resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.15.0.tgz#faaef08cffe0a1a62f60cad0c4e513cff0ac9540" + resolved "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz" integrity sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g== dependencies: encodeurl "~1.0.2" @@ -3819,39 +3893,39 @@ serve-static@1.15.0: set-immediate-shim@~1.0.1: version "1.0.1" - resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61" + resolved "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz" integrity sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E= setprototypeof@1.1.1: version "1.1.1" - resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683" + resolved "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz" integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw== setprototypeof@1.2.0: version "1.2.0" - resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" + resolved "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz" integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw== shebang-command@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" + resolved "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz" integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA== dependencies: shebang-regex "^3.0.0" shebang-regex@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" + resolved "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz" integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== shell-quote@~1.7.2: version "1.7.3" - resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.3.tgz#aa40edac170445b9a431e17bb62c0b881b9c4123" + resolved "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.3.tgz" integrity sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw== side-channel@^1.0.4: version "1.0.4" - resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" + resolved "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz" integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw== dependencies: call-bind "^1.0.0" @@ -3860,19 +3934,19 @@ side-channel@^1.0.4: signal-exit@^4.0.1: version "4.1.0" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04" + resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz" integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw== simple-swizzle@^0.2.2: version "0.2.2" - resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a" + resolved "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz" integrity sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo= dependencies: is-arrayish "^0.3.1" sockjs-client@1.6.1: version "1.6.1" - resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.6.1.tgz#350b8eda42d6d52ddc030c39943364c11dcad806" + resolved "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.6.1.tgz" integrity sha512-2g0tjOR+fRs0amxENLi/q5TiJTqY+WXFOzb5UwXndlK6TO3U/mirZznpx6w34HVMoc3g7cY24yC/ZMIYnDlfkw== dependencies: debug "^3.2.7" @@ -3883,7 +3957,7 @@ sockjs-client@1.6.1: source-map-support@^0.5.17: version "0.5.19" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61" + resolved "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz" integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw== dependencies: buffer-from "^1.0.0" @@ -3891,54 +3965,54 @@ source-map-support@^0.5.17: source-map@^0.5.0: version "0.5.7" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" + resolved "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz" integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1: version "0.6.1" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" + resolved "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== source-map@^0.7.3: version "0.7.3" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" + resolved "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz" integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ== sprintf-js@^1.1.1: version "1.1.2" - resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673" + resolved "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz" integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug== sprintf-js@~1.0.2: version "1.0.3" - resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" + resolved "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz" integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= stack-trace@0.0.x: version "0.0.10" - resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0" + resolved "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz" integrity sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA= statuses@2.0.1: version "2.0.1" - resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63" + resolved "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz" integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ== "statuses@>= 1.5.0 < 2", statuses@~1.5.0: version "1.5.0" - resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" + resolved "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz" integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= stomp-websocket@2.3.4-next: version "2.3.4-next" - resolved "https://registry.yarnpkg.com/stomp-websocket/-/stomp-websocket-2.3.4-next.tgz#253b6e5046a55e6c8e09aa60663ca7627531cb1b" + resolved "https://registry.npmjs.org/stomp-websocket/-/stomp-websocket-2.3.4-next.tgz" integrity sha1-JTtuUEalXmyOCapgZjynYnUxyxs= optionalDependencies: websocket latest "string-width-cjs@npm:string-width@^4.2.0": version "4.2.3" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== dependencies: emoji-regex "^8.0.0" @@ -3947,7 +4021,7 @@ stomp-websocket@2.3.4-next: string-width@^4.1.0: version "4.2.3" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== dependencies: emoji-regex "^8.0.0" @@ -3956,7 +4030,7 @@ string-width@^4.1.0: string-width@^5.0.1, string-width@^5.1.2: version "5.1.2" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794" + resolved "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz" integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA== dependencies: eastasianwidth "^0.2.0" @@ -3965,85 +4039,85 @@ string-width@^5.0.1, string-width@^5.1.2: string_decoder@^1.1.1: version "1.3.0" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" + resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz" integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== dependencies: safe-buffer "~5.2.0" string_decoder@~0.10.x: version "0.10.31" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" + resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ= string_decoder@~1.0.3: version "1.0.3" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab" + resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz" integrity sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ== dependencies: safe-buffer "~5.1.0" string_decoder@~1.1.1: version "1.1.1" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" + resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz" integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== dependencies: safe-buffer "~5.1.0" "strip-ansi-cjs@npm:strip-ansi@^6.0.1": version "6.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== dependencies: ansi-regex "^5.0.1" strip-ansi@^3.0.0: version "3.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" + resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz" integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= dependencies: ansi-regex "^2.0.0" strip-ansi@^5.0.0: version "5.2.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae" + resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz" integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA== dependencies: ansi-regex "^4.1.0" strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== dependencies: ansi-regex "^5.0.1" strip-ansi@^7.0.1: version "7.1.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45" + resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz" integrity sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ== dependencies: ansi-regex "^6.0.1" strip-bom@^4.0.0: version "4.0.0" - resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878" + resolved "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz" integrity sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w== strip-dirs@^2.0.0: version "2.1.0" - resolved "https://registry.yarnpkg.com/strip-dirs/-/strip-dirs-2.1.0.tgz#4987736264fc344cf20f6c34aca9d13d1d4ed6c5" + resolved "https://registry.npmjs.org/strip-dirs/-/strip-dirs-2.1.0.tgz" integrity sha512-JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g== dependencies: is-natural-number "^4.0.1" strip-json-comments@1.0.x: version "1.0.4" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-1.0.4.tgz#1e15fbcac97d3ee99bf2d73b4c656b082bbafb91" + resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz" integrity sha1-HhX7ysl9Pumb8tc7TGVrCCu6+5E= stylus@0.63.0: version "0.63.0" - resolved "https://registry.yarnpkg.com/stylus/-/stylus-0.63.0.tgz#511e8d56f2005b09010fbc1f62561c7b6f72a490" + resolved "https://registry.npmjs.org/stylus/-/stylus-0.63.0.tgz" integrity sha512-OMlgrTCPzE/ibtRMoeLVhOY0RcNuNWh0rhAVqeKnk/QwcuUKQbnqhZ1kg2vzD8VU/6h3FoPTq4RJPHgLBvX6Bw== dependencies: "@adobe/css-tools" "~4.3.3" @@ -4054,31 +4128,31 @@ stylus@0.63.0: supports-color@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" + resolved "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz" integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= supports-color@^5.3.0: version "5.5.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" + resolved "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz" integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== dependencies: has-flag "^3.0.0" supports-color@^7.1.0: version "7.2.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" + resolved "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz" integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== dependencies: has-flag "^4.0.0" supports-preserve-symlinks-flag@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" + resolved "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz" integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== tar-stream@^1.5.2: version "1.5.5" - resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.5.5.tgz#5cad84779f45c83b1f2508d96b09d88c7218af55" + resolved "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.5.tgz" integrity sha512-mQdgLPc/Vjfr3VWqWbfxW8yQNiJCbAZ+Gf6GDu1Cy0bdb33ofyiNGBtAY96jHFhDuivCwgW1H9DgTON+INiXgg== dependencies: bl "^1.0.0" @@ -4088,56 +4162,56 @@ tar-stream@^1.5.2: tdigest@^0.1.1: version "0.1.1" - resolved "https://registry.yarnpkg.com/tdigest/-/tdigest-0.1.1.tgz#2e3cb2c39ea449e55d1e6cd91117accca4588021" + resolved "https://registry.npmjs.org/tdigest/-/tdigest-0.1.1.tgz" integrity sha1-Ljyyw56kSeVdHmzZEReszKRYgCE= dependencies: bintrees "1.0.1" text-hex@1.0.x: version "1.0.0" - resolved "https://registry.yarnpkg.com/text-hex/-/text-hex-1.0.0.tgz#69dc9c1b17446ee79a92bf5b884bb4b9127506f5" + resolved "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz" integrity sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg== through@^2.3.6: version "2.3.8" - resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" + resolved "https://registry.npmjs.org/through/-/through-2.3.8.tgz" integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= to-fast-properties@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" + resolved "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz" integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4= to-regex-range@^5.0.1: version "5.0.1" - resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" + resolved "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz" integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== dependencies: is-number "^7.0.0" toidentifier@1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" + resolved "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz" integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== toidentifier@1.0.1: version "1.0.1" - resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35" + resolved "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz" integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA== token-stream@1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/token-stream/-/token-stream-1.0.0.tgz#cc200eab2613f4166d27ff9afc7ca56d49df6eb4" + resolved "https://registry.npmjs.org/token-stream/-/token-stream-1.0.0.tgz" integrity sha1-zCAOqyYT9BZtJ/+a/HylbUnfbrQ= triple-beam@^1.3.0: version "1.3.0" - resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.3.0.tgz#a595214c7298db8339eeeee083e4d10bd8cb8dd9" + resolved "https://registry.npmjs.org/triple-beam/-/triple-beam-1.3.0.tgz" integrity sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw== ts-node@~10.0.0: version "10.0.0" - resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.0.0.tgz#05f10b9a716b0b624129ad44f0ea05dac84ba3be" + resolved "https://registry.npmjs.org/ts-node/-/ts-node-10.0.0.tgz" integrity sha512-ROWeOIUvfFbPZkoDis0L/55Fk+6gFQNZwwKPLinacRl6tsxstTF1DbAcLKkovwnpKMVvOMHP1TIbnwXwtLg1gg== dependencies: "@tsconfig/node10" "^1.0.7" @@ -4153,52 +4227,57 @@ ts-node@~10.0.0: tslib@~2.3.0: version "2.3.1" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" + resolved "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz" integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw== tv4@1.3.0: version "1.3.0" - resolved "https://registry.yarnpkg.com/tv4/-/tv4-1.3.0.tgz#d020c846fadd50c855abb25ebaecc68fc10f7963" + resolved "https://registry.npmjs.org/tv4/-/tv4-1.3.0.tgz" integrity sha1-0CDIRvrdUMhVq7JeuuzGj8EPeWM= type-detect@^4.0.0: version "4.0.7" - resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.7.tgz#862bd2cf6058ad92799ff5a5b8cf7b6cec726198" + resolved "https://registry.npmjs.org/type-detect/-/type-detect-4.0.7.tgz" integrity sha512-4Rh17pAMVdMWzktddFhISRnUnFIStObtUMNGzDwlA6w/77bmGv3aBbRdCmQR6IjzfkTo9otnW+2K/cDRhKSxDA== type-detect@^4.0.5: version "4.0.8" - resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c" + resolved "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz" integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g== type-is@~1.6.17, type-is@~1.6.18: version "1.6.18" - resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" + resolved "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz" integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g== dependencies: media-typer "0.3.0" mime-types "~2.1.24" -typedarray-to-buffer@^3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.2.tgz#1017b32d984ff556eba100f501589aba1ace2e04" - integrity sha1-EBezLZhP9VbroQD1AViauhrOLgQ= +type@^2.7.2: + version "2.7.3" + resolved "https://registry.yarnpkg.com/type/-/type-2.7.3.tgz#436981652129285cc3ba94f392886c2637ea0486" + integrity sha512-8j+1QmAbPvLZow5Qpi6NCaN8FB60p/6x8/vfNqOk/hC+HuvFZhL4+WfekuhQLiqFZXOgQdrs3B+XxEmCc6b3FQ== + +typedarray-to-buffer@^3.1.5: + version "3.1.5" + resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080" + integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q== dependencies: is-typedarray "^1.0.0" uglify-js@^3.1.4: - version "3.15.4" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.15.4.tgz#fa95c257e88f85614915b906204b9623d4fa340d" - integrity sha512-vMOPGDuvXecPs34V74qDKk4iJ/SN4vL3Ow/23ixafENYvtrNvtbcgUeugTcUGRGsOF/5fU8/NYSL5Hyb3l1OJA== + version "3.19.1" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.19.1.tgz#2d5df6a0872c43da43187968308d7741d44b8056" + integrity sha512-y/2wiW+ceTYR2TSSptAhfnEtpLaQ4Ups5zrjB2d3kuVxHj16j/QJwPl5PvuGy9uARb39J0+iKxcRPvtpsx4A4A== uglify-js@^3.16.1: version "3.17.4" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.17.4.tgz#61678cf5fa3f5b7eb789bb345df29afb8257c22c" + resolved "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.4.tgz" integrity sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g== unbzip2-stream@^1.0.9: version "1.2.5" - resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.2.5.tgz#73a033a567bbbde59654b193c44d48a7e4f43c47" + resolved "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.2.5.tgz" integrity sha512-izD3jxT8xkzwtXRUZjtmRwKnZoeECrfZ8ra/ketwOcusbZEp4mjULMnJOCfTDZBgGQAAY1AJ/IgxcwkavcX9Og== dependencies: buffer "^3.0.1" @@ -4206,12 +4285,12 @@ unbzip2-stream@^1.0.9: unc-path-regex@^0.1.2: version "0.1.2" - resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa" + resolved "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz" integrity sha1-5z3T17DXxe2G+6xrCufYxqadUPo= underscore.string@~3.3.5: version "3.3.6" - resolved "https://registry.yarnpkg.com/underscore.string/-/underscore.string-3.3.6.tgz#ad8cf23d7423cb3b53b898476117588f4e2f9159" + resolved "https://registry.npmjs.org/underscore.string/-/underscore.string-3.3.6.tgz" integrity sha512-VoC83HWXmCrF6rgkyxS9GHv8W9Q5nhMKho+OadDJGzL2oDYbYEppBaCMH6pFlwLeqj2QS+hhkw2kpXkSdD1JxQ== dependencies: sprintf-js "^1.1.1" @@ -4219,71 +4298,78 @@ underscore.string@~3.3.5: unidragger@^2.4.0: version "2.4.0" - resolved "https://registry.yarnpkg.com/unidragger/-/unidragger-2.4.0.tgz#4cd7e564317af0ef42632d5984a82d4ae6314d8d" + resolved "https://registry.npmjs.org/unidragger/-/unidragger-2.4.0.tgz" integrity sha512-MueZK2oXuGE6OAlGKIrSXK2zCq+8yb1QUZgqyTDCSJzvwYL0g2Llrad+TtoQTYxtFnNyxxSw0IMnKNIgEMia1w== dependencies: unipointer "^2.4.0" unipointer@^2.4.0: version "2.4.0" - resolved "https://registry.yarnpkg.com/unipointer/-/unipointer-2.4.0.tgz#ac7316aff6170ff87a4b008e55e842fb4bf13181" + resolved "https://registry.npmjs.org/unipointer/-/unipointer-2.4.0.tgz" integrity sha512-VjzDLPjGK7aYpQKH7bnDZS8X4axF5AFU/LQi+NQe1oyEHfaz6lWKhaQ7n4o7vJ1iJ4i2T0quCIfrQM139p05Sw== dependencies: ev-emitter "^1.0.1" unpipe@1.0.0, unpipe@~1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" + resolved "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz" integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw= uri-path@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/uri-path/-/uri-path-1.0.0.tgz#9747f018358933c31de0fccfd82d138e67262e32" + resolved "https://registry.npmjs.org/uri-path/-/uri-path-1.0.0.tgz" integrity sha1-l0fwGDWJM8Md4PzP2C0TjmcmLjI= url-parse@^1.5.10: version "1.5.10" - resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1" + resolved "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz" integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ== dependencies: querystringify "^2.1.1" requires-port "^1.0.0" +utf-8-validate@^5.0.2: + version "5.0.10" + resolved "https://registry.yarnpkg.com/utf-8-validate/-/utf-8-validate-5.0.10.tgz#d7d10ea39318171ca982718b6b96a8d2442571a2" + integrity sha512-Z6czzLq4u8fPOyx7TU6X3dvUZVvoJmxSQ+IcrlmagKhilxlhZgxPK6C5Jqbkw1IDUmFTM+cz9QDnnLTwDz/2gQ== + dependencies: + node-gyp-build "^4.3.0" + util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1: version "1.0.2" - resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" + resolved "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz" integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= utils-merge@1.0.1: version "1.0.1" - resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" + resolved "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz" integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= uuid@8.3.2: version "8.3.2" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" + resolved "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz" integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== v8flags@~3.2.0: version "3.2.0" - resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-3.2.0.tgz#b243e3b4dfd731fa774e7492128109a0fe66d656" + resolved "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz" integrity sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg== dependencies: homedir-polyfill "^1.0.1" vary@~1.1.2: version "1.1.2" - resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" + resolved "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz" integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= void-elements@^3.1.0: version "3.1.0" - resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-3.1.0.tgz#614f7fbf8d801f0bb5f0661f5b2f5785750e4f09" + resolved "https://registry.npmjs.org/void-elements/-/void-elements-3.1.0.tgz" integrity sha1-YU9/v42AHwu18GYfWy9XhXUOTwk= websocket-driver@>=0.5.1: version "0.7.0" - resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.0.tgz#0caf9d2d755d93aee049d4bdd0d3fe2cca2a24eb" + resolved "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.0.tgz" integrity sha1-DK+dLXVdk67gSdS90NP+LMoqJOs= dependencies: http-parser-js ">=0.4.0" @@ -4291,41 +4377,43 @@ websocket-driver@>=0.5.1: websocket-extensions@>=0.1.1: version "0.1.3" - resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29" + resolved "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz" integrity sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg== websocket@latest: - version "1.0.25" - resolved "https://registry.yarnpkg.com/websocket/-/websocket-1.0.25.tgz#998ec790f0a3eacb8b08b50a4350026692a11958" - integrity sha512-M58njvi6ZxVb5k7kpnHh2BvNKuBWiwIYvsToErBzWhvBZYwlEiLcyLrG41T1jRcrY9ettqPYEqduLI7ul54CVQ== + version "1.0.35" + resolved "https://registry.yarnpkg.com/websocket/-/websocket-1.0.35.tgz#374197207d7d4cc4c36cbf8a1bb886ee52a07885" + integrity sha512-/REy6amwPZl44DDzvRCkaI1q1bIiQB0mEFQLUrhz3z2EK91cp3n72rAjUlrTP0zV22HJIUOVHQGPxhFRjxjt+Q== dependencies: + bufferutil "^4.0.1" debug "^2.2.0" - nan "^2.3.3" - typedarray-to-buffer "^3.1.2" + es5-ext "^0.10.63" + typedarray-to-buffer "^3.1.5" + utf-8-validate "^5.0.2" yaeti "^0.0.6" which@^1.2.14: version "1.3.1" - resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" + resolved "https://registry.npmjs.org/which/-/which-1.3.1.tgz" integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== dependencies: isexe "^2.0.0" which@^2.0.1, which@~2.0.2: version "2.0.2" - resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" + resolved "https://registry.npmjs.org/which/-/which-2.0.2.tgz" integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== dependencies: isexe "^2.0.0" wicket@1.3.8: version "1.3.8" - resolved "https://registry.yarnpkg.com/wicket/-/wicket-1.3.8.tgz#6ff9810f94ee093310d68f66b208036fdf974dfa" + resolved "https://registry.npmjs.org/wicket/-/wicket-1.3.8.tgz" integrity sha512-+UZsrBvp8OI+8PhStpXQw0oJedaCLncZwu7lPdcZ9BpUsyu25rztzHG+IwXGK372nuDGp+Wy4FreM/rzdWYJAg== winston-transport@^4.7.0: version "4.7.0" - resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.7.0.tgz#e302e6889e6ccb7f383b926df6936a5b781bd1f0" + resolved "https://registry.npmjs.org/winston-transport/-/winston-transport-4.7.0.tgz" integrity sha512-ajBj65K5I7denzer2IYW6+2bNIVqLGDHqDw3Ow8Ohh+vdW+rv4MZ6eiDvHoKhfJFZ2auyN8byXieDDJ96ViONg== dependencies: logform "^2.3.2" @@ -4334,7 +4422,7 @@ winston-transport@^4.7.0: winston@3.13.0: version "3.13.0" - resolved "https://registry.yarnpkg.com/winston/-/winston-3.13.0.tgz#e76c0d722f78e04838158c61adc1287201de7ce3" + resolved "https://registry.npmjs.org/winston/-/winston-3.13.0.tgz" integrity sha512-rwidmA1w3SE4j0E5MuIufFhyJPBDG7Nu71RkZor1p2+qHvJSZ9GYDA81AyleQcZbh/+V6HjeBdfnTZJm9rSeQQ== dependencies: "@colors/colors" "^1.6.0" @@ -4351,7 +4439,7 @@ winston@3.13.0: with@^7.0.0: version "7.0.2" - resolved "https://registry.yarnpkg.com/with/-/with-7.0.2.tgz#ccee3ad542d25538a7a7a80aad212b9828495bac" + resolved "https://registry.npmjs.org/with/-/with-7.0.2.tgz" integrity sha512-RNGKj82nUPg3g5ygxkQl0R937xLyho1J24ItRCBTr/m1YnZkzJy1hUiHUJrc/VlsDQzsCnInEGSg3bci0Lmd4w== dependencies: "@babel/parser" "^7.9.6" @@ -4361,17 +4449,17 @@ with@^7.0.0: wkt-parser@^1.3.3: version "1.3.3" - resolved "https://registry.yarnpkg.com/wkt-parser/-/wkt-parser-1.3.3.tgz#46b4e3032dd9c86907f7e630b57e3c6ea2bb772b" + resolved "https://registry.npmjs.org/wkt-parser/-/wkt-parser-1.3.3.tgz" integrity sha512-ZnV3yH8/k58ZPACOXeiHaMuXIiaTk1t0hSUVisbO0t4RjA5wPpUytcxeyiN2h+LZRrmuHIh/1UlrR9e7DHDvTw== wordwrap@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" + resolved "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz" integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus= "wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== dependencies: ansi-styles "^4.0.0" @@ -4380,7 +4468,7 @@ wordwrap@^1.0.0: wrap-ansi@^8.1.0: version "8.1.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" + resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz" integrity sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ== dependencies: ansi-styles "^6.1.0" @@ -4389,27 +4477,27 @@ wrap-ansi@^8.1.0: wrappy@1: version "1.0.2" - resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + resolved "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz" integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= ws@~7.5.2: version "7.5.7" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.7.tgz#9e0ac77ee50af70d58326ecff7e85eb3fa375e67" + resolved "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz" integrity sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A== xtend@^4.0.0: version "4.0.1" - resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af" + resolved "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz" integrity sha1-pcbVMr5lbiPbgg77lDofBJmNY68= yaeti@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/yaeti/-/yaeti-0.0.6.tgz#f26f484d72684cf42bedfb76970aa1608fbf9577" - integrity sha1-8m9ITXJoTPQr7ft2lwqhYI+/lXc= + integrity sha512-MvQa//+KcZCUkBTIC9blM+CU9J2GzuTytsOUwf2lidtvkx/6gnEp1QvJv34t9vdjhFmha/mUiNDbN0D0mJWdug== yauzl@^2.4.2: version "2.9.1" - resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.9.1.tgz#a81981ea70a57946133883f029c5821a89359a7f" + resolved "https://registry.npmjs.org/yauzl/-/yauzl-2.9.1.tgz" integrity sha1-qBmB6nCleUYTOIPwKcWCGok1mn8= dependencies: buffer-crc32 "~0.2.3" @@ -4417,5 +4505,5 @@ yauzl@^2.4.2: yn@3.1.1: version "3.1.1" - resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" + resolved "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz" integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q== -- GitLab From 167d9816942d3861cbab693e14bad290de86011a Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Thu, 1 Aug 2024 13:51:14 +0100 Subject: [PATCH 059/249] Ajusta CI --- .gitlab-ci/build.yml | 4 ++-- client-app/style | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci/build.yml b/.gitlab-ci/build.yml index aeeef1c0..7a5fecba 100644 --- a/.gitlab-ci/build.yml +++ b/.gitlab-ci/build.yml @@ -6,8 +6,7 @@ WEB_BUILD_IMAGE_TAG: latest before_script: - type npm - - npm -v - - npm run install + - npm install cache: paths: - node_modules/ @@ -18,6 +17,7 @@ prepare-unbuilt-version: extends: .web-build stage: pre-build script: + - npm -v - node -v dependencies: [] tags: diff --git a/client-app/style b/client-app/style index 6342614a..3f462dfc 160000 --- a/client-app/style +++ b/client-app/style @@ -1 +1 @@ -Subproject commit 6342614aca6ab9be072482316df0532c2d3a2693 +Subproject commit 3f462dfc0a8e13f48342d11b4766fe2926e7a8d2 -- GitLab From bd6e23c8dbe938eb04c4f8c52269edc972aecadb Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Fri, 2 Aug 2024 11:27:30 +0100 Subject: [PATCH 060/249] Migra desde yarn a npm MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Aumenta requisitos de versión de npm/node. Intercambia fichero de bloqueo yarn por el de npm. Elimina algunas tareas ahora obsoletas a nivel de grunt. Actualiza submódulos. --- .gitlab-ci/build.yml | 2 + README.md | 8 +- build/Dockerfile | 13 +- build/Dockerfile.dockerignore | 1 + client-app/dep/templates | 2 +- client-app/style | 2 +- grunt/config/prepareDependences.js | 20 - grunt/task/preBuild.js | 2 +- grunt/task/prepareDependences.js | 9 - package-lock.json | 7905 ++++++++++++++++++++++++++++ package.json | 6 +- yarn.lock | 4509 ---------------- 12 files changed, 7923 insertions(+), 4556 deletions(-) delete mode 100644 grunt/config/prepareDependences.js delete mode 100644 grunt/task/prepareDependences.js create mode 100644 package-lock.json delete mode 100644 yarn.lock diff --git a/.gitlab-ci/build.yml b/.gitlab-ci/build.yml index 7a5fecba..9ede004a 100644 --- a/.gitlab-ci/build.yml +++ b/.gitlab-ci/build.yml @@ -27,6 +27,7 @@ prepare-unbuilt-version: expire_in: 1 week paths: - node_modules/ + - package-lock.json - client-app/dep/templates/dist/ - client-app/style/style.styl - client-app/style/src/ @@ -49,6 +50,7 @@ prepare-built-version: name: ${CI_JOB_NAME}_${CI_COMMIT_REF_NAME} expire_in: 1 month paths: + - package-lock.json - redmic-project-web-*.tgz - build-report.txt rules: diff --git a/README.md b/README.md index a606517a..4515e4e3 100644 --- a/README.md +++ b/README.md @@ -9,10 +9,10 @@ Cliente web de REDMIC. ## Entorno de desarrollo -Una vez clonado el repositorio del proyecto en el entorno local de desarrollo y satisfechas las dependencias base del sistema (`npm/Node.js`, `grunt-cli` y `Yarn`), es posible instalar sus dependencias y arrancar el servicio en modo de desarrollo: +Una vez clonado el repositorio del proyecto en el entorno local de desarrollo y satisfechas las dependencias base del sistema (`npm/Node.js` y `grunt-cli`), es posible instalar sus dependencias y arrancar el servicio en modo de desarrollo: ```sh -npm run install +npm install OAUTH_URL=https://redmic.grafcan.es/api/oauth \ OAUTH_CLIENT_ID=app \ @@ -42,7 +42,7 @@ Para optimizar la ejecución es necesario realizar un proceso de "compilación" Se puede generar la salida compilada simplemente lanzando los siguientes comandos (cuidado, es un proceso pesado): ```sh -npm run install +npm install npm pack ``` @@ -69,7 +69,7 @@ Se ha preparado una batería de pruebas, tanto unitarias como funcionales, que p Se puede comenzar la ejecución de tests lanzando los siguientes comandos: ```sh -npm run install +npm install npm test ``` diff --git a/build/Dockerfile b/build/Dockerfile index af595220..13ee50a2 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -17,14 +17,11 @@ ADD redmic-project-web-*.tgz / WORKDIR /package -RUN node -e 'const fs = require("fs"); \ - const pkg = JSON.parse(fs.readFileSync("./package.json", "utf-8")); \ - delete pkg.devDependencies; \ - fs.writeFileSync("./package.json", JSON.stringify(pkg), "utf-8");' && \ - yarn install --production --ignore-optional --ignore-scripts && \ - yarn cache clean && \ - yarn autoclean --init && yarn autoclean --force && \ - rm -f yarn.lock .yarnclean +COPY package-lock.json . + +RUN npm install --ignore-scripts && \ + npm cache clean --force && \ + rm -f package-lock.json ARG VERSION diff --git a/build/Dockerfile.dockerignore b/build/Dockerfile.dockerignore index 80cdadcf..adb84c34 100644 --- a/build/Dockerfile.dockerignore +++ b/build/Dockerfile.dockerignore @@ -1,2 +1,3 @@ * !redmic-project-web-*.tgz +!package-lock.json diff --git a/client-app/dep/templates b/client-app/dep/templates index 78f34085..04512eac 160000 --- a/client-app/dep/templates +++ b/client-app/dep/templates @@ -1 +1 @@ -Subproject commit 78f34085f8de7340cd10c4b093abb8256d3c4c7d +Subproject commit 04512eacc2aaed8cce2a5d975382a7a7d16fa777 diff --git a/client-app/style b/client-app/style index 3f462dfc..467576f3 160000 --- a/client-app/style +++ b/client-app/style @@ -1 +1 @@ -Subproject commit 3f462dfc0a8e13f48342d11b4766fe2926e7a8d2 +Subproject commit 467576f36928ddf377aa2188c1dfe1f39b77a088 diff --git a/grunt/config/prepareDependences.js b/grunt/config/prepareDependences.js deleted file mode 100644 index e6b68249..00000000 --- a/grunt/config/prepareDependences.js +++ /dev/null @@ -1,20 +0,0 @@ -module.exports = function(grunt) { - - grunt.config('shell.checkGlobalDependences', { - options: { - stdout: true - }, - command: [ - 'type yarn' - ].join(' && ') - }); - - grunt.config('shell.installDependences', { - options: { - stdout: true - }, - command: [ - 'yarn install --prod=false --ignore-optional --ignore-scripts' - ].join('; ') - }); -}; diff --git a/grunt/task/preBuild.js b/grunt/task/preBuild.js index 2ae2b832..81173c8a 100644 --- a/grunt/task/preBuild.js +++ b/grunt/task/preBuild.js @@ -1,5 +1,5 @@ module.exports = function(grunt) { grunt.registerTask('preBuild', - ['prepareDependences', 'addModules', 'buildModules', 'jshint']); + ['addModules', 'buildModules', 'jshint']); }; diff --git a/grunt/task/prepareDependences.js b/grunt/task/prepareDependences.js deleted file mode 100644 index 00ce716a..00000000 --- a/grunt/task/prepareDependences.js +++ /dev/null @@ -1,9 +0,0 @@ -module.exports = function(grunt) { - - grunt.registerTask('prepareDependences', - 'Comprueba, limpia e instala las dependencias del proyecto', - function() { - - grunt.task.run(['shell:checkGlobalDependences', 'shell:installDependences']); - }); -}; diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 00000000..3cc8b2d7 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,7905 @@ +{ + "name": "@redmic-project/web", + "version": "0.26.0", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "@redmic-project/web", + "version": "0.26.0", + "hasInstallScript": true, + "license": "AGPL-3.0-or-later", + "dependencies": { + "commander": "11.1.0", + "express": "4.19.2", + "morgan": "1.10.0", + "prerender-node": "3.8.0", + "prom-client": "15.1.2", + "pug": "3.0.3", + "response-time": "2.3.2", + "winston": "3.13.0" + }, + "devDependencies": { + "@lweller/leaflet-areaselect": "1.3.0", + "alertifyjs": "1.14.0", + "cbtree": "https://github.com/pjekel/cbtree.git#master", + "color-js": "1.0.5", + "d3": "7.9.0", + "d3-v6-tip": "1.0.9", + "deepmerge": "4.2.0", + "dijit": "1.17.3", + "dojo": "1.17.3", + "dojo-util": "1.17.3", + "dojox": "1.17.3", + "draggabilly": "2.4.1", + "dropzone": "5.9.3", + "glob": "10.4.1", + "grunt": "1.6.1", + "grunt-contrib-clean": "2.0.1", + "grunt-contrib-copy": "1.0.0", + "grunt-contrib-jshint": "3.2.0", + "grunt-contrib-uglify": "5.2.2", + "grunt-shell": "3.0.1", + "handlebars": "4.7.8", + "intern": "4.10.1", + "json-schema-ref-parser": "6.1.0", + "leaflet": "1.9.4", + "leaflet-draw": "1.0.4", + "leaflet-measure": "3.1.0", + "leaflet-minimap": "3.6.1", + "leaflet-nav": "1.0.3", + "leaflet.awesome-markers": "2.0.5", + "leaflet.coordinates": "0.1.5", + "leaflet.nontiledlayer": "1.0.9", + "load-grunt-tasks": "5.1.0", + "mediator-js": "0.11.0", + "moment": "2.30.1", + "nib": "1.2.0", + "packery": "2.1.2", + "pdfjs-dist-viewer-min": "2.12.313", + "proj4": "2.11.0", + "prunecluster": "https://github.com/pedroetb/PruneCluster.git", + "put-selector": "0.3.6", + "sockjs-client": "1.6.1", + "stomp-websocket": "2.3.4-next", + "stylus": "0.63.0", + "tv4": "1.3.0", + "uuid": "8.3.2", + "wicket": "1.3.8" + }, + "engines": { + "node": ">=20.16", + "npm": ">=10.8" + } + }, + "node_modules/@adobe/css-tools": { + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.3.tgz", + "integrity": "sha512-rE0Pygv0sEZ4vBWHlAgJLGDU7Pm8xoO6p3wsEceb7GYAjScrOHpEo8KK/eVkAcnSM+slAEtXjA2JpdjLp4fJQQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/@ampproject/remapping": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.1.2.tgz", + "integrity": "sha512-hoyByceqwKirw7w3Z7gnIIZC3Wx3J484Y3L/cMpXFbr7d9ZQj2mODrirNzcJa+SM3UlpWXYvKV4RlRpFXlWgXg==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@jridgewell/trace-mapping": "^0.3.0" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@babel/code-frame": { + "version": "7.16.7", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz", + "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/highlight": "^7.16.7" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/compat-data": { + "version": "7.17.7", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.7.tgz", + "integrity": "sha512-p8pdE6j0a29TNGebNm7NzYZWB3xVZJBZ7XGs42uAKzQo8VQ3F0By/cQCtUEABwIqw5zo6WA4NbmxsfzADzMKnQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/core": { + "version": "7.17.9", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.17.9.tgz", + "integrity": "sha512-5ug+SfZCpDAkVp9SFIZAzlW18rlzsOcJGaetCjkySnrXXDUw9AR8cDUm1iByTmdWM6yxX6/zycaV76w3YTF2gw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@ampproject/remapping": "^2.1.0", + "@babel/code-frame": "^7.16.7", + "@babel/generator": "^7.17.9", + "@babel/helper-compilation-targets": "^7.17.7", + "@babel/helper-module-transforms": "^7.17.7", + "@babel/helpers": "^7.17.9", + "@babel/parser": "^7.17.9", + "@babel/template": "^7.16.7", + "@babel/traverse": "^7.17.9", + "@babel/types": "^7.17.0", + "convert-source-map": "^1.7.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.2", + "json5": "^2.2.1", + "semver": "^6.3.0" + }, + "engines": { + "node": ">=6.9.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/babel" + } + }, + "node_modules/@babel/core/node_modules/debug": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/@babel/core/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true, + "license": "MIT" + }, + "node_modules/@babel/generator": { + "version": "7.17.9", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.9.tgz", + "integrity": "sha512-rAdDousTwxbIxbz5I7GEQ3lUip+xVCXooZNbsydCWs3xA7ZsYOv+CFRdzGxRX78BmQHu9B1Eso59AOZQOJDEdQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/types": "^7.17.0", + "jsesc": "^2.5.1", + "source-map": "^0.5.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/generator/node_modules/source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/@babel/helper-compilation-targets": { + "version": "7.17.7", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.7.tgz", + "integrity": "sha512-UFzlz2jjd8kroj0hmCFV5zr+tQPi1dpC2cRsDV/3IEW8bJfCPrPpmcSN6ZS8RqIq4LXcmpipCQFPddyFA5Yc7w==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/compat-data": "^7.17.7", + "@babel/helper-validator-option": "^7.16.7", + "browserslist": "^4.17.5", + "semver": "^6.3.0" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, + "node_modules/@babel/helper-environment-visitor": { + "version": "7.16.7", + "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz", + "integrity": "sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/types": "^7.16.7" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-function-name": { + "version": "7.17.9", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz", + "integrity": "sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/template": "^7.16.7", + "@babel/types": "^7.17.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-hoist-variables": { + "version": "7.16.7", + "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz", + "integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/types": "^7.16.7" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-module-imports": { + "version": "7.16.7", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz", + "integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/types": "^7.16.7" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-module-transforms": { + "version": "7.17.7", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.17.7.tgz", + "integrity": "sha512-VmZD99F3gNTYB7fJRDTi+u6l/zxY0BE6OIxPSU7a50s6ZUQkHwSDmV92FfM+oCG0pZRVojGYhkR8I0OGeCVREw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-environment-visitor": "^7.16.7", + "@babel/helper-module-imports": "^7.16.7", + "@babel/helper-simple-access": "^7.17.7", + "@babel/helper-split-export-declaration": "^7.16.7", + "@babel/helper-validator-identifier": "^7.16.7", + "@babel/template": "^7.16.7", + "@babel/traverse": "^7.17.3", + "@babel/types": "^7.17.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-simple-access": { + "version": "7.17.7", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz", + "integrity": "sha512-txyMCGroZ96i+Pxr3Je3lzEJjqwaRC9buMUgtomcrLe5Nd0+fk1h0LLA+ixUF5OW7AhHuQ7Es1WcQJZmZsz2XA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/types": "^7.17.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-split-export-declaration": { + "version": "7.16.7", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz", + "integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/types": "^7.16.7" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-validator-identifier": { + "version": "7.16.7", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz", + "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-validator-option": { + "version": "7.16.7", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz", + "integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helpers": { + "version": "7.17.9", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.9.tgz", + "integrity": "sha512-cPCt915ShDWUEzEp3+UNRktO2n6v49l5RSnG9M5pS24hA+2FAc5si+Pn1i4VVbQQ+jh+bIZhPFQOJOzbrOYY1Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/template": "^7.16.7", + "@babel/traverse": "^7.17.9", + "@babel/types": "^7.17.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/highlight": { + "version": "7.17.9", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.9.tgz", + "integrity": "sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-validator-identifier": "^7.16.7", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/highlight/node_modules/ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-convert": "^1.9.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/highlight/node_modules/chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/highlight/node_modules/has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/highlight/node_modules/supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/parser": { + "version": "7.17.9", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.17.9.tgz", + "integrity": "sha512-vqUSBLP8dQHFPdPi9bc5GK9vRkYHJ49fsZdtoJ8EQ8ibpwk5rPKfvNIwChB0KVXcIjcepEBBd2VHC5r9Gy8ueg==", + "dev": true, + "license": "MIT", + "bin": { + "parser": "bin/babel-parser.js" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@babel/template": { + "version": "7.16.7", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz", + "integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^7.16.7", + "@babel/parser": "^7.16.7", + "@babel/types": "^7.16.7" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/traverse": { + "version": "7.17.9", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.9.tgz", + "integrity": "sha512-PQO8sDIJ8SIwipTPiR71kJQCKQYB5NGImbOviK8K+kg5xkNSYXLBupuX9QhatFowrsvo9Hj8WgArg3W7ijNAQw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^7.16.7", + "@babel/generator": "^7.17.9", + "@babel/helper-environment-visitor": "^7.16.7", + "@babel/helper-function-name": "^7.17.9", + "@babel/helper-hoist-variables": "^7.16.7", + "@babel/helper-split-export-declaration": "^7.16.7", + "@babel/parser": "^7.17.9", + "@babel/types": "^7.17.0", + "debug": "^4.1.0", + "globals": "^11.1.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/traverse/node_modules/debug": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/@babel/traverse/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true, + "license": "MIT" + }, + "node_modules/@babel/types": { + "version": "7.17.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.0.tgz", + "integrity": "sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-validator-identifier": "^7.16.7", + "to-fast-properties": "^2.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@colors/colors": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.6.0.tgz", + "integrity": "sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA==", + "license": "MIT", + "engines": { + "node": ">=0.1.90" + } + }, + "node_modules/@dabh/diagnostics": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.3.tgz", + "integrity": "sha512-hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA==", + "license": "MIT", + "dependencies": { + "colorspace": "1.1.x", + "enabled": "2.0.x", + "kuler": "^2.0.0" + } + }, + "node_modules/@isaacs/cliui": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", + "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", + "dev": true, + "license": "ISC", + "dependencies": { + "string-width": "^5.1.2", + "string-width-cjs": "npm:string-width@^4.2.0", + "strip-ansi": "^7.0.1", + "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", + "wrap-ansi": "^8.1.0", + "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@isaacs/cliui/node_modules/ansi-regex": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/@isaacs/cliui/node_modules/strip-ansi": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, + "node_modules/@istanbuljs/schema": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", + "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/@jridgewell/resolve-uri": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz", + "integrity": "sha512-VPeQ7+wH0itvQxnG+lIzWgkysKIr3L9sslimFW55rHMdGu/qCQ5z5h9zq4gI8uBtqkpHhsF4Z/OwExufUCThew==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/sourcemap-codec": { + "version": "1.4.11", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz", + "integrity": "sha512-Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg==", + "dev": true, + "license": "MIT" + }, + "node_modules/@jridgewell/trace-mapping": { + "version": "0.3.4", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.4.tgz", + "integrity": "sha512-vFv9ttIedivx0ux3QSjhgtCVjPZd5l46ZOMDSCwnH1yUO2e964gO8LZGyv2QkqcgR6TnBU1v+1IFqmeoG+0UJQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/resolve-uri": "^3.0.3", + "@jridgewell/sourcemap-codec": "^1.4.10" + } + }, + "node_modules/@lweller/leaflet-areaselect": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@lweller/leaflet-areaselect/-/leaflet-areaselect-1.3.0.tgz", + "integrity": "sha512-zdLHwkuARjzHTp+3mdkkpHjbsXwer9HJeZzc5IRgqv9fI3osD0+wwj5GCkefVfF1sAsmcEOm/nGoTSfUXewaug==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/leaflet": "*" + } + }, + "node_modules/@opentelemetry/api": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.7.0.tgz", + "integrity": "sha512-AdY5wvN0P2vXBi3b29hxZgSFvdhdxPB9+f0B6s//P9Q8nibRWeA3cHm8UmLpio9ABigkVHJ5NMPk+Mz8VCCyrw==", + "license": "Apache-2.0", + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/@theintern/common": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/@theintern/common/-/common-0.3.0.tgz", + "integrity": "sha512-VKSyZGEyzmicJPvV5Gxeavm8Xbcr0cETAAqMapWZzA9Q85YHMG8VSrmPFlMrDQ524qE0IqQsTi0IlH8NIaN+eQ==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "axios": "~0.21.1", + "tslib": "~2.3.0" + } + }, + "node_modules/@theintern/digdug": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/@theintern/digdug/-/digdug-2.6.2.tgz", + "integrity": "sha512-r9P7zkIp8L2LYKOUfcKl+KOHUTWrIZ9X6Efsb7Tn+OtiIv4oRlXorcoj/5vmrRLO5JF8jFj26HyeSWBNQA2uwg==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@theintern/common": "~0.3.0", + "command-exists": "~1.2.9", + "decompress": "~4.2.1", + "tslib": "~2.3.0" + }, + "bin": { + "digdugEnvironments": "bin/digdugEnvironments.js" + } + }, + "node_modules/@theintern/leadfoot": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@theintern/leadfoot/-/leadfoot-2.4.1.tgz", + "integrity": "sha512-WnmmMlSROXQc6sGJdQCcSXYbrRAni2HMmjjr2qtvXtLNCi7ZG6O/H7rJ+1fNdJckjE3kwF+Ag3Bh1WR7GkfG0Q==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@theintern/common": "~0.3.0", + "jszip": "~3.7.1", + "tslib": "~2.3.0" + } + }, + "node_modules/@tsconfig/node10": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.8.tgz", + "integrity": "sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg==", + "dev": true, + "license": "MIT" + }, + "node_modules/@tsconfig/node12": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.9.tgz", + "integrity": "sha512-/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw==", + "dev": true, + "license": "MIT" + }, + "node_modules/@tsconfig/node14": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.1.tgz", + "integrity": "sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg==", + "dev": true, + "license": "MIT" + }, + "node_modules/@tsconfig/node16": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.2.tgz", + "integrity": "sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==", + "dev": true, + "license": "MIT" + }, + "node_modules/@turf/area": { + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/@turf/area/-/area-5.1.5.tgz", + "integrity": "sha512-lz16gqtvoz+j1jD9y3zj0Z5JnGNd3YfS0h+DQY1EcZymvi75Frm9i5YbEyth0RfxYZeOVufY7YIS3LXbJlI57g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@turf/helpers": "^5.1.5", + "@turf/meta": "^5.1.5" + } + }, + "node_modules/@turf/distance": { + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/@turf/distance/-/distance-5.1.5.tgz", + "integrity": "sha512-sYCAgYZ2MjNKMtx17EijHlK9qHwpA0MuuQWbR4P30LTCl52UlG/reBfV899wKyF3HuDL9ux78IbILwOfeQ4zgA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@turf/helpers": "^5.1.5", + "@turf/invariant": "^5.1.5" + } + }, + "node_modules/@turf/helpers": { + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/@turf/helpers/-/helpers-5.1.5.tgz", + "integrity": "sha512-/lF+JR+qNDHZ8bF9d+Cp58nxtZWJ3sqFe6n3u3Vpj+/0cqkjk4nXKYBSY0azm+GIYB5mWKxUXvuP/m0ZnKj1bw==", + "dev": true, + "license": "MIT" + }, + "node_modules/@turf/invariant": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@turf/invariant/-/invariant-5.2.0.tgz", + "integrity": "sha512-28RCBGvCYsajVkw2EydpzLdcYyhSA77LovuOvgCJplJWaNVyJYH6BOR3HR9w50MEkPqb/Vc/jdo6I6ermlRtQA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@turf/helpers": "^5.1.5" + } + }, + "node_modules/@turf/length": { + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/@turf/length/-/length-5.1.5.tgz", + "integrity": "sha512-0ryx68h512wCoNfwyksLdabxEfwkGNTPg61/QiY+QfGFUOUNhHbP+QimViFpwF5hyX7qmroaSHVclLUqyLGRbg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@turf/distance": "^5.1.5", + "@turf/helpers": "^5.1.5", + "@turf/meta": "^5.1.5" + } + }, + "node_modules/@turf/meta": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@turf/meta/-/meta-5.2.0.tgz", + "integrity": "sha512-ZjQ3Ii62X9FjnK4hhdsbT+64AYRpaI8XMBMcyftEOGSmPMUVnkbvuv3C9geuElAXfQU7Zk1oWGOcrGOD9zr78Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "@turf/helpers": "^5.1.5" + } + }, + "node_modules/@types/babel-types": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/@types/babel-types/-/babel-types-7.0.0.tgz", + "integrity": "sha512-PyWcbX0W4r4GcgXLI0Vu4jyJ/Erueo3PwjgvQcOmWAOBW0ObhzBBciEX+sHvjkNE0umI6nqD192FDKvYZTL91A==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/benchmark": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@types/benchmark/-/benchmark-2.1.1.tgz", + "integrity": "sha512-XmdNOarpSSxnb3DE2rRFOFsEyoqXLUL+7H8nSGS25vs+JS0018bd+cW5Ma9vdlkPmoTHSQ6e8EUFMFMxeE4l+g==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/body-parser": { + "version": "1.16.8", + "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.16.8.tgz", + "integrity": "sha512-BdN2PXxOFnTXFcyONPW6t0fHjz2fvRZHVMFpaS0wYr+Y8fWEaNOs4V8LEu/fpzQlMx+ahdndgTaGTwPC+J/EeA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/express": "*", + "@types/node": "*" + } + }, + "node_modules/@types/body-parser/node_modules/@types/express": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/@types/express/-/express-4.11.0.tgz", + "integrity": "sha512-N1Wdp3v4KmdO3W/CM7KXrDwM4xcVZjlHF2dAOs7sNrTUX8PY3G4n9NkaHlfjGFEfgFeHmRRjywoBd4VkujDs9w==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/body-parser": "*", + "@types/express-serve-static-core": "*", + "@types/serve-static": "*" + } + }, + "node_modules/@types/chai": { + "version": "4.2.22", + "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.2.22.tgz", + "integrity": "sha512-tFfcE+DSTzWAgifkjik9AySNqIyNoYwmR+uecPwwD/XRNfvOjmC/FjCxpiUGDkDVDphPfCUecSQVFw+lN3M3kQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/charm": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@types/charm/-/charm-1.0.3.tgz", + "integrity": "sha512-FpNoSOkloETr+ZJ0RsZpB+a/tqJkniIN+9Enn6uPIbhiNptOWtZzV7FkaqxTRjvvlHeUKMR331Wj9tOmqG10TA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/events": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@types/events/-/events-1.1.0.tgz", + "integrity": "sha512-y3bR98mzYOo0pAZuiLari+cQyiKk3UXRuT45h1RjhfeCzqkjaVsfZJNaxdgtk7/3tzOm1ozLTqEqMP3VbI48jw==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/express": { + "version": "4.17.13", + "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.13.tgz", + "integrity": "sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/body-parser": "*", + "@types/express-serve-static-core": "^4.17.18", + "@types/qs": "*", + "@types/serve-static": "*" + } + }, + "node_modules/@types/express-serve-static-core": { + "version": "4.11.1", + "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.11.1.tgz", + "integrity": "sha512-EehCl3tpuqiM8RUb+0255M8PhhSwTtLfmO7zBBdv0ay/VTd/zmrqDfQdZFsa5z/PVMbH2yCMZPXsnrImpATyIw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/events": "*", + "@types/node": "*" + } + }, + "node_modules/@types/express/node_modules/@types/express-serve-static-core": { + "version": "4.17.18", + "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.18.tgz", + "integrity": "sha512-m4JTwx5RUBNZvky/JJ8swEJPKFd8si08pPF2PfizYjGZOKr/svUWPcoUmLow6MmPzhasphB7gSTINY67xn3JNA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "*", + "@types/qs": "*", + "@types/range-parser": "*" + } + }, + "node_modules/@types/geojson": { + "version": "7946.0.8", + "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.8.tgz", + "integrity": "sha512-1rkryxURpr6aWP7R786/UQOkJ3PcpQiWkAXBmdWc7ryFWqN6a4xfK7BtjXvFBKO9LjQ+MWQSWxYeZX1OApnArA==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/istanbul-lib-coverage": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-1.1.0.tgz", + "integrity": "sha512-ohkhb9LehJy+PA40rDtGAji61NCgdtKLAlFoYp4cnuuQEswwdK3vz9SOIkkyc3wrk8dzjphQApNs56yyXLStaQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/istanbul-lib-instrument": { + "version": "1.7.4", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-instrument/-/istanbul-lib-instrument-1.7.4.tgz", + "integrity": "sha512-1i1VVkU2KrpZCmti+t5J/zBb2KLKxHgU1EYL+0QtnDnVyZ59aSKcpnG6J0I6BZGDON566YzPNIlNfk7m+9l1JA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/babel-types": "*", + "@types/istanbul-lib-coverage": "*", + "source-map": "^0.6.1" + } + }, + "node_modules/@types/istanbul-lib-report": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", + "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/istanbul-lib-coverage": "*" + } + }, + "node_modules/@types/istanbul-lib-source-maps": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz", + "integrity": "sha512-WH6e5naLXI3vB2Px3whNeYxzDgm6S6sk3Ht8e3/BiWwEnzZi72wja3bWzWwcgbFTFp8hBLB7NT2p3lNJgxCxvA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/istanbul-lib-coverage": "*", + "source-map": "^0.6.1" + } + }, + "node_modules/@types/istanbul-reports": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz", + "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/istanbul-lib-report": "*" + } + }, + "node_modules/@types/istanbul-reports/node_modules/@types/istanbul-lib-report": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-1.1.0.tgz", + "integrity": "sha512-nW5QuzmMhr7fHPijtaGOemFFI8Ctrxb/dIXgouSlKmWT16RxWlGLEX/nGghIBOReKe9hPFZXoNh338nFQk2xcA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/istanbul-lib-coverage": "*" + } + }, + "node_modules/@types/leaflet": { + "version": "1.7.9", + "resolved": "https://registry.npmjs.org/@types/leaflet/-/leaflet-1.7.9.tgz", + "integrity": "sha512-H8vPgD49HKzqM41ArHGZM70g/tfhp8W+JcPxfnF+5H/Xvp+xiP+KQOUNWU8U89fqS1Jj3cpRY/+nbnaHFzwnFA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/geojson": "*" + } + }, + "node_modules/@types/mime": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@types/mime/-/mime-2.0.0.tgz", + "integrity": "sha512-A2TAGbTFdBw9azHbpVd+/FkdW2T6msN1uct1O9bH3vTerEHKZhTXJUQXy+hNq1B0RagfU8U+KBdqiZpxjhOUQA==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/minimatch": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz", + "integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/node": { + "version": "9.3.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-9.3.0.tgz", + "integrity": "sha512-wNBfvNjzsJl4tswIZKXCFQY0lss9nKUyJnG6T94X/eqjRgI2jHZ4evdjhQYBSan/vGtF6XVXPApOmNH2rf0KKw==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/qs": { + "version": "6.9.5", + "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.5.tgz", + "integrity": "sha512-/JHkVHtx/REVG0VVToGRGH2+23hsYLHdyG+GrvoUGlGAd0ErauXDyvHtRI/7H7mzLm+tBCKA7pfcpkQ1lf58iQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/range-parser": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.3.tgz", + "integrity": "sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/serve-static": { + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.1.tgz", + "integrity": "sha512-jDMH+3BQPtvqZVIcsH700Dfi8Q3MIcEx16g/VdxjoqiGR/NntekB10xdBpirMKnPe9z2C5cBmL0vte0YttOr3Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/express-serve-static-core": "*", + "@types/mime": "*" + } + }, + "node_modules/@types/ws": { + "version": "7.4.6", + "resolved": "https://registry.npmjs.org/@types/ws/-/ws-7.4.6.tgz", + "integrity": "sha512-ijZ1vzRawI7QoWnTNL8KpHixd2b2XVb9I9HAqI3triPsh1EC0xH0Eg6w2O3TKbDCgiNNlJqfrof6j4T2I+l9vw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/abbrev": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", + "dev": true, + "license": "ISC" + }, + "node_modules/accepts": { + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", + "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==", + "license": "MIT", + "dependencies": { + "mime-types": "~2.1.34", + "negotiator": "0.6.3" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/accepts/node_modules/mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/accepts/node_modules/mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "license": "MIT", + "dependencies": { + "mime-db": "1.52.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/acorn": { + "version": "7.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", + "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", + "license": "MIT", + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/alertifyjs": { + "version": "1.14.0", + "resolved": "https://registry.npmjs.org/alertifyjs/-/alertifyjs-1.14.0.tgz", + "integrity": "sha512-jUxJTcNYhJ2P1Wal73nmyTwMkaPim4PjZP9CAG+S8SK2SinraXxvOxnPrEY81/wc2iBPDFBP7mdg61db4WsuHQ==", + "dev": true + }, + "node_modules/ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/ansi-styles/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/ansi-styles/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "license": "MIT" + }, + "node_modules/append-transform": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-2.0.0.tgz", + "integrity": "sha512-7yeyCEurROLQJFv5Xj4lEGTy0borxepjFv1g22oAdqFu//SrAlDl1O1Nxx15SH1RoliUml6p8dwJW9jvZughhg==", + "dev": true, + "license": "MIT", + "dependencies": { + "default-require-extensions": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/arg": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", + "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", + "dev": true, + "license": "MIT" + }, + "node_modules/argparse": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz", + "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=", + "dev": true, + "license": "MIT", + "dependencies": { + "sprintf-js": "~1.0.2" + } + }, + "node_modules/argparse/node_modules/sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", + "dev": true, + "license": "BSD-3-Clause" + }, + "node_modules/array-differ": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-3.0.0.tgz", + "integrity": "sha512-THtfYS6KtME/yIAhKjZ2ul7XI96lQGHRputJQHO80LAWQnuGP4iCIN8vdMRboGbIEYBwU33q8Tch1os2+X0kMg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/array-each": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz", + "integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/array-flatten": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", + "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=", + "license": "MIT" + }, + "node_modules/array-slice": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz", + "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/array-union": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", + "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/arrify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz", + "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/asap": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", + "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=", + "license": "MIT" + }, + "node_modules/assert-never": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/assert-never/-/assert-never-1.2.1.tgz", + "integrity": "sha512-TaTivMB6pYI1kXwrFlEhLeGfOqoDNdTxjCdwRfFFkEA30Eu+k48W34nlok2EYWJfFFzqaEmichdNM7th6M5HNw==", + "license": "MIT" + }, + "node_modules/assertion-error": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz", + "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==", + "dev": true, + "license": "MIT", + "engines": { + "node": "*" + } + }, + "node_modules/async": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz", + "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==", + "license": "MIT" + }, + "node_modules/axios": { + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", + "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", + "dev": true, + "license": "MIT", + "dependencies": { + "follow-redirects": "^1.14.0" + } + }, + "node_modules/babel-walk": { + "version": "3.0.0-canary-5", + "resolved": "https://registry.npmjs.org/babel-walk/-/babel-walk-3.0.0-canary-5.tgz", + "integrity": "sha512-GAwkz0AihzY5bkwIY5QDR+LvsRQgB/B+1foMPvi0FZPMl5fjD7ICiznUiBdLYMH1QYe6vqu4gWYytZOccLouFw==", + "license": "MIT", + "dependencies": { + "@babel/types": "^7.9.6" + }, + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/babel-walk/node_modules/@babel/helper-validator-identifier": { + "version": "7.12.11", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz", + "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==", + "license": "MIT" + }, + "node_modules/babel-walk/node_modules/@babel/types": { + "version": "7.13.14", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.14.tgz", + "integrity": "sha512-A2aa3QTkWoyqsZZFl56MLUsfmh7O0gN41IPvXAE/++8ojpbz12SszD7JEGYVdn4f9Kt4amIei07swF1h4AqmmQ==", + "license": "MIT", + "dependencies": { + "@babel/helper-validator-identifier": "^7.12.11", + "lodash": "^4.17.19", + "to-fast-properties": "^2.0.0" + } + }, + "node_modules/babel-walk/node_modules/lodash": { + "version": "4.17.20", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", + "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==", + "license": "MIT" + }, + "node_modules/balanced-match": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", + "dev": true, + "license": "MIT" + }, + "node_modules/base64-js": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz", + "integrity": "sha1-EQHpVE9KdrG8OybUUsqW16NeeXg=", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/basic-auth": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz", + "integrity": "sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==", + "license": "MIT", + "dependencies": { + "safe-buffer": "5.1.2" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/basic-auth/node_modules/safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "license": "MIT" + }, + "node_modules/benchmark": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/benchmark/-/benchmark-2.1.4.tgz", + "integrity": "sha1-CfPeMckWQl1JjMLuVloOvzwqVik=", + "dev": true, + "license": "MIT", + "dependencies": { + "lodash": "^4.17.4", + "platform": "^1.3.3" + } + }, + "node_modules/benchmark/node_modules/lodash": { + "version": "4.17.4", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", + "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=", + "dev": true, + "license": "MIT" + }, + "node_modules/benchmark/node_modules/platform": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/platform/-/platform-1.3.5.tgz", + "integrity": "sha512-TuvHS8AOIZNAlE77WUDiR4rySV/VMptyMfcfeoMgs4P8apaZM3JrnbzBiixKUv+XR6i+BXrQh8WAnjaSPFO65Q==", + "dev": true, + "license": "MIT" + }, + "node_modules/bintrees": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/bintrees/-/bintrees-1.0.1.tgz", + "integrity": "sha1-DmVcm5wkNeqraL9AJyJtK1WjRSQ=" + }, + "node_modules/bl": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.1.tgz", + "integrity": "sha1-ysMo977kVzDUBLaSID/LWQ4XLV4=", + "dev": true, + "license": "MIT", + "dependencies": { + "readable-stream": "^2.0.5" + } + }, + "node_modules/body-parser": { + "version": "1.19.0", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz", + "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==", + "dev": true, + "license": "MIT", + "dependencies": { + "bytes": "3.1.0", + "content-type": "~1.0.4", + "debug": "2.6.9", + "depd": "~1.1.2", + "http-errors": "1.7.2", + "iconv-lite": "0.4.24", + "on-finished": "~2.3.0", + "qs": "6.7.0", + "raw-body": "2.4.0", + "type-is": "~1.6.17" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/body-parser/node_modules/http-errors": { + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz", + "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==", + "dev": true, + "license": "MIT", + "dependencies": { + "depd": "~1.1.2", + "inherits": "2.0.3", + "setprototypeof": "1.1.1", + "statuses": ">= 1.5.0 < 2", + "toidentifier": "1.0.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/body-parser/node_modules/qs": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", + "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.6" + } + }, + "node_modules/brace-expansion": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", + "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dev": true, + "license": "MIT", + "dependencies": { + "fill-range": "^7.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/browserslist": { + "version": "4.20.2", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.2.tgz", + "integrity": "sha512-CQOBCqp/9pDvDbx3xfMi+86pr4KXIf2FDkTTdeuYw8OxS9t898LA1Khq57gtufFILXpfgsSx5woNgsBgvGjpsA==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + } + ], + "license": "MIT", + "dependencies": { + "caniuse-lite": "^1.0.30001317", + "electron-to-chromium": "^1.4.84", + "escalade": "^3.1.1", + "node-releases": "^2.0.2", + "picocolors": "^1.0.0" + }, + "bin": { + "browserslist": "cli.js" + }, + "engines": { + "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" + } + }, + "node_modules/buffer": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-3.6.0.tgz", + "integrity": "sha1-pyyTb3e5a/UvX357RnGAYoVR3vs=", + "dev": true, + "license": "MIT", + "dependencies": { + "base64-js": "0.0.8", + "ieee754": "^1.1.4", + "isarray": "^1.0.0" + } + }, + "node_modules/buffer-crc32": { + "version": "0.2.13", + "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", + "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=", + "dev": true, + "license": "MIT", + "engines": { + "node": "*" + } + }, + "node_modules/buffer-from": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.0.0.tgz", + "integrity": "sha512-83apNb8KK0Se60UE1+4Ukbe3HbfELJ6UlI4ldtOGs7So4KD26orJM8hIY9lxdzP+UpItH1Yh/Y8GUvNFWFFRxA==", + "dev": true, + "license": "MIT" + }, + "node_modules/bytes": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", + "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/call-bind": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", + "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "license": "MIT", + "dependencies": { + "function-bind": "^1.1.1", + "get-intrinsic": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/call-me-maybe": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz", + "integrity": "sha1-JtII6onje1y95gJQoV8DHBak1ms=", + "dev": true, + "license": "MIT" + }, + "node_modules/caniuse-lite": { + "version": "1.0.30001331", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001331.tgz", + "integrity": "sha512-Y1xk6paHpUXKP/P6YjQv1xqyTbgAP05ycHBcRdQjTcyXlWol868sJJPlmk5ylOekw2BrucWes5jk+LvVd7WZ5Q==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + } + ], + "license": "CC-BY-4.0" + }, + "node_modules/cbtree": { + "version": "0.9.4", + "resolved": "git+ssh://git@github.com/pjekel/cbtree.git#cc60155a14dd8ecad95a4e8e2b0ce6358cc22066", + "dev": true, + "dependencies": { + "dijit": "1.8", + "dojo": "1.8" + } + }, + "node_modules/cbtree/node_modules/dijit": { + "version": "1.8.14", + "resolved": "https://registry.npmjs.org/dijit/-/dijit-1.8.14.tgz", + "integrity": "sha1-1cZRsNCJTJMX0LcYLjCbKr4BkAM=", + "dev": true, + "dependencies": { + "dojo": "1.8.14" + } + }, + "node_modules/cbtree/node_modules/dojo": { + "version": "1.8.14", + "resolved": "https://registry.npmjs.org/dojo/-/dojo-1.8.14.tgz", + "integrity": "sha1-jCOd0yHoXmpV0DMpuXu4i7pT+zM=", + "dev": true, + "license": "BSD-3-Clause OR AFL-2.1" + }, + "node_modules/chai": { + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.6.tgz", + "integrity": "sha512-bbcp3YfHCUzMOvKqsztczerVgBKSsEijCySNlHHbX3VG1nskvqjz5Rfso1gGwD6w6oOV3eI60pKuMOV5MV7p3Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "assertion-error": "^1.1.0", + "check-error": "^1.0.2", + "deep-eql": "^3.0.1", + "get-func-name": "^2.0.0", + "loupe": "^2.3.1", + "pathval": "^1.1.1", + "type-detect": "^4.0.5" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/character-parser": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/character-parser/-/character-parser-2.2.0.tgz", + "integrity": "sha1-x84o821LzZdE5f/CxfzeHHMmH8A=", + "license": "MIT", + "dependencies": { + "is-regex": "^1.0.3" + } + }, + "node_modules/charm": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/charm/-/charm-1.0.2.tgz", + "integrity": "sha1-it02cVOm2aWBMxBSxAkJkdqZXjU=", + "dev": true, + "license": "MIT", + "dependencies": { + "inherits": "^2.0.1" + } + }, + "node_modules/check-error": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz", + "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=", + "dev": true, + "license": "MIT", + "engines": { + "node": "*" + } + }, + "node_modules/cli": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/cli/-/cli-1.0.1.tgz", + "integrity": "sha1-IoF1NPJL+klQw01TLUjsvGIbjBQ=", + "dev": true, + "license": "MIT", + "dependencies": { + "exit": "0.1.2", + "glob": "^7.1.1" + }, + "engines": { + "node": ">=0.2.5" + } + }, + "node_modules/cli/node_modules/glob": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + } + }, + "node_modules/color": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/color/-/color-3.2.1.tgz", + "integrity": "sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==", + "license": "MIT", + "dependencies": { + "color-convert": "^1.9.3", + "color-string": "^1.6.0" + } + }, + "node_modules/color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "license": "MIT", + "dependencies": { + "color-name": "1.1.3" + } + }, + "node_modules/color-js": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/color-js/-/color-js-1.0.5.tgz", + "integrity": "sha512-KgOTVz7fupb3lOXu4lixP6BR2CdMaTtCnGmLfHZWhq8NU3MABd6U9KjWtJVuYChGS/gIaoA8LakKKQfWhQgwYQ==", + "dev": true, + "license": "BSD 2-Clause" + }, + "node_modules/color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", + "license": "MIT" + }, + "node_modules/color-string": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz", + "integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==", + "license": "MIT", + "dependencies": { + "color-name": "^1.0.0", + "simple-swizzle": "^0.2.2" + } + }, + "node_modules/colors": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz", + "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.1.90" + } + }, + "node_modules/colorspace": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/colorspace/-/colorspace-1.1.4.tgz", + "integrity": "sha512-BgvKJiuVu1igBUF2kEjRCZXol6wiiGbY5ipL/oVPwm0BL9sIpMIzM8IK7vwuxIIzOXMV3Ey5w+vxhm0rR/TN8w==", + "license": "MIT", + "dependencies": { + "color": "^3.1.3", + "text-hex": "1.0.x" + } + }, + "node_modules/command-exists": { + "version": "1.2.9", + "resolved": "https://registry.npmjs.org/command-exists/-/command-exists-1.2.9.tgz", + "integrity": "sha512-LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w==", + "dev": true, + "license": "MIT" + }, + "node_modules/commander": { + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-11.1.0.tgz", + "integrity": "sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ==", + "license": "MIT", + "engines": { + "node": ">=16" + } + }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", + "dev": true, + "license": "MIT" + }, + "node_modules/concurrent": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/concurrent/-/concurrent-0.3.2.tgz", + "integrity": "sha1-DqoAEaFXmMVjURKPIiR/biMX9Q4=", + "dev": true, + "license": "MIT" + }, + "node_modules/console-browserify": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz", + "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=", + "dev": true, + "dependencies": { + "date-now": "^0.1.4" + } + }, + "node_modules/constantinople": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/constantinople/-/constantinople-4.0.1.tgz", + "integrity": "sha512-vCrqcSIq4//Gx74TXXCGnHpulY1dskqLTFGDmhrGxzeXL8lF8kvXv6mpNWlJj1uD4DW23D4ljAqbY4RRaaUZIw==", + "license": "MIT", + "dependencies": { + "@babel/parser": "^7.6.0", + "@babel/types": "^7.6.1" + } + }, + "node_modules/constantinople/node_modules/@babel/helper-validator-identifier": { + "version": "7.12.11", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz", + "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==", + "license": "MIT" + }, + "node_modules/constantinople/node_modules/@babel/parser": { + "version": "7.13.15", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.15.tgz", + "integrity": "sha512-b9COtcAlVEQljy/9fbcMHpG+UIW9ReF+gpaxDHTlZd0c6/UU9ng8zdySAW9sRTzpvcdCHn6bUcbuYUgGzLAWVQ==", + "license": "MIT", + "bin": { + "parser": "bin/babel-parser.js" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/constantinople/node_modules/@babel/types": { + "version": "7.13.14", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.14.tgz", + "integrity": "sha512-A2aa3QTkWoyqsZZFl56MLUsfmh7O0gN41IPvXAE/++8ojpbz12SszD7JEGYVdn4f9Kt4amIei07swF1h4AqmmQ==", + "license": "MIT", + "dependencies": { + "@babel/helper-validator-identifier": "^7.12.11", + "lodash": "^4.17.19", + "to-fast-properties": "^2.0.0" + } + }, + "node_modules/constantinople/node_modules/lodash": { + "version": "4.17.20", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", + "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==", + "license": "MIT" + }, + "node_modules/content-disposition": { + "version": "0.5.4", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", + "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", + "license": "MIT", + "dependencies": { + "safe-buffer": "5.2.1" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/content-disposition/node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, + "node_modules/content-type": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", + "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/convert-source-map": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz", + "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==", + "dev": true, + "license": "MIT", + "dependencies": { + "safe-buffer": "~5.1.1" + } + }, + "node_modules/cookie": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz", + "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/cookie-signature": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", + "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=", + "license": "MIT" + }, + "node_modules/core-util-is": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", + "dev": true, + "license": "MIT" + }, + "node_modules/create-require": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", + "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/cross-spawn": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "dev": true, + "license": "MIT", + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/cross-spawn/node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/d3": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/d3/-/d3-7.9.0.tgz", + "integrity": "sha512-e1U46jVP+w7Iut8Jt8ri1YsPOvFpg46k+K8TpCb0P+zjCkjkPnV7WzfDJzMHy1LnA+wj5pLT1wjO901gLXeEhA==", + "dev": true, + "license": "ISC", + "dependencies": { + "d3-array": "3", + "d3-axis": "3", + "d3-brush": "3", + "d3-chord": "3", + "d3-color": "3", + "d3-contour": "4", + "d3-delaunay": "6", + "d3-dispatch": "3", + "d3-drag": "3", + "d3-dsv": "3", + "d3-ease": "3", + "d3-fetch": "3", + "d3-force": "3", + "d3-format": "3", + "d3-geo": "3", + "d3-hierarchy": "3", + "d3-interpolate": "3", + "d3-path": "3", + "d3-polygon": "3", + "d3-quadtree": "3", + "d3-random": "3", + "d3-scale": "4", + "d3-scale-chromatic": "3", + "d3-selection": "3", + "d3-shape": "3", + "d3-time": "3", + "d3-time-format": "4", + "d3-timer": "3", + "d3-transition": "3", + "d3-zoom": "3" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-array": { + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.1.6.tgz", + "integrity": "sha512-DCbBBNuKOeiR9h04ySRBMW52TFVc91O9wJziuyXw6Ztmy8D3oZbmCkOO3UHKC7ceNJsN2Mavo9+vwV8EAEUXzA==", + "dev": true, + "license": "ISC", + "dependencies": { + "internmap": "1 - 2" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-axis": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/d3-axis/-/d3-axis-3.0.0.tgz", + "integrity": "sha512-IH5tgjV4jE/GhHkRV0HiVYPDtvfjHQlQfJHs0usq7M30XcSBvOotpmH1IgkcXsO/5gEQZD43B//fc7SRT5S+xw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-brush": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/d3-brush/-/d3-brush-3.0.0.tgz", + "integrity": "sha512-ALnjWlVYkXsVIGlOsuWH1+3udkYFI48Ljihfnh8FZPF2QS9o+PzGLBslO0PjzVoHLZ2KCVgAM8NVkXPJB2aNnQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "d3-dispatch": "1 - 3", + "d3-drag": "2 - 3", + "d3-interpolate": "1 - 3", + "d3-selection": "3", + "d3-transition": "3" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-chord": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-chord/-/d3-chord-3.0.1.tgz", + "integrity": "sha512-VE5S6TNa+j8msksl7HwjxMHDM2yNK3XCkusIlpX5kwauBfXuyLAtNg9jCp/iHH61tgI4sb6R/EIMWCqEIdjT/g==", + "dev": true, + "license": "ISC", + "dependencies": { + "d3-path": "1 - 3" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-color": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-3.1.0.tgz", + "integrity": "sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-contour": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/d3-contour/-/d3-contour-4.0.2.tgz", + "integrity": "sha512-4EzFTRIikzs47RGmdxbeUvLWtGedDUNkTcmzoeyg4sP/dvCexO47AaQL7VKy/gul85TOxw+IBgA8US2xwbToNA==", + "dev": true, + "license": "ISC", + "dependencies": { + "d3-array": "^3.2.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-contour/node_modules/d3-array": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.4.tgz", + "integrity": "sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==", + "dev": true, + "license": "ISC", + "dependencies": { + "internmap": "1 - 2" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-delaunay": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/d3-delaunay/-/d3-delaunay-6.0.2.tgz", + "integrity": "sha512-IMLNldruDQScrcfT+MWnazhHbDJhcRJyOEBAJfwQnHle1RPh6WDuLvxNArUju2VSMSUuKlY5BGHRJ2cYyoFLQQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "delaunator": "5" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-dispatch": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-3.0.1.tgz", + "integrity": "sha512-rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-drag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/d3-drag/-/d3-drag-3.0.0.tgz", + "integrity": "sha512-pWbUJLdETVA8lQNJecMxoXfH6x+mO2UQo8rSmZ+QqxcbyA3hfeprFgIT//HW2nlHChWeIIMwS2Fq+gEARkhTkg==", + "dev": true, + "license": "ISC", + "dependencies": { + "d3-dispatch": "1 - 3", + "d3-selection": "3" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-dsv": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-dsv/-/d3-dsv-3.0.1.tgz", + "integrity": "sha512-UG6OvdI5afDIFP9w4G0mNq50dSOsXHJaRE8arAS5o9ApWnIElp8GZw1Dun8vP8OyHOZ/QJUKUJwxiiCCnUwm+Q==", + "dev": true, + "license": "ISC", + "dependencies": { + "commander": "7", + "iconv-lite": "0.6", + "rw": "1" + }, + "bin": { + "csv2json": "bin/dsv2json.js", + "csv2tsv": "bin/dsv2dsv.js", + "dsv2dsv": "bin/dsv2dsv.js", + "dsv2json": "bin/dsv2json.js", + "json2csv": "bin/json2dsv.js", + "json2dsv": "bin/json2dsv.js", + "json2tsv": "bin/json2dsv.js", + "tsv2csv": "bin/dsv2dsv.js", + "tsv2json": "bin/dsv2json.js" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-dsv/node_modules/commander": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", + "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 10" + } + }, + "node_modules/d3-dsv/node_modules/iconv-lite": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "dev": true, + "license": "MIT", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/d3-ease": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-3.0.1.tgz", + "integrity": "sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-fetch": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-fetch/-/d3-fetch-3.0.1.tgz", + "integrity": "sha512-kpkQIM20n3oLVBKGg6oHrUchHM3xODkTzjMoj7aWQFq5QEM+R6E4WkzT5+tojDY7yjez8KgCBRoj4aEr99Fdqw==", + "dev": true, + "license": "ISC", + "dependencies": { + "d3-dsv": "1 - 3" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-force": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/d3-force/-/d3-force-3.0.0.tgz", + "integrity": "sha512-zxV/SsA+U4yte8051P4ECydjD/S+qeYtnaIyAs9tgHCqfguma/aAQDjo85A9Z6EKhBirHRJHXIgJUlffT4wdLg==", + "dev": true, + "license": "ISC", + "dependencies": { + "d3-dispatch": "1 - 3", + "d3-quadtree": "1 - 3", + "d3-timer": "1 - 3" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-format": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-3.1.0.tgz", + "integrity": "sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-geo": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-3.0.1.tgz", + "integrity": "sha512-Wt23xBych5tSy9IYAM1FR2rWIBFWa52B/oF/GYe5zbdHrg08FU8+BuI6X4PvTwPDdqdAdq04fuWJpELtsaEjeA==", + "dev": true, + "license": "ISC", + "dependencies": { + "d3-array": "2.5.0 - 3" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-hierarchy": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-3.1.2.tgz", + "integrity": "sha512-FX/9frcub54beBdugHjDCdikxThEqjnR93Qt7PvQTOHxyiNCAlvMrHhclk3cD5VeAaq9fxmfRp+CnWw9rEMBuA==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-interpolate": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz", + "integrity": "sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==", + "dev": true, + "license": "ISC", + "dependencies": { + "d3-color": "1 - 3" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-path": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-3.0.1.tgz", + "integrity": "sha512-gq6gZom9AFZby0YLduxT1qmrp4xpBA1YZr19OI717WIdKE2OM5ETq5qrHLb301IgxhLwcuxvGZVLeeWc/k1I6w==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-polygon": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-polygon/-/d3-polygon-3.0.1.tgz", + "integrity": "sha512-3vbA7vXYwfe1SYhED++fPUQlWSYTTGmFmQiany/gdbiWgU/iEyQzyymwL9SkJjFFuCS4902BSzewVGsHHmHtXg==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-quadtree": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-3.0.1.tgz", + "integrity": "sha512-04xDrxQTDTCFwP5H6hRhsRcb9xxv2RzkcsygFzmkSIOJy3PeRJP7sNk3VRIbKXcog561P9oU0/rVH6vDROAgUw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-random": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-random/-/d3-random-3.0.1.tgz", + "integrity": "sha512-FXMe9GfxTxqd5D6jFsQ+DJ8BJS4E/fT5mqqdjovykEB2oFbTMDVdg1MGFxfQW+FBOGoB++k8swBrgwSHT1cUXQ==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-scale": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-4.0.2.tgz", + "integrity": "sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "d3-array": "2.10.0 - 3", + "d3-format": "1 - 3", + "d3-interpolate": "1.2.0 - 3", + "d3-time": "2.1.1 - 3", + "d3-time-format": "2 - 4" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-scale-chromatic": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-3.0.0.tgz", + "integrity": "sha512-Lx9thtxAKrO2Pq6OO2Ua474opeziKr279P/TKZsMAhYyNDD3EnCffdbgeSYN5O7m2ByQsxtuP2CSDczNUIZ22g==", + "dev": true, + "license": "ISC", + "dependencies": { + "d3-color": "1 - 3", + "d3-interpolate": "1 - 3" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-selection": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-3.0.0.tgz", + "integrity": "sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-shape": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-3.1.0.tgz", + "integrity": "sha512-tGDh1Muf8kWjEDT/LswZJ8WF85yDZLvVJpYU9Nq+8+yW1Z5enxrmXOhTArlkaElU+CTn0OTVNli+/i+HP45QEQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "d3-path": "1 - 3" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-time": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-3.0.0.tgz", + "integrity": "sha512-zmV3lRnlaLI08y9IMRXSDshQb5Nj77smnfpnd2LrBa/2K281Jijactokeak14QacHs/kKq0AQ121nidNYlarbQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "d3-array": "2 - 3" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-time-format": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-4.1.0.tgz", + "integrity": "sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==", + "dev": true, + "license": "ISC", + "dependencies": { + "d3-time": "1 - 3" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-timer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-3.0.1.tgz", + "integrity": "sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-transition": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-transition/-/d3-transition-3.0.1.tgz", + "integrity": "sha512-ApKvfjsSR6tg06xrL434C0WydLr7JewBB3V+/39RMHsaXTOG0zmt/OAXeng5M5LBm0ojmxJrpomQVZ1aPvBL4w==", + "dev": true, + "license": "ISC", + "dependencies": { + "d3-color": "1 - 3", + "d3-dispatch": "1 - 3", + "d3-ease": "1 - 3", + "d3-interpolate": "1 - 3", + "d3-timer": "1 - 3" + }, + "engines": { + "node": ">=12" + }, + "peerDependencies": { + "d3-selection": "2 - 3" + } + }, + "node_modules/d3-v6-tip": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/d3-v6-tip/-/d3-v6-tip-1.0.9.tgz", + "integrity": "sha512-XU7Ks7aA8GX8X9v4vbBh7r7I7oJ2YwJULkN2mQA5nT+7jxJnTN47WVa1aBPTv2qPMQkh91YECN1mkevnWG0zEw==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "d3-selection": "2" + } + }, + "node_modules/d3-v6-tip/node_modules/d3-selection": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-2.0.0.tgz", + "integrity": "sha512-XoGGqhLUN/W14NmaqcO/bb1nqjDAw5WtSYb2X8wiuQWvSZUsUVYsOSkOybUrNvcBjaywBdYPy03eXHMXjk9nZA==", + "dev": true, + "license": "BSD-3-Clause" + }, + "node_modules/d3-zoom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/d3-zoom/-/d3-zoom-3.0.0.tgz", + "integrity": "sha512-b8AmV3kfQaqWAuacbPuNbL6vahnOJflOhexLzMMNLga62+/nh0JzvJ0aO/5a5MVgUFGS7Hu1P9P03o3fJkDCyw==", + "dev": true, + "license": "ISC", + "dependencies": { + "d3-dispatch": "1 - 3", + "d3-drag": "2 - 3", + "d3-interpolate": "1 - 3", + "d3-selection": "2 - 3", + "d3-transition": "2 - 3" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/date-now": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz", + "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=", + "dev": true + }, + "node_modules/dateformat": { + "version": "4.6.3", + "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-4.6.3.tgz", + "integrity": "sha512-2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA==", + "dev": true, + "license": "MIT", + "engines": { + "node": "*" + } + }, + "node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "license": "MIT", + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/debug/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "license": "MIT" + }, + "node_modules/decompress": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/decompress/-/decompress-4.2.1.tgz", + "integrity": "sha512-e48kc2IjU+2Zw8cTb6VZcJQ3lgVbS4uuB1TfCHbiZIP/haNXm+SVyhu+87jts5/3ROpd82GSVCoNs/z8l4ZOaQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "decompress-tar": "^4.0.0", + "decompress-tarbz2": "^4.0.0", + "decompress-targz": "^4.0.0", + "decompress-unzip": "^4.0.1", + "graceful-fs": "^4.1.10", + "make-dir": "^1.0.0", + "pify": "^2.3.0", + "strip-dirs": "^2.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/decompress-tar": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/decompress-tar/-/decompress-tar-4.1.1.tgz", + "integrity": "sha512-JdJMaCrGpB5fESVyxwpCx4Jdj2AagLmv3y58Qy4GE6HMVjWz1FeVQk1Ct4Kye7PftcdOo/7U7UKzYBJgqnGeUQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "file-type": "^5.2.0", + "is-stream": "^1.1.0", + "tar-stream": "^1.5.2" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/decompress-tarbz2": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz", + "integrity": "sha512-s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A==", + "dev": true, + "license": "MIT", + "dependencies": { + "decompress-tar": "^4.1.0", + "file-type": "^6.1.0", + "is-stream": "^1.1.0", + "seek-bzip": "^1.0.5", + "unbzip2-stream": "^1.0.9" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/decompress-tarbz2/node_modules/file-type": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/file-type/-/file-type-6.2.0.tgz", + "integrity": "sha512-YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/decompress-targz": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/decompress-targz/-/decompress-targz-4.1.1.tgz", + "integrity": "sha512-4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w==", + "dev": true, + "license": "MIT", + "dependencies": { + "decompress-tar": "^4.1.1", + "file-type": "^5.2.0", + "is-stream": "^1.1.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/decompress-unzip": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-4.0.1.tgz", + "integrity": "sha1-3qrM39FK6vhVePczroIQ+bSEj2k=", + "dev": true, + "license": "MIT", + "dependencies": { + "file-type": "^3.8.0", + "get-stream": "^2.2.0", + "pify": "^2.3.0", + "yauzl": "^2.4.2" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/decompress-unzip/node_modules/file-type": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz", + "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/decompress/node_modules/make-dir": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.1.0.tgz", + "integrity": "sha512-0Pkui4wLJ7rxvmfUvs87skoEaxmu0hCUApF8nonzpl7q//FWp9zu8W61Scz4sd/kUiqDxvUhtoam2efDyiBzcA==", + "dev": true, + "license": "MIT", + "dependencies": { + "pify": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/decompress/node_modules/make-dir/node_modules/pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/deep-eql": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz", + "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==", + "dev": true, + "license": "MIT", + "dependencies": { + "type-detect": "^4.0.0" + }, + "engines": { + "node": ">=0.12" + } + }, + "node_modules/deep-eql/node_modules/type-detect": { + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.7.tgz", + "integrity": "sha512-4Rh17pAMVdMWzktddFhISRnUnFIStObtUMNGzDwlA6w/77bmGv3aBbRdCmQR6IjzfkTo9otnW+2K/cDRhKSxDA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/deepmerge": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.0.tgz", + "integrity": "sha512-/pED+kD8V9n15L1lon8DXEiWLQMW4tTiegn1kIWIQ+DBudOkFitz1cfjWQiSeKMPBQOknT3LpueyAmMVJ1Ho2g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/default-require-extensions": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-3.0.0.tgz", + "integrity": "sha512-ek6DpXq/SCpvjhpFsLFRVtIxJCRw6fUR42lYMVZuUMK7n8eMz4Uh5clckdBjEpLhn/gEBZo7hDJnJcwdKLKQjg==", + "dev": true, + "license": "MIT", + "dependencies": { + "strip-bom": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/delaunator": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/delaunator/-/delaunator-5.0.0.tgz", + "integrity": "sha512-AyLvtyJdbv/U1GkiS6gUUzclRoAY4Gs75qkMygJJhU75LW4DNuSF2RMzpxs9jw9Oz1BobHjTdkG3zdP55VxAqw==", + "dev": true, + "license": "ISC", + "dependencies": { + "robust-predicates": "^3.0.0" + } + }, + "node_modules/depd": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", + "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/desandro-matches-selector": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/desandro-matches-selector/-/desandro-matches-selector-2.0.2.tgz", + "integrity": "sha1-cXvu1NwT59jzdi9wem1YpndCGOE=", + "dev": true, + "license": "MIT" + }, + "node_modules/destroy": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", + "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==", + "license": "MIT", + "engines": { + "node": ">= 0.8", + "npm": "1.2.8000 || >= 1.4.16" + } + }, + "node_modules/detect-file": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz", + "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/diff": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz", + "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.3.1" + } + }, + "node_modules/dijit": { + "version": "1.17.3", + "resolved": "https://registry.npmjs.org/dijit/-/dijit-1.17.3.tgz", + "integrity": "sha512-QS+1bNhPT+BF9E+iomQSi5qI+o3oUNSx1r5TF8WlGH4LybGZP+IIGJBOO5/41YduBPljVXhY7vaPsgrycxC6UQ==", + "dev": true, + "license": "BSD-3-Clause OR AFL-2.1", + "dependencies": { + "dojo": "1.17.3" + } + }, + "node_modules/doctypes": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/doctypes/-/doctypes-1.1.0.tgz", + "integrity": "sha1-6oCxBqh1OHdOijpKWv4pPeSJ4Kk=", + "license": "MIT" + }, + "node_modules/dojo": { + "version": "1.17.3", + "resolved": "https://registry.npmjs.org/dojo/-/dojo-1.17.3.tgz", + "integrity": "sha512-iWDx1oSfCEDnIrs8cMW7Zh9Fbjgxu8iRagFz+Qi2eya3MXIAxFXKhv2A7dpi+bfpMpFozLwcsLV8URLw6BsHsA==", + "dev": true, + "license": "BSD-3-Clause OR AFL-2.1" + }, + "node_modules/dojo-util": { + "version": "1.17.3", + "resolved": "https://registry.npmjs.org/dojo-util/-/dojo-util-1.17.3.tgz", + "integrity": "sha512-3hZMwVh9XmofCJh3v3epTlODTnk3FJoGHZiZKVlbhvYLtRC8pkLg6zitOpT2Zg4Jn5URYmPrMmAdwxRHrG736A==", + "dev": true + }, + "node_modules/dojox": { + "version": "1.17.3", + "resolved": "https://registry.npmjs.org/dojox/-/dojox-1.17.3.tgz", + "integrity": "sha512-n2SvGoVTZlOQUQmoqEfW6oGAfmyBtjl4DzWkxoojdTxBq8O0r7pDKBrW3nRrpQW9uZFHfB1XIA3BXS0cnrue/Q==", + "dev": true, + "license": "BSD-3-Clause OR AFL-2.1", + "dependencies": { + "dijit": "1.17.3", + "dojo": "1.17.3" + } + }, + "node_modules/dom-serializer": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz", + "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=", + "dev": true, + "license": "MIT", + "dependencies": { + "domelementtype": "~1.1.1", + "entities": "~1.1.1" + } + }, + "node_modules/dom-serializer/node_modules/domelementtype": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz", + "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=", + "dev": true + }, + "node_modules/dom-serializer/node_modules/entities": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz", + "integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA=", + "dev": true, + "license": "BSD-like" + }, + "node_modules/domelementtype": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz", + "integrity": "sha1-sXrtguirWeUt2cGbF1bg/BhyBMI=", + "dev": true + }, + "node_modules/domhandler": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz", + "integrity": "sha1-LeWaCCLVAn+r/28DLCsloqir5zg=", + "dev": true, + "dependencies": { + "domelementtype": "1" + } + }, + "node_modules/domutils": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz", + "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=", + "dev": true, + "dependencies": { + "dom-serializer": "0", + "domelementtype": "1" + } + }, + "node_modules/draggabilly": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/draggabilly/-/draggabilly-2.4.1.tgz", + "integrity": "sha512-HHHLPEPZqRXIDQDFRFdK7RONZausNlJ4WkA73ST7Z6O2HPWttxFHVwHo8nccuDLzXWwiVKRVuc6fTkW+CQA++A==", + "dev": true, + "license": "MIT", + "dependencies": { + "get-size": "^2.0.2", + "unidragger": "^2.4.0" + } + }, + "node_modules/dropzone": { + "version": "5.9.3", + "resolved": "https://registry.npmjs.org/dropzone/-/dropzone-5.9.3.tgz", + "integrity": "sha512-Azk8kD/2/nJIuVPK+zQ9sjKMRIpRvNyqn9XwbBHNq+iNuSccbJS6hwm1Woy0pMST0erSo0u4j+KJaodndDk4vA==", + "dev": true, + "license": "MIT" + }, + "node_modules/duplexer": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz", + "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=", + "dev": true + }, + "node_modules/eastasianwidth": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", + "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", + "dev": true, + "license": "MIT" + }, + "node_modules/ee-first": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", + "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=", + "license": "MIT" + }, + "node_modules/electron-to-chromium": { + "version": "1.4.107", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.107.tgz", + "integrity": "sha512-Huen6taaVrUrSy8o7mGStByba8PfOWWluHNxSHGBrCgEdFVLtvdQDBr9LBCF9Uci8SYxh28QNNMO0oC17wbGAg==", + "dev": true, + "license": "ISC" + }, + "node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true, + "license": "MIT" + }, + "node_modules/enabled": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/enabled/-/enabled-2.0.0.tgz", + "integrity": "sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==", + "license": "MIT" + }, + "node_modules/encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/end-of-stream": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz", + "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "once": "^1.4.0" + } + }, + "node_modules/entities": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz", + "integrity": "sha1-sph6o4ITR/zeZCsk/fyeT7cSvyY=", + "dev": true, + "license": "BSD-like" + }, + "node_modules/escalade": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", + "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/escape-html": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", + "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=", + "license": "MIT" + }, + "node_modules/escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/esprima": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz", + "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==", + "dev": true, + "license": "BSD-2-Clause", + "bin": { + "esparse": "bin/esparse.js", + "esvalidate": "bin/esvalidate.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/etag": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", + "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/ev-emitter": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ev-emitter/-/ev-emitter-1.1.1.tgz", + "integrity": "sha512-ipiDYhdQSCZ4hSbX4rMW+XzNKMD1prg/sTvoVmSLkuQ1MVlwjJQQA+sW8tMYR3BLUr9KjodFV4pvzunvRhd33Q==", + "dev": true, + "license": "MIT" + }, + "node_modules/eventemitter2": { + "version": "0.4.14", + "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz", + "integrity": "sha1-j2G3XN4BKy6esoTUVFWDtWQ7Yas=", + "dev": true, + "license": "MIT" + }, + "node_modules/eventsource": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-2.0.2.tgz", + "integrity": "sha512-IzUmBGPR3+oUG9dUeXynyNmf91/3zUSJg1lCktzKw47OXuhco54U3r9B7O4XX+Rb1Itm9OZ2b0RkTs10bICOxA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12.0.0" + } + }, + "node_modules/exit": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", + "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=", + "dev": true, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/expand-tilde": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz", + "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=", + "dev": true, + "license": "MIT", + "dependencies": { + "homedir-polyfill": "^1.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/express": { + "version": "4.19.2", + "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz", + "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==", + "license": "MIT", + "dependencies": { + "accepts": "~1.3.8", + "array-flatten": "1.1.1", + "body-parser": "1.20.2", + "content-disposition": "0.5.4", + "content-type": "~1.0.4", + "cookie": "0.6.0", + "cookie-signature": "1.0.6", + "debug": "2.6.9", + "depd": "2.0.0", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "finalhandler": "1.2.0", + "fresh": "0.5.2", + "http-errors": "2.0.0", + "merge-descriptors": "1.0.1", + "methods": "~1.1.2", + "on-finished": "2.4.1", + "parseurl": "~1.3.3", + "path-to-regexp": "0.1.7", + "proxy-addr": "~2.0.7", + "qs": "6.11.0", + "range-parser": "~1.2.1", + "safe-buffer": "5.2.1", + "send": "0.18.0", + "serve-static": "1.15.0", + "setprototypeof": "1.2.0", + "statuses": "2.0.1", + "type-is": "~1.6.18", + "utils-merge": "1.0.1", + "vary": "~1.1.2" + }, + "engines": { + "node": ">= 0.10.0" + } + }, + "node_modules/express/node_modules/body-parser": { + "version": "1.20.2", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz", + "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==", + "license": "MIT", + "dependencies": { + "bytes": "3.1.2", + "content-type": "~1.0.5", + "debug": "2.6.9", + "depd": "2.0.0", + "destroy": "1.2.0", + "http-errors": "2.0.0", + "iconv-lite": "0.4.24", + "on-finished": "2.4.1", + "qs": "6.11.0", + "raw-body": "2.5.2", + "type-is": "~1.6.18", + "unpipe": "1.0.0" + }, + "engines": { + "node": ">= 0.8", + "npm": "1.2.8000 || >= 1.4.16" + } + }, + "node_modules/express/node_modules/body-parser/node_modules/content-type": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", + "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/express/node_modules/bytes": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", + "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/express/node_modules/depd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/express/node_modules/on-finished": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", + "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", + "license": "MIT", + "dependencies": { + "ee-first": "1.1.1" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/express/node_modules/raw-body": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz", + "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==", + "license": "MIT", + "dependencies": { + "bytes": "3.1.2", + "http-errors": "2.0.0", + "iconv-lite": "0.4.24", + "unpipe": "1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/express/node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, + "node_modules/express/node_modules/send": { + "version": "0.18.0", + "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", + "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", + "license": "MIT", + "dependencies": { + "debug": "2.6.9", + "depd": "2.0.0", + "destroy": "1.2.0", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "fresh": "0.5.2", + "http-errors": "2.0.0", + "mime": "1.6.0", + "ms": "2.1.3", + "on-finished": "2.4.1", + "range-parser": "~1.2.1", + "statuses": "2.0.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/express/node_modules/setprototypeof": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", + "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", + "license": "ISC" + }, + "node_modules/express/node_modules/statuses": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", + "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/extend": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", + "dev": true, + "license": "MIT" + }, + "node_modules/faye-websocket": { + "version": "0.11.4", + "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz", + "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "websocket-driver": ">=0.5.1" + }, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/fd-slicer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz", + "integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=", + "dev": true, + "license": "MIT", + "dependencies": { + "pend": "~1.2.0" + } + }, + "node_modules/fecha": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.3.tgz", + "integrity": "sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw==", + "license": "MIT" + }, + "node_modules/figures": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", + "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==", + "dev": true, + "license": "MIT", + "dependencies": { + "escape-string-regexp": "^1.0.5" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/file-sync-cmp": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/file-sync-cmp/-/file-sync-cmp-0.1.1.tgz", + "integrity": "sha1-peeo/7+kk7Q7kju9TKiaU7Y7YSs=", + "dev": true, + "license": "MIT" + }, + "node_modules/file-type": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz", + "integrity": "sha1-LdvqfHP/42No365J3DOMBYwritY=", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/finalhandler": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", + "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==", + "license": "MIT", + "dependencies": { + "debug": "2.6.9", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "on-finished": "2.4.1", + "parseurl": "~1.3.3", + "statuses": "2.0.1", + "unpipe": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/finalhandler/node_modules/on-finished": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", + "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", + "license": "MIT", + "dependencies": { + "ee-first": "1.1.1" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/finalhandler/node_modules/statuses": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", + "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/find-up": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", + "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", + "dev": true, + "license": "MIT", + "dependencies": { + "locate-path": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/findup-sync": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-5.0.0.tgz", + "integrity": "sha512-MzwXju70AuyflbgeOhzvQWAvvQdo1XL0A9bVvlXsYcFEBM87WR4OakL4OfZq+QRmr+duJubio+UtNQCPsVESzQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "detect-file": "^1.0.0", + "is-glob": "^4.0.3", + "micromatch": "^4.0.4", + "resolve-dir": "^1.0.1" + }, + "engines": { + "node": ">= 10.13.0" + } + }, + "node_modules/fined": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz", + "integrity": "sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==", + "dev": true, + "license": "MIT", + "dependencies": { + "expand-tilde": "^2.0.2", + "is-plain-object": "^2.0.3", + "object.defaults": "^1.1.0", + "object.pick": "^1.2.0", + "parse-filepath": "^1.0.1" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/fizzy-ui-utils": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fizzy-ui-utils/-/fizzy-ui-utils-2.0.6.tgz", + "integrity": "sha512-aci2W7ZZ/MKLMuQkFKtCN/GXvheT9lLJW6zWNhjMzpwoWJGMNidxHSJYWQVegXQZMGE+XyO5KFqOTAzz1GVT6Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "desandro-matches-selector": "^2.0.0" + } + }, + "node_modules/flagged-respawn": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz", + "integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/fn.name": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz", + "integrity": "sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==", + "license": "MIT" + }, + "node_modules/follow-redirects": { + "version": "1.14.9", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz", + "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], + "license": "MIT", + "engines": { + "node": ">=4.0" + }, + "peerDependenciesMeta": { + "debug": { + "optional": true + } + } + }, + "node_modules/for-in": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", + "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/for-own": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz", + "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=", + "dev": true, + "license": "MIT", + "dependencies": { + "for-in": "^1.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/foreground-child": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz", + "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==", + "dev": true, + "license": "ISC", + "dependencies": { + "cross-spawn": "^7.0.0", + "signal-exit": "^4.0.1" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/format-util": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/format-util/-/format-util-1.0.5.tgz", + "integrity": "sha512-varLbTj0e0yVyRpqQhuWV+8hlePAgaoFRhNFj50BNjEIrw1/DphHSObtqwskVCPWNgzwPoQrZAbfa/SBiicNeg==", + "dev": true, + "license": "MIT" + }, + "node_modules/forwarded": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", + "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/fresh": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", + "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", + "dev": true, + "license": "ISC" + }, + "node_modules/function-bind": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", + "license": "MIT" + }, + "node_modules/gensync": { + "version": "1.0.0-beta.2", + "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", + "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/get-func-name": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz", + "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=", + "dev": true, + "license": "MIT", + "engines": { + "node": "*" + } + }, + "node_modules/get-intrinsic": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz", + "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==", + "license": "MIT", + "dependencies": { + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/get-size": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/get-size/-/get-size-2.0.2.tgz", + "integrity": "sha1-VV6pirhzLgwCHp4j4iGa3L45jpg=", + "dev": true, + "license": "MIT" + }, + "node_modules/get-stream": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz", + "integrity": "sha1-Xzj5PzRgCWZu4BUKBUFn+Rvdld4=", + "dev": true, + "license": "MIT", + "dependencies": { + "object-assign": "^4.0.1", + "pinkie-promise": "^2.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/getobject": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/getobject/-/getobject-1.0.2.tgz", + "integrity": "sha512-2zblDBaFcb3rB4rF77XVnuINOE2h2k/OnqXAiy0IrTxUfV1iFp3la33oAQVY9pCpWU268WFYVt2t71hlMuLsOg==", + "dev": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/glob": { + "version": "10.4.1", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.1.tgz", + "integrity": "sha512-2jelhlq3E4ho74ZyVLN03oKdAZVUa6UDZzFLVH1H7dnoax+y9qyaq8zBkfDIggjniU19z0wU18y16jMB2eyVIw==", + "dev": true, + "license": "ISC", + "dependencies": { + "foreground-child": "^3.1.0", + "jackspeak": "^3.1.2", + "minimatch": "^9.0.4", + "minipass": "^7.1.2", + "path-scurry": "^1.11.1" + }, + "bin": { + "glob": "dist/esm/bin.mjs" + }, + "engines": { + "node": ">=16 || 14 >=14.18" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/glob/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/glob/node_modules/minimatch": { + "version": "9.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz", + "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/global-modules": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz", + "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==", + "dev": true, + "license": "MIT", + "dependencies": { + "global-prefix": "^1.0.1", + "is-windows": "^1.0.1", + "resolve-dir": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/global-prefix": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz", + "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=", + "dev": true, + "license": "MIT", + "dependencies": { + "expand-tilde": "^2.0.2", + "homedir-polyfill": "^1.0.1", + "ini": "^1.3.4", + "is-windows": "^1.0.1", + "which": "^1.2.14" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/global-prefix/node_modules/which": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", + "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "which": "bin/which" + } + }, + "node_modules/globals": { + "version": "11.12.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", + "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/graceful-fs": { + "version": "4.1.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", + "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/graceful-readlink": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz", + "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=", + "dev": true, + "license": "MIT" + }, + "node_modules/grunt": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/grunt/-/grunt-1.6.1.tgz", + "integrity": "sha512-/ABUy3gYWu5iBmrUSRBP97JLpQUm0GgVveDCp6t3yRNIoltIYw7rEj3g5y1o2PGPR2vfTRGa7WC/LZHLTXnEzA==", + "dev": true, + "license": "MIT", + "dependencies": { + "dateformat": "~4.6.2", + "eventemitter2": "~0.4.13", + "exit": "~0.1.2", + "findup-sync": "~5.0.0", + "glob": "~7.1.6", + "grunt-cli": "~1.4.3", + "grunt-known-options": "~2.0.0", + "grunt-legacy-log": "~3.0.0", + "grunt-legacy-util": "~2.0.1", + "iconv-lite": "~0.6.3", + "js-yaml": "~3.14.0", + "minimatch": "~3.0.4", + "nopt": "~3.0.6" + }, + "bin": { + "grunt": "bin/grunt" + }, + "engines": { + "node": ">=16" + } + }, + "node_modules/grunt-cli": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.4.3.tgz", + "integrity": "sha512-9Dtx/AhVeB4LYzsViCjUQkd0Kw0McN2gYpdmGYKtE2a5Yt7v1Q+HYZVWhqXc/kGnxlMtqKDxSwotiGeFmkrCoQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "grunt-known-options": "~2.0.0", + "interpret": "~1.1.0", + "liftup": "~3.0.1", + "nopt": "~4.0.1", + "v8flags": "~3.2.0" + }, + "bin": { + "grunt": "bin/grunt" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/grunt-cli/node_modules/nopt": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz", + "integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==", + "dev": true, + "license": "ISC", + "dependencies": { + "abbrev": "1", + "osenv": "^0.1.4" + }, + "bin": { + "nopt": "bin/nopt.js" + } + }, + "node_modules/grunt-contrib-clean": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/grunt-contrib-clean/-/grunt-contrib-clean-2.0.1.tgz", + "integrity": "sha512-uRvnXfhiZt8akb/ZRDHJpQQtkkVkqc/opWO4Po/9ehC2hPxgptB9S6JHDC/Nxswo4CJSM0iFPT/Iym3cEMWzKA==", + "dev": true, + "license": "MIT", + "dependencies": { + "async": "^3.2.3", + "rimraf": "^2.6.2" + }, + "engines": { + "node": ">=12" + }, + "peerDependencies": { + "grunt": ">=0.4.5" + } + }, + "node_modules/grunt-contrib-copy": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/grunt-contrib-copy/-/grunt-contrib-copy-1.0.0.tgz", + "integrity": "sha1-cGDGWB6QS4qw0A8HbgqPbj58NXM=", + "dev": true, + "license": "MIT", + "dependencies": { + "chalk": "^1.1.1", + "file-sync-cmp": "^0.1.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/grunt-contrib-copy/node_modules/ansi-styles": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", + "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/grunt-contrib-copy/node_modules/chalk": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^2.2.1", + "escape-string-regexp": "^1.0.2", + "has-ansi": "^2.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^2.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/grunt-contrib-copy/node_modules/strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^2.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/grunt-contrib-copy/node_modules/supports-color": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/grunt-contrib-jshint": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/grunt-contrib-jshint/-/grunt-contrib-jshint-3.2.0.tgz", + "integrity": "sha512-pcXWCSZWfoMSvcV4BwH21TUtLtcX0Ms8IGuOPIcLeXK3fud9KclY7iqMKY94jFx8TxZzh028YYtpR+io8DiEaQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "chalk": "~4.1.2", + "hooker": "^0.2.3", + "jshint": "~2.13.4" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/grunt-contrib-uglify": { + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-5.2.2.tgz", + "integrity": "sha512-ITxiWxrjjP+RZu/aJ5GLvdele+sxlznh+6fK9Qckio5ma8f7Iv8woZjRkGfafvpuygxNefOJNc+hfjjBayRn2Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "chalk": "^4.1.2", + "maxmin": "^3.0.0", + "uglify-js": "^3.16.1", + "uri-path": "^1.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/grunt-contrib-uglify/node_modules/uglify-js": { + "version": "3.17.4", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.4.tgz", + "integrity": "sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==", + "dev": true, + "license": "BSD-2-Clause", + "bin": { + "uglifyjs": "bin/uglifyjs" + }, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/grunt-known-options": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-2.0.0.tgz", + "integrity": "sha512-GD7cTz0I4SAede1/+pAbmJRG44zFLPipVtdL9o3vqx9IEyb7b4/Y3s7r6ofI3CchR5GvYJ+8buCSioDv5dQLiA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/grunt-legacy-log": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-3.0.0.tgz", + "integrity": "sha512-GHZQzZmhyq0u3hr7aHW4qUH0xDzwp2YXldLPZTCjlOeGscAOWWPftZG3XioW8MasGp+OBRIu39LFx14SLjXRcA==", + "dev": true, + "license": "MIT", + "dependencies": { + "colors": "~1.1.2", + "grunt-legacy-log-utils": "~2.1.0", + "hooker": "~0.2.3", + "lodash": "~4.17.19" + }, + "engines": { + "node": ">= 0.10.0" + } + }, + "node_modules/grunt-legacy-log-utils": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/grunt-legacy-log-utils/-/grunt-legacy-log-utils-2.1.0.tgz", + "integrity": "sha512-lwquaPXJtKQk0rUM1IQAop5noEpwFqOXasVoedLeNzaibf/OPWjKYvvdqnEHNmU+0T0CaReAXIbGo747ZD+Aaw==", + "dev": true, + "license": "MIT", + "dependencies": { + "chalk": "~4.1.0", + "lodash": "~4.17.19" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/grunt-legacy-util": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-2.0.1.tgz", + "integrity": "sha512-2bQiD4fzXqX8rhNdXkAywCadeqiPiay0oQny77wA2F3WF4grPJXCvAcyoWUJV+po/b15glGkxuSiQCK299UC2w==", + "dev": true, + "license": "MIT", + "dependencies": { + "async": "~3.2.0", + "exit": "~0.1.2", + "getobject": "~1.0.0", + "hooker": "~0.2.3", + "lodash": "~4.17.21", + "underscore.string": "~3.3.5", + "which": "~2.0.2" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/grunt-shell": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/grunt-shell/-/grunt-shell-3.0.1.tgz", + "integrity": "sha512-C8eR4frw/NmIFIwSvzSLS4wOQBUzC+z6QhrKPzwt/tlaIqlzH35i/O2MggVOBj2Sh1tbaAqpASWxGiGsi4JMIQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "chalk": "^2.4.1", + "npm-run-path": "^2.0.0", + "strip-ansi": "^5.0.0" + }, + "engines": { + "node": ">=6" + }, + "peerDependencies": { + "grunt": ">=1" + } + }, + "node_modules/grunt-shell/node_modules/ansi-regex": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz", + "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/grunt-shell/node_modules/ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-convert": "^1.9.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/grunt-shell/node_modules/chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/grunt-shell/node_modules/has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/grunt-shell/node_modules/strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^4.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/grunt-shell/node_modules/supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/grunt/node_modules/glob": { + "version": "7.1.7", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz", + "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/grunt/node_modules/iconv-lite": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "dev": true, + "license": "MIT", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/gzip-size": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-5.1.1.tgz", + "integrity": "sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA==", + "dev": true, + "license": "MIT", + "dependencies": { + "duplexer": "^0.1.1", + "pify": "^4.0.1" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/gzip-size/node_modules/pify": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", + "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/handlebars": { + "version": "4.7.8", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz", + "integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "minimist": "^1.2.5", + "neo-async": "^2.6.2", + "source-map": "^0.6.1", + "wordwrap": "^1.0.0" + }, + "bin": { + "handlebars": "bin/handlebars" + }, + "engines": { + "node": ">=0.4.7" + }, + "optionalDependencies": { + "uglify-js": "^3.1.4" + } + }, + "node_modules/has": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", + "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "license": "MIT", + "dependencies": { + "function-bind": "^1.1.1" + }, + "engines": { + "node": ">= 0.4.0" + } + }, + "node_modules/has-ansi": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", + "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^2.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/has-symbols": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", + "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/homedir-polyfill": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz", + "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==", + "dev": true, + "license": "MIT", + "dependencies": { + "parse-passwd": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/hooker": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz", + "integrity": "sha1-uDT3I8xKJCqmWWNFnfbZhMXT2Vk=", + "dev": true, + "engines": { + "node": "*" + } + }, + "node_modules/html-escaper": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", + "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", + "dev": true, + "license": "MIT" + }, + "node_modules/htmlparser2": { + "version": "3.8.3", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz", + "integrity": "sha1-mWwosZFRaovoZQGn15dX5ccMEGg=", + "dev": true, + "license": "MIT", + "dependencies": { + "domelementtype": "1", + "domhandler": "2.3", + "domutils": "1.5", + "entities": "1.0", + "readable-stream": "1.1" + } + }, + "node_modules/htmlparser2/node_modules/isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", + "dev": true, + "license": "MIT" + }, + "node_modules/htmlparser2/node_modules/readable-stream": { + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz", + "integrity": "sha1-9u73ZPUUyJ4rniMUanW6EGdW0j4=", + "dev": true, + "license": "MIT", + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", + "isarray": "0.0.1", + "string_decoder": "~0.10.x" + } + }, + "node_modules/htmlparser2/node_modules/string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", + "dev": true, + "license": "MIT" + }, + "node_modules/http-errors": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", + "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", + "license": "MIT", + "dependencies": { + "depd": "2.0.0", + "inherits": "2.0.4", + "setprototypeof": "1.2.0", + "statuses": "2.0.1", + "toidentifier": "1.0.1" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/http-errors/node_modules/depd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/http-errors/node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "license": "ISC" + }, + "node_modules/http-errors/node_modules/setprototypeof": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", + "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", + "license": "ISC" + }, + "node_modules/http-errors/node_modules/statuses": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", + "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/http-errors/node_modules/toidentifier": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", + "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", + "license": "MIT", + "engines": { + "node": ">=0.6" + } + }, + "node_modules/http-parser-js": { + "version": "0.4.9", + "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.9.tgz", + "integrity": "sha1-6hoE+2St/wJC6ZdPKX3Uw8rSceE=", + "dev": true, + "license": "MIT" + }, + "node_modules/iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "license": "MIT", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/ieee754": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz", + "integrity": "sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q=", + "dev": true, + "license": "BSD-3-Clause" + }, + "node_modules/immediate": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz", + "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=", + "dev": true, + "license": "MIT" + }, + "node_modules/inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "dev": true, + "license": "ISC", + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "node_modules/inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", + "license": "ISC" + }, + "node_modules/ini": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", + "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", + "dev": true, + "license": "ISC", + "engines": { + "node": "*" + } + }, + "node_modules/intern": { + "version": "4.10.1", + "resolved": "https://registry.npmjs.org/intern/-/intern-4.10.1.tgz", + "integrity": "sha512-GyUmdpdKGoEu1hRMNYeldPF11lFZlC1Pbq28ImzEY+7OHRDinMU9c8jwGxY7eAaUe15oy0Y7cocdjC/mzUuOng==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@theintern/common": "~0.3.0", + "@theintern/digdug": "~2.6.2", + "@theintern/leadfoot": "~2.4.1", + "@types/benchmark": "~2.1.1", + "@types/chai": "~4.2.20", + "@types/charm": "~1.0.2", + "@types/express": "~4.17.13", + "@types/istanbul-lib-coverage": "~2.0.3", + "@types/istanbul-lib-instrument": "~1.7.4", + "@types/istanbul-lib-report": "~3.0.0", + "@types/istanbul-lib-source-maps": "~4.0.1", + "@types/istanbul-reports": "~3.0.1", + "@types/ws": "7.4.6", + "benchmark": "~2.1.4", + "body-parser": "~1.19.0", + "chai": "~4.3.4", + "charm": "~1.0.2", + "concurrent": "~0.3.2", + "diff": "~5.0.0", + "express": "~4.17.1", + "glob": "~7.1.7", + "http-errors": "~1.8.0", + "istanbul-lib-coverage": "~3.0.0", + "istanbul-lib-hook": "~3.0.0", + "istanbul-lib-instrument": "~4.0.3", + "istanbul-lib-report": "~3.0.0", + "istanbul-lib-source-maps": "~4.0.0", + "istanbul-reports": "~3.0.2", + "lodash": "~4.17.15", + "mime-types": "~2.1.31", + "minimatch": "~3.0.4", + "platform": "~1.3.6", + "resolve": "~1.20.0", + "shell-quote": "~1.7.2", + "source-map": "~0.6.1", + "ts-node": "~10.0.0", + "tslib": "~2.3.0", + "ws": "~7.5.2" + }, + "bin": { + "intern": "bin/intern.js" + } + }, + "node_modules/intern/node_modules/@types/istanbul-lib-coverage": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz", + "integrity": "sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==", + "dev": true, + "license": "MIT" + }, + "node_modules/intern/node_modules/accepts": { + "version": "1.3.7", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz", + "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==", + "dev": true, + "license": "MIT", + "dependencies": { + "mime-types": "~2.1.24", + "negotiator": "0.6.2" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/intern/node_modules/accepts/node_modules/mime-db": { + "version": "1.45.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.45.0.tgz", + "integrity": "sha512-CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/intern/node_modules/accepts/node_modules/mime-types": { + "version": "2.1.28", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.28.tgz", + "integrity": "sha512-0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "mime-db": "1.45.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/intern/node_modules/content-disposition": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz", + "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==", + "dev": true, + "license": "MIT", + "dependencies": { + "safe-buffer": "5.1.2" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/intern/node_modules/cookie": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz", + "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/intern/node_modules/express": { + "version": "4.17.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz", + "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==", + "dev": true, + "license": "MIT", + "dependencies": { + "accepts": "~1.3.7", + "array-flatten": "1.1.1", + "body-parser": "1.19.0", + "content-disposition": "0.5.3", + "content-type": "~1.0.4", + "cookie": "0.4.0", + "cookie-signature": "1.0.6", + "debug": "2.6.9", + "depd": "~1.1.2", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "finalhandler": "~1.1.2", + "fresh": "0.5.2", + "merge-descriptors": "1.0.1", + "methods": "~1.1.2", + "on-finished": "~2.3.0", + "parseurl": "~1.3.3", + "path-to-regexp": "0.1.7", + "proxy-addr": "~2.0.5", + "qs": "6.7.0", + "range-parser": "~1.2.1", + "safe-buffer": "5.1.2", + "send": "0.17.1", + "serve-static": "1.14.1", + "setprototypeof": "1.1.1", + "statuses": "~1.5.0", + "type-is": "~1.6.18", + "utils-merge": "1.0.1", + "vary": "~1.1.2" + }, + "engines": { + "node": ">= 0.10.0" + } + }, + "node_modules/intern/node_modules/finalhandler": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz", + "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==", + "dev": true, + "license": "MIT", + "dependencies": { + "debug": "2.6.9", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "on-finished": "~2.3.0", + "parseurl": "~1.3.3", + "statuses": "~1.5.0", + "unpipe": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/intern/node_modules/forwarded": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz", + "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/intern/node_modules/glob": { + "version": "7.1.7", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz", + "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/intern/node_modules/http-errors": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz", + "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==", + "dev": true, + "license": "MIT", + "dependencies": { + "depd": "~1.1.2", + "inherits": "2.0.4", + "setprototypeof": "1.2.0", + "statuses": ">= 1.5.0 < 2", + "toidentifier": "1.0.1" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/intern/node_modules/http-errors/node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/intern/node_modules/http-errors/node_modules/setprototypeof": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", + "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", + "dev": true, + "license": "ISC" + }, + "node_modules/intern/node_modules/istanbul-lib-coverage": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.2.tgz", + "integrity": "sha512-o5+eTUYzCJ11/+JhW5/FUCdfsdoYVdQ/8I/OveE2XsjehYn5DdeSnNQAbjYaO8gQ6hvGTN6GM6ddQqpTVG5j8g==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=8" + } + }, + "node_modules/intern/node_modules/lodash": { + "version": "4.17.20", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", + "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==", + "dev": true, + "license": "MIT" + }, + "node_modules/intern/node_modules/mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/intern/node_modules/mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "dev": true, + "license": "MIT", + "dependencies": { + "mime-db": "1.52.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/intern/node_modules/negotiator": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", + "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/intern/node_modules/proxy-addr": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz", + "integrity": "sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==", + "dev": true, + "license": "MIT", + "dependencies": { + "forwarded": "~0.1.2", + "ipaddr.js": "1.9.1" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/intern/node_modules/qs": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", + "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.6" + } + }, + "node_modules/intern/node_modules/safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "dev": true, + "license": "MIT" + }, + "node_modules/intern/node_modules/serve-static": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz", + "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==", + "dev": true, + "license": "MIT", + "dependencies": { + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "parseurl": "~1.3.3", + "send": "0.17.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/intern/node_modules/toidentifier": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", + "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.6" + } + }, + "node_modules/internmap": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz", + "integrity": "sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=12" + } + }, + "node_modules/interpret": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz", + "integrity": "sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=", + "dev": true, + "license": "MIT" + }, + "node_modules/ipaddr.js": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", + "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", + "license": "MIT", + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/is-absolute": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz", + "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-relative": "^1.0.0", + "is-windows": "^1.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-arrayish": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz", + "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==", + "license": "MIT" + }, + "node_modules/is-core-module": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz", + "integrity": "sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==", + "license": "MIT", + "dependencies": { + "has": "^1.0.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-expression": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/is-expression/-/is-expression-4.0.0.tgz", + "integrity": "sha512-zMIXX63sxzG3XrkHkrAPvm/OVZVSCPNkwMHU8oTX7/U3AL78I0QXCEICXUM13BIa8TYGZ68PiTKfQz3yaTNr4A==", + "license": "MIT", + "dependencies": { + "acorn": "^7.1.1", + "object-assign": "^4.1.1" + } + }, + "node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-natural-number": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/is-natural-number/-/is-natural-number-4.0.1.tgz", + "integrity": "sha1-q5124dtM7VHjXeDHLr7PCfc0zeg=", + "dev": true, + "license": "MIT" + }, + "node_modules/is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/is-plain-object": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", + "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", + "dev": true, + "license": "MIT", + "dependencies": { + "isobject": "^3.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-promise": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz", + "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=", + "license": "MIT" + }, + "node_modules/is-regex": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz", + "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=", + "license": "MIT", + "dependencies": { + "has": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/is-regex/node_modules/has": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz", + "integrity": "sha1-hGFzP1OLCDfJNh45qauelwTcLyg=", + "dependencies": { + "function-bind": "^1.0.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/is-relative": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz", + "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-unc-path": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-stream": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", + "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-unc-path": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz", + "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "unc-path-regex": "^0.1.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-windows": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", + "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true, + "license": "MIT" + }, + "node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", + "dev": true, + "license": "ISC" + }, + "node_modules/isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/istanbul-lib-coverage": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz", + "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=8" + } + }, + "node_modules/istanbul-lib-hook": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-3.0.0.tgz", + "integrity": "sha512-Pt/uge1Q9s+5VAZ+pCo16TYMWPBIl+oaNIjgLQxcX0itS6ueeaA+pEfThZpH8WxhFgCiEb8sAJY6MdUKgiIWaQ==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "append-transform": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/istanbul-lib-instrument": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz", + "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@babel/core": "^7.7.5", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-coverage": "^3.0.0", + "semver": "^6.3.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/istanbul-lib-report": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", + "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "istanbul-lib-coverage": "^3.0.0", + "make-dir": "^3.0.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/istanbul-lib-source-maps": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz", + "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "debug": "^4.1.1", + "istanbul-lib-coverage": "^3.0.0", + "source-map": "^0.6.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/istanbul-lib-source-maps/node_modules/debug": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/istanbul-lib-source-maps/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true, + "license": "MIT" + }, + "node_modules/istanbul-reports": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.5.tgz", + "integrity": "sha512-5+19PlhnGabNWB7kOFnuxT8H3T/iIyQzIbQMxXsURmmvKg86P2sbkrGOT77VnHw0Qr0gc2XzRaRfMZYYbSQCJQ==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "html-escaper": "^2.0.0", + "istanbul-lib-report": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/jackspeak": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.0.tgz", + "integrity": "sha512-JVYhQnN59LVPFCEcVa2C3CrEKYacvjRfqIQl+h8oi91aLYQVWRYbxjPcv1bUiUy/kLmQaANrYfNMCO3kuEDHfw==", + "dev": true, + "license": "BlueOak-1.0.0", + "dependencies": { + "@isaacs/cliui": "^8.0.2" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + }, + "optionalDependencies": { + "@pkgjs/parseargs": "^0.11.0" + } + }, + "node_modules/js-stringify": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/js-stringify/-/js-stringify-1.0.2.tgz", + "integrity": "sha1-Fzb939lyTyijaCrcYjCufk6Weds=", + "license": "MIT" + }, + "node_modules/js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/js-yaml": { + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", + "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "dev": true, + "license": "MIT", + "dependencies": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/jsesc": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", + "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", + "dev": true, + "license": "MIT", + "bin": { + "jsesc": "bin/jsesc" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/jshint": { + "version": "2.13.4", + "resolved": "https://registry.npmjs.org/jshint/-/jshint-2.13.4.tgz", + "integrity": "sha512-HO3bosL84b2qWqI0q+kpT/OpRJwo0R4ivgmxaO848+bo10rc50SkPnrtwSFXttW0ym4np8jbJvLwk5NziB7jIw==", + "dev": true, + "license": "MIT", + "dependencies": { + "cli": "~1.0.0", + "console-browserify": "1.1.x", + "exit": "0.1.x", + "htmlparser2": "3.8.x", + "lodash": "~4.17.21", + "minimatch": "~3.0.2", + "strip-json-comments": "1.0.x" + }, + "bin": { + "jshint": "bin/jshint" + } + }, + "node_modules/json-schema-ref-parser": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/json-schema-ref-parser/-/json-schema-ref-parser-6.1.0.tgz", + "integrity": "sha512-pXe9H1m6IgIpXmE5JSb8epilNTGsmTb2iPohAXpOdhqGFbQjNeHHsZxU+C8w6T81GZxSPFLeUoqDJmzxx5IGuw==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-me-maybe": "^1.0.1", + "js-yaml": "^3.12.1", + "ono": "^4.0.11" + } + }, + "node_modules/json5": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz", + "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==", + "dev": true, + "license": "MIT", + "bin": { + "json5": "lib/cli.js" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/jstransformer": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/jstransformer/-/jstransformer-1.0.0.tgz", + "integrity": "sha1-7Yvwkh4vPx7U1cGkT2hwntJHIsM=", + "license": "MIT", + "dependencies": { + "is-promise": "^2.0.0", + "promise": "^7.0.1" + } + }, + "node_modules/jszip": { + "version": "3.7.1", + "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.7.1.tgz", + "integrity": "sha512-ghL0tz1XG9ZEmRMcEN2vt7xabrDdqHHeykgARpmZ0BiIctWxM47Vt63ZO2dnp4QYt/xJVLLy5Zv1l/xRdh2byg==", + "dev": true, + "license": "(MIT OR GPL-3.0-or-later)", + "dependencies": { + "lie": "~3.3.0", + "pako": "~1.0.2", + "readable-stream": "~2.3.6", + "set-immediate-shim": "~1.0.1" + } + }, + "node_modules/jszip/node_modules/process-nextick-args": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", + "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==", + "dev": true, + "license": "MIT" + }, + "node_modules/jszip/node_modules/readable-stream": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dev": true, + "license": "MIT", + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "node_modules/jszip/node_modules/string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "license": "MIT", + "dependencies": { + "safe-buffer": "~5.1.0" + } + }, + "node_modules/kind-of": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/kuler": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz", + "integrity": "sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A==", + "license": "MIT" + }, + "node_modules/leaflet": { + "version": "1.9.4", + "resolved": "https://registry.npmjs.org/leaflet/-/leaflet-1.9.4.tgz", + "integrity": "sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA==", + "dev": true, + "license": "BSD-2-Clause" + }, + "node_modules/leaflet-draw": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/leaflet-draw/-/leaflet-draw-1.0.4.tgz", + "integrity": "sha512-rsQ6saQO5ST5Aj6XRFylr5zvarWgzWnrg46zQ1MEOEIHsppdC/8hnN8qMoFvACsPvTioAuysya/TVtog15tyAQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/leaflet-measure": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/leaflet-measure/-/leaflet-measure-3.1.0.tgz", + "integrity": "sha512-ln5c9UNaWDEd24tIzDt9hwnpb8OaCPBfSWNBg2H8rb9SA3cbXW9+NqohA6/8TdsNDGJZr36woXMrqRq07Pcl3w==", + "dev": true, + "license": "MIT", + "dependencies": { + "@turf/area": "^5.1.5", + "@turf/length": "^5.1.5", + "lodash": "^4.17.5" + }, + "peerDependencies": { + "leaflet": "^1.0.0" + } + }, + "node_modules/leaflet-minimap": { + "version": "3.6.1", + "resolved": "https://registry.npmjs.org/leaflet-minimap/-/leaflet-minimap-3.6.1.tgz", + "integrity": "sha1-KkP/Oz2UekWgrPS978llBbZzpsY=", + "dev": true, + "license": "BSD-2-Clause" + }, + "node_modules/leaflet-nav": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/leaflet-nav/-/leaflet-nav-1.0.3.tgz", + "integrity": "sha512-0PmK4Khb1MY1yZQk4wal0+pkvWWAGCUK8vXu+8FjttF3qq+D3Sktd8qus6DMvqVvte9pnqKHvWE2JqdhG6by7A==", + "dev": true, + "license": "MIT" + }, + "node_modules/leaflet.awesome-markers": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/leaflet.awesome-markers/-/leaflet.awesome-markers-2.0.5.tgz", + "integrity": "sha512-Ne/xDjkGyaujwNVVkv2tyXQUV0ZW7gZ0Mo0FuQY4jp2qWrvXi0hwDBvmZyF/8YOvybyMabTMM/mFWCTd1jZIQA==", + "dev": true, + "license": "ISC" + }, + "node_modules/leaflet.coordinates": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/leaflet.coordinates/-/leaflet.coordinates-0.1.5.tgz", + "integrity": "sha1-oHF7ZDsIOY0fPC/6DsYoE9TPh6o=", + "dev": true + }, + "node_modules/leaflet.nontiledlayer": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/leaflet.nontiledlayer/-/leaflet.nontiledlayer-1.0.9.tgz", + "integrity": "sha512-w4yeTLNFhTToAmGQ7P9cAiGFVwVLJzuO3A/tFNMWRVYl1BLvrvlqY7hKE33pmmeoQ6m5ZsWd0qbdYq/d+zBuUQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "leaflet": "^1.6.0" + } + }, + "node_modules/leaflet.nontiledlayer/node_modules/leaflet": { + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/leaflet/-/leaflet-1.7.1.tgz", + "integrity": "sha512-/xwPEBidtg69Q3HlqPdU3DnrXQOvQU/CCHA1tcDQVzOwm91YMYaILjNp7L4Eaw5Z4sOYdbBz6koWyibppd8Zqw==", + "dev": true, + "license": "BSD-2-Clause" + }, + "node_modules/lie": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz", + "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "immediate": "~3.0.5" + } + }, + "node_modules/liftup": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/liftup/-/liftup-3.0.1.tgz", + "integrity": "sha512-yRHaiQDizWSzoXk3APcA71eOI/UuhEkNN9DiW2Tt44mhYzX4joFoCZlxsSOF7RyeLlfqzFLQI1ngFq3ggMPhOw==", + "dev": true, + "license": "MIT", + "dependencies": { + "extend": "^3.0.2", + "findup-sync": "^4.0.0", + "fined": "^1.2.0", + "flagged-respawn": "^1.0.1", + "is-plain-object": "^2.0.4", + "object.map": "^1.0.1", + "rechoir": "^0.7.0", + "resolve": "^1.19.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/liftup/node_modules/findup-sync": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-4.0.0.tgz", + "integrity": "sha512-6jvvn/12IC4quLBL1KNokxC7wWTvYncaVUYSoxWw7YykPLuRrnv4qdHcSOywOI5RpkOVGeQRtWM8/q+G6W6qfQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "detect-file": "^1.0.0", + "is-glob": "^4.0.0", + "micromatch": "^4.0.2", + "resolve-dir": "^1.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/liftup/node_modules/is-core-module": { + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz", + "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==", + "dev": true, + "license": "MIT", + "dependencies": { + "has": "^1.0.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/liftup/node_modules/is-glob": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", + "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/liftup/node_modules/path-parse": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", + "dev": true, + "license": "MIT" + }, + "node_modules/liftup/node_modules/resolve": { + "version": "1.22.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz", + "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-core-module": "^2.8.1", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/load-grunt-tasks": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/load-grunt-tasks/-/load-grunt-tasks-5.1.0.tgz", + "integrity": "sha512-oNj0Jlka1TsfDe+9He0kcA1cRln+TMoTsEByW7ij6kyktNLxBKJtslCFEvFrLC2Dj0S19IWJh3fOCIjLby2Xrg==", + "dev": true, + "license": "MIT", + "dependencies": { + "arrify": "^2.0.1", + "multimatch": "^4.0.0", + "pkg-up": "^3.1.0", + "resolve-pkg": "^2.0.0" + }, + "engines": { + "node": ">=8" + }, + "peerDependencies": { + "grunt": ">=1" + } + }, + "node_modules/locate-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", + "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/lodash": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", + "dev": true, + "license": "MIT" + }, + "node_modules/logform": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/logform/-/logform-2.4.0.tgz", + "integrity": "sha512-CPSJw4ftjf517EhXZGGvTHHkYobo7ZCc0kvwUoOYcjfR2UVrI66RHj8MCrfAdEitdmFqbu2BYdYs8FHHZSb6iw==", + "license": "MIT", + "dependencies": { + "@colors/colors": "1.5.0", + "fecha": "^4.2.0", + "ms": "^2.1.1", + "safe-stable-stringify": "^2.3.1", + "triple-beam": "^1.3.0" + } + }, + "node_modules/logform/node_modules/@colors/colors": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz", + "integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==", + "license": "MIT", + "engines": { + "node": ">=0.1.90" + } + }, + "node_modules/loupe": { + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.4.tgz", + "integrity": "sha512-OvKfgCC2Ndby6aSTREl5aCCPTNIzlDfQZvZxNUrBrihDhL3xcrYegTblhmEiCrg2kKQz4XsFIaemE5BF4ybSaQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "get-func-name": "^2.0.0" + } + }, + "node_modules/lru-cache": { + "version": "10.2.2", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.2.tgz", + "integrity": "sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==", + "dev": true, + "license": "ISC", + "engines": { + "node": "14 || >=16.14" + } + }, + "node_modules/make-dir": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", + "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", + "dev": true, + "license": "MIT", + "dependencies": { + "semver": "^6.0.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/make-error": { + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", + "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", + "dev": true, + "license": "ISC" + }, + "node_modules/make-iterator": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz", + "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==", + "dev": true, + "license": "MIT", + "dependencies": { + "kind-of": "^6.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/map-cache": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", + "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/maxmin": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/maxmin/-/maxmin-3.0.0.tgz", + "integrity": "sha512-wcahMInmGtg/7c6a75fr21Ch/Ks1Tb+Jtoan5Ft4bAI0ZvJqyOw8kkM7e7p8hDSzY805vmxwHT50KcjGwKyJ0g==", + "dev": true, + "license": "MIT", + "dependencies": { + "chalk": "^4.1.0", + "figures": "^3.2.0", + "gzip-size": "^5.1.1", + "pretty-bytes": "^5.3.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/media-typer": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", + "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mediator-js": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/mediator-js/-/mediator-js-0.11.0.tgz", + "integrity": "sha512-ehVcM3bSkr79E5yXUIyOPxw9xqhmvtTMkws5+lT8vl52awVkL/8rfDd8njmVxNldGmqKvFWSOvfppxG2AHM0TQ==", + "dev": true, + "engines": { + "node": ">=0.6.0" + } + }, + "node_modules/merge-descriptors": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", + "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=", + "license": "MIT" + }, + "node_modules/methods": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", + "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mgrs": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/mgrs/-/mgrs-1.0.0.tgz", + "integrity": "sha1-+5FYjnjJACVnI5XLQLJffNatGCk=", + "dev": true, + "license": "MIT" + }, + "node_modules/micromatch": { + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", + "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "dev": true, + "license": "MIT", + "dependencies": { + "braces": "^3.0.2", + "picomatch": "^2.3.1" + }, + "engines": { + "node": ">=8.6" + } + }, + "node_modules/mime": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", + "license": "MIT", + "bin": { + "mime": "cli.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/mime-db": { + "version": "1.45.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.45.0.tgz", + "integrity": "sha512-CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.28", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.28.tgz", + "integrity": "sha512-0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ==", + "license": "MIT", + "dependencies": { + "mime-db": "1.45.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/minimist": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", + "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==", + "dev": true, + "license": "MIT" + }, + "node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/moment": { + "version": "2.30.1", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz", + "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==", + "dev": true, + "license": "MIT", + "engines": { + "node": "*" + } + }, + "node_modules/morgan": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz", + "integrity": "sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==", + "license": "MIT", + "dependencies": { + "basic-auth": "~2.0.1", + "debug": "2.6.9", + "depd": "~2.0.0", + "on-finished": "~2.3.0", + "on-headers": "~1.0.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/morgan/node_modules/depd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/morgan/node_modules/on-headers": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz", + "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "license": "MIT" + }, + "node_modules/multimatch": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-4.0.0.tgz", + "integrity": "sha512-lDmx79y1z6i7RNx0ZGCPq1bzJ6ZoDDKbvh7jxr9SJcWLkShMzXrHbYVpTdnhNM5MXpDUxCQ4DgqVttVXlBgiBQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/minimatch": "^3.0.3", + "array-differ": "^3.0.0", + "array-union": "^2.1.0", + "arrify": "^2.0.1", + "minimatch": "^3.0.4" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/negotiator": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", + "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/neo-async": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", + "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", + "dev": true, + "license": "MIT" + }, + "node_modules/nib": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/nib/-/nib-1.2.0.tgz", + "integrity": "sha512-7HgrnMl/3yOmWykueO8/D0q+0iWwe7Z+CK2Eaq/xQV8w1hK80WN1oReRQkfkrztbAAnp/nTHkUSl5EcVkor6JQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": "*" + }, + "peerDependencies": { + "stylus": "*" + } + }, + "node_modules/node-releases": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.3.tgz", + "integrity": "sha512-maHFz6OLqYxz+VQyCAtA3PTX4UP/53pa05fyDNc9CwjvJ0yEh6+xBwKsgCxMNhS8taUKBFYxfuiaD9U/55iFaw==", + "dev": true, + "license": "MIT" + }, + "node_modules/nopt": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", + "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", + "dev": true, + "license": "ISC", + "dependencies": { + "abbrev": "1" + }, + "bin": { + "nopt": "bin/nopt.js" + } + }, + "node_modules/npm-run-path": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", + "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", + "dev": true, + "license": "MIT", + "dependencies": { + "path-key": "^2.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/object-inspect": { + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz", + "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==", + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object.defaults": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz", + "integrity": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=", + "dev": true, + "license": "MIT", + "dependencies": { + "array-each": "^1.0.1", + "array-slice": "^1.0.0", + "for-own": "^1.0.0", + "isobject": "^3.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/object.map": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz", + "integrity": "sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=", + "dev": true, + "license": "MIT", + "dependencies": { + "for-own": "^1.0.0", + "make-iterator": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/object.pick": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz", + "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", + "dev": true, + "license": "MIT", + "dependencies": { + "isobject": "^3.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/on-finished": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", + "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=", + "license": "MIT", + "dependencies": { + "ee-first": "1.1.1" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/on-headers": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz", + "integrity": "sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c=", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "dev": true, + "license": "ISC", + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/one-time": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/one-time/-/one-time-1.0.0.tgz", + "integrity": "sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g==", + "license": "MIT", + "dependencies": { + "fn.name": "1.x.x" + } + }, + "node_modules/ono": { + "version": "4.0.11", + "resolved": "https://registry.npmjs.org/ono/-/ono-4.0.11.tgz", + "integrity": "sha512-jQ31cORBFE6td25deYeD80wxKBMj+zBmHTrVxnc6CKhx8gho6ipmWM5zj/oeoqioZ99yqBls9Z/9Nss7J26G2g==", + "dev": true, + "license": "MIT", + "dependencies": { + "format-util": "^1.0.3" + } + }, + "node_modules/os-homedir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", + "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/os-tmpdir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/osenv": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz", + "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", + "dev": true, + "license": "ISC", + "dependencies": { + "os-homedir": "^1.0.0", + "os-tmpdir": "^1.0.0" + } + }, + "node_modules/outlayer": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/outlayer/-/outlayer-2.1.1.tgz", + "integrity": "sha1-KYY7beEOpdrf/8rfoNcokHOH6aI=", + "dev": true, + "license": "MIT", + "dependencies": { + "ev-emitter": "^1.0.0", + "fizzy-ui-utils": "^2.0.0", + "get-size": "^2.0.2" + } + }, + "node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-locate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", + "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-limit": "^2.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/packery": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/packery/-/packery-2.1.2.tgz", + "integrity": "sha512-Coc+8Atz03c0iu1RK0PZIJMKcKrE4i9Z8UBBywqz7Dhy40mMPM5wMQfqO9P2eqFP+lxKjGMTHgRAwjBQc+AQ5w==", + "dev": true, + "license": "GPL-3.0", + "dependencies": { + "get-size": "^2.0.2", + "outlayer": "^2.0.0" + } + }, + "node_modules/pako": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz", + "integrity": "sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==", + "dev": true, + "license": "(MIT AND Zlib)" + }, + "node_modules/parse-filepath": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz", + "integrity": "sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=", + "dev": true, + "license": "MIT", + "dependencies": { + "is-absolute": "^1.0.0", + "map-cache": "^0.2.0", + "path-root": "^0.1.1" + }, + "engines": { + "node": ">=0.8" + } + }, + "node_modules/parse-passwd": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz", + "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/parseurl": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", + "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/path-key": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", + "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/path-parse": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", + "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==", + "license": "MIT" + }, + "node_modules/path-root": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz", + "integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=", + "dev": true, + "license": "MIT", + "dependencies": { + "path-root-regex": "^0.1.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/path-root-regex": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz", + "integrity": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/path-scurry": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", + "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", + "dev": true, + "license": "BlueOak-1.0.0", + "dependencies": { + "lru-cache": "^10.2.0", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" + }, + "engines": { + "node": ">=16 || 14 >=14.18" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/path-scurry/node_modules/minipass": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz", + "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/path-to-regexp": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", + "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=", + "license": "MIT" + }, + "node_modules/pathval": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz", + "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": "*" + } + }, + "node_modules/pdfjs-dist-viewer-min": { + "version": "2.12.313", + "resolved": "https://registry.npmjs.org/pdfjs-dist-viewer-min/-/pdfjs-dist-viewer-min-2.12.313.tgz", + "integrity": "sha512-Li6SwOH5hj9G4hn7EsepVe/BWy+xKfMRmwJ6EbdIcmFUHDuoB6ISGJNBH7QsYk8fY8mGMZlFzP4B892u59YeGw==", + "dev": true, + "license": "Apache-2.0" + }, + "node_modules/pend": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", + "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=", + "dev": true, + "license": "MIT" + }, + "node_modules/picocolors": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", + "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/pinkie": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", + "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/pinkie-promise": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", + "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", + "dev": true, + "license": "MIT", + "dependencies": { + "pinkie": "^2.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/pkg-up": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz", + "integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==", + "dev": true, + "license": "MIT", + "dependencies": { + "find-up": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/platform": { + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/platform/-/platform-1.3.6.tgz", + "integrity": "sha512-fnWVljUchTro6RiCFvCXBbNhJc2NijN7oIQxbwsyL0buWJPG85v81ehlHI9fXrJsMNgTofEoWIQeClKpgxFLrg==", + "dev": true, + "license": "MIT" + }, + "node_modules/prerender-node": { + "version": "3.8.0", + "resolved": "https://registry.npmjs.org/prerender-node/-/prerender-node-3.8.0.tgz", + "integrity": "sha512-MJcdr/RePzCaYw30XQ2H64rXAkGuHDGitHmx2D1OPsNxEDMho5ha8GfwJVLxstPdj49vgerwZqnsE+2M/4Ov2A==", + "license": "MIT" + }, + "node_modules/pretty-bytes": { + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz", + "integrity": "sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/process-nextick-args": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", + "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=", + "dev": true, + "license": "MIT" + }, + "node_modules/proj4": { + "version": "2.11.0", + "resolved": "https://registry.npmjs.org/proj4/-/proj4-2.11.0.tgz", + "integrity": "sha512-SasuTkAx8HnWQHfIyhkdUNJorSJqINHAN3EyMWYiQRVorftz9DHz650YraFgczwgtHOxqnfuDxSNv3C8MUnHeg==", + "dev": true, + "license": "MIT", + "dependencies": { + "mgrs": "1.0.0", + "wkt-parser": "^1.3.3" + } + }, + "node_modules/prom-client": { + "version": "15.1.2", + "resolved": "https://registry.npmjs.org/prom-client/-/prom-client-15.1.2.tgz", + "integrity": "sha512-on3h1iXb04QFLLThrmVYg1SChBQ9N1c+nKAjebBjokBqipddH3uxmOUcEkTnzmJ8Jh/5TSUnUqS40i2QB2dJHQ==", + "license": "Apache-2.0", + "dependencies": { + "@opentelemetry/api": "^1.4.0", + "tdigest": "^0.1.1" + }, + "engines": { + "node": "^16 || ^18 || >=20" + } + }, + "node_modules/promise": { + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz", + "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==", + "license": "MIT", + "dependencies": { + "asap": "~2.0.3" + } + }, + "node_modules/proxy-addr": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", + "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", + "license": "MIT", + "dependencies": { + "forwarded": "0.2.0", + "ipaddr.js": "1.9.1" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/prunecluster": { + "name": "PruneCluster", + "version": "2.1.0", + "resolved": "git+ssh://git@github.com/pedroetb/PruneCluster.git#5430b605050f181d02fa7ef8cd8ef43d25b422d8", + "dev": true, + "license": "MIT" + }, + "node_modules/pug": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/pug/-/pug-3.0.3.tgz", + "integrity": "sha512-uBi6kmc9f3SZ3PXxqcHiUZLmIXgfgWooKWXcwSGwQd2Zi5Rb0bT14+8CJjJgI8AB+nndLaNgHGrcc6bPIB665g==", + "license": "MIT", + "dependencies": { + "pug-code-gen": "^3.0.3", + "pug-filters": "^4.0.0", + "pug-lexer": "^5.0.1", + "pug-linker": "^4.0.0", + "pug-load": "^3.0.0", + "pug-parser": "^6.0.0", + "pug-runtime": "^3.0.1", + "pug-strip-comments": "^2.0.0" + } + }, + "node_modules/pug-attrs": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pug-attrs/-/pug-attrs-3.0.0.tgz", + "integrity": "sha512-azINV9dUtzPMFQktvTXciNAfAuVh/L/JCl0vtPCwvOA21uZrC08K/UnmrL+SXGEVc1FwzjW62+xw5S/uaLj6cA==", + "license": "MIT", + "dependencies": { + "constantinople": "^4.0.1", + "js-stringify": "^1.0.2", + "pug-runtime": "^3.0.0" + } + }, + "node_modules/pug-code-gen": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/pug-code-gen/-/pug-code-gen-3.0.3.tgz", + "integrity": "sha512-cYQg0JW0w32Ux+XTeZnBEeuWrAY7/HNE6TWnhiHGnnRYlCgyAUPoyh9KzCMa9WhcJlJ1AtQqpEYHc+vbCzA+Aw==", + "license": "MIT", + "dependencies": { + "constantinople": "^4.0.1", + "doctypes": "^1.1.0", + "js-stringify": "^1.0.2", + "pug-attrs": "^3.0.0", + "pug-error": "^2.1.0", + "pug-runtime": "^3.0.1", + "void-elements": "^3.1.0", + "with": "^7.0.0" + } + }, + "node_modules/pug-code-gen/node_modules/pug-error": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/pug-error/-/pug-error-2.1.0.tgz", + "integrity": "sha512-lv7sU9e5Jk8IeUheHata6/UThZ7RK2jnaaNztxfPYUY+VxZyk/ePVaNZ/vwmH8WqGvDz3LrNYt/+gA55NDg6Pg==", + "license": "MIT" + }, + "node_modules/pug-error": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/pug-error/-/pug-error-2.0.0.tgz", + "integrity": "sha512-sjiUsi9M4RAGHktC1drQfCr5C5eriu24Lfbt4s+7SykztEOwVZtbFk1RRq0tzLxcMxMYTBR+zMQaG07J/btayQ==", + "license": "MIT" + }, + "node_modules/pug-filters": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/pug-filters/-/pug-filters-4.0.0.tgz", + "integrity": "sha512-yeNFtq5Yxmfz0f9z2rMXGw/8/4i1cCFecw/Q7+D0V2DdtII5UvqE12VaZ2AY7ri6o5RNXiweGH79OCq+2RQU4A==", + "license": "MIT", + "dependencies": { + "constantinople": "^4.0.1", + "jstransformer": "1.0.0", + "pug-error": "^2.0.0", + "pug-walk": "^2.0.0", + "resolve": "^1.15.1" + } + }, + "node_modules/pug-lexer": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/pug-lexer/-/pug-lexer-5.0.1.tgz", + "integrity": "sha512-0I6C62+keXlZPZkOJeVam9aBLVP2EnbeDw3An+k0/QlqdwH6rv8284nko14Na7c0TtqtogfWXcRoFE4O4Ff20w==", + "license": "MIT", + "dependencies": { + "character-parser": "^2.2.0", + "is-expression": "^4.0.0", + "pug-error": "^2.0.0" + } + }, + "node_modules/pug-linker": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/pug-linker/-/pug-linker-4.0.0.tgz", + "integrity": "sha512-gjD1yzp0yxbQqnzBAdlhbgoJL5qIFJw78juN1NpTLt/mfPJ5VgC4BvkoD3G23qKzJtIIXBbcCt6FioLSFLOHdw==", + "license": "MIT", + "dependencies": { + "pug-error": "^2.0.0", + "pug-walk": "^2.0.0" + } + }, + "node_modules/pug-load": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pug-load/-/pug-load-3.0.0.tgz", + "integrity": "sha512-OCjTEnhLWZBvS4zni/WUMjH2YSUosnsmjGBB1An7CsKQarYSWQ0GCVyd4eQPMFJqZ8w9xgs01QdiZXKVjk92EQ==", + "license": "MIT", + "dependencies": { + "object-assign": "^4.1.1", + "pug-walk": "^2.0.0" + } + }, + "node_modules/pug-parser": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/pug-parser/-/pug-parser-6.0.0.tgz", + "integrity": "sha512-ukiYM/9cH6Cml+AOl5kETtM9NR3WulyVP2y4HOU45DyMim1IeP/OOiyEWRr6qk5I5klpsBnbuHpwKmTx6WURnw==", + "license": "MIT", + "dependencies": { + "pug-error": "^2.0.0", + "token-stream": "1.0.0" + } + }, + "node_modules/pug-runtime": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/pug-runtime/-/pug-runtime-3.0.1.tgz", + "integrity": "sha512-L50zbvrQ35TkpHwv0G6aLSuueDRwc/97XdY8kL3tOT0FmhgG7UypU3VztfV/LATAvmUfYi4wNxSajhSAeNN+Kg==", + "license": "MIT" + }, + "node_modules/pug-strip-comments": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/pug-strip-comments/-/pug-strip-comments-2.0.0.tgz", + "integrity": "sha512-zo8DsDpH7eTkPHCXFeAk1xZXJbyoTfdPlNR0bK7rpOMuhBYb0f5qUVCO1xlsitYd3w5FQTK7zpNVKb3rZoUrrQ==", + "license": "MIT", + "dependencies": { + "pug-error": "^2.0.0" + } + }, + "node_modules/pug-walk": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/pug-walk/-/pug-walk-2.0.0.tgz", + "integrity": "sha512-yYELe9Q5q9IQhuvqsZNwA5hfPkMJ8u92bQLIMcsMxf/VADjNtEYptU+inlufAFYcWdHlwNfZOEnOOQrZrcyJCQ==", + "license": "MIT" + }, + "node_modules/put-selector": { + "version": "0.3.6", + "resolved": "https://registry.npmjs.org/put-selector/-/put-selector-0.3.6.tgz", + "integrity": "sha1-Fy6PjZeNVQcrJ1ehZFd21oXID6I=", + "dev": true + }, + "node_modules/qs": { + "version": "6.11.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", + "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", + "license": "BSD-3-Clause", + "dependencies": { + "side-channel": "^1.0.4" + }, + "engines": { + "node": ">=0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/querystringify": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", + "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/range-parser": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", + "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/raw-body": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz", + "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "bytes": "3.1.0", + "http-errors": "1.7.2", + "iconv-lite": "0.4.24", + "unpipe": "1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/raw-body/node_modules/http-errors": { + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz", + "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==", + "dev": true, + "license": "MIT", + "dependencies": { + "depd": "~1.1.2", + "inherits": "2.0.3", + "setprototypeof": "1.1.1", + "statuses": ">= 1.5.0 < 2", + "toidentifier": "1.0.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/readable-stream": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", + "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~1.0.6", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.0.3", + "util-deprecate": "~1.0.1" + } + }, + "node_modules/rechoir": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz", + "integrity": "sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==", + "dev": true, + "license": "MIT", + "dependencies": { + "resolve": "^1.9.0" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/rechoir/node_modules/is-core-module": { + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz", + "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==", + "dev": true, + "license": "MIT", + "dependencies": { + "has": "^1.0.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/rechoir/node_modules/path-parse": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", + "dev": true, + "license": "MIT" + }, + "node_modules/rechoir/node_modules/resolve": { + "version": "1.22.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz", + "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-core-module": "^2.8.1", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/requires-port": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", + "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=", + "dev": true, + "license": "MIT" + }, + "node_modules/resolve": { + "version": "1.20.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz", + "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==", + "license": "MIT", + "dependencies": { + "is-core-module": "^2.2.0", + "path-parse": "^1.0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/resolve-dir": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz", + "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=", + "dev": true, + "license": "MIT", + "dependencies": { + "expand-tilde": "^2.0.0", + "global-modules": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/resolve-from": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/resolve-pkg": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/resolve-pkg/-/resolve-pkg-2.0.0.tgz", + "integrity": "sha512-+1lzwXehGCXSeryaISr6WujZzowloigEofRB+dj75y9RRa/obVcYgbHJd53tdYw8pvZj8GojXaaENws8Ktw/hQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "resolve-from": "^5.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/response-time": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/response-time/-/response-time-2.3.2.tgz", + "integrity": "sha1-/6cbq5UtYvfB1Jt0NDVfvGjf/Fo=", + "license": "MIT", + "dependencies": { + "depd": "~1.1.0", + "on-headers": "~1.0.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/rimraf": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", + "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "dev": true, + "license": "ISC", + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + } + }, + "node_modules/rimraf/node_modules/glob": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", + "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", + "dev": true, + "license": "ISC", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/robust-predicates": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/robust-predicates/-/robust-predicates-3.0.1.tgz", + "integrity": "sha512-ndEIpszUHiG4HtDsQLeIuMvRsDnn8c8rYStabochtUeCvfuvNptb5TUbVD68LRAILPX7p9nqQGh4xJgn3EHS/g==", + "dev": true, + "license": "Unlicense" + }, + "node_modules/rw": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz", + "integrity": "sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q=", + "dev": true, + "license": "BSD-3-Clause" + }, + "node_modules/safe-buffer": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", + "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", + "dev": true, + "license": "MIT" + }, + "node_modules/safe-stable-stringify": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.3.1.tgz", + "integrity": "sha512-kYBSfT+troD9cDA85VDnHZ1rpHC50O0g1e6WlGHVCz/g+JS+9WKLj+XwFYyR8UbrZN8ll9HUpDAAddY58MGisg==", + "license": "MIT", + "engines": { + "node": ">=10" + } + }, + "node_modules/safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "license": "MIT" + }, + "node_modules/sax": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.3.0.tgz", + "integrity": "sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA==", + "dev": true, + "license": "ISC" + }, + "node_modules/seek-bzip": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.5.tgz", + "integrity": "sha1-z+kXyz0nS8/6x5J1ivUxc+sfq9w=", + "dev": true, + "license": "MIT", + "dependencies": { + "commander": "~2.8.1" + }, + "bin": { + "seek-bunzip": "bin/seek-bunzip", + "seek-table": "bin/seek-bzip-table" + } + }, + "node_modules/seek-bzip/node_modules/commander": { + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz", + "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=", + "dev": true, + "license": "MIT", + "dependencies": { + "graceful-readlink": ">= 1.0.0" + }, + "engines": { + "node": ">= 0.6.x" + } + }, + "node_modules/semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/send": { + "version": "0.17.1", + "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz", + "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==", + "dev": true, + "license": "MIT", + "dependencies": { + "debug": "2.6.9", + "depd": "~1.1.2", + "destroy": "~1.0.4", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "fresh": "0.5.2", + "http-errors": "~1.7.2", + "mime": "1.6.0", + "ms": "2.1.1", + "on-finished": "~2.3.0", + "range-parser": "~1.2.1", + "statuses": "~1.5.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/send/node_modules/destroy": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", + "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=", + "dev": true, + "license": "MIT" + }, + "node_modules/send/node_modules/http-errors": { + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz", + "integrity": "sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==", + "dev": true, + "license": "MIT", + "dependencies": { + "depd": "~1.1.2", + "inherits": "2.0.4", + "setprototypeof": "1.1.1", + "statuses": ">= 1.5.0 < 2", + "toidentifier": "1.0.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/send/node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/send/node_modules/ms": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", + "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", + "dev": true, + "license": "MIT" + }, + "node_modules/serve-static": { + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz", + "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==", + "license": "MIT", + "dependencies": { + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "parseurl": "~1.3.3", + "send": "0.18.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/serve-static/node_modules/depd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/serve-static/node_modules/on-finished": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", + "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", + "license": "MIT", + "dependencies": { + "ee-first": "1.1.1" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/serve-static/node_modules/send": { + "version": "0.18.0", + "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", + "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", + "license": "MIT", + "dependencies": { + "debug": "2.6.9", + "depd": "2.0.0", + "destroy": "1.2.0", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "fresh": "0.5.2", + "http-errors": "2.0.0", + "mime": "1.6.0", + "ms": "2.1.3", + "on-finished": "2.4.1", + "range-parser": "~1.2.1", + "statuses": "2.0.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/serve-static/node_modules/statuses": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", + "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/set-immediate-shim": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz", + "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/setprototypeof": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz", + "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==", + "dev": true, + "license": "ISC" + }, + "node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, + "license": "MIT", + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/shell-quote": { + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.3.tgz", + "integrity": "sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw==", + "dev": true, + "license": "MIT" + }, + "node_modules/side-channel": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", + "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.0", + "get-intrinsic": "^1.0.2", + "object-inspect": "^1.9.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/simple-swizzle": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz", + "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=", + "license": "MIT", + "dependencies": { + "is-arrayish": "^0.3.1" + } + }, + "node_modules/sockjs-client": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.6.1.tgz", + "integrity": "sha512-2g0tjOR+fRs0amxENLi/q5TiJTqY+WXFOzb5UwXndlK6TO3U/mirZznpx6w34HVMoc3g7cY24yC/ZMIYnDlfkw==", + "dev": true, + "license": "MIT", + "dependencies": { + "debug": "^3.2.7", + "eventsource": "^2.0.2", + "faye-websocket": "^0.11.4", + "inherits": "^2.0.4", + "url-parse": "^1.5.10" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://tidelift.com/funding/github/npm/sockjs-client" + } + }, + "node_modules/sockjs-client/node_modules/debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/sockjs-client/node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/source-map-support": { + "version": "0.5.19", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz", + "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==", + "dev": true, + "license": "MIT", + "dependencies": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + }, + "node_modules/sprintf-js": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz", + "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==", + "dev": true, + "license": "BSD-3-Clause" + }, + "node_modules/stack-trace": { + "version": "0.0.10", + "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz", + "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=", + "license": "MIT", + "engines": { + "node": "*" + } + }, + "node_modules/statuses": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", + "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/stomp-websocket": { + "version": "2.3.4-next", + "resolved": "https://registry.npmjs.org/stomp-websocket/-/stomp-websocket-2.3.4-next.tgz", + "integrity": "sha1-JTtuUEalXmyOCapgZjynYnUxyxs=", + "dev": true, + "license": "Apache-2.0", + "optionalDependencies": { + "websocket": "latest" + } + }, + "node_modules/string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "safe-buffer": "~5.1.0" + } + }, + "node_modules/string-width": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", + "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "dev": true, + "license": "MIT", + "dependencies": { + "eastasianwidth": "^0.2.0", + "emoji-regex": "^9.2.2", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/string-width-cjs": { + "name": "string-width", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/string-width/node_modules/ansi-regex": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/string-width/node_modules/emoji-regex": { + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "dev": true, + "license": "MIT" + }, + "node_modules/string-width/node_modules/strip-ansi": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, + "node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi-cjs": { + "name": "strip-ansi", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi-cjs/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-bom": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", + "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-dirs": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/strip-dirs/-/strip-dirs-2.1.0.tgz", + "integrity": "sha512-JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-natural-number": "^4.0.1" + } + }, + "node_modules/strip-json-comments": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz", + "integrity": "sha1-HhX7ysl9Pumb8tc7TGVrCCu6+5E=", + "dev": true, + "license": "MIT", + "bin": { + "strip-json-comments": "cli.js" + }, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/stylus": { + "version": "0.63.0", + "resolved": "https://registry.npmjs.org/stylus/-/stylus-0.63.0.tgz", + "integrity": "sha512-OMlgrTCPzE/ibtRMoeLVhOY0RcNuNWh0rhAVqeKnk/QwcuUKQbnqhZ1kg2vzD8VU/6h3FoPTq4RJPHgLBvX6Bw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@adobe/css-tools": "~4.3.3", + "debug": "^4.3.2", + "glob": "^7.1.6", + "sax": "~1.3.0", + "source-map": "^0.7.3" + }, + "bin": { + "stylus": "bin/stylus" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://opencollective.com/stylus" + } + }, + "node_modules/stylus/node_modules/debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/stylus/node_modules/glob": { + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", + "dev": true, + "license": "ISC", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/stylus/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true, + "license": "MIT" + }, + "node_modules/stylus/node_modules/source-map": { + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", + "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">= 8" + } + }, + "node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/supports-preserve-symlinks-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/tar-stream": { + "version": "1.5.5", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.5.tgz", + "integrity": "sha512-mQdgLPc/Vjfr3VWqWbfxW8yQNiJCbAZ+Gf6GDu1Cy0bdb33ofyiNGBtAY96jHFhDuivCwgW1H9DgTON+INiXgg==", + "dev": true, + "license": "MIT", + "dependencies": { + "bl": "^1.0.0", + "end-of-stream": "^1.0.0", + "readable-stream": "^2.0.0", + "xtend": "^4.0.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/tdigest": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/tdigest/-/tdigest-0.1.1.tgz", + "integrity": "sha1-Ljyyw56kSeVdHmzZEReszKRYgCE=", + "license": "MIT", + "dependencies": { + "bintrees": "1.0.1" + } + }, + "node_modules/text-hex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz", + "integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==", + "license": "MIT" + }, + "node_modules/through": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", + "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=", + "dev": true, + "license": "MIT" + }, + "node_modules/to-fast-properties": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", + "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=", + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, + "node_modules/toidentifier": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz", + "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.6" + } + }, + "node_modules/token-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/token-stream/-/token-stream-1.0.0.tgz", + "integrity": "sha1-zCAOqyYT9BZtJ/+a/HylbUnfbrQ=", + "license": "MIT" + }, + "node_modules/triple-beam": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.3.0.tgz", + "integrity": "sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw==", + "license": "MIT" + }, + "node_modules/ts-node": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.0.0.tgz", + "integrity": "sha512-ROWeOIUvfFbPZkoDis0L/55Fk+6gFQNZwwKPLinacRl6tsxstTF1DbAcLKkovwnpKMVvOMHP1TIbnwXwtLg1gg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@tsconfig/node10": "^1.0.7", + "@tsconfig/node12": "^1.0.7", + "@tsconfig/node14": "^1.0.0", + "@tsconfig/node16": "^1.0.1", + "arg": "^4.1.0", + "create-require": "^1.1.0", + "diff": "^4.0.1", + "make-error": "^1.1.1", + "source-map-support": "^0.5.17", + "yn": "3.1.1" + }, + "bin": { + "ts-node": "dist/bin.js", + "ts-node-cwd": "dist/bin-cwd.js", + "ts-node-script": "dist/bin-script.js", + "ts-node-transpile-only": "dist/bin-transpile.js", + "ts-script": "dist/bin-script-deprecated.js" + }, + "engines": { + "node": ">=12.0.0" + }, + "peerDependencies": { + "@swc/core": ">=1.2.45", + "@swc/wasm": ">=1.2.45", + "@types/node": "*", + "typescript": ">=2.7" + }, + "peerDependenciesMeta": { + "@swc/core": { + "optional": true + }, + "@swc/wasm": { + "optional": true + } + } + }, + "node_modules/ts-node/node_modules/diff": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", + "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.3.1" + } + }, + "node_modules/tslib": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", + "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==", + "dev": true, + "license": "0BSD" + }, + "node_modules/tv4": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/tv4/-/tv4-1.3.0.tgz", + "integrity": "sha1-0CDIRvrdUMhVq7JeuuzGj8EPeWM=", + "dev": true, + "license": [ + { + "type": "Public Domain", + "url": "http://geraintluff.github.io/tv4/LICENSE.txt" + }, + { + "type": "MIT", + "url": "http://jsonary.com/LICENSE.txt" + } + ], + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/type-detect": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", + "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/type-is": { + "version": "1.6.18", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", + "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", + "license": "MIT", + "dependencies": { + "media-typer": "0.3.0", + "mime-types": "~2.1.24" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/typescript": { + "version": "5.5.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz", + "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==", + "dev": true, + "license": "Apache-2.0", + "peer": true, + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=14.17" + } + }, + "node_modules/unbzip2-stream": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.2.5.tgz", + "integrity": "sha512-izD3jxT8xkzwtXRUZjtmRwKnZoeECrfZ8ra/ketwOcusbZEp4mjULMnJOCfTDZBgGQAAY1AJ/IgxcwkavcX9Og==", + "dev": true, + "license": "MIT", + "dependencies": { + "buffer": "^3.0.1", + "through": "^2.3.6" + } + }, + "node_modules/unc-path-regex": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz", + "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/underscore.string": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-3.3.6.tgz", + "integrity": "sha512-VoC83HWXmCrF6rgkyxS9GHv8W9Q5nhMKho+OadDJGzL2oDYbYEppBaCMH6pFlwLeqj2QS+hhkw2kpXkSdD1JxQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "sprintf-js": "^1.1.1", + "util-deprecate": "^1.0.2" + }, + "engines": { + "node": "*" + } + }, + "node_modules/unidragger": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/unidragger/-/unidragger-2.4.0.tgz", + "integrity": "sha512-MueZK2oXuGE6OAlGKIrSXK2zCq+8yb1QUZgqyTDCSJzvwYL0g2Llrad+TtoQTYxtFnNyxxSw0IMnKNIgEMia1w==", + "dev": true, + "license": "MIT", + "dependencies": { + "unipointer": "^2.4.0" + } + }, + "node_modules/unipointer": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/unipointer/-/unipointer-2.4.0.tgz", + "integrity": "sha512-VjzDLPjGK7aYpQKH7bnDZS8X4axF5AFU/LQi+NQe1oyEHfaz6lWKhaQ7n4o7vJ1iJ4i2T0quCIfrQM139p05Sw==", + "dev": true, + "license": "MIT", + "dependencies": { + "ev-emitter": "^1.0.1" + } + }, + "node_modules/unpipe": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", + "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/uri-path": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/uri-path/-/uri-path-1.0.0.tgz", + "integrity": "sha1-l0fwGDWJM8Md4PzP2C0TjmcmLjI=", + "dev": true, + "license": "WTFPL OR MIT", + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/url-parse": { + "version": "1.5.10", + "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz", + "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "querystringify": "^2.1.1", + "requires-port": "^1.0.0" + } + }, + "node_modules/util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", + "license": "MIT" + }, + "node_modules/utils-merge": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", + "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=", + "license": "MIT", + "engines": { + "node": ">= 0.4.0" + } + }, + "node_modules/uuid": { + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", + "dev": true, + "license": "MIT", + "bin": { + "uuid": "dist/bin/uuid" + } + }, + "node_modules/v8flags": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz", + "integrity": "sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==", + "dev": true, + "license": "MIT", + "dependencies": { + "homedir-polyfill": "^1.0.1" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/vary": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", + "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/void-elements": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-3.1.0.tgz", + "integrity": "sha1-YU9/v42AHwu18GYfWy9XhXUOTwk=", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/websocket-driver": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.0.tgz", + "integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=", + "dev": true, + "license": "MIT", + "dependencies": { + "http-parser-js": ">=0.4.0", + "websocket-extensions": ">=0.1.1" + }, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/websocket-extensions": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz", + "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "license": "ISC", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/wicket": { + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/wicket/-/wicket-1.3.8.tgz", + "integrity": "sha512-+UZsrBvp8OI+8PhStpXQw0oJedaCLncZwu7lPdcZ9BpUsyu25rztzHG+IwXGK372nuDGp+Wy4FreM/rzdWYJAg==", + "dev": true, + "license": "GPL-3.0" + }, + "node_modules/winston": { + "version": "3.13.0", + "resolved": "https://registry.npmjs.org/winston/-/winston-3.13.0.tgz", + "integrity": "sha512-rwidmA1w3SE4j0E5MuIufFhyJPBDG7Nu71RkZor1p2+qHvJSZ9GYDA81AyleQcZbh/+V6HjeBdfnTZJm9rSeQQ==", + "license": "MIT", + "dependencies": { + "@colors/colors": "^1.6.0", + "@dabh/diagnostics": "^2.0.2", + "async": "^3.2.3", + "is-stream": "^2.0.0", + "logform": "^2.4.0", + "one-time": "^1.0.0", + "readable-stream": "^3.4.0", + "safe-stable-stringify": "^2.3.1", + "stack-trace": "0.0.x", + "triple-beam": "^1.3.0", + "winston-transport": "^4.7.0" + }, + "engines": { + "node": ">= 12.0.0" + } + }, + "node_modules/winston-transport": { + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-4.7.0.tgz", + "integrity": "sha512-ajBj65K5I7denzer2IYW6+2bNIVqLGDHqDw3Ow8Ohh+vdW+rv4MZ6eiDvHoKhfJFZ2auyN8byXieDDJ96ViONg==", + "license": "MIT", + "dependencies": { + "logform": "^2.3.2", + "readable-stream": "^3.6.0", + "triple-beam": "^1.3.0" + }, + "engines": { + "node": ">= 12.0.0" + } + }, + "node_modules/winston-transport/node_modules/readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "license": "MIT", + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/winston-transport/node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, + "node_modules/winston-transport/node_modules/string_decoder": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "license": "MIT", + "dependencies": { + "safe-buffer": "~5.2.0" + } + }, + "node_modules/winston/node_modules/is-stream": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", + "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/winston/node_modules/readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "license": "MIT", + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/winston/node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, + "node_modules/winston/node_modules/string_decoder": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "license": "MIT", + "dependencies": { + "safe-buffer": "~5.2.0" + } + }, + "node_modules/with": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/with/-/with-7.0.2.tgz", + "integrity": "sha512-RNGKj82nUPg3g5ygxkQl0R937xLyho1J24ItRCBTr/m1YnZkzJy1hUiHUJrc/VlsDQzsCnInEGSg3bci0Lmd4w==", + "license": "MIT", + "dependencies": { + "@babel/parser": "^7.9.6", + "@babel/types": "^7.9.6", + "assert-never": "^1.2.1", + "babel-walk": "3.0.0-canary-5" + }, + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/with/node_modules/@babel/helper-validator-identifier": { + "version": "7.12.11", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz", + "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==", + "license": "MIT" + }, + "node_modules/with/node_modules/@babel/parser": { + "version": "7.13.15", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.15.tgz", + "integrity": "sha512-b9COtcAlVEQljy/9fbcMHpG+UIW9ReF+gpaxDHTlZd0c6/UU9ng8zdySAW9sRTzpvcdCHn6bUcbuYUgGzLAWVQ==", + "license": "MIT", + "bin": { + "parser": "bin/babel-parser.js" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/with/node_modules/@babel/types": { + "version": "7.13.14", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.14.tgz", + "integrity": "sha512-A2aa3QTkWoyqsZZFl56MLUsfmh7O0gN41IPvXAE/++8ojpbz12SszD7JEGYVdn4f9Kt4amIei07swF1h4AqmmQ==", + "license": "MIT", + "dependencies": { + "@babel/helper-validator-identifier": "^7.12.11", + "lodash": "^4.17.19", + "to-fast-properties": "^2.0.0" + } + }, + "node_modules/with/node_modules/lodash": { + "version": "4.17.20", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", + "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==", + "license": "MIT" + }, + "node_modules/wkt-parser": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/wkt-parser/-/wkt-parser-1.3.3.tgz", + "integrity": "sha512-ZnV3yH8/k58ZPACOXeiHaMuXIiaTk1t0hSUVisbO0t4RjA5wPpUytcxeyiN2h+LZRrmuHIh/1UlrR9e7DHDvTw==", + "dev": true, + "license": "MIT" + }, + "node_modules/wordwrap": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", + "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", + "dev": true, + "license": "MIT" + }, + "node_modules/wrap-ansi": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", + "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^6.1.0", + "string-width": "^5.0.1", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/wrap-ansi-cjs": { + "name": "wrap-ansi", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/wrap-ansi-cjs/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi/node_modules/ansi-regex": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/wrap-ansi/node_modules/ansi-styles": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", + "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/wrap-ansi/node_modules/strip-ansi": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "dev": true, + "license": "ISC" + }, + "node_modules/ws": { + "version": "7.5.7", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz", + "integrity": "sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8.3.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": "^5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, + "node_modules/xtend": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", + "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.4" + } + }, + "node_modules/yauzl": { + "version": "2.9.1", + "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.9.1.tgz", + "integrity": "sha1-qBmB6nCleUYTOIPwKcWCGok1mn8=", + "dev": true, + "license": "MIT", + "dependencies": { + "buffer-crc32": "~0.2.3", + "fd-slicer": "~1.0.1" + } + }, + "node_modules/yn": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", + "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + } + } +} diff --git a/package.json b/package.json index 69cc0343..e2b41424 100644 --- a/package.json +++ b/package.json @@ -84,10 +84,10 @@ "tv4": "1.3.0", "wicket": "1.3.8" }, - "files": ["dist", "yarn.lock"], + "files": ["dist"], "engines": { - "node": ">=16.0", - "npm": ">=8.19" + "node": ">=20.16", + "npm": ">=10.8" }, "main": "server-app", "license": "AGPL-3.0-or-later", diff --git a/yarn.lock b/yarn.lock deleted file mode 100644 index 6275a950..00000000 --- a/yarn.lock +++ /dev/null @@ -1,4509 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -"@adobe/css-tools@~4.3.3": - version "4.3.3" - resolved "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.3.tgz" - integrity sha512-rE0Pygv0sEZ4vBWHlAgJLGDU7Pm8xoO6p3wsEceb7GYAjScrOHpEo8KK/eVkAcnSM+slAEtXjA2JpdjLp4fJQQ== - -"@ampproject/remapping@^2.1.0": - version "2.1.2" - resolved "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.1.2.tgz" - integrity sha512-hoyByceqwKirw7w3Z7gnIIZC3Wx3J484Y3L/cMpXFbr7d9ZQj2mODrirNzcJa+SM3UlpWXYvKV4RlRpFXlWgXg== - dependencies: - "@jridgewell/trace-mapping" "^0.3.0" - -"@babel/code-frame@^7.16.7": - version "7.16.7" - resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz" - integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg== - dependencies: - "@babel/highlight" "^7.16.7" - -"@babel/compat-data@^7.17.7": - version "7.17.7" - resolved "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.7.tgz" - integrity sha512-p8pdE6j0a29TNGebNm7NzYZWB3xVZJBZ7XGs42uAKzQo8VQ3F0By/cQCtUEABwIqw5zo6WA4NbmxsfzADzMKnQ== - -"@babel/core@^7.7.5": - version "7.17.9" - resolved "https://registry.npmjs.org/@babel/core/-/core-7.17.9.tgz" - integrity sha512-5ug+SfZCpDAkVp9SFIZAzlW18rlzsOcJGaetCjkySnrXXDUw9AR8cDUm1iByTmdWM6yxX6/zycaV76w3YTF2gw== - dependencies: - "@ampproject/remapping" "^2.1.0" - "@babel/code-frame" "^7.16.7" - "@babel/generator" "^7.17.9" - "@babel/helper-compilation-targets" "^7.17.7" - "@babel/helper-module-transforms" "^7.17.7" - "@babel/helpers" "^7.17.9" - "@babel/parser" "^7.17.9" - "@babel/template" "^7.16.7" - "@babel/traverse" "^7.17.9" - "@babel/types" "^7.17.0" - convert-source-map "^1.7.0" - debug "^4.1.0" - gensync "^1.0.0-beta.2" - json5 "^2.2.1" - semver "^6.3.0" - -"@babel/generator@^7.17.9": - version "7.17.9" - resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.17.9.tgz" - integrity sha512-rAdDousTwxbIxbz5I7GEQ3lUip+xVCXooZNbsydCWs3xA7ZsYOv+CFRdzGxRX78BmQHu9B1Eso59AOZQOJDEdQ== - dependencies: - "@babel/types" "^7.17.0" - jsesc "^2.5.1" - source-map "^0.5.0" - -"@babel/helper-compilation-targets@^7.17.7": - version "7.17.7" - resolved "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.7.tgz" - integrity sha512-UFzlz2jjd8kroj0hmCFV5zr+tQPi1dpC2cRsDV/3IEW8bJfCPrPpmcSN6ZS8RqIq4LXcmpipCQFPddyFA5Yc7w== - dependencies: - "@babel/compat-data" "^7.17.7" - "@babel/helper-validator-option" "^7.16.7" - browserslist "^4.17.5" - semver "^6.3.0" - -"@babel/helper-environment-visitor@^7.16.7": - version "7.16.7" - resolved "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz" - integrity sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag== - dependencies: - "@babel/types" "^7.16.7" - -"@babel/helper-function-name@^7.17.9": - version "7.17.9" - resolved "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz" - integrity sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg== - dependencies: - "@babel/template" "^7.16.7" - "@babel/types" "^7.17.0" - -"@babel/helper-hoist-variables@^7.16.7": - version "7.16.7" - resolved "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz" - integrity sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg== - dependencies: - "@babel/types" "^7.16.7" - -"@babel/helper-module-imports@^7.16.7": - version "7.16.7" - resolved "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz" - integrity sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg== - dependencies: - "@babel/types" "^7.16.7" - -"@babel/helper-module-transforms@^7.17.7": - version "7.17.7" - resolved "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.17.7.tgz" - integrity sha512-VmZD99F3gNTYB7fJRDTi+u6l/zxY0BE6OIxPSU7a50s6ZUQkHwSDmV92FfM+oCG0pZRVojGYhkR8I0OGeCVREw== - dependencies: - "@babel/helper-environment-visitor" "^7.16.7" - "@babel/helper-module-imports" "^7.16.7" - "@babel/helper-simple-access" "^7.17.7" - "@babel/helper-split-export-declaration" "^7.16.7" - "@babel/helper-validator-identifier" "^7.16.7" - "@babel/template" "^7.16.7" - "@babel/traverse" "^7.17.3" - "@babel/types" "^7.17.0" - -"@babel/helper-simple-access@^7.17.7": - version "7.17.7" - resolved "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz" - integrity sha512-txyMCGroZ96i+Pxr3Je3lzEJjqwaRC9buMUgtomcrLe5Nd0+fk1h0LLA+ixUF5OW7AhHuQ7Es1WcQJZmZsz2XA== - dependencies: - "@babel/types" "^7.17.0" - -"@babel/helper-split-export-declaration@^7.16.7": - version "7.16.7" - resolved "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz" - integrity sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw== - dependencies: - "@babel/types" "^7.16.7" - -"@babel/helper-validator-identifier@^7.12.11": - version "7.12.11" - resolved "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz" - integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw== - -"@babel/helper-validator-identifier@^7.16.7": - version "7.16.7" - resolved "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz" - integrity sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw== - -"@babel/helper-validator-option@^7.16.7": - version "7.16.7" - resolved "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz" - integrity sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ== - -"@babel/helpers@^7.17.9": - version "7.17.9" - resolved "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.9.tgz" - integrity sha512-cPCt915ShDWUEzEp3+UNRktO2n6v49l5RSnG9M5pS24hA+2FAc5si+Pn1i4VVbQQ+jh+bIZhPFQOJOzbrOYY1Q== - dependencies: - "@babel/template" "^7.16.7" - "@babel/traverse" "^7.17.9" - "@babel/types" "^7.17.0" - -"@babel/highlight@^7.16.7": - version "7.17.9" - resolved "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.9.tgz" - integrity sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg== - dependencies: - "@babel/helper-validator-identifier" "^7.16.7" - chalk "^2.0.0" - js-tokens "^4.0.0" - -"@babel/parser@^7.16.7", "@babel/parser@^7.17.9": - version "7.17.9" - resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.17.9.tgz" - integrity sha512-vqUSBLP8dQHFPdPi9bc5GK9vRkYHJ49fsZdtoJ8EQ8ibpwk5rPKfvNIwChB0KVXcIjcepEBBd2VHC5r9Gy8ueg== - -"@babel/parser@^7.6.0", "@babel/parser@^7.9.6": - version "7.13.15" - resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.13.15.tgz" - integrity sha512-b9COtcAlVEQljy/9fbcMHpG+UIW9ReF+gpaxDHTlZd0c6/UU9ng8zdySAW9sRTzpvcdCHn6bUcbuYUgGzLAWVQ== - -"@babel/template@^7.16.7": - version "7.16.7" - resolved "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz" - integrity sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w== - dependencies: - "@babel/code-frame" "^7.16.7" - "@babel/parser" "^7.16.7" - "@babel/types" "^7.16.7" - -"@babel/traverse@^7.17.3", "@babel/traverse@^7.17.9": - version "7.17.9" - resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.9.tgz" - integrity sha512-PQO8sDIJ8SIwipTPiR71kJQCKQYB5NGImbOviK8K+kg5xkNSYXLBupuX9QhatFowrsvo9Hj8WgArg3W7ijNAQw== - dependencies: - "@babel/code-frame" "^7.16.7" - "@babel/generator" "^7.17.9" - "@babel/helper-environment-visitor" "^7.16.7" - "@babel/helper-function-name" "^7.17.9" - "@babel/helper-hoist-variables" "^7.16.7" - "@babel/helper-split-export-declaration" "^7.16.7" - "@babel/parser" "^7.17.9" - "@babel/types" "^7.17.0" - debug "^4.1.0" - globals "^11.1.0" - -"@babel/types@^7.16.7", "@babel/types@^7.17.0": - version "7.17.0" - resolved "https://registry.npmjs.org/@babel/types/-/types-7.17.0.tgz" - integrity sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw== - dependencies: - "@babel/helper-validator-identifier" "^7.16.7" - to-fast-properties "^2.0.0" - -"@babel/types@^7.6.1", "@babel/types@^7.9.6": - version "7.13.14" - resolved "https://registry.npmjs.org/@babel/types/-/types-7.13.14.tgz" - integrity sha512-A2aa3QTkWoyqsZZFl56MLUsfmh7O0gN41IPvXAE/++8ojpbz12SszD7JEGYVdn4f9Kt4amIei07swF1h4AqmmQ== - dependencies: - "@babel/helper-validator-identifier" "^7.12.11" - lodash "^4.17.19" - to-fast-properties "^2.0.0" - -"@colors/colors@1.5.0": - version "1.5.0" - resolved "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz" - integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ== - -"@colors/colors@^1.6.0": - version "1.6.0" - resolved "https://registry.npmjs.org/@colors/colors/-/colors-1.6.0.tgz" - integrity sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA== - -"@dabh/diagnostics@^2.0.2": - version "2.0.3" - resolved "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.3.tgz" - integrity sha512-hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA== - dependencies: - colorspace "1.1.x" - enabled "2.0.x" - kuler "^2.0.0" - -"@isaacs/cliui@^8.0.2": - version "8.0.2" - resolved "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz" - integrity sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA== - dependencies: - string-width "^5.1.2" - string-width-cjs "npm:string-width@^4.2.0" - strip-ansi "^7.0.1" - strip-ansi-cjs "npm:strip-ansi@^6.0.1" - wrap-ansi "^8.1.0" - wrap-ansi-cjs "npm:wrap-ansi@^7.0.0" - -"@istanbuljs/schema@^0.1.2": - version "0.1.3" - resolved "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz" - integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA== - -"@jridgewell/resolve-uri@^3.0.3": - version "3.0.5" - resolved "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz" - integrity sha512-VPeQ7+wH0itvQxnG+lIzWgkysKIr3L9sslimFW55rHMdGu/qCQ5z5h9zq4gI8uBtqkpHhsF4Z/OwExufUCThew== - -"@jridgewell/sourcemap-codec@^1.4.10": - version "1.4.11" - resolved "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz" - integrity sha512-Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg== - -"@jridgewell/trace-mapping@^0.3.0": - version "0.3.4" - resolved "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.4.tgz" - integrity sha512-vFv9ttIedivx0ux3QSjhgtCVjPZd5l46ZOMDSCwnH1yUO2e964gO8LZGyv2QkqcgR6TnBU1v+1IFqmeoG+0UJQ== - dependencies: - "@jridgewell/resolve-uri" "^3.0.3" - "@jridgewell/sourcemap-codec" "^1.4.10" - -"@lweller/leaflet-areaselect@1.3.0": - version "1.3.0" - resolved "https://registry.npmjs.org/@lweller/leaflet-areaselect/-/leaflet-areaselect-1.3.0.tgz" - integrity sha512-zdLHwkuARjzHTp+3mdkkpHjbsXwer9HJeZzc5IRgqv9fI3osD0+wwj5GCkefVfF1sAsmcEOm/nGoTSfUXewaug== - dependencies: - "@types/leaflet" "*" - -"@opentelemetry/api@^1.4.0": - version "1.7.0" - resolved "https://registry.npmjs.org/@opentelemetry/api/-/api-1.7.0.tgz" - integrity sha512-AdY5wvN0P2vXBi3b29hxZgSFvdhdxPB9+f0B6s//P9Q8nibRWeA3cHm8UmLpio9ABigkVHJ5NMPk+Mz8VCCyrw== - -"@pkgjs/parseargs@^0.11.0": - version "0.11.0" - resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33" - integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg== - -"@theintern/common@~0.3.0": - version "0.3.0" - resolved "https://registry.npmjs.org/@theintern/common/-/common-0.3.0.tgz" - integrity sha512-VKSyZGEyzmicJPvV5Gxeavm8Xbcr0cETAAqMapWZzA9Q85YHMG8VSrmPFlMrDQ524qE0IqQsTi0IlH8NIaN+eQ== - dependencies: - axios "~0.21.1" - tslib "~2.3.0" - -"@theintern/digdug@~2.6.2": - version "2.6.2" - resolved "https://registry.npmjs.org/@theintern/digdug/-/digdug-2.6.2.tgz" - integrity sha512-r9P7zkIp8L2LYKOUfcKl+KOHUTWrIZ9X6Efsb7Tn+OtiIv4oRlXorcoj/5vmrRLO5JF8jFj26HyeSWBNQA2uwg== - dependencies: - "@theintern/common" "~0.3.0" - command-exists "~1.2.9" - decompress "~4.2.1" - tslib "~2.3.0" - -"@theintern/leadfoot@~2.4.1": - version "2.4.1" - resolved "https://registry.npmjs.org/@theintern/leadfoot/-/leadfoot-2.4.1.tgz" - integrity sha512-WnmmMlSROXQc6sGJdQCcSXYbrRAni2HMmjjr2qtvXtLNCi7ZG6O/H7rJ+1fNdJckjE3kwF+Ag3Bh1WR7GkfG0Q== - dependencies: - "@theintern/common" "~0.3.0" - jszip "~3.7.1" - tslib "~2.3.0" - -"@tsconfig/node10@^1.0.7": - version "1.0.8" - resolved "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.8.tgz" - integrity sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg== - -"@tsconfig/node12@^1.0.7": - version "1.0.9" - resolved "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.9.tgz" - integrity sha512-/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw== - -"@tsconfig/node14@^1.0.0": - version "1.0.1" - resolved "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.1.tgz" - integrity sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg== - -"@tsconfig/node16@^1.0.1": - version "1.0.2" - resolved "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.2.tgz" - integrity sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA== - -"@turf/area@^5.1.5": - version "5.1.5" - resolved "https://registry.npmjs.org/@turf/area/-/area-5.1.5.tgz" - integrity sha512-lz16gqtvoz+j1jD9y3zj0Z5JnGNd3YfS0h+DQY1EcZymvi75Frm9i5YbEyth0RfxYZeOVufY7YIS3LXbJlI57g== - dependencies: - "@turf/helpers" "^5.1.5" - "@turf/meta" "^5.1.5" - -"@turf/distance@^5.1.5": - version "5.1.5" - resolved "https://registry.npmjs.org/@turf/distance/-/distance-5.1.5.tgz" - integrity sha512-sYCAgYZ2MjNKMtx17EijHlK9qHwpA0MuuQWbR4P30LTCl52UlG/reBfV899wKyF3HuDL9ux78IbILwOfeQ4zgA== - dependencies: - "@turf/helpers" "^5.1.5" - "@turf/invariant" "^5.1.5" - -"@turf/helpers@^5.1.5": - version "5.1.5" - resolved "https://registry.npmjs.org/@turf/helpers/-/helpers-5.1.5.tgz" - integrity sha512-/lF+JR+qNDHZ8bF9d+Cp58nxtZWJ3sqFe6n3u3Vpj+/0cqkjk4nXKYBSY0azm+GIYB5mWKxUXvuP/m0ZnKj1bw== - -"@turf/invariant@^5.1.5": - version "5.2.0" - resolved "https://registry.npmjs.org/@turf/invariant/-/invariant-5.2.0.tgz" - integrity sha512-28RCBGvCYsajVkw2EydpzLdcYyhSA77LovuOvgCJplJWaNVyJYH6BOR3HR9w50MEkPqb/Vc/jdo6I6ermlRtQA== - dependencies: - "@turf/helpers" "^5.1.5" - -"@turf/length@^5.1.5": - version "5.1.5" - resolved "https://registry.npmjs.org/@turf/length/-/length-5.1.5.tgz" - integrity sha512-0ryx68h512wCoNfwyksLdabxEfwkGNTPg61/QiY+QfGFUOUNhHbP+QimViFpwF5hyX7qmroaSHVclLUqyLGRbg== - dependencies: - "@turf/distance" "^5.1.5" - "@turf/helpers" "^5.1.5" - "@turf/meta" "^5.1.5" - -"@turf/meta@^5.1.5": - version "5.2.0" - resolved "https://registry.npmjs.org/@turf/meta/-/meta-5.2.0.tgz" - integrity sha512-ZjQ3Ii62X9FjnK4hhdsbT+64AYRpaI8XMBMcyftEOGSmPMUVnkbvuv3C9geuElAXfQU7Zk1oWGOcrGOD9zr78Q== - dependencies: - "@turf/helpers" "^5.1.5" - -"@types/babel-types@*": - version "7.0.0" - resolved "https://registry.npmjs.org/@types/babel-types/-/babel-types-7.0.0.tgz" - integrity sha512-PyWcbX0W4r4GcgXLI0Vu4jyJ/Erueo3PwjgvQcOmWAOBW0ObhzBBciEX+sHvjkNE0umI6nqD192FDKvYZTL91A== - -"@types/benchmark@~2.1.1": - version "2.1.1" - resolved "https://registry.npmjs.org/@types/benchmark/-/benchmark-2.1.1.tgz" - integrity sha512-XmdNOarpSSxnb3DE2rRFOFsEyoqXLUL+7H8nSGS25vs+JS0018bd+cW5Ma9vdlkPmoTHSQ6e8EUFMFMxeE4l+g== - -"@types/body-parser@*": - version "1.16.8" - resolved "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.16.8.tgz" - integrity sha512-BdN2PXxOFnTXFcyONPW6t0fHjz2fvRZHVMFpaS0wYr+Y8fWEaNOs4V8LEu/fpzQlMx+ahdndgTaGTwPC+J/EeA== - dependencies: - "@types/express" "*" - "@types/node" "*" - -"@types/chai@~4.2.20": - version "4.2.22" - resolved "https://registry.npmjs.org/@types/chai/-/chai-4.2.22.tgz" - integrity sha512-tFfcE+DSTzWAgifkjik9AySNqIyNoYwmR+uecPwwD/XRNfvOjmC/FjCxpiUGDkDVDphPfCUecSQVFw+lN3M3kQ== - -"@types/charm@~1.0.2": - version "1.0.3" - resolved "https://registry.npmjs.org/@types/charm/-/charm-1.0.3.tgz" - integrity sha512-FpNoSOkloETr+ZJ0RsZpB+a/tqJkniIN+9Enn6uPIbhiNptOWtZzV7FkaqxTRjvvlHeUKMR331Wj9tOmqG10TA== - dependencies: - "@types/node" "*" - -"@types/events@*": - version "1.1.0" - resolved "https://registry.npmjs.org/@types/events/-/events-1.1.0.tgz" - integrity sha512-y3bR98mzYOo0pAZuiLari+cQyiKk3UXRuT45h1RjhfeCzqkjaVsfZJNaxdgtk7/3tzOm1ozLTqEqMP3VbI48jw== - -"@types/express-serve-static-core@*": - version "4.11.1" - resolved "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.11.1.tgz" - integrity sha512-EehCl3tpuqiM8RUb+0255M8PhhSwTtLfmO7zBBdv0ay/VTd/zmrqDfQdZFsa5z/PVMbH2yCMZPXsnrImpATyIw== - dependencies: - "@types/events" "*" - "@types/node" "*" - -"@types/express-serve-static-core@^4.17.18": - version "4.17.18" - resolved "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.18.tgz" - integrity sha512-m4JTwx5RUBNZvky/JJ8swEJPKFd8si08pPF2PfizYjGZOKr/svUWPcoUmLow6MmPzhasphB7gSTINY67xn3JNA== - dependencies: - "@types/node" "*" - "@types/qs" "*" - "@types/range-parser" "*" - -"@types/express@*": - version "4.11.0" - resolved "https://registry.npmjs.org/@types/express/-/express-4.11.0.tgz" - integrity sha512-N1Wdp3v4KmdO3W/CM7KXrDwM4xcVZjlHF2dAOs7sNrTUX8PY3G4n9NkaHlfjGFEfgFeHmRRjywoBd4VkujDs9w== - dependencies: - "@types/body-parser" "*" - "@types/express-serve-static-core" "*" - "@types/serve-static" "*" - -"@types/express@~4.17.13": - version "4.17.13" - resolved "https://registry.npmjs.org/@types/express/-/express-4.17.13.tgz" - integrity sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA== - dependencies: - "@types/body-parser" "*" - "@types/express-serve-static-core" "^4.17.18" - "@types/qs" "*" - "@types/serve-static" "*" - -"@types/geojson@*": - version "7946.0.8" - resolved "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.8.tgz" - integrity sha512-1rkryxURpr6aWP7R786/UQOkJ3PcpQiWkAXBmdWc7ryFWqN6a4xfK7BtjXvFBKO9LjQ+MWQSWxYeZX1OApnArA== - -"@types/istanbul-lib-coverage@*": - version "1.1.0" - resolved "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-1.1.0.tgz" - integrity sha512-ohkhb9LehJy+PA40rDtGAji61NCgdtKLAlFoYp4cnuuQEswwdK3vz9SOIkkyc3wrk8dzjphQApNs56yyXLStaQ== - -"@types/istanbul-lib-coverage@~2.0.3": - version "2.0.4" - resolved "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz" - integrity sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g== - -"@types/istanbul-lib-instrument@~1.7.4": - version "1.7.4" - resolved "https://registry.npmjs.org/@types/istanbul-lib-instrument/-/istanbul-lib-instrument-1.7.4.tgz" - integrity sha512-1i1VVkU2KrpZCmti+t5J/zBb2KLKxHgU1EYL+0QtnDnVyZ59aSKcpnG6J0I6BZGDON566YzPNIlNfk7m+9l1JA== - dependencies: - "@types/babel-types" "*" - "@types/istanbul-lib-coverage" "*" - source-map "^0.6.1" - -"@types/istanbul-lib-report@*": - version "1.1.0" - resolved "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-1.1.0.tgz" - integrity sha512-nW5QuzmMhr7fHPijtaGOemFFI8Ctrxb/dIXgouSlKmWT16RxWlGLEX/nGghIBOReKe9hPFZXoNh338nFQk2xcA== - dependencies: - "@types/istanbul-lib-coverage" "*" - -"@types/istanbul-lib-report@~3.0.0": - version "3.0.0" - resolved "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz" - integrity sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg== - dependencies: - "@types/istanbul-lib-coverage" "*" - -"@types/istanbul-lib-source-maps@~4.0.1": - version "4.0.1" - resolved "https://registry.npmjs.org/@types/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz" - integrity sha512-WH6e5naLXI3vB2Px3whNeYxzDgm6S6sk3Ht8e3/BiWwEnzZi72wja3bWzWwcgbFTFp8hBLB7NT2p3lNJgxCxvA== - dependencies: - "@types/istanbul-lib-coverage" "*" - source-map "^0.6.1" - -"@types/istanbul-reports@~3.0.1": - version "3.0.1" - resolved "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz" - integrity sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw== - dependencies: - "@types/istanbul-lib-report" "*" - -"@types/leaflet@*": - version "1.7.9" - resolved "https://registry.npmjs.org/@types/leaflet/-/leaflet-1.7.9.tgz" - integrity sha512-H8vPgD49HKzqM41ArHGZM70g/tfhp8W+JcPxfnF+5H/Xvp+xiP+KQOUNWU8U89fqS1Jj3cpRY/+nbnaHFzwnFA== - dependencies: - "@types/geojson" "*" - -"@types/mime@*": - version "2.0.0" - resolved "https://registry.npmjs.org/@types/mime/-/mime-2.0.0.tgz" - integrity sha512-A2TAGbTFdBw9azHbpVd+/FkdW2T6msN1uct1O9bH3vTerEHKZhTXJUQXy+hNq1B0RagfU8U+KBdqiZpxjhOUQA== - -"@types/minimatch@^3.0.3": - version "3.0.5" - resolved "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz" - integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ== - -"@types/node@*": - version "9.3.0" - resolved "https://registry.npmjs.org/@types/node/-/node-9.3.0.tgz" - integrity sha512-wNBfvNjzsJl4tswIZKXCFQY0lss9nKUyJnG6T94X/eqjRgI2jHZ4evdjhQYBSan/vGtF6XVXPApOmNH2rf0KKw== - -"@types/qs@*": - version "6.9.5" - resolved "https://registry.npmjs.org/@types/qs/-/qs-6.9.5.tgz" - integrity sha512-/JHkVHtx/REVG0VVToGRGH2+23hsYLHdyG+GrvoUGlGAd0ErauXDyvHtRI/7H7mzLm+tBCKA7pfcpkQ1lf58iQ== - -"@types/range-parser@*": - version "1.2.3" - resolved "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.3.tgz" - integrity sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA== - -"@types/serve-static@*": - version "1.13.1" - resolved "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.1.tgz" - integrity sha512-jDMH+3BQPtvqZVIcsH700Dfi8Q3MIcEx16g/VdxjoqiGR/NntekB10xdBpirMKnPe9z2C5cBmL0vte0YttOr3Q== - dependencies: - "@types/express-serve-static-core" "*" - "@types/mime" "*" - -"@types/ws@7.4.6": - version "7.4.6" - resolved "https://registry.npmjs.org/@types/ws/-/ws-7.4.6.tgz" - integrity sha512-ijZ1vzRawI7QoWnTNL8KpHixd2b2XVb9I9HAqI3triPsh1EC0xH0Eg6w2O3TKbDCgiNNlJqfrof6j4T2I+l9vw== - dependencies: - "@types/node" "*" - -abbrev@1: - version "1.1.1" - resolved "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz" - integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== - -accepts@~1.3.7: - version "1.3.7" - resolved "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz" - integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA== - dependencies: - mime-types "~2.1.24" - negotiator "0.6.2" - -accepts@~1.3.8: - version "1.3.8" - resolved "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz" - integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw== - dependencies: - mime-types "~2.1.34" - negotiator "0.6.3" - -acorn@^7.1.1: - version "7.4.1" - resolved "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz" - integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== - -alertifyjs@1.14.0: - version "1.14.0" - resolved "https://registry.npmjs.org/alertifyjs/-/alertifyjs-1.14.0.tgz" - integrity sha512-jUxJTcNYhJ2P1Wal73nmyTwMkaPim4PjZP9CAG+S8SK2SinraXxvOxnPrEY81/wc2iBPDFBP7mdg61db4WsuHQ== - -ansi-regex@^2.0.0: - version "2.1.1" - resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz" - integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8= - -ansi-regex@^4.1.0: - version "4.1.1" - resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz" - integrity sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g== - -ansi-regex@^5.0.1: - version "5.0.1" - resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz" - integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== - -ansi-regex@^6.0.1: - version "6.0.1" - resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz" - integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA== - -ansi-styles@^2.2.1: - version "2.2.1" - resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz" - integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= - -ansi-styles@^3.2.1: - version "3.2.1" - resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz" - integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== - dependencies: - color-convert "^1.9.0" - -ansi-styles@^4.0.0, ansi-styles@^4.1.0: - version "4.3.0" - resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz" - integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== - dependencies: - color-convert "^2.0.1" - -ansi-styles@^6.1.0: - version "6.2.1" - resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz" - integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug== - -append-transform@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/append-transform/-/append-transform-2.0.0.tgz" - integrity sha512-7yeyCEurROLQJFv5Xj4lEGTy0borxepjFv1g22oAdqFu//SrAlDl1O1Nxx15SH1RoliUml6p8dwJW9jvZughhg== - dependencies: - default-require-extensions "^3.0.0" - -arg@^4.1.0: - version "4.1.3" - resolved "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz" - integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA== - -argparse@^1.0.7: - version "1.0.9" - resolved "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz" - integrity sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY= - dependencies: - sprintf-js "~1.0.2" - -array-differ@^3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/array-differ/-/array-differ-3.0.0.tgz" - integrity sha512-THtfYS6KtME/yIAhKjZ2ul7XI96lQGHRputJQHO80LAWQnuGP4iCIN8vdMRboGbIEYBwU33q8Tch1os2+X0kMg== - -array-each@^1.0.1: - version "1.0.1" - resolved "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz" - integrity sha1-p5SvDAWrF1KEbudTofIRoFugxE8= - -array-flatten@1.1.1: - version "1.1.1" - resolved "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz" - integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= - -array-slice@^1.0.0: - version "1.1.0" - resolved "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz" - integrity sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w== - -array-union@^2.1.0: - version "2.1.0" - resolved "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz" - integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== - -arrify@^2.0.1: - version "2.0.1" - resolved "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz" - integrity sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug== - -asap@~2.0.3: - version "2.0.6" - resolved "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz" - integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY= - -assert-never@^1.2.1: - version "1.2.1" - resolved "https://registry.npmjs.org/assert-never/-/assert-never-1.2.1.tgz" - integrity sha512-TaTivMB6pYI1kXwrFlEhLeGfOqoDNdTxjCdwRfFFkEA30Eu+k48W34nlok2EYWJfFFzqaEmichdNM7th6M5HNw== - -assertion-error@^1.1.0: - version "1.1.0" - resolved "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz" - integrity sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw== - -async@^3.2.3, async@~3.2.0: - version "3.2.3" - resolved "https://registry.npmjs.org/async/-/async-3.2.3.tgz" - integrity sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g== - -axios@~0.21.1: - version "0.21.4" - resolved "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz" - integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg== - dependencies: - follow-redirects "^1.14.0" - -babel-walk@3.0.0-canary-5: - version "3.0.0-canary-5" - resolved "https://registry.npmjs.org/babel-walk/-/babel-walk-3.0.0-canary-5.tgz" - integrity sha512-GAwkz0AihzY5bkwIY5QDR+LvsRQgB/B+1foMPvi0FZPMl5fjD7ICiznUiBdLYMH1QYe6vqu4gWYytZOccLouFw== - dependencies: - "@babel/types" "^7.9.6" - -balanced-match@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz" - integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= - -base64-js@0.0.8: - version "0.0.8" - resolved "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz" - integrity sha1-EQHpVE9KdrG8OybUUsqW16NeeXg= - -basic-auth@~2.0.1: - version "2.0.1" - resolved "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz" - integrity sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg== - dependencies: - safe-buffer "5.1.2" - -benchmark@~2.1.4: - version "2.1.4" - resolved "https://registry.npmjs.org/benchmark/-/benchmark-2.1.4.tgz" - integrity sha1-CfPeMckWQl1JjMLuVloOvzwqVik= - dependencies: - lodash "^4.17.4" - platform "^1.3.3" - -bintrees@1.0.1: - version "1.0.1" - resolved "https://registry.npmjs.org/bintrees/-/bintrees-1.0.1.tgz" - integrity sha1-DmVcm5wkNeqraL9AJyJtK1WjRSQ= - -bl@^1.0.0: - version "1.2.1" - resolved "https://registry.npmjs.org/bl/-/bl-1.2.1.tgz" - integrity sha1-ysMo977kVzDUBLaSID/LWQ4XLV4= - dependencies: - readable-stream "^2.0.5" - -body-parser@1.19.0, body-parser@~1.19.0: - version "1.19.0" - resolved "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz" - integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw== - dependencies: - bytes "3.1.0" - content-type "~1.0.4" - debug "2.6.9" - depd "~1.1.2" - http-errors "1.7.2" - iconv-lite "0.4.24" - on-finished "~2.3.0" - qs "6.7.0" - raw-body "2.4.0" - type-is "~1.6.17" - -body-parser@1.20.2: - version "1.20.2" - resolved "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz" - integrity sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA== - dependencies: - bytes "3.1.2" - content-type "~1.0.5" - debug "2.6.9" - depd "2.0.0" - destroy "1.2.0" - http-errors "2.0.0" - iconv-lite "0.4.24" - on-finished "2.4.1" - qs "6.11.0" - raw-body "2.5.2" - type-is "~1.6.18" - unpipe "1.0.0" - -brace-expansion@^1.1.7: - version "1.1.8" - resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz" - integrity sha1-wHshHHyVLsH479Uad+8NHTmQopI= - dependencies: - balanced-match "^1.0.0" - concat-map "0.0.1" - -brace-expansion@^2.0.1: - version "2.0.1" - resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz" - integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA== - dependencies: - balanced-match "^1.0.0" - -braces@^3.0.2: - version "3.0.2" - resolved "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz" - integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== - dependencies: - fill-range "^7.0.1" - -browserslist@^4.17.5: - version "4.20.2" - resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.20.2.tgz" - integrity sha512-CQOBCqp/9pDvDbx3xfMi+86pr4KXIf2FDkTTdeuYw8OxS9t898LA1Khq57gtufFILXpfgsSx5woNgsBgvGjpsA== - dependencies: - caniuse-lite "^1.0.30001317" - electron-to-chromium "^1.4.84" - escalade "^3.1.1" - node-releases "^2.0.2" - picocolors "^1.0.0" - -buffer-crc32@~0.2.3: - version "0.2.13" - resolved "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz" - integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI= - -buffer-from@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/buffer-from/-/buffer-from-1.0.0.tgz" - integrity sha512-83apNb8KK0Se60UE1+4Ukbe3HbfELJ6UlI4ldtOGs7So4KD26orJM8hIY9lxdzP+UpItH1Yh/Y8GUvNFWFFRxA== - -buffer@^3.0.1: - version "3.6.0" - resolved "https://registry.npmjs.org/buffer/-/buffer-3.6.0.tgz" - integrity sha1-pyyTb3e5a/UvX357RnGAYoVR3vs= - dependencies: - base64-js "0.0.8" - ieee754 "^1.1.4" - isarray "^1.0.0" - -bufferutil@^4.0.1: - version "4.0.8" - resolved "https://registry.yarnpkg.com/bufferutil/-/bufferutil-4.0.8.tgz#1de6a71092d65d7766c4d8a522b261a6e787e8ea" - integrity sha512-4T53u4PdgsXqKaIctwF8ifXlRTTmEPJ8iEPWFdGZvcf7sbwYo6FKFEX9eNNAnzFZ7EzJAQ3CJeOtCRA4rDp7Pw== - dependencies: - node-gyp-build "^4.3.0" - -bytes@3.1.0: - version "3.1.0" - resolved "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz" - integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg== - -bytes@3.1.2: - version "3.1.2" - resolved "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz" - integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg== - -call-bind@^1.0.0: - version "1.0.2" - resolved "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz" - integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA== - dependencies: - function-bind "^1.1.1" - get-intrinsic "^1.0.2" - -call-me-maybe@^1.0.1: - version "1.0.1" - resolved "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz" - integrity sha1-JtII6onje1y95gJQoV8DHBak1ms= - -caniuse-lite@^1.0.30001317: - version "1.0.30001331" - resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001331.tgz" - integrity sha512-Y1xk6paHpUXKP/P6YjQv1xqyTbgAP05ycHBcRdQjTcyXlWol868sJJPlmk5ylOekw2BrucWes5jk+LvVd7WZ5Q== - -"cbtree@https://github.com/pjekel/cbtree.git#master": - version "0.9.4" - resolved "git+ssh://git@github.com/pjekel/cbtree.git#cc60155a14dd8ecad95a4e8e2b0ce6358cc22066" - dependencies: - dijit "1.8" - dojo "1.8" - -chai@~4.3.4: - version "4.3.6" - resolved "https://registry.npmjs.org/chai/-/chai-4.3.6.tgz" - integrity sha512-bbcp3YfHCUzMOvKqsztczerVgBKSsEijCySNlHHbX3VG1nskvqjz5Rfso1gGwD6w6oOV3eI60pKuMOV5MV7p3Q== - dependencies: - assertion-error "^1.1.0" - check-error "^1.0.2" - deep-eql "^3.0.1" - get-func-name "^2.0.0" - loupe "^2.3.1" - pathval "^1.1.1" - type-detect "^4.0.5" - -chalk@^1.1.1: - version "1.1.3" - resolved "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz" - integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= - dependencies: - ansi-styles "^2.2.1" - escape-string-regexp "^1.0.2" - has-ansi "^2.0.0" - strip-ansi "^3.0.0" - supports-color "^2.0.0" - -chalk@^2.0.0, chalk@^2.4.1: - version "2.4.2" - resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz" - integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== - dependencies: - ansi-styles "^3.2.1" - escape-string-regexp "^1.0.5" - supports-color "^5.3.0" - -chalk@^4.1.0, chalk@^4.1.2, chalk@~4.1.0, chalk@~4.1.2: - version "4.1.2" - resolved "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz" - integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== - dependencies: - ansi-styles "^4.1.0" - supports-color "^7.1.0" - -character-parser@^2.2.0: - version "2.2.0" - resolved "https://registry.npmjs.org/character-parser/-/character-parser-2.2.0.tgz" - integrity sha1-x84o821LzZdE5f/CxfzeHHMmH8A= - dependencies: - is-regex "^1.0.3" - -charm@~1.0.2: - version "1.0.2" - resolved "https://registry.npmjs.org/charm/-/charm-1.0.2.tgz" - integrity sha1-it02cVOm2aWBMxBSxAkJkdqZXjU= - dependencies: - inherits "^2.0.1" - -check-error@^1.0.2: - version "1.0.2" - resolved "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz" - integrity sha1-V00xLt2Iu13YkS6Sht1sCu1KrII= - -cli@~1.0.0: - version "1.0.1" - resolved "https://registry.npmjs.org/cli/-/cli-1.0.1.tgz" - integrity sha1-IoF1NPJL+klQw01TLUjsvGIbjBQ= - dependencies: - exit "0.1.2" - glob "^7.1.1" - -color-convert@^1.9.0, color-convert@^1.9.3: - version "1.9.3" - resolved "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz" - integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== - dependencies: - color-name "1.1.3" - -color-convert@^2.0.1: - version "2.0.1" - resolved "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz" - integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== - dependencies: - color-name "~1.1.4" - -color-js@1.0.5: - version "1.0.5" - resolved "https://registry.npmjs.org/color-js/-/color-js-1.0.5.tgz" - integrity sha512-KgOTVz7fupb3lOXu4lixP6BR2CdMaTtCnGmLfHZWhq8NU3MABd6U9KjWtJVuYChGS/gIaoA8LakKKQfWhQgwYQ== - -color-name@1.1.3, color-name@^1.0.0: - version "1.1.3" - resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz" - integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= - -color-name@~1.1.4: - version "1.1.4" - resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz" - integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== - -color-string@^1.6.0: - version "1.9.1" - resolved "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz" - integrity sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg== - dependencies: - color-name "^1.0.0" - simple-swizzle "^0.2.2" - -color@^3.1.3: - version "3.2.1" - resolved "https://registry.npmjs.org/color/-/color-3.2.1.tgz" - integrity sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA== - dependencies: - color-convert "^1.9.3" - color-string "^1.6.0" - -colors@~1.1.2: - version "1.1.2" - resolved "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz" - integrity sha1-FopHAXVran9RoSzgyXv6KMCE7WM= - -colorspace@1.1.x: - version "1.1.4" - resolved "https://registry.npmjs.org/colorspace/-/colorspace-1.1.4.tgz" - integrity sha512-BgvKJiuVu1igBUF2kEjRCZXol6wiiGbY5ipL/oVPwm0BL9sIpMIzM8IK7vwuxIIzOXMV3Ey5w+vxhm0rR/TN8w== - dependencies: - color "^3.1.3" - text-hex "1.0.x" - -command-exists@~1.2.9: - version "1.2.9" - resolved "https://registry.npmjs.org/command-exists/-/command-exists-1.2.9.tgz" - integrity sha512-LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w== - -commander@11.1.0: - version "11.1.0" - resolved "https://registry.npmjs.org/commander/-/commander-11.1.0.tgz" - integrity sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ== - -commander@7: - version "7.2.0" - resolved "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz" - integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== - -commander@~2.8.1: - version "2.8.1" - resolved "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz" - integrity sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ= - dependencies: - graceful-readlink ">= 1.0.0" - -concat-map@0.0.1: - version "0.0.1" - resolved "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz" - integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= - -concurrent@~0.3.2: - version "0.3.2" - resolved "https://registry.npmjs.org/concurrent/-/concurrent-0.3.2.tgz" - integrity sha1-DqoAEaFXmMVjURKPIiR/biMX9Q4= - -console-browserify@1.1.x: - version "1.1.0" - resolved "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz" - integrity sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA= - dependencies: - date-now "^0.1.4" - -constantinople@^4.0.1: - version "4.0.1" - resolved "https://registry.npmjs.org/constantinople/-/constantinople-4.0.1.tgz" - integrity sha512-vCrqcSIq4//Gx74TXXCGnHpulY1dskqLTFGDmhrGxzeXL8lF8kvXv6mpNWlJj1uD4DW23D4ljAqbY4RRaaUZIw== - dependencies: - "@babel/parser" "^7.6.0" - "@babel/types" "^7.6.1" - -content-disposition@0.5.3: - version "0.5.3" - resolved "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz" - integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g== - dependencies: - safe-buffer "5.1.2" - -content-disposition@0.5.4: - version "0.5.4" - resolved "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz" - integrity sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ== - dependencies: - safe-buffer "5.2.1" - -content-type@~1.0.4: - version "1.0.4" - resolved "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz" - integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== - -content-type@~1.0.5: - version "1.0.5" - resolved "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz" - integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA== - -convert-source-map@^1.7.0: - version "1.8.0" - resolved "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz" - integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA== - dependencies: - safe-buffer "~5.1.1" - -cookie-signature@1.0.6: - version "1.0.6" - resolved "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz" - integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw= - -cookie@0.4.0: - version "0.4.0" - resolved "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz" - integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg== - -cookie@0.6.0: - version "0.6.0" - resolved "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz" - integrity sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw== - -core-util-is@~1.0.0: - version "1.0.2" - resolved "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz" - integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= - -create-require@^1.1.0: - version "1.1.1" - resolved "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz" - integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ== - -cross-spawn@^7.0.0: - version "7.0.3" - resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz" - integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== - dependencies: - path-key "^3.1.0" - shebang-command "^2.0.0" - which "^2.0.1" - -"d3-array@2 - 3", "d3-array@2.10.0 - 3", "d3-array@2.5.0 - 3", d3-array@3: - version "3.1.6" - resolved "https://registry.npmjs.org/d3-array/-/d3-array-3.1.6.tgz" - integrity sha512-DCbBBNuKOeiR9h04ySRBMW52TFVc91O9wJziuyXw6Ztmy8D3oZbmCkOO3UHKC7ceNJsN2Mavo9+vwV8EAEUXzA== - dependencies: - internmap "1 - 2" - -d3-array@^3.2.0: - version "3.2.4" - resolved "https://registry.npmjs.org/d3-array/-/d3-array-3.2.4.tgz" - integrity sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg== - dependencies: - internmap "1 - 2" - -d3-axis@3: - version "3.0.0" - resolved "https://registry.npmjs.org/d3-axis/-/d3-axis-3.0.0.tgz" - integrity sha512-IH5tgjV4jE/GhHkRV0HiVYPDtvfjHQlQfJHs0usq7M30XcSBvOotpmH1IgkcXsO/5gEQZD43B//fc7SRT5S+xw== - -d3-brush@3: - version "3.0.0" - resolved "https://registry.npmjs.org/d3-brush/-/d3-brush-3.0.0.tgz" - integrity sha512-ALnjWlVYkXsVIGlOsuWH1+3udkYFI48Ljihfnh8FZPF2QS9o+PzGLBslO0PjzVoHLZ2KCVgAM8NVkXPJB2aNnQ== - dependencies: - d3-dispatch "1 - 3" - d3-drag "2 - 3" - d3-interpolate "1 - 3" - d3-selection "3" - d3-transition "3" - -d3-chord@3: - version "3.0.1" - resolved "https://registry.npmjs.org/d3-chord/-/d3-chord-3.0.1.tgz" - integrity sha512-VE5S6TNa+j8msksl7HwjxMHDM2yNK3XCkusIlpX5kwauBfXuyLAtNg9jCp/iHH61tgI4sb6R/EIMWCqEIdjT/g== - dependencies: - d3-path "1 - 3" - -"d3-color@1 - 3", d3-color@3: - version "3.1.0" - resolved "https://registry.npmjs.org/d3-color/-/d3-color-3.1.0.tgz" - integrity sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA== - -d3-contour@4: - version "4.0.2" - resolved "https://registry.npmjs.org/d3-contour/-/d3-contour-4.0.2.tgz" - integrity sha512-4EzFTRIikzs47RGmdxbeUvLWtGedDUNkTcmzoeyg4sP/dvCexO47AaQL7VKy/gul85TOxw+IBgA8US2xwbToNA== - dependencies: - d3-array "^3.2.0" - -d3-delaunay@6: - version "6.0.2" - resolved "https://registry.npmjs.org/d3-delaunay/-/d3-delaunay-6.0.2.tgz" - integrity sha512-IMLNldruDQScrcfT+MWnazhHbDJhcRJyOEBAJfwQnHle1RPh6WDuLvxNArUju2VSMSUuKlY5BGHRJ2cYyoFLQQ== - dependencies: - delaunator "5" - -"d3-dispatch@1 - 3", d3-dispatch@3: - version "3.0.1" - resolved "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-3.0.1.tgz" - integrity sha512-rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg== - -"d3-drag@2 - 3", d3-drag@3: - version "3.0.0" - resolved "https://registry.npmjs.org/d3-drag/-/d3-drag-3.0.0.tgz" - integrity sha512-pWbUJLdETVA8lQNJecMxoXfH6x+mO2UQo8rSmZ+QqxcbyA3hfeprFgIT//HW2nlHChWeIIMwS2Fq+gEARkhTkg== - dependencies: - d3-dispatch "1 - 3" - d3-selection "3" - -"d3-dsv@1 - 3", d3-dsv@3: - version "3.0.1" - resolved "https://registry.npmjs.org/d3-dsv/-/d3-dsv-3.0.1.tgz" - integrity sha512-UG6OvdI5afDIFP9w4G0mNq50dSOsXHJaRE8arAS5o9ApWnIElp8GZw1Dun8vP8OyHOZ/QJUKUJwxiiCCnUwm+Q== - dependencies: - commander "7" - iconv-lite "0.6" - rw "1" - -"d3-ease@1 - 3", d3-ease@3: - version "3.0.1" - resolved "https://registry.npmjs.org/d3-ease/-/d3-ease-3.0.1.tgz" - integrity sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w== - -d3-fetch@3: - version "3.0.1" - resolved "https://registry.npmjs.org/d3-fetch/-/d3-fetch-3.0.1.tgz" - integrity sha512-kpkQIM20n3oLVBKGg6oHrUchHM3xODkTzjMoj7aWQFq5QEM+R6E4WkzT5+tojDY7yjez8KgCBRoj4aEr99Fdqw== - dependencies: - d3-dsv "1 - 3" - -d3-force@3: - version "3.0.0" - resolved "https://registry.npmjs.org/d3-force/-/d3-force-3.0.0.tgz" - integrity sha512-zxV/SsA+U4yte8051P4ECydjD/S+qeYtnaIyAs9tgHCqfguma/aAQDjo85A9Z6EKhBirHRJHXIgJUlffT4wdLg== - dependencies: - d3-dispatch "1 - 3" - d3-quadtree "1 - 3" - d3-timer "1 - 3" - -"d3-format@1 - 3", d3-format@3: - version "3.1.0" - resolved "https://registry.npmjs.org/d3-format/-/d3-format-3.1.0.tgz" - integrity sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA== - -d3-geo@3: - version "3.0.1" - resolved "https://registry.npmjs.org/d3-geo/-/d3-geo-3.0.1.tgz" - integrity sha512-Wt23xBych5tSy9IYAM1FR2rWIBFWa52B/oF/GYe5zbdHrg08FU8+BuI6X4PvTwPDdqdAdq04fuWJpELtsaEjeA== - dependencies: - d3-array "2.5.0 - 3" - -d3-hierarchy@3: - version "3.1.2" - resolved "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-3.1.2.tgz" - integrity sha512-FX/9frcub54beBdugHjDCdikxThEqjnR93Qt7PvQTOHxyiNCAlvMrHhclk3cD5VeAaq9fxmfRp+CnWw9rEMBuA== - -"d3-interpolate@1 - 3", "d3-interpolate@1.2.0 - 3", d3-interpolate@3: - version "3.0.1" - resolved "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz" - integrity sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g== - dependencies: - d3-color "1 - 3" - -"d3-path@1 - 3", d3-path@3: - version "3.0.1" - resolved "https://registry.npmjs.org/d3-path/-/d3-path-3.0.1.tgz" - integrity sha512-gq6gZom9AFZby0YLduxT1qmrp4xpBA1YZr19OI717WIdKE2OM5ETq5qrHLb301IgxhLwcuxvGZVLeeWc/k1I6w== - -d3-polygon@3: - version "3.0.1" - resolved "https://registry.npmjs.org/d3-polygon/-/d3-polygon-3.0.1.tgz" - integrity sha512-3vbA7vXYwfe1SYhED++fPUQlWSYTTGmFmQiany/gdbiWgU/iEyQzyymwL9SkJjFFuCS4902BSzewVGsHHmHtXg== - -"d3-quadtree@1 - 3", d3-quadtree@3: - version "3.0.1" - resolved "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-3.0.1.tgz" - integrity sha512-04xDrxQTDTCFwP5H6hRhsRcb9xxv2RzkcsygFzmkSIOJy3PeRJP7sNk3VRIbKXcog561P9oU0/rVH6vDROAgUw== - -d3-random@3: - version "3.0.1" - resolved "https://registry.npmjs.org/d3-random/-/d3-random-3.0.1.tgz" - integrity sha512-FXMe9GfxTxqd5D6jFsQ+DJ8BJS4E/fT5mqqdjovykEB2oFbTMDVdg1MGFxfQW+FBOGoB++k8swBrgwSHT1cUXQ== - -d3-scale-chromatic@3: - version "3.0.0" - resolved "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-3.0.0.tgz" - integrity sha512-Lx9thtxAKrO2Pq6OO2Ua474opeziKr279P/TKZsMAhYyNDD3EnCffdbgeSYN5O7m2ByQsxtuP2CSDczNUIZ22g== - dependencies: - d3-color "1 - 3" - d3-interpolate "1 - 3" - -d3-scale@4: - version "4.0.2" - resolved "https://registry.npmjs.org/d3-scale/-/d3-scale-4.0.2.tgz" - integrity sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ== - dependencies: - d3-array "2.10.0 - 3" - d3-format "1 - 3" - d3-interpolate "1.2.0 - 3" - d3-time "2.1.1 - 3" - d3-time-format "2 - 4" - -d3-selection@2: - version "2.0.0" - resolved "https://registry.npmjs.org/d3-selection/-/d3-selection-2.0.0.tgz" - integrity sha512-XoGGqhLUN/W14NmaqcO/bb1nqjDAw5WtSYb2X8wiuQWvSZUsUVYsOSkOybUrNvcBjaywBdYPy03eXHMXjk9nZA== - -"d3-selection@2 - 3", d3-selection@3: - version "3.0.0" - resolved "https://registry.npmjs.org/d3-selection/-/d3-selection-3.0.0.tgz" - integrity sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ== - -d3-shape@3: - version "3.1.0" - resolved "https://registry.npmjs.org/d3-shape/-/d3-shape-3.1.0.tgz" - integrity sha512-tGDh1Muf8kWjEDT/LswZJ8WF85yDZLvVJpYU9Nq+8+yW1Z5enxrmXOhTArlkaElU+CTn0OTVNli+/i+HP45QEQ== - dependencies: - d3-path "1 - 3" - -"d3-time-format@2 - 4", d3-time-format@4: - version "4.1.0" - resolved "https://registry.npmjs.org/d3-time-format/-/d3-time-format-4.1.0.tgz" - integrity sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg== - dependencies: - d3-time "1 - 3" - -"d3-time@1 - 3", "d3-time@2.1.1 - 3", d3-time@3: - version "3.0.0" - resolved "https://registry.npmjs.org/d3-time/-/d3-time-3.0.0.tgz" - integrity sha512-zmV3lRnlaLI08y9IMRXSDshQb5Nj77smnfpnd2LrBa/2K281Jijactokeak14QacHs/kKq0AQ121nidNYlarbQ== - dependencies: - d3-array "2 - 3" - -"d3-timer@1 - 3", d3-timer@3: - version "3.0.1" - resolved "https://registry.npmjs.org/d3-timer/-/d3-timer-3.0.1.tgz" - integrity sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA== - -"d3-transition@2 - 3", d3-transition@3: - version "3.0.1" - resolved "https://registry.npmjs.org/d3-transition/-/d3-transition-3.0.1.tgz" - integrity sha512-ApKvfjsSR6tg06xrL434C0WydLr7JewBB3V+/39RMHsaXTOG0zmt/OAXeng5M5LBm0ojmxJrpomQVZ1aPvBL4w== - dependencies: - d3-color "1 - 3" - d3-dispatch "1 - 3" - d3-ease "1 - 3" - d3-interpolate "1 - 3" - d3-timer "1 - 3" - -d3-v6-tip@1.0.9: - version "1.0.9" - resolved "https://registry.npmjs.org/d3-v6-tip/-/d3-v6-tip-1.0.9.tgz" - integrity sha512-XU7Ks7aA8GX8X9v4vbBh7r7I7oJ2YwJULkN2mQA5nT+7jxJnTN47WVa1aBPTv2qPMQkh91YECN1mkevnWG0zEw== - dependencies: - d3-selection "2" - -d3-zoom@3: - version "3.0.0" - resolved "https://registry.npmjs.org/d3-zoom/-/d3-zoom-3.0.0.tgz" - integrity sha512-b8AmV3kfQaqWAuacbPuNbL6vahnOJflOhexLzMMNLga62+/nh0JzvJ0aO/5a5MVgUFGS7Hu1P9P03o3fJkDCyw== - dependencies: - d3-dispatch "1 - 3" - d3-drag "2 - 3" - d3-interpolate "1 - 3" - d3-selection "2 - 3" - d3-transition "2 - 3" - -d3@7.9.0: - version "7.9.0" - resolved "https://registry.npmjs.org/d3/-/d3-7.9.0.tgz" - integrity sha512-e1U46jVP+w7Iut8Jt8ri1YsPOvFpg46k+K8TpCb0P+zjCkjkPnV7WzfDJzMHy1LnA+wj5pLT1wjO901gLXeEhA== - dependencies: - d3-array "3" - d3-axis "3" - d3-brush "3" - d3-chord "3" - d3-color "3" - d3-contour "4" - d3-delaunay "6" - d3-dispatch "3" - d3-drag "3" - d3-dsv "3" - d3-ease "3" - d3-fetch "3" - d3-force "3" - d3-format "3" - d3-geo "3" - d3-hierarchy "3" - d3-interpolate "3" - d3-path "3" - d3-polygon "3" - d3-quadtree "3" - d3-random "3" - d3-scale "4" - d3-scale-chromatic "3" - d3-selection "3" - d3-shape "3" - d3-time "3" - d3-time-format "4" - d3-timer "3" - d3-transition "3" - d3-zoom "3" - -d@1, d@^1.0.1, d@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/d/-/d-1.0.2.tgz#2aefd554b81981e7dccf72d6842ae725cb17e5de" - integrity sha512-MOqHvMWF9/9MX6nza0KgvFH4HpMU0EF5uUDXqX/BtxtU8NfB0QzRtJ8Oe/6SuS4kbhyzVJwjd97EA4PKrzJ8bw== - dependencies: - es5-ext "^0.10.64" - type "^2.7.2" - -date-now@^0.1.4: - version "0.1.4" - resolved "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz" - integrity sha1-6vQ5/U1ISK105cx9vvIAZyueNFs= - -dateformat@~4.6.2: - version "4.6.3" - resolved "https://registry.npmjs.org/dateformat/-/dateformat-4.6.3.tgz" - integrity sha512-2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA== - -debug@2.6.9, debug@^2.2.0: - version "2.6.9" - resolved "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz" - integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== - dependencies: - ms "2.0.0" - -debug@^3.2.7: - version "3.2.7" - resolved "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz" - integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== - dependencies: - ms "^2.1.1" - -debug@^4.1.0, debug@^4.1.1: - version "4.3.1" - resolved "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz" - integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== - dependencies: - ms "2.1.2" - -debug@^4.3.2: - version "4.3.4" - resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz" - integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== - dependencies: - ms "2.1.2" - -decompress-tar@^4.0.0, decompress-tar@^4.1.0, decompress-tar@^4.1.1: - version "4.1.1" - resolved "https://registry.npmjs.org/decompress-tar/-/decompress-tar-4.1.1.tgz" - integrity sha512-JdJMaCrGpB5fESVyxwpCx4Jdj2AagLmv3y58Qy4GE6HMVjWz1FeVQk1Ct4Kye7PftcdOo/7U7UKzYBJgqnGeUQ== - dependencies: - file-type "^5.2.0" - is-stream "^1.1.0" - tar-stream "^1.5.2" - -decompress-tarbz2@^4.0.0: - version "4.1.1" - resolved "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz" - integrity sha512-s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A== - dependencies: - decompress-tar "^4.1.0" - file-type "^6.1.0" - is-stream "^1.1.0" - seek-bzip "^1.0.5" - unbzip2-stream "^1.0.9" - -decompress-targz@^4.0.0: - version "4.1.1" - resolved "https://registry.npmjs.org/decompress-targz/-/decompress-targz-4.1.1.tgz" - integrity sha512-4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w== - dependencies: - decompress-tar "^4.1.1" - file-type "^5.2.0" - is-stream "^1.1.0" - -decompress-unzip@^4.0.1: - version "4.0.1" - resolved "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-4.0.1.tgz" - integrity sha1-3qrM39FK6vhVePczroIQ+bSEj2k= - dependencies: - file-type "^3.8.0" - get-stream "^2.2.0" - pify "^2.3.0" - yauzl "^2.4.2" - -decompress@~4.2.1: - version "4.2.1" - resolved "https://registry.npmjs.org/decompress/-/decompress-4.2.1.tgz" - integrity sha512-e48kc2IjU+2Zw8cTb6VZcJQ3lgVbS4uuB1TfCHbiZIP/haNXm+SVyhu+87jts5/3ROpd82GSVCoNs/z8l4ZOaQ== - dependencies: - decompress-tar "^4.0.0" - decompress-tarbz2 "^4.0.0" - decompress-targz "^4.0.0" - decompress-unzip "^4.0.1" - graceful-fs "^4.1.10" - make-dir "^1.0.0" - pify "^2.3.0" - strip-dirs "^2.0.0" - -deep-eql@^3.0.1: - version "3.0.1" - resolved "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz" - integrity sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw== - dependencies: - type-detect "^4.0.0" - -deepmerge@4.2.0: - version "4.2.0" - resolved "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.0.tgz" - integrity sha512-/pED+kD8V9n15L1lon8DXEiWLQMW4tTiegn1kIWIQ+DBudOkFitz1cfjWQiSeKMPBQOknT3LpueyAmMVJ1Ho2g== - -default-require-extensions@^3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-3.0.0.tgz" - integrity sha512-ek6DpXq/SCpvjhpFsLFRVtIxJCRw6fUR42lYMVZuUMK7n8eMz4Uh5clckdBjEpLhn/gEBZo7hDJnJcwdKLKQjg== - dependencies: - strip-bom "^4.0.0" - -delaunator@5: - version "5.0.0" - resolved "https://registry.npmjs.org/delaunator/-/delaunator-5.0.0.tgz" - integrity sha512-AyLvtyJdbv/U1GkiS6gUUzclRoAY4Gs75qkMygJJhU75LW4DNuSF2RMzpxs9jw9Oz1BobHjTdkG3zdP55VxAqw== - dependencies: - robust-predicates "^3.0.0" - -depd@2.0.0, depd@~2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz" - integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== - -depd@~1.1.0, depd@~1.1.2: - version "1.1.2" - resolved "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz" - integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= - -desandro-matches-selector@^2.0.0: - version "2.0.2" - resolved "https://registry.npmjs.org/desandro-matches-selector/-/desandro-matches-selector-2.0.2.tgz" - integrity sha1-cXvu1NwT59jzdi9wem1YpndCGOE= - -destroy@1.2.0: - version "1.2.0" - resolved "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz" - integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg== - -destroy@~1.0.4: - version "1.0.4" - resolved "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz" - integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= - -detect-file@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz" - integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc= - -diff@^4.0.1: - version "4.0.2" - resolved "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz" - integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A== - -diff@~5.0.0: - version "5.0.0" - resolved "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz" - integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w== - -dijit@1.17.3: - version "1.17.3" - resolved "https://registry.npmjs.org/dijit/-/dijit-1.17.3.tgz" - integrity sha512-QS+1bNhPT+BF9E+iomQSi5qI+o3oUNSx1r5TF8WlGH4LybGZP+IIGJBOO5/41YduBPljVXhY7vaPsgrycxC6UQ== - dependencies: - dojo "1.17.3" - -dijit@1.8: - version "1.8.14" - resolved "https://registry.npmjs.org/dijit/-/dijit-1.8.14.tgz" - integrity sha1-1cZRsNCJTJMX0LcYLjCbKr4BkAM= - dependencies: - dojo "1.8.14" - -doctypes@^1.1.0: - version "1.1.0" - resolved "https://registry.npmjs.org/doctypes/-/doctypes-1.1.0.tgz" - integrity sha1-6oCxBqh1OHdOijpKWv4pPeSJ4Kk= - -dojo-util@1.17.3: - version "1.17.3" - resolved "https://registry.npmjs.org/dojo-util/-/dojo-util-1.17.3.tgz" - integrity sha512-3hZMwVh9XmofCJh3v3epTlODTnk3FJoGHZiZKVlbhvYLtRC8pkLg6zitOpT2Zg4Jn5URYmPrMmAdwxRHrG736A== - -dojo@1.17.3: - version "1.17.3" - resolved "https://registry.npmjs.org/dojo/-/dojo-1.17.3.tgz" - integrity sha512-iWDx1oSfCEDnIrs8cMW7Zh9Fbjgxu8iRagFz+Qi2eya3MXIAxFXKhv2A7dpi+bfpMpFozLwcsLV8URLw6BsHsA== - -dojo@1.8, dojo@1.8.14: - version "1.8.14" - resolved "https://registry.npmjs.org/dojo/-/dojo-1.8.14.tgz" - integrity sha1-jCOd0yHoXmpV0DMpuXu4i7pT+zM= - -dojox@1.17.3: - version "1.17.3" - resolved "https://registry.npmjs.org/dojox/-/dojox-1.17.3.tgz" - integrity sha512-n2SvGoVTZlOQUQmoqEfW6oGAfmyBtjl4DzWkxoojdTxBq8O0r7pDKBrW3nRrpQW9uZFHfB1XIA3BXS0cnrue/Q== - dependencies: - dijit "1.17.3" - dojo "1.17.3" - -dom-serializer@0: - version "0.1.0" - resolved "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz" - integrity sha1-BzxpdUbOB4DOI75KKOKT5AvDDII= - dependencies: - domelementtype "~1.1.1" - entities "~1.1.1" - -domelementtype@1: - version "1.3.0" - resolved "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz" - integrity sha1-sXrtguirWeUt2cGbF1bg/BhyBMI= - -domelementtype@~1.1.1: - version "1.1.3" - resolved "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz" - integrity sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs= - -domhandler@2.3: - version "2.3.0" - resolved "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz" - integrity sha1-LeWaCCLVAn+r/28DLCsloqir5zg= - dependencies: - domelementtype "1" - -domutils@1.5: - version "1.5.1" - resolved "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz" - integrity sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8= - dependencies: - dom-serializer "0" - domelementtype "1" - -draggabilly@2.4.1: - version "2.4.1" - resolved "https://registry.npmjs.org/draggabilly/-/draggabilly-2.4.1.tgz" - integrity sha512-HHHLPEPZqRXIDQDFRFdK7RONZausNlJ4WkA73ST7Z6O2HPWttxFHVwHo8nccuDLzXWwiVKRVuc6fTkW+CQA++A== - dependencies: - get-size "^2.0.2" - unidragger "^2.4.0" - -dropzone@5.9.3: - version "5.9.3" - resolved "https://registry.npmjs.org/dropzone/-/dropzone-5.9.3.tgz" - integrity sha512-Azk8kD/2/nJIuVPK+zQ9sjKMRIpRvNyqn9XwbBHNq+iNuSccbJS6hwm1Woy0pMST0erSo0u4j+KJaodndDk4vA== - -duplexer@^0.1.1: - version "0.1.1" - resolved "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz" - integrity sha1-rOb/gIwc5mtX0ev5eXessCM0z8E= - -eastasianwidth@^0.2.0: - version "0.2.0" - resolved "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz" - integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA== - -ee-first@1.1.1: - version "1.1.1" - resolved "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz" - integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= - -electron-to-chromium@^1.4.84: - version "1.4.107" - resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.107.tgz" - integrity sha512-Huen6taaVrUrSy8o7mGStByba8PfOWWluHNxSHGBrCgEdFVLtvdQDBr9LBCF9Uci8SYxh28QNNMO0oC17wbGAg== - -emoji-regex@^8.0.0: - version "8.0.0" - resolved "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz" - integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== - -emoji-regex@^9.2.2: - version "9.2.2" - resolved "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz" - integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg== - -enabled@2.0.x: - version "2.0.0" - resolved "https://registry.npmjs.org/enabled/-/enabled-2.0.0.tgz" - integrity sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ== - -encodeurl@~1.0.2: - version "1.0.2" - resolved "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz" - integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= - -end-of-stream@^1.0.0: - version "1.4.1" - resolved "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz" - integrity sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q== - dependencies: - once "^1.4.0" - -entities@1.0: - version "1.0.0" - resolved "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz" - integrity sha1-sph6o4ITR/zeZCsk/fyeT7cSvyY= - -entities@~1.1.1: - version "1.1.1" - resolved "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz" - integrity sha1-blwtClYhtdra7O+AuQ7ftc13cvA= - -es5-ext@^0.10.35, es5-ext@^0.10.62, es5-ext@^0.10.63, es5-ext@^0.10.64, es5-ext@~0.10.14: - version "0.10.64" - resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.64.tgz#12e4ffb48f1ba2ea777f1fcdd1918ef73ea21714" - integrity sha512-p2snDhiLaXe6dahss1LddxqEm+SkuDvV8dnIQG0MWjyHpcMNfXKPE+/Cc0y+PhxJX3A4xGNeFCj5oc0BUh6deg== - dependencies: - es6-iterator "^2.0.3" - es6-symbol "^3.1.3" - esniff "^2.0.1" - next-tick "^1.1.0" - -es6-iterator@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7" - integrity sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g== - dependencies: - d "1" - es5-ext "^0.10.35" - es6-symbol "^3.1.1" - -es6-symbol@^3.1.1, es6-symbol@^3.1.3: - version "3.1.4" - resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.4.tgz#f4e7d28013770b4208ecbf3e0bf14d3bcb557b8c" - integrity sha512-U9bFFjX8tFiATgtkJ1zg25+KviIXpgRvRHS8sau3GfhVzThRQrOeksPeT0BWW2MNZs1OEWJ1DPXOQMn0KKRkvg== - dependencies: - d "^1.0.2" - ext "^1.7.0" - -escalade@^3.1.1: - version "3.1.1" - resolved "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz" - integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== - -escape-html@~1.0.3: - version "1.0.3" - resolved "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz" - integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= - -escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: - version "1.0.5" - resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz" - integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= - -esniff@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/esniff/-/esniff-2.0.1.tgz#a4d4b43a5c71c7ec51c51098c1d8a29081f9b308" - integrity sha512-kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg== - dependencies: - d "^1.0.1" - es5-ext "^0.10.62" - event-emitter "^0.3.5" - type "^2.7.2" - -esprima@^4.0.0: - version "4.0.0" - resolved "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz" - integrity sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw== - -etag@~1.8.1: - version "1.8.1" - resolved "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz" - integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= - -ev-emitter@^1.0.0, ev-emitter@^1.0.1: - version "1.1.1" - resolved "https://registry.npmjs.org/ev-emitter/-/ev-emitter-1.1.1.tgz" - integrity sha512-ipiDYhdQSCZ4hSbX4rMW+XzNKMD1prg/sTvoVmSLkuQ1MVlwjJQQA+sW8tMYR3BLUr9KjodFV4pvzunvRhd33Q== - -event-emitter@^0.3.5: - version "0.3.5" - resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39" - integrity sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA== - dependencies: - d "1" - es5-ext "~0.10.14" - -eventemitter2@~0.4.13: - version "0.4.14" - resolved "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz" - integrity sha1-j2G3XN4BKy6esoTUVFWDtWQ7Yas= - -eventsource@^2.0.2: - version "2.0.2" - resolved "https://registry.npmjs.org/eventsource/-/eventsource-2.0.2.tgz" - integrity sha512-IzUmBGPR3+oUG9dUeXynyNmf91/3zUSJg1lCktzKw47OXuhco54U3r9B7O4XX+Rb1Itm9OZ2b0RkTs10bICOxA== - -exit@0.1.2, exit@0.1.x, exit@~0.1.2: - version "0.1.2" - resolved "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz" - integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw= - -expand-tilde@^2.0.0, expand-tilde@^2.0.2: - version "2.0.2" - resolved "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz" - integrity sha1-l+gBqgUt8CRU3kawK/YhZCzchQI= - dependencies: - homedir-polyfill "^1.0.1" - -express@4.19.2: - version "4.19.2" - resolved "https://registry.npmjs.org/express/-/express-4.19.2.tgz" - integrity sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q== - dependencies: - accepts "~1.3.8" - array-flatten "1.1.1" - body-parser "1.20.2" - content-disposition "0.5.4" - content-type "~1.0.4" - cookie "0.6.0" - cookie-signature "1.0.6" - debug "2.6.9" - depd "2.0.0" - encodeurl "~1.0.2" - escape-html "~1.0.3" - etag "~1.8.1" - finalhandler "1.2.0" - fresh "0.5.2" - http-errors "2.0.0" - merge-descriptors "1.0.1" - methods "~1.1.2" - on-finished "2.4.1" - parseurl "~1.3.3" - path-to-regexp "0.1.7" - proxy-addr "~2.0.7" - qs "6.11.0" - range-parser "~1.2.1" - safe-buffer "5.2.1" - send "0.18.0" - serve-static "1.15.0" - setprototypeof "1.2.0" - statuses "2.0.1" - type-is "~1.6.18" - utils-merge "1.0.1" - vary "~1.1.2" - -express@~4.17.1: - version "4.17.1" - resolved "https://registry.npmjs.org/express/-/express-4.17.1.tgz" - integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g== - dependencies: - accepts "~1.3.7" - array-flatten "1.1.1" - body-parser "1.19.0" - content-disposition "0.5.3" - content-type "~1.0.4" - cookie "0.4.0" - cookie-signature "1.0.6" - debug "2.6.9" - depd "~1.1.2" - encodeurl "~1.0.2" - escape-html "~1.0.3" - etag "~1.8.1" - finalhandler "~1.1.2" - fresh "0.5.2" - merge-descriptors "1.0.1" - methods "~1.1.2" - on-finished "~2.3.0" - parseurl "~1.3.3" - path-to-regexp "0.1.7" - proxy-addr "~2.0.5" - qs "6.7.0" - range-parser "~1.2.1" - safe-buffer "5.1.2" - send "0.17.1" - serve-static "1.14.1" - setprototypeof "1.1.1" - statuses "~1.5.0" - type-is "~1.6.18" - utils-merge "1.0.1" - vary "~1.1.2" - -ext@^1.7.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/ext/-/ext-1.7.0.tgz#0ea4383c0103d60e70be99e9a7f11027a33c4f5f" - integrity sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw== - dependencies: - type "^2.7.2" - -extend@^3.0.2: - version "3.0.2" - resolved "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz" - integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== - -faye-websocket@^0.11.4: - version "0.11.4" - resolved "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz" - integrity sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g== - dependencies: - websocket-driver ">=0.5.1" - -fd-slicer@~1.0.1: - version "1.0.1" - resolved "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz" - integrity sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU= - dependencies: - pend "~1.2.0" - -fecha@^4.2.0: - version "4.2.3" - resolved "https://registry.npmjs.org/fecha/-/fecha-4.2.3.tgz" - integrity sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw== - -figures@^3.2.0: - version "3.2.0" - resolved "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz" - integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg== - dependencies: - escape-string-regexp "^1.0.5" - -file-sync-cmp@^0.1.0: - version "0.1.1" - resolved "https://registry.npmjs.org/file-sync-cmp/-/file-sync-cmp-0.1.1.tgz" - integrity sha1-peeo/7+kk7Q7kju9TKiaU7Y7YSs= - -file-type@^3.8.0: - version "3.9.0" - resolved "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz" - integrity sha1-JXoHg4TR24CHvESdEH1SpSZyuek= - -file-type@^5.2.0: - version "5.2.0" - resolved "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz" - integrity sha1-LdvqfHP/42No365J3DOMBYwritY= - -file-type@^6.1.0: - version "6.2.0" - resolved "https://registry.npmjs.org/file-type/-/file-type-6.2.0.tgz" - integrity sha512-YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg== - -fill-range@^7.0.1: - version "7.0.1" - resolved "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz" - integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== - dependencies: - to-regex-range "^5.0.1" - -finalhandler@1.2.0: - version "1.2.0" - resolved "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz" - integrity sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg== - dependencies: - debug "2.6.9" - encodeurl "~1.0.2" - escape-html "~1.0.3" - on-finished "2.4.1" - parseurl "~1.3.3" - statuses "2.0.1" - unpipe "~1.0.0" - -finalhandler@~1.1.2: - version "1.1.2" - resolved "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz" - integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA== - dependencies: - debug "2.6.9" - encodeurl "~1.0.2" - escape-html "~1.0.3" - on-finished "~2.3.0" - parseurl "~1.3.3" - statuses "~1.5.0" - unpipe "~1.0.0" - -find-up@^3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz" - integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg== - dependencies: - locate-path "^3.0.0" - -findup-sync@^4.0.0: - version "4.0.0" - resolved "https://registry.npmjs.org/findup-sync/-/findup-sync-4.0.0.tgz" - integrity sha512-6jvvn/12IC4quLBL1KNokxC7wWTvYncaVUYSoxWw7YykPLuRrnv4qdHcSOywOI5RpkOVGeQRtWM8/q+G6W6qfQ== - dependencies: - detect-file "^1.0.0" - is-glob "^4.0.0" - micromatch "^4.0.2" - resolve-dir "^1.0.1" - -findup-sync@~5.0.0: - version "5.0.0" - resolved "https://registry.npmjs.org/findup-sync/-/findup-sync-5.0.0.tgz" - integrity sha512-MzwXju70AuyflbgeOhzvQWAvvQdo1XL0A9bVvlXsYcFEBM87WR4OakL4OfZq+QRmr+duJubio+UtNQCPsVESzQ== - dependencies: - detect-file "^1.0.0" - is-glob "^4.0.3" - micromatch "^4.0.4" - resolve-dir "^1.0.1" - -fined@^1.2.0: - version "1.2.0" - resolved "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz" - integrity sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng== - dependencies: - expand-tilde "^2.0.2" - is-plain-object "^2.0.3" - object.defaults "^1.1.0" - object.pick "^1.2.0" - parse-filepath "^1.0.1" - -fizzy-ui-utils@^2.0.0: - version "2.0.6" - resolved "https://registry.npmjs.org/fizzy-ui-utils/-/fizzy-ui-utils-2.0.6.tgz" - integrity sha512-aci2W7ZZ/MKLMuQkFKtCN/GXvheT9lLJW6zWNhjMzpwoWJGMNidxHSJYWQVegXQZMGE+XyO5KFqOTAzz1GVT6Q== - dependencies: - desandro-matches-selector "^2.0.0" - -flagged-respawn@^1.0.1: - version "1.0.1" - resolved "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz" - integrity sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q== - -fn.name@1.x.x: - version "1.1.0" - resolved "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz" - integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw== - -follow-redirects@^1.14.0: - version "1.14.9" - resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz" - integrity sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w== - -for-in@^1.0.1: - version "1.0.2" - resolved "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz" - integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA= - -for-own@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz" - integrity sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs= - dependencies: - for-in "^1.0.1" - -foreground-child@^3.1.0: - version "3.1.1" - resolved "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz" - integrity sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg== - dependencies: - cross-spawn "^7.0.0" - signal-exit "^4.0.1" - -format-util@^1.0.3: - version "1.0.5" - resolved "https://registry.npmjs.org/format-util/-/format-util-1.0.5.tgz" - integrity sha512-varLbTj0e0yVyRpqQhuWV+8hlePAgaoFRhNFj50BNjEIrw1/DphHSObtqwskVCPWNgzwPoQrZAbfa/SBiicNeg== - -forwarded@0.2.0: - version "0.2.0" - resolved "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz" - integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow== - -forwarded@~0.1.2: - version "0.1.2" - resolved "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz" - integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ= - -fresh@0.5.2: - version "0.5.2" - resolved "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz" - integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac= - -fs.realpath@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz" - integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= - -function-bind@^1.0.2, function-bind@^1.1.1: - version "1.1.1" - resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz" - integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== - -gensync@^1.0.0-beta.2: - version "1.0.0-beta.2" - resolved "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz" - integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg== - -get-func-name@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz" - integrity sha1-6td0q+5y4gQJQzoGY2YCPdaIekE= - -get-intrinsic@^1.0.2: - version "1.1.1" - resolved "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz" - integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q== - dependencies: - function-bind "^1.1.1" - has "^1.0.3" - has-symbols "^1.0.1" - -get-size@^2.0.2: - version "2.0.2" - resolved "https://registry.npmjs.org/get-size/-/get-size-2.0.2.tgz" - integrity sha1-VV6pirhzLgwCHp4j4iGa3L45jpg= - -get-stream@^2.2.0: - version "2.3.1" - resolved "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz" - integrity sha1-Xzj5PzRgCWZu4BUKBUFn+Rvdld4= - dependencies: - object-assign "^4.0.1" - pinkie-promise "^2.0.0" - -getobject@~1.0.0: - version "1.0.2" - resolved "https://registry.npmjs.org/getobject/-/getobject-1.0.2.tgz" - integrity sha512-2zblDBaFcb3rB4rF77XVnuINOE2h2k/OnqXAiy0IrTxUfV1iFp3la33oAQVY9pCpWU268WFYVt2t71hlMuLsOg== - -glob@10.4.1: - version "10.4.1" - resolved "https://registry.npmjs.org/glob/-/glob-10.4.1.tgz" - integrity sha512-2jelhlq3E4ho74ZyVLN03oKdAZVUa6UDZzFLVH1H7dnoax+y9qyaq8zBkfDIggjniU19z0wU18y16jMB2eyVIw== - dependencies: - foreground-child "^3.1.0" - jackspeak "^3.1.2" - minimatch "^9.0.4" - minipass "^7.1.2" - path-scurry "^1.11.1" - -glob@^7.1.1: - version "7.1.2" - resolved "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz" - integrity sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - -glob@^7.1.3: - version "7.2.0" - resolved "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz" - integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - -glob@^7.1.6: - version "7.1.6" - resolved "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz" - integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - -glob@~7.1.6, glob@~7.1.7: - version "7.1.7" - resolved "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz" - integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - -global-modules@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz" - integrity sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg== - dependencies: - global-prefix "^1.0.1" - is-windows "^1.0.1" - resolve-dir "^1.0.0" - -global-prefix@^1.0.1: - version "1.0.2" - resolved "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz" - integrity sha1-2/dDxsFJklk8ZVVoy2btMsASLr4= - dependencies: - expand-tilde "^2.0.2" - homedir-polyfill "^1.0.1" - ini "^1.3.4" - is-windows "^1.0.1" - which "^1.2.14" - -globals@^11.1.0: - version "11.12.0" - resolved "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz" - integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== - -graceful-fs@^4.1.10: - version "4.1.11" - resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz" - integrity sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg= - -"graceful-readlink@>= 1.0.0": - version "1.0.1" - resolved "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz" - integrity sha1-TK+tdrxi8C+gObL5Tpo906ORpyU= - -grunt-cli@~1.4.3: - version "1.4.3" - resolved "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.4.3.tgz" - integrity sha512-9Dtx/AhVeB4LYzsViCjUQkd0Kw0McN2gYpdmGYKtE2a5Yt7v1Q+HYZVWhqXc/kGnxlMtqKDxSwotiGeFmkrCoQ== - dependencies: - grunt-known-options "~2.0.0" - interpret "~1.1.0" - liftup "~3.0.1" - nopt "~4.0.1" - v8flags "~3.2.0" - -grunt-contrib-clean@2.0.1: - version "2.0.1" - resolved "https://registry.npmjs.org/grunt-contrib-clean/-/grunt-contrib-clean-2.0.1.tgz" - integrity sha512-uRvnXfhiZt8akb/ZRDHJpQQtkkVkqc/opWO4Po/9ehC2hPxgptB9S6JHDC/Nxswo4CJSM0iFPT/Iym3cEMWzKA== - dependencies: - async "^3.2.3" - rimraf "^2.6.2" - -grunt-contrib-copy@1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/grunt-contrib-copy/-/grunt-contrib-copy-1.0.0.tgz" - integrity sha1-cGDGWB6QS4qw0A8HbgqPbj58NXM= - dependencies: - chalk "^1.1.1" - file-sync-cmp "^0.1.0" - -grunt-contrib-jshint@3.2.0: - version "3.2.0" - resolved "https://registry.npmjs.org/grunt-contrib-jshint/-/grunt-contrib-jshint-3.2.0.tgz" - integrity sha512-pcXWCSZWfoMSvcV4BwH21TUtLtcX0Ms8IGuOPIcLeXK3fud9KclY7iqMKY94jFx8TxZzh028YYtpR+io8DiEaQ== - dependencies: - chalk "~4.1.2" - hooker "^0.2.3" - jshint "~2.13.4" - -grunt-contrib-uglify@5.2.2: - version "5.2.2" - resolved "https://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-5.2.2.tgz" - integrity sha512-ITxiWxrjjP+RZu/aJ5GLvdele+sxlznh+6fK9Qckio5ma8f7Iv8woZjRkGfafvpuygxNefOJNc+hfjjBayRn2Q== - dependencies: - chalk "^4.1.2" - maxmin "^3.0.0" - uglify-js "^3.16.1" - uri-path "^1.0.0" - -grunt-known-options@~2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-2.0.0.tgz" - integrity sha512-GD7cTz0I4SAede1/+pAbmJRG44zFLPipVtdL9o3vqx9IEyb7b4/Y3s7r6ofI3CchR5GvYJ+8buCSioDv5dQLiA== - -grunt-legacy-log-utils@~2.1.0: - version "2.1.0" - resolved "https://registry.npmjs.org/grunt-legacy-log-utils/-/grunt-legacy-log-utils-2.1.0.tgz" - integrity sha512-lwquaPXJtKQk0rUM1IQAop5noEpwFqOXasVoedLeNzaibf/OPWjKYvvdqnEHNmU+0T0CaReAXIbGo747ZD+Aaw== - dependencies: - chalk "~4.1.0" - lodash "~4.17.19" - -grunt-legacy-log@~3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-3.0.0.tgz" - integrity sha512-GHZQzZmhyq0u3hr7aHW4qUH0xDzwp2YXldLPZTCjlOeGscAOWWPftZG3XioW8MasGp+OBRIu39LFx14SLjXRcA== - dependencies: - colors "~1.1.2" - grunt-legacy-log-utils "~2.1.0" - hooker "~0.2.3" - lodash "~4.17.19" - -grunt-legacy-util@~2.0.1: - version "2.0.1" - resolved "https://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-2.0.1.tgz" - integrity sha512-2bQiD4fzXqX8rhNdXkAywCadeqiPiay0oQny77wA2F3WF4grPJXCvAcyoWUJV+po/b15glGkxuSiQCK299UC2w== - dependencies: - async "~3.2.0" - exit "~0.1.2" - getobject "~1.0.0" - hooker "~0.2.3" - lodash "~4.17.21" - underscore.string "~3.3.5" - which "~2.0.2" - -grunt-shell@3.0.1: - version "3.0.1" - resolved "https://registry.npmjs.org/grunt-shell/-/grunt-shell-3.0.1.tgz" - integrity sha512-C8eR4frw/NmIFIwSvzSLS4wOQBUzC+z6QhrKPzwt/tlaIqlzH35i/O2MggVOBj2Sh1tbaAqpASWxGiGsi4JMIQ== - dependencies: - chalk "^2.4.1" - npm-run-path "^2.0.0" - strip-ansi "^5.0.0" - -grunt@1.6.1: - version "1.6.1" - resolved "https://registry.npmjs.org/grunt/-/grunt-1.6.1.tgz" - integrity sha512-/ABUy3gYWu5iBmrUSRBP97JLpQUm0GgVveDCp6t3yRNIoltIYw7rEj3g5y1o2PGPR2vfTRGa7WC/LZHLTXnEzA== - dependencies: - dateformat "~4.6.2" - eventemitter2 "~0.4.13" - exit "~0.1.2" - findup-sync "~5.0.0" - glob "~7.1.6" - grunt-cli "~1.4.3" - grunt-known-options "~2.0.0" - grunt-legacy-log "~3.0.0" - grunt-legacy-util "~2.0.1" - iconv-lite "~0.6.3" - js-yaml "~3.14.0" - minimatch "~3.0.4" - nopt "~3.0.6" - -gzip-size@^5.1.1: - version "5.1.1" - resolved "https://registry.npmjs.org/gzip-size/-/gzip-size-5.1.1.tgz" - integrity sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA== - dependencies: - duplexer "^0.1.1" - pify "^4.0.1" - -handlebars@4.7.8: - version "4.7.8" - resolved "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz" - integrity sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ== - dependencies: - minimist "^1.2.5" - neo-async "^2.6.2" - source-map "^0.6.1" - wordwrap "^1.0.0" - optionalDependencies: - uglify-js "^3.1.4" - -has-ansi@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz" - integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE= - dependencies: - ansi-regex "^2.0.0" - -has-flag@^3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz" - integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= - -has-flag@^4.0.0: - version "4.0.0" - resolved "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz" - integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== - -has-symbols@^1.0.1: - version "1.0.3" - resolved "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz" - integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== - -has@^1.0.1: - version "1.0.1" - resolved "https://registry.npmjs.org/has/-/has-1.0.1.tgz" - integrity sha1-hGFzP1OLCDfJNh45qauelwTcLyg= - dependencies: - function-bind "^1.0.2" - -has@^1.0.3: - version "1.0.3" - resolved "https://registry.npmjs.org/has/-/has-1.0.3.tgz" - integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== - dependencies: - function-bind "^1.1.1" - -homedir-polyfill@^1.0.1: - version "1.0.3" - resolved "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz" - integrity sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA== - dependencies: - parse-passwd "^1.0.0" - -hooker@^0.2.3, hooker@~0.2.3: - version "0.2.3" - resolved "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz" - integrity sha1-uDT3I8xKJCqmWWNFnfbZhMXT2Vk= - -html-escaper@^2.0.0: - version "2.0.2" - resolved "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz" - integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg== - -htmlparser2@3.8.x: - version "3.8.3" - resolved "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz" - integrity sha1-mWwosZFRaovoZQGn15dX5ccMEGg= - dependencies: - domelementtype "1" - domhandler "2.3" - domutils "1.5" - entities "1.0" - readable-stream "1.1" - -http-errors@1.7.2: - version "1.7.2" - resolved "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz" - integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg== - dependencies: - depd "~1.1.2" - inherits "2.0.3" - setprototypeof "1.1.1" - statuses ">= 1.5.0 < 2" - toidentifier "1.0.0" - -http-errors@2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz" - integrity sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ== - dependencies: - depd "2.0.0" - inherits "2.0.4" - setprototypeof "1.2.0" - statuses "2.0.1" - toidentifier "1.0.1" - -http-errors@~1.7.2: - version "1.7.3" - resolved "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz" - integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw== - dependencies: - depd "~1.1.2" - inherits "2.0.4" - setprototypeof "1.1.1" - statuses ">= 1.5.0 < 2" - toidentifier "1.0.0" - -http-errors@~1.8.0: - version "1.8.1" - resolved "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz" - integrity sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g== - dependencies: - depd "~1.1.2" - inherits "2.0.4" - setprototypeof "1.2.0" - statuses ">= 1.5.0 < 2" - toidentifier "1.0.1" - -http-parser-js@>=0.4.0: - version "0.4.9" - resolved "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.9.tgz" - integrity sha1-6hoE+2St/wJC6ZdPKX3Uw8rSceE= - -iconv-lite@0.4.24: - version "0.4.24" - resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz" - integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== - dependencies: - safer-buffer ">= 2.1.2 < 3" - -iconv-lite@0.6, iconv-lite@~0.6.3: - version "0.6.3" - resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz" - integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== - dependencies: - safer-buffer ">= 2.1.2 < 3.0.0" - -ieee754@^1.1.4: - version "1.1.8" - resolved "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz" - integrity sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q= - -immediate@~3.0.5: - version "3.0.6" - resolved "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz" - integrity sha1-nbHb0Pr43m++D13V5Wu2BigN5ps= - -inflight@^1.0.4: - version "1.0.6" - resolved "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz" - integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= - dependencies: - once "^1.3.0" - wrappy "1" - -inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3: - version "2.0.3" - resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz" - integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= - -inherits@2.0.4, inherits@^2.0.4: - version "2.0.4" - resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz" - integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== - -ini@^1.3.4: - version "1.3.5" - resolved "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz" - integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw== - -intern@4.10.1: - version "4.10.1" - resolved "https://registry.npmjs.org/intern/-/intern-4.10.1.tgz" - integrity sha512-GyUmdpdKGoEu1hRMNYeldPF11lFZlC1Pbq28ImzEY+7OHRDinMU9c8jwGxY7eAaUe15oy0Y7cocdjC/mzUuOng== - dependencies: - "@theintern/common" "~0.3.0" - "@theintern/digdug" "~2.6.2" - "@theintern/leadfoot" "~2.4.1" - "@types/benchmark" "~2.1.1" - "@types/chai" "~4.2.20" - "@types/charm" "~1.0.2" - "@types/express" "~4.17.13" - "@types/istanbul-lib-coverage" "~2.0.3" - "@types/istanbul-lib-instrument" "~1.7.4" - "@types/istanbul-lib-report" "~3.0.0" - "@types/istanbul-lib-source-maps" "~4.0.1" - "@types/istanbul-reports" "~3.0.1" - "@types/ws" "7.4.6" - benchmark "~2.1.4" - body-parser "~1.19.0" - chai "~4.3.4" - charm "~1.0.2" - concurrent "~0.3.2" - diff "~5.0.0" - express "~4.17.1" - glob "~7.1.7" - http-errors "~1.8.0" - istanbul-lib-coverage "~3.0.0" - istanbul-lib-hook "~3.0.0" - istanbul-lib-instrument "~4.0.3" - istanbul-lib-report "~3.0.0" - istanbul-lib-source-maps "~4.0.0" - istanbul-reports "~3.0.2" - lodash "~4.17.15" - mime-types "~2.1.31" - minimatch "~3.0.4" - platform "~1.3.6" - resolve "~1.20.0" - shell-quote "~1.7.2" - source-map "~0.6.1" - ts-node "~10.0.0" - tslib "~2.3.0" - ws "~7.5.2" - -"internmap@1 - 2": - version "2.0.3" - resolved "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz" - integrity sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg== - -interpret@~1.1.0: - version "1.1.0" - resolved "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz" - integrity sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ= - -ipaddr.js@1.9.1: - version "1.9.1" - resolved "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz" - integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g== - -is-absolute@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz" - integrity sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA== - dependencies: - is-relative "^1.0.0" - is-windows "^1.0.1" - -is-arrayish@^0.3.1: - version "0.3.2" - resolved "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz" - integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ== - -is-core-module@^2.2.0: - version "2.2.0" - resolved "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz" - integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ== - dependencies: - has "^1.0.3" - -is-core-module@^2.8.1: - version "2.9.0" - resolved "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz" - integrity sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A== - dependencies: - has "^1.0.3" - -is-expression@^4.0.0: - version "4.0.0" - resolved "https://registry.npmjs.org/is-expression/-/is-expression-4.0.0.tgz" - integrity sha512-zMIXX63sxzG3XrkHkrAPvm/OVZVSCPNkwMHU8oTX7/U3AL78I0QXCEICXUM13BIa8TYGZ68PiTKfQz3yaTNr4A== - dependencies: - acorn "^7.1.1" - object-assign "^4.1.1" - -is-extglob@^2.1.1: - version "2.1.1" - resolved "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz" - integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= - -is-fullwidth-code-point@^3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz" - integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== - -is-glob@^4.0.0: - version "4.0.1" - resolved "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz" - integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg== - dependencies: - is-extglob "^2.1.1" - -is-glob@^4.0.3: - version "4.0.3" - resolved "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz" - integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg== - dependencies: - is-extglob "^2.1.1" - -is-natural-number@^4.0.1: - version "4.0.1" - resolved "https://registry.npmjs.org/is-natural-number/-/is-natural-number-4.0.1.tgz" - integrity sha1-q5124dtM7VHjXeDHLr7PCfc0zeg= - -is-number@^7.0.0: - version "7.0.0" - resolved "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz" - integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== - -is-plain-object@^2.0.3, is-plain-object@^2.0.4: - version "2.0.4" - resolved "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz" - integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og== - dependencies: - isobject "^3.0.1" - -is-promise@^2.0.0: - version "2.1.0" - resolved "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz" - integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o= - -is-regex@^1.0.3: - version "1.0.4" - resolved "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz" - integrity sha1-VRdIm1RwkbCTDglWVM7SXul+lJE= - dependencies: - has "^1.0.1" - -is-relative@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz" - integrity sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA== - dependencies: - is-unc-path "^1.0.0" - -is-stream@^1.1.0: - version "1.1.0" - resolved "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz" - integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ= - -is-stream@^2.0.0: - version "2.0.1" - resolved "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz" - integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg== - -is-typedarray@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" - integrity sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA== - -is-unc-path@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz" - integrity sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ== - dependencies: - unc-path-regex "^0.1.2" - -is-windows@^1.0.1: - version "1.0.2" - resolved "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz" - integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA== - -isarray@0.0.1: - version "0.0.1" - resolved "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" - integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8= - -isarray@^1.0.0, isarray@~1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz" - integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= - -isexe@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz" - integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= - -isobject@^3.0.0, isobject@^3.0.1: - version "3.0.1" - resolved "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz" - integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= - -istanbul-lib-coverage@^3.0.0: - version "3.2.0" - resolved "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz" - integrity sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw== - -istanbul-lib-coverage@~3.0.0: - version "3.0.2" - resolved "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.2.tgz" - integrity sha512-o5+eTUYzCJ11/+JhW5/FUCdfsdoYVdQ/8I/OveE2XsjehYn5DdeSnNQAbjYaO8gQ6hvGTN6GM6ddQqpTVG5j8g== - -istanbul-lib-hook@~3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-3.0.0.tgz" - integrity sha512-Pt/uge1Q9s+5VAZ+pCo16TYMWPBIl+oaNIjgLQxcX0itS6ueeaA+pEfThZpH8WxhFgCiEb8sAJY6MdUKgiIWaQ== - dependencies: - append-transform "^2.0.0" - -istanbul-lib-instrument@~4.0.3: - version "4.0.3" - resolved "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz" - integrity sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ== - dependencies: - "@babel/core" "^7.7.5" - "@istanbuljs/schema" "^0.1.2" - istanbul-lib-coverage "^3.0.0" - semver "^6.3.0" - -istanbul-lib-report@^3.0.0, istanbul-lib-report@~3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz" - integrity sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw== - dependencies: - istanbul-lib-coverage "^3.0.0" - make-dir "^3.0.0" - supports-color "^7.1.0" - -istanbul-lib-source-maps@~4.0.0: - version "4.0.1" - resolved "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz" - integrity sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw== - dependencies: - debug "^4.1.1" - istanbul-lib-coverage "^3.0.0" - source-map "^0.6.1" - -istanbul-reports@~3.0.2: - version "3.0.5" - resolved "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.5.tgz" - integrity sha512-5+19PlhnGabNWB7kOFnuxT8H3T/iIyQzIbQMxXsURmmvKg86P2sbkrGOT77VnHw0Qr0gc2XzRaRfMZYYbSQCJQ== - dependencies: - html-escaper "^2.0.0" - istanbul-lib-report "^3.0.0" - -jackspeak@^3.1.2: - version "3.4.0" - resolved "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.0.tgz" - integrity sha512-JVYhQnN59LVPFCEcVa2C3CrEKYacvjRfqIQl+h8oi91aLYQVWRYbxjPcv1bUiUy/kLmQaANrYfNMCO3kuEDHfw== - dependencies: - "@isaacs/cliui" "^8.0.2" - optionalDependencies: - "@pkgjs/parseargs" "^0.11.0" - -js-stringify@^1.0.2: - version "1.0.2" - resolved "https://registry.npmjs.org/js-stringify/-/js-stringify-1.0.2.tgz" - integrity sha1-Fzb939lyTyijaCrcYjCufk6Weds= - -js-tokens@^4.0.0: - version "4.0.0" - resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz" - integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== - -js-yaml@^3.12.1, js-yaml@~3.14.0: - version "3.14.1" - resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz" - integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== - dependencies: - argparse "^1.0.7" - esprima "^4.0.0" - -jsesc@^2.5.1: - version "2.5.2" - resolved "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz" - integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA== - -jshint@~2.13.4: - version "2.13.4" - resolved "https://registry.npmjs.org/jshint/-/jshint-2.13.4.tgz" - integrity sha512-HO3bosL84b2qWqI0q+kpT/OpRJwo0R4ivgmxaO848+bo10rc50SkPnrtwSFXttW0ym4np8jbJvLwk5NziB7jIw== - dependencies: - cli "~1.0.0" - console-browserify "1.1.x" - exit "0.1.x" - htmlparser2 "3.8.x" - lodash "~4.17.21" - minimatch "~3.0.2" - strip-json-comments "1.0.x" - -json-schema-ref-parser@6.1.0: - version "6.1.0" - resolved "https://registry.npmjs.org/json-schema-ref-parser/-/json-schema-ref-parser-6.1.0.tgz" - integrity sha512-pXe9H1m6IgIpXmE5JSb8epilNTGsmTb2iPohAXpOdhqGFbQjNeHHsZxU+C8w6T81GZxSPFLeUoqDJmzxx5IGuw== - dependencies: - call-me-maybe "^1.0.1" - js-yaml "^3.12.1" - ono "^4.0.11" - -json5@^2.2.1: - version "2.2.1" - resolved "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz" - integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA== - -jstransformer@1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/jstransformer/-/jstransformer-1.0.0.tgz" - integrity sha1-7Yvwkh4vPx7U1cGkT2hwntJHIsM= - dependencies: - is-promise "^2.0.0" - promise "^7.0.1" - -jszip@~3.7.1: - version "3.7.1" - resolved "https://registry.npmjs.org/jszip/-/jszip-3.7.1.tgz" - integrity sha512-ghL0tz1XG9ZEmRMcEN2vt7xabrDdqHHeykgARpmZ0BiIctWxM47Vt63ZO2dnp4QYt/xJVLLy5Zv1l/xRdh2byg== - dependencies: - lie "~3.3.0" - pako "~1.0.2" - readable-stream "~2.3.6" - set-immediate-shim "~1.0.1" - -kind-of@^6.0.2: - version "6.0.3" - resolved "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz" - integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== - -kuler@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz" - integrity sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A== - -leaflet-draw@1.0.4: - version "1.0.4" - resolved "https://registry.npmjs.org/leaflet-draw/-/leaflet-draw-1.0.4.tgz" - integrity sha512-rsQ6saQO5ST5Aj6XRFylr5zvarWgzWnrg46zQ1MEOEIHsppdC/8hnN8qMoFvACsPvTioAuysya/TVtog15tyAQ== - -leaflet-measure@3.1.0: - version "3.1.0" - resolved "https://registry.npmjs.org/leaflet-measure/-/leaflet-measure-3.1.0.tgz" - integrity sha512-ln5c9UNaWDEd24tIzDt9hwnpb8OaCPBfSWNBg2H8rb9SA3cbXW9+NqohA6/8TdsNDGJZr36woXMrqRq07Pcl3w== - dependencies: - "@turf/area" "^5.1.5" - "@turf/length" "^5.1.5" - lodash "^4.17.5" - -leaflet-minimap@3.6.1: - version "3.6.1" - resolved "https://registry.npmjs.org/leaflet-minimap/-/leaflet-minimap-3.6.1.tgz" - integrity sha1-KkP/Oz2UekWgrPS978llBbZzpsY= - -leaflet-nav@1.0.3: - version "1.0.3" - resolved "https://registry.npmjs.org/leaflet-nav/-/leaflet-nav-1.0.3.tgz" - integrity sha512-0PmK4Khb1MY1yZQk4wal0+pkvWWAGCUK8vXu+8FjttF3qq+D3Sktd8qus6DMvqVvte9pnqKHvWE2JqdhG6by7A== - -leaflet.awesome-markers@2.0.5: - version "2.0.5" - resolved "https://registry.npmjs.org/leaflet.awesome-markers/-/leaflet.awesome-markers-2.0.5.tgz" - integrity sha512-Ne/xDjkGyaujwNVVkv2tyXQUV0ZW7gZ0Mo0FuQY4jp2qWrvXi0hwDBvmZyF/8YOvybyMabTMM/mFWCTd1jZIQA== - -leaflet.coordinates@0.1.5: - version "0.1.5" - resolved "https://registry.npmjs.org/leaflet.coordinates/-/leaflet.coordinates-0.1.5.tgz" - integrity sha1-oHF7ZDsIOY0fPC/6DsYoE9TPh6o= - -leaflet.nontiledlayer@1.0.9: - version "1.0.9" - resolved "https://registry.npmjs.org/leaflet.nontiledlayer/-/leaflet.nontiledlayer-1.0.9.tgz" - integrity sha512-w4yeTLNFhTToAmGQ7P9cAiGFVwVLJzuO3A/tFNMWRVYl1BLvrvlqY7hKE33pmmeoQ6m5ZsWd0qbdYq/d+zBuUQ== - dependencies: - leaflet "^1.6.0" - -leaflet@1.9.4: - version "1.9.4" - resolved "https://registry.npmjs.org/leaflet/-/leaflet-1.9.4.tgz" - integrity sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA== - -leaflet@^1.6.0: - version "1.7.1" - resolved "https://registry.npmjs.org/leaflet/-/leaflet-1.7.1.tgz" - integrity sha512-/xwPEBidtg69Q3HlqPdU3DnrXQOvQU/CCHA1tcDQVzOwm91YMYaILjNp7L4Eaw5Z4sOYdbBz6koWyibppd8Zqw== - -lie@~3.3.0: - version "3.3.0" - resolved "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz" - integrity sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ== - dependencies: - immediate "~3.0.5" - -liftup@~3.0.1: - version "3.0.1" - resolved "https://registry.npmjs.org/liftup/-/liftup-3.0.1.tgz" - integrity sha512-yRHaiQDizWSzoXk3APcA71eOI/UuhEkNN9DiW2Tt44mhYzX4joFoCZlxsSOF7RyeLlfqzFLQI1ngFq3ggMPhOw== - dependencies: - extend "^3.0.2" - findup-sync "^4.0.0" - fined "^1.2.0" - flagged-respawn "^1.0.1" - is-plain-object "^2.0.4" - object.map "^1.0.1" - rechoir "^0.7.0" - resolve "^1.19.0" - -load-grunt-tasks@5.1.0: - version "5.1.0" - resolved "https://registry.npmjs.org/load-grunt-tasks/-/load-grunt-tasks-5.1.0.tgz" - integrity sha512-oNj0Jlka1TsfDe+9He0kcA1cRln+TMoTsEByW7ij6kyktNLxBKJtslCFEvFrLC2Dj0S19IWJh3fOCIjLby2Xrg== - dependencies: - arrify "^2.0.1" - multimatch "^4.0.0" - pkg-up "^3.1.0" - resolve-pkg "^2.0.0" - -locate-path@^3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz" - integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A== - dependencies: - p-locate "^3.0.0" - path-exists "^3.0.0" - -lodash@^4.17.19, lodash@~4.17.15: - version "4.17.20" - resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz" - integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA== - -lodash@^4.17.4: - version "4.17.4" - resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz" - integrity sha1-eCA6TRwyiuHYbcpkYONptX9AVa4= - -lodash@^4.17.5, lodash@~4.17.19, lodash@~4.17.21: - version "4.17.21" - resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz" - integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== - -logform@^2.3.2, logform@^2.4.0: - version "2.4.0" - resolved "https://registry.npmjs.org/logform/-/logform-2.4.0.tgz" - integrity sha512-CPSJw4ftjf517EhXZGGvTHHkYobo7ZCc0kvwUoOYcjfR2UVrI66RHj8MCrfAdEitdmFqbu2BYdYs8FHHZSb6iw== - dependencies: - "@colors/colors" "1.5.0" - fecha "^4.2.0" - ms "^2.1.1" - safe-stable-stringify "^2.3.1" - triple-beam "^1.3.0" - -loupe@^2.3.1: - version "2.3.4" - resolved "https://registry.npmjs.org/loupe/-/loupe-2.3.4.tgz" - integrity sha512-OvKfgCC2Ndby6aSTREl5aCCPTNIzlDfQZvZxNUrBrihDhL3xcrYegTblhmEiCrg2kKQz4XsFIaemE5BF4ybSaQ== - dependencies: - get-func-name "^2.0.0" - -lru-cache@^10.2.0: - version "10.2.2" - resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.2.tgz" - integrity sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ== - -make-dir@^1.0.0: - version "1.1.0" - resolved "https://registry.npmjs.org/make-dir/-/make-dir-1.1.0.tgz" - integrity sha512-0Pkui4wLJ7rxvmfUvs87skoEaxmu0hCUApF8nonzpl7q//FWp9zu8W61Scz4sd/kUiqDxvUhtoam2efDyiBzcA== - dependencies: - pify "^3.0.0" - -make-dir@^3.0.0: - version "3.1.0" - resolved "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz" - integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== - dependencies: - semver "^6.0.0" - -make-error@^1.1.1: - version "1.3.6" - resolved "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz" - integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw== - -make-iterator@^1.0.0: - version "1.0.1" - resolved "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz" - integrity sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw== - dependencies: - kind-of "^6.0.2" - -map-cache@^0.2.0: - version "0.2.2" - resolved "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz" - integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8= - -maxmin@^3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/maxmin/-/maxmin-3.0.0.tgz" - integrity sha512-wcahMInmGtg/7c6a75fr21Ch/Ks1Tb+Jtoan5Ft4bAI0ZvJqyOw8kkM7e7p8hDSzY805vmxwHT50KcjGwKyJ0g== - dependencies: - chalk "^4.1.0" - figures "^3.2.0" - gzip-size "^5.1.1" - pretty-bytes "^5.3.0" - -media-typer@0.3.0: - version "0.3.0" - resolved "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz" - integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= - -mediator-js@0.11.0: - version "0.11.0" - resolved "https://registry.npmjs.org/mediator-js/-/mediator-js-0.11.0.tgz" - integrity sha512-ehVcM3bSkr79E5yXUIyOPxw9xqhmvtTMkws5+lT8vl52awVkL/8rfDd8njmVxNldGmqKvFWSOvfppxG2AHM0TQ== - -merge-descriptors@1.0.1: - version "1.0.1" - resolved "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz" - integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E= - -methods@~1.1.2: - version "1.1.2" - resolved "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz" - integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= - -mgrs@1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/mgrs/-/mgrs-1.0.0.tgz" - integrity sha1-+5FYjnjJACVnI5XLQLJffNatGCk= - -micromatch@^4.0.2, micromatch@^4.0.4: - version "4.0.5" - resolved "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz" - integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== - dependencies: - braces "^3.0.2" - picomatch "^2.3.1" - -mime-db@1.45.0: - version "1.45.0" - resolved "https://registry.npmjs.org/mime-db/-/mime-db-1.45.0.tgz" - integrity sha512-CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w== - -mime-db@1.52.0: - version "1.52.0" - resolved "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz" - integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== - -mime-types@~2.1.24: - version "2.1.28" - resolved "https://registry.npmjs.org/mime-types/-/mime-types-2.1.28.tgz" - integrity sha512-0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ== - dependencies: - mime-db "1.45.0" - -mime-types@~2.1.31, mime-types@~2.1.34: - version "2.1.35" - resolved "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz" - integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== - dependencies: - mime-db "1.52.0" - -mime@1.6.0: - version "1.6.0" - resolved "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz" - integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== - -minimatch@^3.0.4, minimatch@~3.0.2, minimatch@~3.0.4: - version "3.0.4" - resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz" - integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== - dependencies: - brace-expansion "^1.1.7" - -minimatch@^9.0.4: - version "9.0.4" - resolved "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz" - integrity sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw== - dependencies: - brace-expansion "^2.0.1" - -minimist@^1.2.5: - version "1.2.6" - resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz" - integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== - -"minipass@^5.0.0 || ^6.0.2 || ^7.0.0": - version "7.0.4" - resolved "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz" - integrity sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ== - -minipass@^7.1.2: - version "7.1.2" - resolved "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz" - integrity sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw== - -moment@2.30.1: - version "2.30.1" - resolved "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz" - integrity sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how== - -morgan@1.10.0: - version "1.10.0" - resolved "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz" - integrity sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ== - dependencies: - basic-auth "~2.0.1" - debug "2.6.9" - depd "~2.0.0" - on-finished "~2.3.0" - on-headers "~1.0.2" - -ms@2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz" - integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= - -ms@2.1.1: - version "2.1.1" - resolved "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz" - integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg== - -ms@2.1.2: - version "2.1.2" - resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz" - integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== - -ms@2.1.3, ms@^2.1.1: - version "2.1.3" - resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz" - integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== - -multimatch@^4.0.0: - version "4.0.0" - resolved "https://registry.npmjs.org/multimatch/-/multimatch-4.0.0.tgz" - integrity sha512-lDmx79y1z6i7RNx0ZGCPq1bzJ6ZoDDKbvh7jxr9SJcWLkShMzXrHbYVpTdnhNM5MXpDUxCQ4DgqVttVXlBgiBQ== - dependencies: - "@types/minimatch" "^3.0.3" - array-differ "^3.0.0" - array-union "^2.1.0" - arrify "^2.0.1" - minimatch "^3.0.4" - -negotiator@0.6.2: - version "0.6.2" - resolved "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz" - integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== - -negotiator@0.6.3: - version "0.6.3" - resolved "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz" - integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== - -neo-async@^2.6.2: - version "2.6.2" - resolved "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz" - integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== - -next-tick@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.1.0.tgz#1836ee30ad56d67ef281b22bd199f709449b35eb" - integrity sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ== - -nib@1.2.0: - version "1.2.0" - resolved "https://registry.npmjs.org/nib/-/nib-1.2.0.tgz" - integrity sha512-7HgrnMl/3yOmWykueO8/D0q+0iWwe7Z+CK2Eaq/xQV8w1hK80WN1oReRQkfkrztbAAnp/nTHkUSl5EcVkor6JQ== - -node-gyp-build@^4.3.0: - version "4.8.1" - resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.8.1.tgz#976d3ad905e71b76086f4f0b0d3637fe79b6cda5" - integrity sha512-OSs33Z9yWr148JZcbZd5WiAXhh/n9z8TxQcdMhIOlpN9AhWpLfvVFO73+m77bBABQMaY9XSvIa+qk0jlI7Gcaw== - -node-releases@^2.0.2: - version "2.0.3" - resolved "https://registry.npmjs.org/node-releases/-/node-releases-2.0.3.tgz" - integrity sha512-maHFz6OLqYxz+VQyCAtA3PTX4UP/53pa05fyDNc9CwjvJ0yEh6+xBwKsgCxMNhS8taUKBFYxfuiaD9U/55iFaw== - -nopt@~3.0.6: - version "3.0.6" - resolved "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz" - integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k= - dependencies: - abbrev "1" - -nopt@~4.0.1: - version "4.0.3" - resolved "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz" - integrity sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg== - dependencies: - abbrev "1" - osenv "^0.1.4" - -npm-run-path@^2.0.0: - version "2.0.2" - resolved "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz" - integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8= - dependencies: - path-key "^2.0.0" - -object-assign@^4.0.1, object-assign@^4.1.1: - version "4.1.1" - resolved "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz" - integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= - -object-inspect@^1.9.0: - version "1.12.0" - resolved "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz" - integrity sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g== - -object.defaults@^1.1.0: - version "1.1.0" - resolved "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz" - integrity sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8= - dependencies: - array-each "^1.0.1" - array-slice "^1.0.0" - for-own "^1.0.0" - isobject "^3.0.0" - -object.map@^1.0.1: - version "1.0.1" - resolved "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz" - integrity sha1-z4Plncj8wK1fQlDh94s7gb2AHTc= - dependencies: - for-own "^1.0.0" - make-iterator "^1.0.0" - -object.pick@^1.2.0: - version "1.3.0" - resolved "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz" - integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c= - dependencies: - isobject "^3.0.1" - -on-finished@2.4.1: - version "2.4.1" - resolved "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz" - integrity sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg== - dependencies: - ee-first "1.1.1" - -on-finished@~2.3.0: - version "2.3.0" - resolved "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz" - integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc= - dependencies: - ee-first "1.1.1" - -on-headers@~1.0.1: - version "1.0.1" - resolved "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz" - integrity sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c= - -on-headers@~1.0.2: - version "1.0.2" - resolved "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz" - integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA== - -once@^1.3.0, once@^1.4.0: - version "1.4.0" - resolved "https://registry.npmjs.org/once/-/once-1.4.0.tgz" - integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= - dependencies: - wrappy "1" - -one-time@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/one-time/-/one-time-1.0.0.tgz" - integrity sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g== - dependencies: - fn.name "1.x.x" - -ono@^4.0.11: - version "4.0.11" - resolved "https://registry.npmjs.org/ono/-/ono-4.0.11.tgz" - integrity sha512-jQ31cORBFE6td25deYeD80wxKBMj+zBmHTrVxnc6CKhx8gho6ipmWM5zj/oeoqioZ99yqBls9Z/9Nss7J26G2g== - dependencies: - format-util "^1.0.3" - -os-homedir@^1.0.0: - version "1.0.2" - resolved "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz" - integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M= - -os-tmpdir@^1.0.0: - version "1.0.2" - resolved "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz" - integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= - -osenv@^0.1.4: - version "0.1.5" - resolved "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz" - integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g== - dependencies: - os-homedir "^1.0.0" - os-tmpdir "^1.0.0" - -outlayer@^2.0.0: - version "2.1.1" - resolved "https://registry.npmjs.org/outlayer/-/outlayer-2.1.1.tgz" - integrity sha1-KYY7beEOpdrf/8rfoNcokHOH6aI= - dependencies: - ev-emitter "^1.0.0" - fizzy-ui-utils "^2.0.0" - get-size "^2.0.2" - -p-limit@^2.0.0: - version "2.3.0" - resolved "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz" - integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== - dependencies: - p-try "^2.0.0" - -p-locate@^3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz" - integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ== - dependencies: - p-limit "^2.0.0" - -p-try@^2.0.0: - version "2.2.0" - resolved "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz" - integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== - -packery@2.1.2: - version "2.1.2" - resolved "https://registry.npmjs.org/packery/-/packery-2.1.2.tgz" - integrity sha512-Coc+8Atz03c0iu1RK0PZIJMKcKrE4i9Z8UBBywqz7Dhy40mMPM5wMQfqO9P2eqFP+lxKjGMTHgRAwjBQc+AQ5w== - dependencies: - get-size "^2.0.2" - outlayer "^2.0.0" - -pako@~1.0.2: - version "1.0.6" - resolved "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz" - integrity sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg== - -parse-filepath@^1.0.1: - version "1.0.2" - resolved "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz" - integrity sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE= - dependencies: - is-absolute "^1.0.0" - map-cache "^0.2.0" - path-root "^0.1.1" - -parse-passwd@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz" - integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY= - -parseurl@~1.3.3: - version "1.3.3" - resolved "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz" - integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== - -path-exists@^3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz" - integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU= - -path-is-absolute@^1.0.0: - version "1.0.1" - resolved "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz" - integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= - -path-key@^2.0.0: - version "2.0.1" - resolved "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz" - integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= - -path-key@^3.1.0: - version "3.1.1" - resolved "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz" - integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== - -path-parse@^1.0.6: - version "1.0.6" - resolved "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz" - integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw== - -path-parse@^1.0.7: - version "1.0.7" - resolved "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz" - integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== - -path-root-regex@^0.1.0: - version "0.1.2" - resolved "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz" - integrity sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0= - -path-root@^0.1.1: - version "0.1.1" - resolved "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz" - integrity sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc= - dependencies: - path-root-regex "^0.1.0" - -path-scurry@^1.11.1: - version "1.11.1" - resolved "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz" - integrity sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA== - dependencies: - lru-cache "^10.2.0" - minipass "^5.0.0 || ^6.0.2 || ^7.0.0" - -path-to-regexp@0.1.7: - version "0.1.7" - resolved "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz" - integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= - -pathval@^1.1.1: - version "1.1.1" - resolved "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz" - integrity sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ== - -pdfjs-dist-viewer-min@2.12.313: - version "2.12.313" - resolved "https://registry.npmjs.org/pdfjs-dist-viewer-min/-/pdfjs-dist-viewer-min-2.12.313.tgz" - integrity sha512-Li6SwOH5hj9G4hn7EsepVe/BWy+xKfMRmwJ6EbdIcmFUHDuoB6ISGJNBH7QsYk8fY8mGMZlFzP4B892u59YeGw== - -pend@~1.2.0: - version "1.2.0" - resolved "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz" - integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA= - -picocolors@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz" - integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== - -picomatch@^2.3.1: - version "2.3.1" - resolved "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz" - integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== - -pify@^2.3.0: - version "2.3.0" - resolved "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz" - integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw= - -pify@^3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz" - integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY= - -pify@^4.0.1: - version "4.0.1" - resolved "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz" - integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g== - -pinkie-promise@^2.0.0: - version "2.0.1" - resolved "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz" - integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o= - dependencies: - pinkie "^2.0.0" - -pinkie@^2.0.0: - version "2.0.4" - resolved "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz" - integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA= - -pkg-up@^3.1.0: - version "3.1.0" - resolved "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz" - integrity sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA== - dependencies: - find-up "^3.0.0" - -platform@^1.3.3: - version "1.3.5" - resolved "https://registry.npmjs.org/platform/-/platform-1.3.5.tgz" - integrity sha512-TuvHS8AOIZNAlE77WUDiR4rySV/VMptyMfcfeoMgs4P8apaZM3JrnbzBiixKUv+XR6i+BXrQh8WAnjaSPFO65Q== - -platform@~1.3.6: - version "1.3.6" - resolved "https://registry.npmjs.org/platform/-/platform-1.3.6.tgz" - integrity sha512-fnWVljUchTro6RiCFvCXBbNhJc2NijN7oIQxbwsyL0buWJPG85v81ehlHI9fXrJsMNgTofEoWIQeClKpgxFLrg== - -prerender-node@3.8.0: - version "3.8.0" - resolved "https://registry.npmjs.org/prerender-node/-/prerender-node-3.8.0.tgz" - integrity sha512-MJcdr/RePzCaYw30XQ2H64rXAkGuHDGitHmx2D1OPsNxEDMho5ha8GfwJVLxstPdj49vgerwZqnsE+2M/4Ov2A== - -pretty-bytes@^5.3.0: - version "5.6.0" - resolved "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz" - integrity sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg== - -process-nextick-args@~1.0.6: - version "1.0.7" - resolved "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz" - integrity sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M= - -process-nextick-args@~2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz" - integrity sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw== - -proj4@2.11.0: - version "2.11.0" - resolved "https://registry.npmjs.org/proj4/-/proj4-2.11.0.tgz" - integrity sha512-SasuTkAx8HnWQHfIyhkdUNJorSJqINHAN3EyMWYiQRVorftz9DHz650YraFgczwgtHOxqnfuDxSNv3C8MUnHeg== - dependencies: - mgrs "1.0.0" - wkt-parser "^1.3.3" - -prom-client@15.1.2: - version "15.1.2" - resolved "https://registry.npmjs.org/prom-client/-/prom-client-15.1.2.tgz" - integrity sha512-on3h1iXb04QFLLThrmVYg1SChBQ9N1c+nKAjebBjokBqipddH3uxmOUcEkTnzmJ8Jh/5TSUnUqS40i2QB2dJHQ== - dependencies: - "@opentelemetry/api" "^1.4.0" - tdigest "^0.1.1" - -promise@^7.0.1: - version "7.3.1" - resolved "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz" - integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg== - dependencies: - asap "~2.0.3" - -proxy-addr@~2.0.5: - version "2.0.6" - resolved "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz" - integrity sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw== - dependencies: - forwarded "~0.1.2" - ipaddr.js "1.9.1" - -proxy-addr@~2.0.7: - version "2.0.7" - resolved "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz" - integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg== - dependencies: - forwarded "0.2.0" - ipaddr.js "1.9.1" - -"prunecluster@https://github.com/pedroetb/PruneCluster.git": - version "2.1.0" - resolved "git+ssh://git@github.com/pedroetb/PruneCluster.git#5430b605050f181d02fa7ef8cd8ef43d25b422d8" - -pug-attrs@^3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/pug-attrs/-/pug-attrs-3.0.0.tgz" - integrity sha512-azINV9dUtzPMFQktvTXciNAfAuVh/L/JCl0vtPCwvOA21uZrC08K/UnmrL+SXGEVc1FwzjW62+xw5S/uaLj6cA== - dependencies: - constantinople "^4.0.1" - js-stringify "^1.0.2" - pug-runtime "^3.0.0" - -pug-code-gen@^3.0.3: - version "3.0.3" - resolved "https://registry.npmjs.org/pug-code-gen/-/pug-code-gen-3.0.3.tgz" - integrity sha512-cYQg0JW0w32Ux+XTeZnBEeuWrAY7/HNE6TWnhiHGnnRYlCgyAUPoyh9KzCMa9WhcJlJ1AtQqpEYHc+vbCzA+Aw== - dependencies: - constantinople "^4.0.1" - doctypes "^1.1.0" - js-stringify "^1.0.2" - pug-attrs "^3.0.0" - pug-error "^2.1.0" - pug-runtime "^3.0.1" - void-elements "^3.1.0" - with "^7.0.0" - -pug-error@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/pug-error/-/pug-error-2.0.0.tgz" - integrity sha512-sjiUsi9M4RAGHktC1drQfCr5C5eriu24Lfbt4s+7SykztEOwVZtbFk1RRq0tzLxcMxMYTBR+zMQaG07J/btayQ== - -pug-error@^2.1.0: - version "2.1.0" - resolved "https://registry.npmjs.org/pug-error/-/pug-error-2.1.0.tgz" - integrity sha512-lv7sU9e5Jk8IeUheHata6/UThZ7RK2jnaaNztxfPYUY+VxZyk/ePVaNZ/vwmH8WqGvDz3LrNYt/+gA55NDg6Pg== - -pug-filters@^4.0.0: - version "4.0.0" - resolved "https://registry.npmjs.org/pug-filters/-/pug-filters-4.0.0.tgz" - integrity sha512-yeNFtq5Yxmfz0f9z2rMXGw/8/4i1cCFecw/Q7+D0V2DdtII5UvqE12VaZ2AY7ri6o5RNXiweGH79OCq+2RQU4A== - dependencies: - constantinople "^4.0.1" - jstransformer "1.0.0" - pug-error "^2.0.0" - pug-walk "^2.0.0" - resolve "^1.15.1" - -pug-lexer@^5.0.1: - version "5.0.1" - resolved "https://registry.npmjs.org/pug-lexer/-/pug-lexer-5.0.1.tgz" - integrity sha512-0I6C62+keXlZPZkOJeVam9aBLVP2EnbeDw3An+k0/QlqdwH6rv8284nko14Na7c0TtqtogfWXcRoFE4O4Ff20w== - dependencies: - character-parser "^2.2.0" - is-expression "^4.0.0" - pug-error "^2.0.0" - -pug-linker@^4.0.0: - version "4.0.0" - resolved "https://registry.npmjs.org/pug-linker/-/pug-linker-4.0.0.tgz" - integrity sha512-gjD1yzp0yxbQqnzBAdlhbgoJL5qIFJw78juN1NpTLt/mfPJ5VgC4BvkoD3G23qKzJtIIXBbcCt6FioLSFLOHdw== - dependencies: - pug-error "^2.0.0" - pug-walk "^2.0.0" - -pug-load@^3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/pug-load/-/pug-load-3.0.0.tgz" - integrity sha512-OCjTEnhLWZBvS4zni/WUMjH2YSUosnsmjGBB1An7CsKQarYSWQ0GCVyd4eQPMFJqZ8w9xgs01QdiZXKVjk92EQ== - dependencies: - object-assign "^4.1.1" - pug-walk "^2.0.0" - -pug-parser@^6.0.0: - version "6.0.0" - resolved "https://registry.npmjs.org/pug-parser/-/pug-parser-6.0.0.tgz" - integrity sha512-ukiYM/9cH6Cml+AOl5kETtM9NR3WulyVP2y4HOU45DyMim1IeP/OOiyEWRr6qk5I5klpsBnbuHpwKmTx6WURnw== - dependencies: - pug-error "^2.0.0" - token-stream "1.0.0" - -pug-runtime@^3.0.0, pug-runtime@^3.0.1: - version "3.0.1" - resolved "https://registry.npmjs.org/pug-runtime/-/pug-runtime-3.0.1.tgz" - integrity sha512-L50zbvrQ35TkpHwv0G6aLSuueDRwc/97XdY8kL3tOT0FmhgG7UypU3VztfV/LATAvmUfYi4wNxSajhSAeNN+Kg== - -pug-strip-comments@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/pug-strip-comments/-/pug-strip-comments-2.0.0.tgz" - integrity sha512-zo8DsDpH7eTkPHCXFeAk1xZXJbyoTfdPlNR0bK7rpOMuhBYb0f5qUVCO1xlsitYd3w5FQTK7zpNVKb3rZoUrrQ== - dependencies: - pug-error "^2.0.0" - -pug-walk@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/pug-walk/-/pug-walk-2.0.0.tgz" - integrity sha512-yYELe9Q5q9IQhuvqsZNwA5hfPkMJ8u92bQLIMcsMxf/VADjNtEYptU+inlufAFYcWdHlwNfZOEnOOQrZrcyJCQ== - -pug@3.0.3: - version "3.0.3" - resolved "https://registry.npmjs.org/pug/-/pug-3.0.3.tgz" - integrity sha512-uBi6kmc9f3SZ3PXxqcHiUZLmIXgfgWooKWXcwSGwQd2Zi5Rb0bT14+8CJjJgI8AB+nndLaNgHGrcc6bPIB665g== - dependencies: - pug-code-gen "^3.0.3" - pug-filters "^4.0.0" - pug-lexer "^5.0.1" - pug-linker "^4.0.0" - pug-load "^3.0.0" - pug-parser "^6.0.0" - pug-runtime "^3.0.1" - pug-strip-comments "^2.0.0" - -put-selector@0.3.6: - version "0.3.6" - resolved "https://registry.npmjs.org/put-selector/-/put-selector-0.3.6.tgz" - integrity sha1-Fy6PjZeNVQcrJ1ehZFd21oXID6I= - -qs@6.11.0: - version "6.11.0" - resolved "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz" - integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q== - dependencies: - side-channel "^1.0.4" - -qs@6.7.0: - version "6.7.0" - resolved "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz" - integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ== - -querystringify@^2.1.1: - version "2.2.0" - resolved "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz" - integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ== - -range-parser@~1.2.1: - version "1.2.1" - resolved "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz" - integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== - -raw-body@2.4.0: - version "2.4.0" - resolved "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz" - integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q== - dependencies: - bytes "3.1.0" - http-errors "1.7.2" - iconv-lite "0.4.24" - unpipe "1.0.0" - -raw-body@2.5.2: - version "2.5.2" - resolved "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz" - integrity sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA== - dependencies: - bytes "3.1.2" - http-errors "2.0.0" - iconv-lite "0.4.24" - unpipe "1.0.0" - -readable-stream@1.1: - version "1.1.13" - resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz" - integrity sha1-9u73ZPUUyJ4rniMUanW6EGdW0j4= - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.1" - isarray "0.0.1" - string_decoder "~0.10.x" - -readable-stream@^2.0.0, readable-stream@^2.0.5: - version "2.3.3" - resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz" - integrity sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ== - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.3" - isarray "~1.0.0" - process-nextick-args "~1.0.6" - safe-buffer "~5.1.1" - string_decoder "~1.0.3" - util-deprecate "~1.0.1" - -readable-stream@^3.4.0, readable-stream@^3.6.0: - version "3.6.0" - resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz" - integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== - dependencies: - inherits "^2.0.3" - string_decoder "^1.1.1" - util-deprecate "^1.0.1" - -readable-stream@~2.3.6: - version "2.3.7" - resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz" - integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.3" - isarray "~1.0.0" - process-nextick-args "~2.0.0" - safe-buffer "~5.1.1" - string_decoder "~1.1.1" - util-deprecate "~1.0.1" - -rechoir@^0.7.0: - version "0.7.1" - resolved "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz" - integrity sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg== - dependencies: - resolve "^1.9.0" - -requires-port@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz" - integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8= - -resolve-dir@^1.0.0, resolve-dir@^1.0.1: - version "1.0.1" - resolved "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz" - integrity sha1-eaQGRMNivoLybv/nOcm7U4IEb0M= - dependencies: - expand-tilde "^2.0.0" - global-modules "^1.0.0" - -resolve-from@^5.0.0: - version "5.0.0" - resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz" - integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== - -resolve-pkg@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/resolve-pkg/-/resolve-pkg-2.0.0.tgz" - integrity sha512-+1lzwXehGCXSeryaISr6WujZzowloigEofRB+dj75y9RRa/obVcYgbHJd53tdYw8pvZj8GojXaaENws8Ktw/hQ== - dependencies: - resolve-from "^5.0.0" - -resolve@^1.15.1, resolve@~1.20.0: - version "1.20.0" - resolved "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz" - integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== - dependencies: - is-core-module "^2.2.0" - path-parse "^1.0.6" - -resolve@^1.19.0, resolve@^1.9.0: - version "1.22.0" - resolved "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz" - integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw== - dependencies: - is-core-module "^2.8.1" - path-parse "^1.0.7" - supports-preserve-symlinks-flag "^1.0.0" - -response-time@2.3.2: - version "2.3.2" - resolved "https://registry.npmjs.org/response-time/-/response-time-2.3.2.tgz" - integrity sha1-/6cbq5UtYvfB1Jt0NDVfvGjf/Fo= - dependencies: - depd "~1.1.0" - on-headers "~1.0.1" - -rimraf@^2.6.2: - version "2.7.1" - resolved "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz" - integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== - dependencies: - glob "^7.1.3" - -robust-predicates@^3.0.0: - version "3.0.1" - resolved "https://registry.npmjs.org/robust-predicates/-/robust-predicates-3.0.1.tgz" - integrity sha512-ndEIpszUHiG4HtDsQLeIuMvRsDnn8c8rYStabochtUeCvfuvNptb5TUbVD68LRAILPX7p9nqQGh4xJgn3EHS/g== - -rw@1: - version "1.3.3" - resolved "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz" - integrity sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q= - -safe-buffer@5.1.2: - version "5.1.2" - resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz" - integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== - -safe-buffer@5.2.1, safe-buffer@~5.2.0: - version "5.2.1" - resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz" - integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== - -safe-buffer@~5.1.0, safe-buffer@~5.1.1: - version "5.1.1" - resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz" - integrity sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg== - -safe-stable-stringify@^2.3.1: - version "2.3.1" - resolved "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.3.1.tgz" - integrity sha512-kYBSfT+troD9cDA85VDnHZ1rpHC50O0g1e6WlGHVCz/g+JS+9WKLj+XwFYyR8UbrZN8ll9HUpDAAddY58MGisg== - -"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0": - version "2.1.2" - resolved "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz" - integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== - -sax@~1.3.0: - version "1.3.0" - resolved "https://registry.npmjs.org/sax/-/sax-1.3.0.tgz" - integrity sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA== - -seek-bzip@^1.0.5: - version "1.0.5" - resolved "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.5.tgz" - integrity sha1-z+kXyz0nS8/6x5J1ivUxc+sfq9w= - dependencies: - commander "~2.8.1" - -semver@^6.0.0, semver@^6.3.0: - version "6.3.0" - resolved "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz" - integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== - -send@0.17.1: - version "0.17.1" - resolved "https://registry.npmjs.org/send/-/send-0.17.1.tgz" - integrity sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg== - dependencies: - debug "2.6.9" - depd "~1.1.2" - destroy "~1.0.4" - encodeurl "~1.0.2" - escape-html "~1.0.3" - etag "~1.8.1" - fresh "0.5.2" - http-errors "~1.7.2" - mime "1.6.0" - ms "2.1.1" - on-finished "~2.3.0" - range-parser "~1.2.1" - statuses "~1.5.0" - -send@0.18.0: - version "0.18.0" - resolved "https://registry.npmjs.org/send/-/send-0.18.0.tgz" - integrity sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg== - dependencies: - debug "2.6.9" - depd "2.0.0" - destroy "1.2.0" - encodeurl "~1.0.2" - escape-html "~1.0.3" - etag "~1.8.1" - fresh "0.5.2" - http-errors "2.0.0" - mime "1.6.0" - ms "2.1.3" - on-finished "2.4.1" - range-parser "~1.2.1" - statuses "2.0.1" - -serve-static@1.14.1: - version "1.14.1" - resolved "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz" - integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg== - dependencies: - encodeurl "~1.0.2" - escape-html "~1.0.3" - parseurl "~1.3.3" - send "0.17.1" - -serve-static@1.15.0: - version "1.15.0" - resolved "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz" - integrity sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g== - dependencies: - encodeurl "~1.0.2" - escape-html "~1.0.3" - parseurl "~1.3.3" - send "0.18.0" - -set-immediate-shim@~1.0.1: - version "1.0.1" - resolved "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz" - integrity sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E= - -setprototypeof@1.1.1: - version "1.1.1" - resolved "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz" - integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw== - -setprototypeof@1.2.0: - version "1.2.0" - resolved "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz" - integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw== - -shebang-command@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz" - integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA== - dependencies: - shebang-regex "^3.0.0" - -shebang-regex@^3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz" - integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== - -shell-quote@~1.7.2: - version "1.7.3" - resolved "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.3.tgz" - integrity sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw== - -side-channel@^1.0.4: - version "1.0.4" - resolved "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz" - integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw== - dependencies: - call-bind "^1.0.0" - get-intrinsic "^1.0.2" - object-inspect "^1.9.0" - -signal-exit@^4.0.1: - version "4.1.0" - resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz" - integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw== - -simple-swizzle@^0.2.2: - version "0.2.2" - resolved "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz" - integrity sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo= - dependencies: - is-arrayish "^0.3.1" - -sockjs-client@1.6.1: - version "1.6.1" - resolved "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.6.1.tgz" - integrity sha512-2g0tjOR+fRs0amxENLi/q5TiJTqY+WXFOzb5UwXndlK6TO3U/mirZznpx6w34HVMoc3g7cY24yC/ZMIYnDlfkw== - dependencies: - debug "^3.2.7" - eventsource "^2.0.2" - faye-websocket "^0.11.4" - inherits "^2.0.4" - url-parse "^1.5.10" - -source-map-support@^0.5.17: - version "0.5.19" - resolved "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz" - integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw== - dependencies: - buffer-from "^1.0.0" - source-map "^0.6.0" - -source-map@^0.5.0: - version "0.5.7" - resolved "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz" - integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= - -source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1: - version "0.6.1" - resolved "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz" - integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== - -source-map@^0.7.3: - version "0.7.3" - resolved "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz" - integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ== - -sprintf-js@^1.1.1: - version "1.1.2" - resolved "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz" - integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug== - -sprintf-js@~1.0.2: - version "1.0.3" - resolved "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz" - integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= - -stack-trace@0.0.x: - version "0.0.10" - resolved "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz" - integrity sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA= - -statuses@2.0.1: - version "2.0.1" - resolved "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz" - integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ== - -"statuses@>= 1.5.0 < 2", statuses@~1.5.0: - version "1.5.0" - resolved "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz" - integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= - -stomp-websocket@2.3.4-next: - version "2.3.4-next" - resolved "https://registry.npmjs.org/stomp-websocket/-/stomp-websocket-2.3.4-next.tgz" - integrity sha1-JTtuUEalXmyOCapgZjynYnUxyxs= - optionalDependencies: - websocket latest - -"string-width-cjs@npm:string-width@^4.2.0": - version "4.2.3" - resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" - -string-width@^4.1.0: - version "4.2.3" - resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" - -string-width@^5.0.1, string-width@^5.1.2: - version "5.1.2" - resolved "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz" - integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA== - dependencies: - eastasianwidth "^0.2.0" - emoji-regex "^9.2.2" - strip-ansi "^7.0.1" - -string_decoder@^1.1.1: - version "1.3.0" - resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz" - integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== - dependencies: - safe-buffer "~5.2.0" - -string_decoder@~0.10.x: - version "0.10.31" - resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" - integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ= - -string_decoder@~1.0.3: - version "1.0.3" - resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz" - integrity sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ== - dependencies: - safe-buffer "~5.1.0" - -string_decoder@~1.1.1: - version "1.1.1" - resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz" - integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== - dependencies: - safe-buffer "~5.1.0" - -"strip-ansi-cjs@npm:strip-ansi@^6.0.1": - version "6.0.1" - resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== - dependencies: - ansi-regex "^5.0.1" - -strip-ansi@^3.0.0: - version "3.0.1" - resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz" - integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= - dependencies: - ansi-regex "^2.0.0" - -strip-ansi@^5.0.0: - version "5.2.0" - resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz" - integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA== - dependencies: - ansi-regex "^4.1.0" - -strip-ansi@^6.0.0, strip-ansi@^6.0.1: - version "6.0.1" - resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== - dependencies: - ansi-regex "^5.0.1" - -strip-ansi@^7.0.1: - version "7.1.0" - resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz" - integrity sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ== - dependencies: - ansi-regex "^6.0.1" - -strip-bom@^4.0.0: - version "4.0.0" - resolved "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz" - integrity sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w== - -strip-dirs@^2.0.0: - version "2.1.0" - resolved "https://registry.npmjs.org/strip-dirs/-/strip-dirs-2.1.0.tgz" - integrity sha512-JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g== - dependencies: - is-natural-number "^4.0.1" - -strip-json-comments@1.0.x: - version "1.0.4" - resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz" - integrity sha1-HhX7ysl9Pumb8tc7TGVrCCu6+5E= - -stylus@0.63.0: - version "0.63.0" - resolved "https://registry.npmjs.org/stylus/-/stylus-0.63.0.tgz" - integrity sha512-OMlgrTCPzE/ibtRMoeLVhOY0RcNuNWh0rhAVqeKnk/QwcuUKQbnqhZ1kg2vzD8VU/6h3FoPTq4RJPHgLBvX6Bw== - dependencies: - "@adobe/css-tools" "~4.3.3" - debug "^4.3.2" - glob "^7.1.6" - sax "~1.3.0" - source-map "^0.7.3" - -supports-color@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz" - integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= - -supports-color@^5.3.0: - version "5.5.0" - resolved "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz" - integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== - dependencies: - has-flag "^3.0.0" - -supports-color@^7.1.0: - version "7.2.0" - resolved "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz" - integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== - dependencies: - has-flag "^4.0.0" - -supports-preserve-symlinks-flag@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz" - integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== - -tar-stream@^1.5.2: - version "1.5.5" - resolved "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.5.tgz" - integrity sha512-mQdgLPc/Vjfr3VWqWbfxW8yQNiJCbAZ+Gf6GDu1Cy0bdb33ofyiNGBtAY96jHFhDuivCwgW1H9DgTON+INiXgg== - dependencies: - bl "^1.0.0" - end-of-stream "^1.0.0" - readable-stream "^2.0.0" - xtend "^4.0.0" - -tdigest@^0.1.1: - version "0.1.1" - resolved "https://registry.npmjs.org/tdigest/-/tdigest-0.1.1.tgz" - integrity sha1-Ljyyw56kSeVdHmzZEReszKRYgCE= - dependencies: - bintrees "1.0.1" - -text-hex@1.0.x: - version "1.0.0" - resolved "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz" - integrity sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg== - -through@^2.3.6: - version "2.3.8" - resolved "https://registry.npmjs.org/through/-/through-2.3.8.tgz" - integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= - -to-fast-properties@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz" - integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4= - -to-regex-range@^5.0.1: - version "5.0.1" - resolved "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz" - integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== - dependencies: - is-number "^7.0.0" - -toidentifier@1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz" - integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== - -toidentifier@1.0.1: - version "1.0.1" - resolved "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz" - integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA== - -token-stream@1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/token-stream/-/token-stream-1.0.0.tgz" - integrity sha1-zCAOqyYT9BZtJ/+a/HylbUnfbrQ= - -triple-beam@^1.3.0: - version "1.3.0" - resolved "https://registry.npmjs.org/triple-beam/-/triple-beam-1.3.0.tgz" - integrity sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw== - -ts-node@~10.0.0: - version "10.0.0" - resolved "https://registry.npmjs.org/ts-node/-/ts-node-10.0.0.tgz" - integrity sha512-ROWeOIUvfFbPZkoDis0L/55Fk+6gFQNZwwKPLinacRl6tsxstTF1DbAcLKkovwnpKMVvOMHP1TIbnwXwtLg1gg== - dependencies: - "@tsconfig/node10" "^1.0.7" - "@tsconfig/node12" "^1.0.7" - "@tsconfig/node14" "^1.0.0" - "@tsconfig/node16" "^1.0.1" - arg "^4.1.0" - create-require "^1.1.0" - diff "^4.0.1" - make-error "^1.1.1" - source-map-support "^0.5.17" - yn "3.1.1" - -tslib@~2.3.0: - version "2.3.1" - resolved "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz" - integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw== - -tv4@1.3.0: - version "1.3.0" - resolved "https://registry.npmjs.org/tv4/-/tv4-1.3.0.tgz" - integrity sha1-0CDIRvrdUMhVq7JeuuzGj8EPeWM= - -type-detect@^4.0.0: - version "4.0.7" - resolved "https://registry.npmjs.org/type-detect/-/type-detect-4.0.7.tgz" - integrity sha512-4Rh17pAMVdMWzktddFhISRnUnFIStObtUMNGzDwlA6w/77bmGv3aBbRdCmQR6IjzfkTo9otnW+2K/cDRhKSxDA== - -type-detect@^4.0.5: - version "4.0.8" - resolved "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz" - integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g== - -type-is@~1.6.17, type-is@~1.6.18: - version "1.6.18" - resolved "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz" - integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g== - dependencies: - media-typer "0.3.0" - mime-types "~2.1.24" - -type@^2.7.2: - version "2.7.3" - resolved "https://registry.yarnpkg.com/type/-/type-2.7.3.tgz#436981652129285cc3ba94f392886c2637ea0486" - integrity sha512-8j+1QmAbPvLZow5Qpi6NCaN8FB60p/6x8/vfNqOk/hC+HuvFZhL4+WfekuhQLiqFZXOgQdrs3B+XxEmCc6b3FQ== - -typedarray-to-buffer@^3.1.5: - version "3.1.5" - resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080" - integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q== - dependencies: - is-typedarray "^1.0.0" - -uglify-js@^3.1.4: - version "3.19.1" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.19.1.tgz#2d5df6a0872c43da43187968308d7741d44b8056" - integrity sha512-y/2wiW+ceTYR2TSSptAhfnEtpLaQ4Ups5zrjB2d3kuVxHj16j/QJwPl5PvuGy9uARb39J0+iKxcRPvtpsx4A4A== - -uglify-js@^3.16.1: - version "3.17.4" - resolved "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.4.tgz" - integrity sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g== - -unbzip2-stream@^1.0.9: - version "1.2.5" - resolved "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.2.5.tgz" - integrity sha512-izD3jxT8xkzwtXRUZjtmRwKnZoeECrfZ8ra/ketwOcusbZEp4mjULMnJOCfTDZBgGQAAY1AJ/IgxcwkavcX9Og== - dependencies: - buffer "^3.0.1" - through "^2.3.6" - -unc-path-regex@^0.1.2: - version "0.1.2" - resolved "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz" - integrity sha1-5z3T17DXxe2G+6xrCufYxqadUPo= - -underscore.string@~3.3.5: - version "3.3.6" - resolved "https://registry.npmjs.org/underscore.string/-/underscore.string-3.3.6.tgz" - integrity sha512-VoC83HWXmCrF6rgkyxS9GHv8W9Q5nhMKho+OadDJGzL2oDYbYEppBaCMH6pFlwLeqj2QS+hhkw2kpXkSdD1JxQ== - dependencies: - sprintf-js "^1.1.1" - util-deprecate "^1.0.2" - -unidragger@^2.4.0: - version "2.4.0" - resolved "https://registry.npmjs.org/unidragger/-/unidragger-2.4.0.tgz" - integrity sha512-MueZK2oXuGE6OAlGKIrSXK2zCq+8yb1QUZgqyTDCSJzvwYL0g2Llrad+TtoQTYxtFnNyxxSw0IMnKNIgEMia1w== - dependencies: - unipointer "^2.4.0" - -unipointer@^2.4.0: - version "2.4.0" - resolved "https://registry.npmjs.org/unipointer/-/unipointer-2.4.0.tgz" - integrity sha512-VjzDLPjGK7aYpQKH7bnDZS8X4axF5AFU/LQi+NQe1oyEHfaz6lWKhaQ7n4o7vJ1iJ4i2T0quCIfrQM139p05Sw== - dependencies: - ev-emitter "^1.0.1" - -unpipe@1.0.0, unpipe@~1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz" - integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw= - -uri-path@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/uri-path/-/uri-path-1.0.0.tgz" - integrity sha1-l0fwGDWJM8Md4PzP2C0TjmcmLjI= - -url-parse@^1.5.10: - version "1.5.10" - resolved "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz" - integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ== - dependencies: - querystringify "^2.1.1" - requires-port "^1.0.0" - -utf-8-validate@^5.0.2: - version "5.0.10" - resolved "https://registry.yarnpkg.com/utf-8-validate/-/utf-8-validate-5.0.10.tgz#d7d10ea39318171ca982718b6b96a8d2442571a2" - integrity sha512-Z6czzLq4u8fPOyx7TU6X3dvUZVvoJmxSQ+IcrlmagKhilxlhZgxPK6C5Jqbkw1IDUmFTM+cz9QDnnLTwDz/2gQ== - dependencies: - node-gyp-build "^4.3.0" - -util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1: - version "1.0.2" - resolved "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz" - integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= - -utils-merge@1.0.1: - version "1.0.1" - resolved "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz" - integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= - -uuid@8.3.2: - version "8.3.2" - resolved "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz" - integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== - -v8flags@~3.2.0: - version "3.2.0" - resolved "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz" - integrity sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg== - dependencies: - homedir-polyfill "^1.0.1" - -vary@~1.1.2: - version "1.1.2" - resolved "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz" - integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= - -void-elements@^3.1.0: - version "3.1.0" - resolved "https://registry.npmjs.org/void-elements/-/void-elements-3.1.0.tgz" - integrity sha1-YU9/v42AHwu18GYfWy9XhXUOTwk= - -websocket-driver@>=0.5.1: - version "0.7.0" - resolved "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.0.tgz" - integrity sha1-DK+dLXVdk67gSdS90NP+LMoqJOs= - dependencies: - http-parser-js ">=0.4.0" - websocket-extensions ">=0.1.1" - -websocket-extensions@>=0.1.1: - version "0.1.3" - resolved "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz" - integrity sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg== - -websocket@latest: - version "1.0.35" - resolved "https://registry.yarnpkg.com/websocket/-/websocket-1.0.35.tgz#374197207d7d4cc4c36cbf8a1bb886ee52a07885" - integrity sha512-/REy6amwPZl44DDzvRCkaI1q1bIiQB0mEFQLUrhz3z2EK91cp3n72rAjUlrTP0zV22HJIUOVHQGPxhFRjxjt+Q== - dependencies: - bufferutil "^4.0.1" - debug "^2.2.0" - es5-ext "^0.10.63" - typedarray-to-buffer "^3.1.5" - utf-8-validate "^5.0.2" - yaeti "^0.0.6" - -which@^1.2.14: - version "1.3.1" - resolved "https://registry.npmjs.org/which/-/which-1.3.1.tgz" - integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== - dependencies: - isexe "^2.0.0" - -which@^2.0.1, which@~2.0.2: - version "2.0.2" - resolved "https://registry.npmjs.org/which/-/which-2.0.2.tgz" - integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== - dependencies: - isexe "^2.0.0" - -wicket@1.3.8: - version "1.3.8" - resolved "https://registry.npmjs.org/wicket/-/wicket-1.3.8.tgz" - integrity sha512-+UZsrBvp8OI+8PhStpXQw0oJedaCLncZwu7lPdcZ9BpUsyu25rztzHG+IwXGK372nuDGp+Wy4FreM/rzdWYJAg== - -winston-transport@^4.7.0: - version "4.7.0" - resolved "https://registry.npmjs.org/winston-transport/-/winston-transport-4.7.0.tgz" - integrity sha512-ajBj65K5I7denzer2IYW6+2bNIVqLGDHqDw3Ow8Ohh+vdW+rv4MZ6eiDvHoKhfJFZ2auyN8byXieDDJ96ViONg== - dependencies: - logform "^2.3.2" - readable-stream "^3.6.0" - triple-beam "^1.3.0" - -winston@3.13.0: - version "3.13.0" - resolved "https://registry.npmjs.org/winston/-/winston-3.13.0.tgz" - integrity sha512-rwidmA1w3SE4j0E5MuIufFhyJPBDG7Nu71RkZor1p2+qHvJSZ9GYDA81AyleQcZbh/+V6HjeBdfnTZJm9rSeQQ== - dependencies: - "@colors/colors" "^1.6.0" - "@dabh/diagnostics" "^2.0.2" - async "^3.2.3" - is-stream "^2.0.0" - logform "^2.4.0" - one-time "^1.0.0" - readable-stream "^3.4.0" - safe-stable-stringify "^2.3.1" - stack-trace "0.0.x" - triple-beam "^1.3.0" - winston-transport "^4.7.0" - -with@^7.0.0: - version "7.0.2" - resolved "https://registry.npmjs.org/with/-/with-7.0.2.tgz" - integrity sha512-RNGKj82nUPg3g5ygxkQl0R937xLyho1J24ItRCBTr/m1YnZkzJy1hUiHUJrc/VlsDQzsCnInEGSg3bci0Lmd4w== - dependencies: - "@babel/parser" "^7.9.6" - "@babel/types" "^7.9.6" - assert-never "^1.2.1" - babel-walk "3.0.0-canary-5" - -wkt-parser@^1.3.3: - version "1.3.3" - resolved "https://registry.npmjs.org/wkt-parser/-/wkt-parser-1.3.3.tgz" - integrity sha512-ZnV3yH8/k58ZPACOXeiHaMuXIiaTk1t0hSUVisbO0t4RjA5wPpUytcxeyiN2h+LZRrmuHIh/1UlrR9e7DHDvTw== - -wordwrap@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz" - integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus= - -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": - version "7.0.0" - resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - -wrap-ansi@^8.1.0: - version "8.1.0" - resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz" - integrity sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ== - dependencies: - ansi-styles "^6.1.0" - string-width "^5.0.1" - strip-ansi "^7.0.1" - -wrappy@1: - version "1.0.2" - resolved "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz" - integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= - -ws@~7.5.2: - version "7.5.7" - resolved "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz" - integrity sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A== - -xtend@^4.0.0: - version "4.0.1" - resolved "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz" - integrity sha1-pcbVMr5lbiPbgg77lDofBJmNY68= - -yaeti@^0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/yaeti/-/yaeti-0.0.6.tgz#f26f484d72684cf42bedfb76970aa1608fbf9577" - integrity sha512-MvQa//+KcZCUkBTIC9blM+CU9J2GzuTytsOUwf2lidtvkx/6gnEp1QvJv34t9vdjhFmha/mUiNDbN0D0mJWdug== - -yauzl@^2.4.2: - version "2.9.1" - resolved "https://registry.npmjs.org/yauzl/-/yauzl-2.9.1.tgz" - integrity sha1-qBmB6nCleUYTOIPwKcWCGok1mn8= - dependencies: - buffer-crc32 "~0.2.3" - fd-slicer "~1.0.1" - -yn@3.1.1: - version "3.1.1" - resolved "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz" - integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q== -- GitLab From c65176b22d618ca98d280ef84df92cd017bf53b5 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Fri, 2 Aug 2024 13:31:58 +0100 Subject: [PATCH 061/249] Agrega recursos de server-app a package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit En nuevas versiones de npm el empaquetado parece no incluir por defecto lo que se referencia desde la propiedad main, por lo que se añaden los recursos de la parte servidora explícitamente. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e2b41424..cca3582e 100644 --- a/package.json +++ b/package.json @@ -84,7 +84,7 @@ "tv4": "1.3.0", "wicket": "1.3.8" }, - "files": ["dist"], + "files": ["server-app", "dist"], "engines": { "node": ">=20.16", "npm": ">=10.8" -- GitLab From f90ca6caf543e2bf4c70e1fe25642505067d36bf Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Fri, 2 Aug 2024 14:19:14 +0100 Subject: [PATCH 062/249] =?UTF-8?q?Migra=20invocaci=C3=B3n=20de=20yarn=20o?= =?UTF-8?q?lvidada=20a=20npm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- grunt/config/buildModules.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/grunt/config/buildModules.js b/grunt/config/buildModules.js index 51d150d3..aa9b59ca 100644 --- a/grunt/config/buildModules.js +++ b/grunt/config/buildModules.js @@ -1,17 +1,16 @@ module.exports = function(grunt) { - var preBuildCmds = ['yarn install']; + var preBuildCmds = ['npm install']; grunt.config('redmicConfig.buildModules', { - 'client-app/dep/pruneCluster': [ - 'npm install', + 'client-app/dep/pruneCluster': preBuildCmds.concat([ 'grunt build:dist --force' - ], + ]), 'client-app/dep/wicket': [ 'npm run build' ], 'client-app/dep/templates': preBuildCmds.concat([ - 'grunt' + 'grunt build' ]), 'client-app/style': preBuildCmds.concat([ 'grunt addModules buildModules' -- GitLab From 20a35abfdf6fe27961985cea830f6ce5c898673d Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Mon, 5 Aug 2024 10:10:25 +0100 Subject: [PATCH 063/249] Omite uso de body-parser y actualiza imagen base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit La dependencia body-parser ya viene incluida con express, no hace falta requerirla por separado como antes. Actualiza base de imagen Docker para cumplir con los nuevos requisitos mínimos. --- build/.env | 2 +- build/Dockerfile | 6 +++--- server-app/src/exposure.js | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/build/.env b/build/.env index 43830917..00a41dac 100644 --- a/build/.env +++ b/build/.env @@ -1 +1 @@ -NODE_IMAGE_TAG=18.12.1-alpine3.16 +NODE_IMAGE_TAG=20.16.0-alpine3.20 diff --git a/build/Dockerfile b/build/Dockerfile index 13ee50a2..73483bbb 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,4 +1,4 @@ -ARG NODE_IMAGE_TAG +ARG NODE_IMAGE_TAG=lts-alpine FROM node:${NODE_IMAGE_TAG} @@ -8,11 +8,11 @@ ENV NODE_ENV="production" EXPOSE 3050 +CMD ["server-app", "-b"] + HEALTHCHECK --interval=30s --timeout=15s --start-period=1m --retries=3 \ CMD wget --spider -q http://localhost:3050 || exit 1 -CMD ["server-app", "-b"] - ADD redmic-project-web-*.tgz / WORKDIR /package diff --git a/server-app/src/exposure.js b/server-app/src/exposure.js index 27af5d98..db266f68 100644 --- a/server-app/src/exposure.js +++ b/server-app/src/exposure.js @@ -1,5 +1,4 @@ const express = require('express'), - bodyParser = require('body-parser'), path = require('path'), production = !!parseInt(process.env.PRODUCTION, 10), @@ -123,7 +122,7 @@ function exposeContents(app, directoryName) { function expose(app) { - app.use(bodyParser.urlencoded({ extended: false })); + app.use(express.urlencoded({ extended: false })); if (params.useBuilt) { exposeContents(app, 'dist'); -- GitLab From bd2353fd8c7bdd24661ab11b8e1873e43b34f537 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Mon, 5 Aug 2024 13:54:41 +0100 Subject: [PATCH 064/249] =?UTF-8?q?Mueve=20contenidos=20de=20vista=20home?= =?UTF-8?q?=20a=20nueva=20ubicaci=C3=B3n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Mantiene un fichero placeholder para poder seguir cargando la vista desde su ubicación antigua, ya que este valor viene asignado desde la base de datos. Se replica todo su contenido real en su nueva ubicación, adaptando las rutas de importación necesarias. --- client-app/src/home/HomeView.js | 264 ++++++++++++++++++ .../home/views => home/item}/ProductWidget.js | 0 .../views => home/item}/SearchBarWidget.js | 0 .../item}/SearchFastFilterWidget.js | 0 .../views => home/item}/SearchFilterWidget.js | 0 .../item}/SearchResultsWidget.js | 0 .../home/views => home/item}/SocialWidget.js | 4 +- .../home/views => home/item}/StatsWidget.js | 0 .../views => home/item}/_DashboardItem.js | 0 client-app/src/oldapp/home/views/HomeView.js | 263 +---------------- 10 files changed, 269 insertions(+), 262 deletions(-) create mode 100644 client-app/src/home/HomeView.js rename client-app/src/{oldapp/home/views => home/item}/ProductWidget.js (100%) rename client-app/src/{oldapp/home/views => home/item}/SearchBarWidget.js (100%) rename client-app/src/{oldapp/home/views => home/item}/SearchFastFilterWidget.js (100%) rename client-app/src/{oldapp/home/views => home/item}/SearchFilterWidget.js (100%) rename client-app/src/{oldapp/home/views => home/item}/SearchResultsWidget.js (100%) rename client-app/src/{oldapp/home/views => home/item}/SocialWidget.js (95%) rename client-app/src/{oldapp/home/views => home/item}/StatsWidget.js (100%) rename client-app/src/{oldapp/home/views => home/item}/_DashboardItem.js (100%) diff --git a/client-app/src/home/HomeView.js b/client-app/src/home/HomeView.js new file mode 100644 index 00000000..dfc03d6a --- /dev/null +++ b/client-app/src/home/HomeView.js @@ -0,0 +1,264 @@ +define([ + 'app/designs/details/Controller' + , 'app/designs/details/Layout' + , 'src/home/item/ProductWidget' + , 'src/home/item/SearchBarWidget' + , 'src/home/item/SearchFastFilterWidget' + , 'src/home/item/SearchFilterWidget' + , 'src/home/item/SearchResultsWidget' + , 'src/home/item/SocialWidget' + , 'src/home/item/StatsWidget' + , 'src/redmicConfig' + , 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'src/util/Credentials' + , 'src/component/base/_Filter' + , 'src/component/layout/templateDisplayer/TemplateDisplayer' + , 'templates/InitialInfo' +], function( + Controller + , Layout + , ProductWidget + , SearchBarWidget + , SearchFastFilterWidget + , SearchFilterWidget + , SearchResultsWidget + , SocialWidget + , StatsWidget + , redmicConfig + , declare + , lang + , Credentials + , _Filter + , TemplateDisplayer + , TemplateInfo +) { + + return declare([Layout, Controller, _Filter], { + // summary: + // Vista inicial de la aplicación. + + constructor: function(args) { + + this.config = { + target: redmicConfig.services.activity, + propsWidget: { + }, + filterConfig: { + initQuery: { + returnFields: redmicConfig.returnFields.activity, + sorts: [{ + field: 'starred', + order: 'DESC' + }] + } + } + }; + + this.widgetConfigs = { + searchBar: { + width: 6, + height: 1, + type: SearchBarWidget, + props: { + omitTitleBar: true, + resizable: false + } + }, + searchFilter: { + width: 6, + height: 3, + type: SearchFilterWidget, + hidden: true, + props: { + omitTitleBar: true + } + }, + searchFastFilter: { + width: 2, + height: 4, + type: SearchFastFilterWidget, + props: { + windowTitle: 'fastFilters', + omitTitleCloseButton: true, + facetsSearchConfig: { + query: { + size: 10, + sorts: [{ + field: 'id', + order: 'DESC' + }] + } + } + } + }, + searchResults: { + width: 4, + height: 4, + type: SearchResultsWidget, + props: { + queryChannel: 'stub', + windowTitle: 'starredActivities', + omitTitleCloseButton: true + } + }, + info: { + width: 3, + height: 2, + type: TemplateDisplayer, + props: { + windowTitle: 'info', + template: TemplateInfo, + 'class': 'mediumSolidContainer.borderRadiusBottom', + target: 'initial_info' + } + }, + products: { + width: 3, + height: 6, + type: ProductWidget, + props: { + windowTitle: 'products' + } + }, + stats: { + width: 3, + height: 3, + type: StatsWidget, + props: { + windowTitle: 'statistics' + } + }, + social: { + width: 3, + height: 1, + type: SocialWidget, + props: { + windowTitle: 'followUs' + } + } + }; + + lang.mixin(this, this.config, args); + }, + + _putMetaTags: function() { + // TODO esto es necesario porque se trata de una vista detalle, que define el método original, + // pero no interesa en este caso. Pisando nuevamente el método, se comporta como define _View. + // Revisar el proceso de rellenar metatags + + this._putDefaultMetaTags(); + }, + + _afterShow: function(request) { + + if (this._getPreviouslyShown()) { + return; + } + + this._listenAfterFirstShow(); + this._publishAfterFirstShow(); + }, + + _listenAfterFirstShow: function() { + + var addedToQueryChannel = this.getChannel('ADDED_TO_QUERY'); + this._once(addedToQueryChannel, lang.hitch(this, function() { + + this._once(addedToQueryChannel, lang.hitch(this, function() { + + this._publish(this._getWidgetInstance('searchResults').getChannel('SET_PROPS'), { + windowTitle: 'searchResults' + }); + })); + })); + + this._listenWidgets(); + }, + + _listenWidgets: function() { + + this._setSubscriptions([{ + channel: this._getWidgetInstance('searchBar').getChannel('SEARCH_BY_TEXT'), + callback: lang.hitch(this, this._onSearchByText) + },{ + channel: this._getWidgetInstance('searchBar').getChannel('TOGGLE_ADVANCED_SEARCH'), + callback: lang.hitch(this, this._toggleAdvancedSearch) + },{ + channel: this._getWidgetInstance('searchFilter').getChannel('CANCELLED'), + callback: lang.hitch(this, this._toggleAdvancedSearch) + },{ + channel: this._getWidgetInstance('stats').getChannel('TOTAL_ACTIVITIES'), + callback: lang.hitch(this, this._subStatsTotalActivities) + }]); + }, + + _publishAfterFirstShow: function() { + + var obj = { + queryChannel: this.queryChannel + }; + + this._publish(this._getWidgetInstance('searchFastFilter').getChannel('SET_PROPS'), obj); + this._publish(this._getWidgetInstance('searchFilter').getChannel('SET_PROPS'), obj); + this._publish(this._getWidgetInstance('searchResults').getChannel('SET_PROPS'), obj); + }, + + _onSearchByText: function(searchDefinition) { + + this._emitEvt('ADD_TO_QUERY', { + query: { + text: { + text: searchDefinition.searchText || null + }, + sorts: null + } + }); + }, + + _toggleAdvancedSearch: function() { + + if (!this._advancedSearchShown) { + this._advancedSearchShown = true; + this._showWidget('searchFilter'); + } else { + this._advancedSearchShown = false; + this._hideWidget('searchFilter'); + } + }, + + _subStatsTotalActivities: function(res) { + + this._publish(this._getWidgetInstance('searchBar').getChannel('SET_PROPS'), { + totalActivities: res.value + }); + }, + + _clearModules: function() { + + this._publish(this._getWidgetInstance('info').getChannel('CLEAR')); + }, + + _refreshModules: function() { + + var obj = { + info: '' + }; + + if (Credentials.get('userRole') === 'ROLE_GUEST') { + obj.roleGuest = this.i18n.contentInfo1 + ' '; + obj.roleGuest += this.i18n.visitor; + obj.roleGuest += this.i18n.contentInfo2; + obj.register = this.i18n.register.toLowerCase(); + obj.info += this.i18n.contentInfo3; + } + + obj.info += this.i18n.contentSend; + + this._emitEvt('INJECT_ITEM', { + data: obj, + target: 'initial_info' + }); + } + }); +}); diff --git a/client-app/src/oldapp/home/views/ProductWidget.js b/client-app/src/home/item/ProductWidget.js similarity index 100% rename from client-app/src/oldapp/home/views/ProductWidget.js rename to client-app/src/home/item/ProductWidget.js diff --git a/client-app/src/oldapp/home/views/SearchBarWidget.js b/client-app/src/home/item/SearchBarWidget.js similarity index 100% rename from client-app/src/oldapp/home/views/SearchBarWidget.js rename to client-app/src/home/item/SearchBarWidget.js diff --git a/client-app/src/oldapp/home/views/SearchFastFilterWidget.js b/client-app/src/home/item/SearchFastFilterWidget.js similarity index 100% rename from client-app/src/oldapp/home/views/SearchFastFilterWidget.js rename to client-app/src/home/item/SearchFastFilterWidget.js diff --git a/client-app/src/oldapp/home/views/SearchFilterWidget.js b/client-app/src/home/item/SearchFilterWidget.js similarity index 100% rename from client-app/src/oldapp/home/views/SearchFilterWidget.js rename to client-app/src/home/item/SearchFilterWidget.js diff --git a/client-app/src/oldapp/home/views/SearchResultsWidget.js b/client-app/src/home/item/SearchResultsWidget.js similarity index 100% rename from client-app/src/oldapp/home/views/SearchResultsWidget.js rename to client-app/src/home/item/SearchResultsWidget.js diff --git a/client-app/src/oldapp/home/views/SocialWidget.js b/client-app/src/home/item/SocialWidget.js similarity index 95% rename from client-app/src/oldapp/home/views/SocialWidget.js rename to client-app/src/home/item/SocialWidget.js index 444580d4..6eac806a 100644 --- a/client-app/src/oldapp/home/views/SocialWidget.js +++ b/client-app/src/home/item/SocialWidget.js @@ -1,12 +1,10 @@ define([ - 'app/home/views/_DashboardItem' - , 'app/base/views/Module' + 'src/home/item/_DashboardItem' , 'dojo/_base/declare' , 'dojo/_base/lang' , 'put-selector/put' ], function( _DashboardItem - , Module , declare , lang , put diff --git a/client-app/src/oldapp/home/views/StatsWidget.js b/client-app/src/home/item/StatsWidget.js similarity index 100% rename from client-app/src/oldapp/home/views/StatsWidget.js rename to client-app/src/home/item/StatsWidget.js diff --git a/client-app/src/oldapp/home/views/_DashboardItem.js b/client-app/src/home/item/_DashboardItem.js similarity index 100% rename from client-app/src/oldapp/home/views/_DashboardItem.js rename to client-app/src/home/item/_DashboardItem.js diff --git a/client-app/src/oldapp/home/views/HomeView.js b/client-app/src/oldapp/home/views/HomeView.js index 8482b838..71e58bb9 100644 --- a/client-app/src/oldapp/home/views/HomeView.js +++ b/client-app/src/oldapp/home/views/HomeView.js @@ -1,264 +1,9 @@ define([ - 'app/designs/details/Controller' - , 'app/designs/details/Layout' - , 'app/home/views/ProductWidget' - , 'app/home/views/SearchBarWidget' - , 'app/home/views/SearchFastFilterWidget' - , 'app/home/views/SearchFilterWidget' - , 'app/home/views/SearchResultsWidget' - , 'app/home/views/SocialWidget' - , 'app/home/views/StatsWidget' - , 'src/redmicConfig' - , 'dojo/_base/declare' - , 'dojo/_base/lang' - , 'src/util/Credentials' - , 'src/component/base/_Filter' - , 'src/component/layout/templateDisplayer/TemplateDisplayer' - , 'templates/InitialInfo' + 'src/home/HomeView' ], function( - Controller - , Layout - , ProductWidget - , SearchBarWidget - , SearchFastFilterWidget - , SearchFilterWidget - , SearchResultsWidget - , SocialWidget - , StatsWidget - , redmicConfig - , declare - , lang - , Credentials - , _Filter - , TemplateDisplayer - , TemplateInfo + HomeView ) { - return declare([Layout, Controller, _Filter], { - // summary: - // Vista inicial de la aplicación. - - constructor: function(args) { - - this.config = { - target: redmicConfig.services.activity, - propsWidget: { - }, - filterConfig: { - initQuery: { - returnFields: redmicConfig.returnFields.activity, - sorts: [{ - field: 'starred', - order: 'DESC' - }] - } - } - }; - - this.widgetConfigs = { - searchBar: { - width: 6, - height: 1, - type: SearchBarWidget, - props: { - omitTitleBar: true, - resizable: false - } - }, - searchFilter: { - width: 6, - height: 3, - type: SearchFilterWidget, - hidden: true, - props: { - omitTitleBar: true - } - }, - searchFastFilter: { - width: 2, - height: 4, - type: SearchFastFilterWidget, - props: { - windowTitle: 'fastFilters', - omitTitleCloseButton: true, - facetsSearchConfig: { - query: { - size: 10, - sorts: [{ - field: 'id', - order: 'DESC' - }] - } - } - } - }, - searchResults: { - width: 4, - height: 4, - type: SearchResultsWidget, - props: { - queryChannel: 'stub', - windowTitle: 'starredActivities', - omitTitleCloseButton: true - } - }, - info: { - width: 3, - height: 2, - type: TemplateDisplayer, - props: { - windowTitle: 'info', - template: TemplateInfo, - 'class': 'mediumSolidContainer.borderRadiusBottom', - target: 'initial_info' - } - }, - products: { - width: 3, - height: 6, - type: ProductWidget, - props: { - windowTitle: 'products' - } - }, - stats: { - width: 3, - height: 3, - type: StatsWidget, - props: { - windowTitle: 'statistics' - } - }, - social: { - width: 3, - height: 1, - type: SocialWidget, - props: { - windowTitle: 'followUs' - } - } - }; - - lang.mixin(this, this.config, args); - }, - - _putMetaTags: function() { - // TODO esto es necesario porque se trata de una vista detalle, que define el método original, - // pero no interesa en este caso. Pisando nuevamente el método, se comporta como define _View. - // Revisar el proceso de rellenar metatags - - this._putDefaultMetaTags(); - }, - - _afterShow: function(request) { - - if (this._getPreviouslyShown()) { - return; - } - - this._listenAfterFirstShow(); - this._publishAfterFirstShow(); - }, - - _listenAfterFirstShow: function() { - - var addedToQueryChannel = this.getChannel('ADDED_TO_QUERY'); - this._once(addedToQueryChannel, lang.hitch(this, function() { - - this._once(addedToQueryChannel, lang.hitch(this, function() { - - this._publish(this._getWidgetInstance('searchResults').getChannel('SET_PROPS'), { - windowTitle: 'searchResults' - }); - })); - })); - - this._listenWidgets(); - }, - - _listenWidgets: function() { - - this._setSubscriptions([{ - channel: this._getWidgetInstance('searchBar').getChannel('SEARCH_BY_TEXT'), - callback: lang.hitch(this, this._onSearchByText) - },{ - channel: this._getWidgetInstance('searchBar').getChannel('TOGGLE_ADVANCED_SEARCH'), - callback: lang.hitch(this, this._toggleAdvancedSearch) - },{ - channel: this._getWidgetInstance('searchFilter').getChannel('CANCELLED'), - callback: lang.hitch(this, this._toggleAdvancedSearch) - },{ - channel: this._getWidgetInstance('stats').getChannel('TOTAL_ACTIVITIES'), - callback: lang.hitch(this, this._subStatsTotalActivities) - }]); - }, - - _publishAfterFirstShow: function() { - - var obj = { - queryChannel: this.queryChannel - }; - - this._publish(this._getWidgetInstance('searchFastFilter').getChannel('SET_PROPS'), obj); - this._publish(this._getWidgetInstance('searchFilter').getChannel('SET_PROPS'), obj); - this._publish(this._getWidgetInstance('searchResults').getChannel('SET_PROPS'), obj); - }, - - _onSearchByText: function(searchDefinition) { - - this._emitEvt('ADD_TO_QUERY', { - query: { - text: { - text: searchDefinition.searchText || null - }, - sorts: null - } - }); - }, - - _toggleAdvancedSearch: function() { - - if (!this._advancedSearchShown) { - this._advancedSearchShown = true; - this._showWidget('searchFilter'); - } else { - this._advancedSearchShown = false; - this._hideWidget('searchFilter'); - } - }, - - _subStatsTotalActivities: function(res) { - - this._publish(this._getWidgetInstance('searchBar').getChannel('SET_PROPS'), { - totalActivities: res.value - }); - }, - - _clearModules: function() { - - this._publish(this._getWidgetInstance('info').getChannel('CLEAR')); - }, - - _refreshModules: function() { - - var obj = { - info: '' - }; - - if (Credentials.get('userRole') === 'ROLE_GUEST') { - obj.roleGuest = this.i18n.contentInfo1 + ' '; - obj.roleGuest += this.i18n.visitor; - obj.roleGuest += this.i18n.contentInfo2; - obj.register = this.i18n.register.toLowerCase(); - obj.info += this.i18n.contentInfo3; - } - - obj.info += this.i18n.contentSend; - - this._emitEvt('INJECT_ITEM', { - data: obj, - target: 'initial_info' - }); - } - }); + // TODO placeholder hasta que se referencien las vistas a partir de src/ + return HomeView; }); -- GitLab From c57a06fae465d185b67399b813427bb359e86a2d Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Wed, 7 Aug 2024 11:06:53 +0100 Subject: [PATCH 065/249] Sube un nivel de directorio a las vistas detalle MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit En lugar de anidar 'detail' dentro de 'src/catalog/', se definen también a primer nivel en 'src/detail/'. --- client-app/src/{catalog => }/detail/_WidgetDefinition.js | 0 client-app/src/{catalog => }/detail/activity/ActivityDetail.js | 2 +- .../src/{catalog => }/detail/activity/_ActivityLayoutWidget.js | 2 +- client-app/src/oldapp/designs/details/main/Program.js | 2 +- client-app/src/oldapp/designs/details/main/Project.js | 2 +- client-app/src/oldapp/designs/details/main/_DetailsBase.js | 2 +- .../src/oldapp/details/views/ActivityCatalogDetailsView.js | 2 +- client-app/src/oldapp/details/views/ActivityDetailsView.js | 2 +- 8 files changed, 7 insertions(+), 7 deletions(-) rename client-app/src/{catalog => }/detail/_WidgetDefinition.js (100%) rename client-app/src/{catalog => }/detail/activity/ActivityDetail.js (98%) rename client-app/src/{catalog => }/detail/activity/_ActivityLayoutWidget.js (99%) diff --git a/client-app/src/catalog/detail/_WidgetDefinition.js b/client-app/src/detail/_WidgetDefinition.js similarity index 100% rename from client-app/src/catalog/detail/_WidgetDefinition.js rename to client-app/src/detail/_WidgetDefinition.js diff --git a/client-app/src/catalog/detail/activity/ActivityDetail.js b/client-app/src/detail/activity/ActivityDetail.js similarity index 98% rename from client-app/src/catalog/detail/activity/ActivityDetail.js rename to client-app/src/detail/activity/ActivityDetail.js index 789fa308..7bc00a94 100644 --- a/client-app/src/catalog/detail/activity/ActivityDetail.js +++ b/client-app/src/detail/activity/ActivityDetail.js @@ -4,7 +4,7 @@ define([ , 'dojo/_base/declare' , 'dojo/_base/lang' , 'src/component/base/_ExternalConfig' - , 'src/catalog/detail/activity/_ActivityLayoutWidget' + , 'src/detail/activity/_ActivityLayoutWidget' , 'templates/ActivityInfo' ], function( redmicConfig diff --git a/client-app/src/catalog/detail/activity/_ActivityLayoutWidget.js b/client-app/src/detail/activity/_ActivityLayoutWidget.js similarity index 99% rename from client-app/src/catalog/detail/activity/_ActivityLayoutWidget.js rename to client-app/src/detail/activity/_ActivityLayoutWidget.js index a7f122b0..e898b70a 100644 --- a/client-app/src/catalog/detail/activity/_ActivityLayoutWidget.js +++ b/client-app/src/detail/activity/_ActivityLayoutWidget.js @@ -1,6 +1,6 @@ define([ 'dojo/_base/declare' - , 'src/catalog/detail/_WidgetDefinition' + , 'src/detail/_WidgetDefinition' ], function( declare , _WidgetDefinition diff --git a/client-app/src/oldapp/designs/details/main/Program.js b/client-app/src/oldapp/designs/details/main/Program.js index 559d0522..d18bedb7 100644 --- a/client-app/src/oldapp/designs/details/main/Program.js +++ b/client-app/src/oldapp/designs/details/main/Program.js @@ -4,7 +4,7 @@ define([ , "dojo/_base/lang" , "templates/ProjectInfo" , "templates/ProjectList" - , 'src/catalog/detail/_WidgetDefinition' + , 'src/detail/_WidgetDefinition' , "./_ActivityBase" ], function( redmicConfig diff --git a/client-app/src/oldapp/designs/details/main/Project.js b/client-app/src/oldapp/designs/details/main/Project.js index f696c6a8..924708fc 100644 --- a/client-app/src/oldapp/designs/details/main/Project.js +++ b/client-app/src/oldapp/designs/details/main/Project.js @@ -4,7 +4,7 @@ define([ , "dojo/_base/lang" , "templates/ActivityList" , "templates/ProjectInfo" - , 'src/catalog/detail/_WidgetDefinition' + , 'src/detail/_WidgetDefinition' , "./_ActivityBase" ], function( redmicConfig diff --git a/client-app/src/oldapp/designs/details/main/_DetailsBase.js b/client-app/src/oldapp/designs/details/main/_DetailsBase.js index e7637ec7..1a0e4c0c 100644 --- a/client-app/src/oldapp/designs/details/main/_DetailsBase.js +++ b/client-app/src/oldapp/designs/details/main/_DetailsBase.js @@ -5,7 +5,7 @@ define([ , "app/designs/details/_AddTitle" , "dojo/_base/declare" , "dojo/_base/lang" - , 'src/catalog/detail/_WidgetDefinition' + , 'src/detail/_WidgetDefinition' , "templates/ActivityList" ], function( _Main diff --git a/client-app/src/oldapp/details/views/ActivityCatalogDetailsView.js b/client-app/src/oldapp/details/views/ActivityCatalogDetailsView.js index 8a2dad7d..da7214a4 100644 --- a/client-app/src/oldapp/details/views/ActivityCatalogDetailsView.js +++ b/client-app/src/oldapp/details/views/ActivityCatalogDetailsView.js @@ -1,7 +1,7 @@ define([ 'src/redmicConfig' , 'dojo/_base/declare' - , 'src/catalog/detail/activity/ActivityDetail' + , 'src/detail/activity/ActivityDetail' ], function( redmicConfig , declare diff --git a/client-app/src/oldapp/details/views/ActivityDetailsView.js b/client-app/src/oldapp/details/views/ActivityDetailsView.js index b3e3b751..a682b9d1 100644 --- a/client-app/src/oldapp/details/views/ActivityDetailsView.js +++ b/client-app/src/oldapp/details/views/ActivityDetailsView.js @@ -1,7 +1,7 @@ define([ 'src/redmicConfig' , 'dojo/_base/declare' - , 'src/catalog/detail/activity/ActivityDetail' + , 'src/detail/activity/ActivityDetail' ], function( redmicConfig , declare -- GitLab From f16ea64c97dcc03a747b2576302530143895e8a9 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Thu, 8 Aug 2024 08:29:43 +0100 Subject: [PATCH 066/249] =?UTF-8?q?Agrupa=20importaci=C3=B3n=20de=20depend?= =?UTF-8?q?encias=20de=20Task?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client-app/src/app/innerApp.js | 10 +++------- client-app/src/component/socket/Task.js | 6 +++++- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/client-app/src/app/innerApp.js b/client-app/src/app/innerApp.js index c0f2bde1..496881fb 100644 --- a/client-app/src/app/innerApp.js +++ b/client-app/src/app/innerApp.js @@ -11,8 +11,6 @@ define([ , 'src/component/notification/Notification' , 'src/component/selection/Selector' , 'src/component/socket/_IngestData' - , 'src/component/socket/_Report' - , 'src/component/socket/_Worms' , 'src/component/socket/Socket' , 'src/component/socket/Task' ], function( @@ -28,8 +26,6 @@ define([ , Notification , Selector , _IngestData - , _Report - , _Worms , Socket , Task ) { @@ -200,13 +196,13 @@ define([ }); } - var definitionTask = declare([Task, _Report, _Worms]); + var TaskDefinition = Task; if (userRole === 'ROLE_ADMINISTRATOR' || userRole === 'ROLE_OAG') { - definitionTask = declare([definitionTask, _IngestData]); + TaskDefinition = declare([TaskDefinition, _IngestData]); } - new definitionTask({ + new TaskDefinition({ parentChannel: this.getChannel() }); diff --git a/client-app/src/component/socket/Task.js b/client-app/src/component/socket/Task.js index 33e8ef40..3a3e1a88 100644 --- a/client-app/src/component/socket/Task.js +++ b/client-app/src/component/socket/Task.js @@ -5,6 +5,8 @@ define([ , "src/component/base/_Module" , "src/component/base/_Store" , "src/component/base/_Selection" + , 'src/component/socket/_Report' + , 'src/component/socket/_Worms' , "src/util/Credentials" ], function( declare @@ -13,9 +15,11 @@ define([ , _Module , _Store , _Selection + , _Report + , _Worms , Credentials ){ - return declare([_Module, _AuthFirewall, _Store, _Selection], { + return declare([_Module, _AuthFirewall, _Store, _Selection, _Report, _Worms], { // Summary: // Módulo para gestionar la ejecución de tareas en segundo plano via sockets -- GitLab From c42791fcb5840ff7a89c384ff3c9cd076701f409 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Thu, 8 Aug 2024 11:04:11 +0100 Subject: [PATCH 067/249] Rebautiza y reubica componentes principales MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Para clarificar aun más el uso que se hace de cada componente, se han reubicado aquellos que se instancian a primer nivel (no todos, en progreso todavía) hacia dentro de 'src/app/component/', emulando la estructura general de 'src/component/' pero en el ámbito de app. Se renombra a los componentes innerApp y outerApp y sus elementos base, ya que se producía confusión entre estos elementos y el componente App principal. Ahora, se han identificado como implementaciones del componente Layout, que son importadas e instanciadas por el componente App. --- client-app/src/app/App.js | 38 +++++++++---------- .../base => app/component}/Analytics.js | 0 .../src/app/{ => component}/CheckBrowser.js | 0 .../src/app/{ => component}/CookieLoader.js | 0 .../component}/ExternalConfig.js | 0 .../base => app/component}/Loading.js | 0 .../src/app/{ => component}/ModuleStore.js | 0 client-app/src/app/{ => component}/Router.js | 0 .../components => app/component}/Topbar.js | 0 .../layout/InnerLayoutImpl.js} | 13 ++++--- .../{_app.js => component/layout/Layout.js} | 23 ++++++----- .../layout/OuterLayoutImpl.js} | 9 +++-- .../layout/_LayoutItfc.js} | 17 +++++---- .../component/meta}/MetaTags.js | 4 +- .../component/meta}/metaTagsContent.js | 0 .../component/sidebar}/MainSidebarImpl.js | 8 +--- .../component/sidebar}/Sidebar.js | 0 .../component/sidebar}/_Secondary.js | 6 +-- 18 files changed, 57 insertions(+), 61 deletions(-) rename client-app/src/{component/base => app/component}/Analytics.js (100%) rename client-app/src/app/{ => component}/CheckBrowser.js (100%) rename client-app/src/app/{ => component}/CookieLoader.js (100%) rename client-app/src/{component/components => app/component}/ExternalConfig.js (100%) rename client-app/src/{component/base => app/component}/Loading.js (100%) rename client-app/src/app/{ => component}/ModuleStore.js (100%) rename client-app/src/app/{ => component}/Router.js (100%) rename client-app/src/{component/components => app/component}/Topbar.js (100%) rename client-app/src/app/{innerApp.js => component/layout/InnerLayoutImpl.js} (96%) rename client-app/src/app/{_app.js => component/layout/Layout.js} (77%) rename client-app/src/app/{outerApp.js => component/layout/OuterLayoutImpl.js} (64%) rename client-app/src/app/{_appItfc.js => component/layout/_LayoutItfc.js} (63%) rename client-app/src/{component/metaTags => app/component/meta}/MetaTags.js (99%) rename client-app/src/{component/metaTags => app/component/meta}/metaTagsContent.js (100%) rename client-app/src/{component/components/Sidebar => app/component/sidebar}/MainSidebarImpl.js (90%) rename client-app/src/{component/components/Sidebar => app/component/sidebar}/Sidebar.js (100%) rename client-app/src/{component/components/Sidebar => app/component/sidebar}/_Secondary.js (99%) diff --git a/client-app/src/app/App.js b/client-app/src/app/App.js index b933242f..aecf6e99 100644 --- a/client-app/src/app/App.js +++ b/client-app/src/app/App.js @@ -5,21 +5,21 @@ define([ , 'dojo/dom' , 'dojo/has' , 'put-selector/put' - , 'src/app/CheckBrowser' - , 'src/app/CookieLoader' - , 'src/app/innerApp' - , 'src/app/ModuleStore' - , 'src/app/outerApp' - , 'src/app/Router' + , 'src/app/component/Analytics' + , 'src/app/component/CheckBrowser' + , 'src/app/component/CookieLoader' + , 'src/app/component/ExternalConfig' + , 'src/app/component/layout/InnerLayoutImpl' + , 'src/app/component/layout/OuterLayoutImpl' + , 'src/app/component/Loading' + , 'src/app/component/meta/MetaTags' + , 'src/app/component/ModuleStore' + , 'src/app/component/Router' , 'src/component/notification/CommunicationCenter' , 'src/component/notification/Alert' , 'src/component/base/Credentials' - , 'src/component/base/Analytics' - , 'src/component/metaTags/MetaTags' , 'src/component/base/_Module' , 'src/component/base/_Store' - , 'src/component/base/Loading' - , 'src/component/components/ExternalConfig' , 'src/component/store/RestManagerImpl' , 'templates/LoadingCustom' ], function( @@ -29,21 +29,21 @@ define([ , dom , has , put + , Analytics , CheckBrowser , CookieLoader - , InnerApp + , ExternalConfig + , InnerLayoutImpl + , OuterLayoutImpl + , Loading + , MetaTags , ModuleStore - , OuterApp , Router , CommunicationCenter , Alert , Credentials - , Analytics - , MetaTags , _Module , _Store - , Loading - , ExternalConfig , RestManagerImpl , LoadingCustomTemplate ) { @@ -97,7 +97,7 @@ define([ // Instancia del módulo para gestionar el nodo cargando desde cualquier módulo. // _currLayoutInstance: Object - // Instancia del layout de aplicación actual (innerApp o outerApp). + // Instancia del componente de layout de aplicación actual (InnerLayoutImpl o OuterLayoutImpl). // _currModuleInstance: Object // Instancia del módulo que está activado actualmente. // _currModuleKey: String @@ -370,7 +370,7 @@ define([ this._deleteLayout(); - this._currLayoutInstance = new InnerApp({ + this._currLayoutInstance = new InnerLayoutImpl({ parentChannel: this.getChannel(), ecomarcan: this._ecomarcan }); @@ -389,7 +389,7 @@ define([ this._deleteLayout(); - this._currLayoutInstance = new OuterApp({ + this._currLayoutInstance = new OuterLayoutImpl({ parentChannel: this.getChannel(), ecomarcan: this._ecomarcan }); diff --git a/client-app/src/component/base/Analytics.js b/client-app/src/app/component/Analytics.js similarity index 100% rename from client-app/src/component/base/Analytics.js rename to client-app/src/app/component/Analytics.js diff --git a/client-app/src/app/CheckBrowser.js b/client-app/src/app/component/CheckBrowser.js similarity index 100% rename from client-app/src/app/CheckBrowser.js rename to client-app/src/app/component/CheckBrowser.js diff --git a/client-app/src/app/CookieLoader.js b/client-app/src/app/component/CookieLoader.js similarity index 100% rename from client-app/src/app/CookieLoader.js rename to client-app/src/app/component/CookieLoader.js diff --git a/client-app/src/component/components/ExternalConfig.js b/client-app/src/app/component/ExternalConfig.js similarity index 100% rename from client-app/src/component/components/ExternalConfig.js rename to client-app/src/app/component/ExternalConfig.js diff --git a/client-app/src/component/base/Loading.js b/client-app/src/app/component/Loading.js similarity index 100% rename from client-app/src/component/base/Loading.js rename to client-app/src/app/component/Loading.js diff --git a/client-app/src/app/ModuleStore.js b/client-app/src/app/component/ModuleStore.js similarity index 100% rename from client-app/src/app/ModuleStore.js rename to client-app/src/app/component/ModuleStore.js diff --git a/client-app/src/app/Router.js b/client-app/src/app/component/Router.js similarity index 100% rename from client-app/src/app/Router.js rename to client-app/src/app/component/Router.js diff --git a/client-app/src/component/components/Topbar.js b/client-app/src/app/component/Topbar.js similarity index 100% rename from client-app/src/component/components/Topbar.js rename to client-app/src/app/component/Topbar.js diff --git a/client-app/src/app/innerApp.js b/client-app/src/app/component/layout/InnerLayoutImpl.js similarity index 96% rename from client-app/src/app/innerApp.js rename to client-app/src/app/component/layout/InnerLayoutImpl.js index 496881fb..4e673f52 100644 --- a/client-app/src/app/innerApp.js +++ b/client-app/src/app/component/layout/InnerLayoutImpl.js @@ -5,9 +5,9 @@ define([ , 'dojo/dom-class' , 'put-selector/put' , 'src/util/Credentials' - , 'src/app/_app' - , 'src/component/components/Sidebar/MainSidebarImpl' - , 'src/component/components/Topbar' + , 'src/app/component/layout/Layout' + , 'src/app/component/sidebar/MainSidebarImpl' + , 'src/app/component/Topbar' , 'src/component/notification/Notification' , 'src/component/selection/Selector' , 'src/component/socket/_IngestData' @@ -20,7 +20,7 @@ define([ , domClass , put , Credentials - , App + , Layout , MainSidebarImpl , Topbar , Notification @@ -30,9 +30,10 @@ define([ , Task ) { - return declare(App, { + return declare(Layout, { // Summary: - // Implementación del módulo App, encargada de mostrar las vistas de la parte interna de la aplicación + // Implementación del componente Layout, encargada de mostrar las vistas de la parte interna de la + // aplicación. // // Description: // Inicialmente, crea los módulos y estructuras necesarias para la parte interna de la app. También se diff --git a/client-app/src/app/_app.js b/client-app/src/app/component/layout/Layout.js similarity index 77% rename from client-app/src/app/_app.js rename to client-app/src/app/component/layout/Layout.js index bcb3cdd5..c0587078 100644 --- a/client-app/src/app/_app.js +++ b/client-app/src/app/component/layout/Layout.js @@ -1,23 +1,22 @@ define([ - 'src/component/base/_Module' - , 'src/component/base/_Show' - , 'dojo/_base/declare' + 'dojo/_base/declare' , 'dojo/_base/lang' - , './_appItfc' + , 'src/app/component/layout/_LayoutItfc' + , 'src/component/base/_Module' + , 'src/component/base/_Show' ], function( - _Module - , _Show - , declare + declare , lang - , _appItfc + , _LayoutItfc + , _Module + , _Show ) { - return declare([_Module, _Show, _appItfc], { + return declare([_Module, _Show, _LayoutItfc], { // Summary: - // Módulo App para gestionar la aplicación - // + // Componente de layout para estructurar la aplicación, tanto a nivel interno como externo. // Description: - // Recibe módulos desde Router, pertenecientes a la parte externa o interna, para mostrar en pantalla + // Recibe órdenes para mostrar en pantalla los diferentes módulos de la aplicación. constructor: function(args) { diff --git a/client-app/src/app/outerApp.js b/client-app/src/app/component/layout/OuterLayoutImpl.js similarity index 64% rename from client-app/src/app/outerApp.js rename to client-app/src/app/component/layout/OuterLayoutImpl.js index 517a084a..4ffb1169 100644 --- a/client-app/src/app/outerApp.js +++ b/client-app/src/app/component/layout/OuterLayoutImpl.js @@ -1,16 +1,17 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'src/app/_app' + , 'src/app/component/layout/Layout' ], function( declare , lang - , App + , Layout ) { - return declare(App, { + return declare(Layout, { // Summary: - // Implementación del módulo App, encargada de mostrar las vistas de la parte externa de la aplicación + // Implementación del componente Layout, encargada de mostrar las vistas de la parte externa de la + // aplicación. constructor: function(args) { diff --git a/client-app/src/app/_appItfc.js b/client-app/src/app/component/layout/_LayoutItfc.js similarity index 63% rename from client-app/src/app/_appItfc.js rename to client-app/src/app/component/layout/_LayoutItfc.js index b702b4ee..8adaaa6d 100644 --- a/client-app/src/app/_appItfc.js +++ b/client-app/src/app/component/layout/_LayoutItfc.js @@ -1,24 +1,25 @@ define([ - "dojo/_base/declare" - , "dojo/_base/lang" - , "src/component/base/_Itfc" + 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'src/component/base/_Itfc' ], function( declare , lang , _Itfc -){ +) { + return declare(_Itfc, { // summary: - // Interfaz de _app. + // Interfaz de _Layout. // description: // Define los métodos que debe poseer el módulo o la implementación. _getMethodsToImplement: function() { return lang.mixin(this.inherited(arguments), { - "_doResize": {}, - "_getNode": {}, - "_onAppHide": {} + '_doResize': {}, + '_getNode': {}, + '_onAppHide': {} }); } }); diff --git a/client-app/src/component/metaTags/MetaTags.js b/client-app/src/app/component/meta/MetaTags.js similarity index 99% rename from client-app/src/component/metaTags/MetaTags.js rename to client-app/src/app/component/meta/MetaTags.js index c830481b..66d019be 100644 --- a/client-app/src/component/metaTags/MetaTags.js +++ b/client-app/src/app/component/meta/MetaTags.js @@ -2,14 +2,14 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/query' + , 'src/app/component/meta/metaTagsContent' , 'src/component/base/_Module' - , './metaTagsContent' ], function( declare , lang , query - , _Module , metaTagsContent + , _Module ) { return declare(_Module, { diff --git a/client-app/src/component/metaTags/metaTagsContent.js b/client-app/src/app/component/meta/metaTagsContent.js similarity index 100% rename from client-app/src/component/metaTags/metaTagsContent.js rename to client-app/src/app/component/meta/metaTagsContent.js diff --git a/client-app/src/component/components/Sidebar/MainSidebarImpl.js b/client-app/src/app/component/sidebar/MainSidebarImpl.js similarity index 90% rename from client-app/src/component/components/Sidebar/MainSidebarImpl.js rename to client-app/src/app/component/sidebar/MainSidebarImpl.js index e84f0e63..8951eb6d 100644 --- a/client-app/src/component/components/Sidebar/MainSidebarImpl.js +++ b/client-app/src/app/component/sidebar/MainSidebarImpl.js @@ -1,13 +1,9 @@ define([ "dojo/_base/declare" - , "dojo/_base/lang" - , "dojo/aspect" - , "src/component/components/Sidebar/_Secondary" - , "src/component/components/Sidebar/Sidebar" + , "src/app/component/sidebar/_Secondary" + , "src/app/component/sidebar/Sidebar" ], function( declare - , lang - , aspect , _Secondary , Sidebar ) { diff --git a/client-app/src/component/components/Sidebar/Sidebar.js b/client-app/src/app/component/sidebar/Sidebar.js similarity index 100% rename from client-app/src/component/components/Sidebar/Sidebar.js rename to client-app/src/app/component/sidebar/Sidebar.js diff --git a/client-app/src/component/components/Sidebar/_Secondary.js b/client-app/src/app/component/sidebar/_Secondary.js similarity index 99% rename from client-app/src/component/components/Sidebar/_Secondary.js rename to client-app/src/app/component/sidebar/_Secondary.js index c5f7d8c4..ad169134 100644 --- a/client-app/src/component/components/Sidebar/_Secondary.js +++ b/client-app/src/app/component/sidebar/_Secondary.js @@ -1,6 +1,5 @@ define([ - "dijit/registry" - , "dojo/_base/declare" + "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" , "dojo/dom-class" @@ -10,8 +9,7 @@ define([ , "dojo/NodeList-dom" , "dojo/NodeList-traverse" ], function( - registry - , declare + declare , lang , aspect , domClass -- GitLab From e5f4119783a8faa281475091291e137c956fdc37 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Thu, 8 Aug 2024 13:55:02 +0100 Subject: [PATCH 068/249] Simplifica y mejora bloqueo de Task a invitados MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit En lugar de pisar métodos a lo bestia, se utiliza la función de predicados de suscripciones de Mediator, para omitir la ejecución de los callback cuando le llega una publicación y el usuario no se ha identificado. --- .../src/component/base/_AuthFirewall.js | 58 ------------------- .../src/component/base/_ChkCollection.js | 13 +++++ client-app/src/component/socket/Task.js | 32 ++++++---- .../src/component/socket/_IngestData.js | 25 ++++---- client-app/src/component/socket/_Report.js | 13 +++-- client-app/src/component/socket/_Worms.js | 17 +++--- 6 files changed, 65 insertions(+), 93 deletions(-) delete mode 100644 client-app/src/component/base/_AuthFirewall.js diff --git a/client-app/src/component/base/_AuthFirewall.js b/client-app/src/component/base/_AuthFirewall.js deleted file mode 100644 index 92f6b7c4..00000000 --- a/client-app/src/component/base/_AuthFirewall.js +++ /dev/null @@ -1,58 +0,0 @@ -define([ - "dojo/_base/declare" - , "dojo/_base/lang" - , "dojo/aspect" - , "src/util/Credentials" - , "src/util/GuestChecker" -], function( - declare - , lang - , aspect - , Credentials - , GuestChecker -){ - return declare(null, { - // summary: - // Extension de _Module. - // description: - // - - constructor: function(args) { - - aspect.before(this, "_setSubscription", lang.hitch(this, this._setSubscriptionChecker)); - aspect.before(this, "_setPublication", lang.hitch(this, this._setPublicationChecker)); - }, - - _setSubscriptionChecker: function(subscription) { - - // TODO esta manera de bloquear acciones a los invitados es un poco chapucera, por ahora se permite - // pasar a 'destroy', pero habrá que replantearlo para hacerlo bien - if (Credentials.get("userRole") === "ROLE_GUEST" && - subscription.channel.indexOf(this.ownChannel) !== -1 && - subscription.channel.indexOf('destroy') === -1) { - - subscription.callback = "_subAuthFailed"; - } - - return [subscription]; - }, - - _setPublicationChecker: function(publication) { - - if (Credentials.get("userRole") === "ROLE_GUEST") { - publication.callback = "_pubAuthFailed"; - } - - return [publication]; - }, - - _subAuthFailed: function() { - - GuestChecker.protectFromGuests(); - }, - - _pubAuthFailed: function() { - - } - }); -}); diff --git a/client-app/src/component/base/_ChkCollection.js b/client-app/src/component/base/_ChkCollection.js index f99dc750..7a01f317 100644 --- a/client-app/src/component/base/_ChkCollection.js +++ b/client-app/src/component/base/_ChkCollection.js @@ -1,9 +1,13 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' + , 'src/util/Credentials' + , 'src/util/GuestChecker' ], function( declare , lang + , Credentials + , GuestChecker ) { return declare(null, { @@ -125,6 +129,15 @@ define([ _chkSuccessfulStatus: function(status) { return status >= 200 && status < 400; + }, + + _chkUserIsNotGuest: function() { + + var userIsGuest = Credentials.get("userRole") === "ROLE_GUEST"; + + userIsGuest && GuestChecker.protectFromGuests(); + + return !userIsGuest; } }); }); diff --git a/client-app/src/component/socket/Task.js b/client-app/src/component/socket/Task.js index 3a3e1a88..848f359d 100644 --- a/client-app/src/component/socket/Task.js +++ b/client-app/src/component/socket/Task.js @@ -1,7 +1,6 @@ define([ "dojo/_base/declare" , "dojo/_base/lang" - , "src/component/base/_AuthFirewall" , "src/component/base/_Module" , "src/component/base/_Store" , "src/component/base/_Selection" @@ -11,7 +10,6 @@ define([ ], function( declare , lang - , _AuthFirewall , _Module , _Store , _Selection @@ -19,7 +17,7 @@ define([ , _Worms , Credentials ){ - return declare([_Module, _AuthFirewall, _Store, _Selection, _Report, _Worms], { + return declare([_Module, _Store, _Selection, _Report, _Worms], { // Summary: // Módulo para gestionar la ejecución de tareas en segundo plano via sockets @@ -57,12 +55,12 @@ define([ }; lang.mixin(this, this.config, args); - - this.baseSubscriptionsTarget = '/user/' + Credentials.get("userId"); }, _setConfigurations: function() { + this.baseSubscriptionsTarget = '/user/' + Credentials.get("userId"); + this.socketChannels = this._merge([{ getTasks: { baseTarget: this.baseSubscriptionsTarget + this.baseTarget + 'status', @@ -73,21 +71,28 @@ define([ _defineSubscriptions: function () { + var commonOpts = this._getSubCommonOpts(); + this.subscriptionsConfig.push({ channel : this.getChannel("REFRESH_STATUS"), - callback: "_subRefreshStatus" + callback: "_subRefreshStatus", + options: commonOpts },{ channel: this.getChannel("SOCKET_CONNECT"), - callback: "_subSocketConnect" + callback: "_subSocketConnect", + options: commonOpts },{ channel : this.getChannel("BUTTON_EVENT"), - callback: "_subButtonEvent" + callback: "_subButtonEvent", + options: commonOpts },{ channel : this.getChannel("REMOVE"), - callback: "_subRemove" + callback: "_subRemove", + options: commonOpts },{ channel : this.getChannel("ALL_TASK"), - callback: "_subAllTask" + callback: "_subAllTask", + options: commonOpts }); }, @@ -102,6 +107,13 @@ define([ }); }, + _getSubCommonOpts: function() { + + return { + predicate: lang.hitch(this, this._chkUserIsNotGuest) + }; + }, + _subRefreshStatus: function() { this._allTaskSocket({ diff --git a/client-app/src/component/socket/_IngestData.js b/client-app/src/component/socket/_IngestData.js index 246048c3..04ad1d0b 100644 --- a/client-app/src/component/socket/_IngestData.js +++ b/client-app/src/component/socket/_IngestData.js @@ -1,15 +1,13 @@ define([ - 'src/redmicConfig' - , "dojo/_base/declare" + "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "src/util/Credentials" + , 'src/redmicConfig' ], function( - redmicConfig - , declare + declare , lang , aspect - , Credentials + , redmicConfig ){ return declare(null, { // Summary: @@ -30,8 +28,6 @@ define([ lang.mixin(this, this.config, args); - this.ingestBaseTarget = this.baseTarget + "ingest/"; - aspect.before(this, "_afterSetConfigurations", lang.hitch(this, this._setIngestDataConfigurations)); aspect.after(this, "_defineSubscriptions", lang.hitch(this, this._defineIngestDataSubscriptions)); aspect.before(this, "_mixEventsAndActions", lang.hitch(this, this._mixIngestDataEventsAndActions)); @@ -39,6 +35,8 @@ define([ _setIngestDataConfigurations: function() { + this.ingestBaseTarget = this.baseTarget + "ingest/"; + this.socketChannels = this._merge([{ ingestStatus: { baseTarget: this.baseSubscriptionsTarget + this.ingestBaseTarget + 'status', @@ -56,15 +54,20 @@ define([ _defineIngestDataSubscriptions: function () { + var commonOpts = this._getSubCommonOpts(); + this.subscriptionsConfig.push({ channel : this.getChannel("INGEST_DATA_RUN"), - callback: "_subIngestDataRun" + callback: "_subIngestDataRun", + options: commonOpts },{ channel : this.getChannel("INGEST_DATA_RESUME"), - callback: "_subIngestDataResume" + callback: "_subIngestDataResume", + options: commonOpts },{ channel : this.getChannel("INGEST_DATA_STOP"), - callback: "_subIngestDataStop" + callback: "_subIngestDataStop", + options: commonOpts }); }, diff --git a/client-app/src/component/socket/_Report.js b/client-app/src/component/socket/_Report.js index 048459dd..079665fb 100644 --- a/client-app/src/component/socket/_Report.js +++ b/client-app/src/component/socket/_Report.js @@ -1,16 +1,16 @@ define([ 'alertify/alertify.min' - , 'src/redmicConfig' , "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" + , 'src/redmicConfig' , "src/util/Credentials" ], function( alertify - , redmicConfig , declare , lang , aspect + , redmicConfig , Credentials ){ return declare(null, { @@ -32,8 +32,6 @@ define([ lang.mixin(this, this.config, args); - this.reportBaseTarget = this.baseTarget + "report/"; - aspect.before(this, "_afterSetConfigurations", lang.hitch(this, this._setReportConfigurations)); aspect.after(this, "_defineSubscriptions", lang.hitch(this, this._defineReportSubscriptions)); aspect.before(this, "_mixEventsAndActions", lang.hitch(this, this._mixReportEventsAndActions)); @@ -41,6 +39,8 @@ define([ _setReportConfigurations: function() { + this.reportBaseTarget = this.baseTarget + "report/"; + this.socketChannels = this._merge([{ reportStatus: { baseTarget: this.baseSubscriptionsTarget + this.reportBaseTarget + 'status', @@ -59,9 +59,12 @@ define([ _defineReportSubscriptions: function () { + var commonOpts = this._getSubCommonOpts(); + this.subscriptionsConfig.push({ channel : this.getChannel("GET_REPORT"), - callback: "_subGetReport" + callback: "_subGetReport", + options: commonOpts }); }, diff --git a/client-app/src/component/socket/_Worms.js b/client-app/src/component/socket/_Worms.js index c2ec11c5..8f2ddb47 100644 --- a/client-app/src/component/socket/_Worms.js +++ b/client-app/src/component/socket/_Worms.js @@ -1,15 +1,11 @@ define([ - 'src/redmicConfig' - , "dojo/_base/declare" + "dojo/_base/declare" , "dojo/_base/lang" , "dojo/aspect" - , "src/util/Credentials" ], function( - redmicConfig - , declare + declare , lang , aspect - , Credentials ){ return declare(null, { // Summary: @@ -27,8 +23,6 @@ define([ lang.mixin(this, this.config, args); - this.wormsBaseTarget = this.baseTarget + "wormstoredmic/"; - aspect.before(this, "_afterSetConfigurations", lang.hitch(this, this._setWormsConfigurations)); aspect.after(this, "_defineSubscriptions", lang.hitch(this, this._defineWormsSubscriptions)); aspect.before(this, "_mixEventsAndActions", lang.hitch(this, this._mixWormsEventsAndActions)); @@ -36,6 +30,8 @@ define([ _setWormsConfigurations: function() { + this.wormsBaseTarget = this.baseTarget + "wormstoredmic/"; + this.socketChannels = this._merge([{ ingestStatus: { baseTarget: this.baseSubscriptionsTarget + this.wormsBaseTarget + '/status', @@ -53,9 +49,12 @@ define([ _defineWormsSubscriptions: function () { + var commonOpts = this._getSubCommonOpts(); + this.subscriptionsConfig.push({ channel : this.getChannel("WORMS_RUN"), - callback: "_subWormsRun" + callback: "_subWormsRun", + options: commonOpts }); }, -- GitLab From a2857c6e78b2aed1ae6e0148730f1c77541a5d24 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Thu, 8 Aug 2024 14:00:12 +0100 Subject: [PATCH 069/249] Mueve componente global de credenciales --- client-app/src/app/App.js | 12 ++++++------ .../{component/base => app/component}/Credentials.js | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) rename client-app/src/{component/base => app/component}/Credentials.js (98%) diff --git a/client-app/src/app/App.js b/client-app/src/app/App.js index aecf6e99..5f0f8c7a 100644 --- a/client-app/src/app/App.js +++ b/client-app/src/app/App.js @@ -1,6 +1,5 @@ define([ - 'src/redmicConfig' - , 'dojo/_base/declare' + 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/dom' , 'dojo/has' @@ -8,6 +7,7 @@ define([ , 'src/app/component/Analytics' , 'src/app/component/CheckBrowser' , 'src/app/component/CookieLoader' + , 'src/app/component/Credentials' , 'src/app/component/ExternalConfig' , 'src/app/component/layout/InnerLayoutImpl' , 'src/app/component/layout/OuterLayoutImpl' @@ -17,14 +17,13 @@ define([ , 'src/app/component/Router' , 'src/component/notification/CommunicationCenter' , 'src/component/notification/Alert' - , 'src/component/base/Credentials' , 'src/component/base/_Module' , 'src/component/base/_Store' , 'src/component/store/RestManagerImpl' + , 'src/redmicConfig' , 'templates/LoadingCustom' ], function( - redmicConfig - , declare + declare , lang , dom , has @@ -32,6 +31,7 @@ define([ , Analytics , CheckBrowser , CookieLoader + , Credentials , ExternalConfig , InnerLayoutImpl , OuterLayoutImpl @@ -41,10 +41,10 @@ define([ , Router , CommunicationCenter , Alert - , Credentials , _Module , _Store , RestManagerImpl + , redmicConfig , LoadingCustomTemplate ) { diff --git a/client-app/src/component/base/Credentials.js b/client-app/src/app/component/Credentials.js similarity index 98% rename from client-app/src/component/base/Credentials.js rename to client-app/src/app/component/Credentials.js index cb756352..79376ac9 100644 --- a/client-app/src/component/base/Credentials.js +++ b/client-app/src/app/component/Credentials.js @@ -1,16 +1,16 @@ define([ - 'src/redmicConfig' - , 'dojo/_base/declare' + 'dojo/_base/declare' , 'dojo/_base/lang' , 'src/component/base/_Module' , 'src/component/base/_Store' + , 'src/redmicConfig' , 'src/util/Credentials' ], function( - redmicConfig - , declare + declare , lang , _Module , _Store + , redmicConfig , Credentials ) { -- GitLab From 89b104e3bb53a942c2a9dd07db593a0c7c16541f Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Fri, 9 Aug 2024 13:42:16 +0100 Subject: [PATCH 070/249] Omite checks de Task, anula instancia para guest MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit En lugar de añadir comprobaciones para permitir o denegar el acceso a publicarle al componente Task, se evita en primer lugar la creación de su instancia cuando el usuario es invitado. Solamente se instanciaba en estos casos para mandar a mostrar el aviso de registro necesario. Se comprueba y lanza el aviso si es necesario antes de realizar la acción restringida, por ahora sólo la generación de informes pdf. --- .../app/component/layout/InnerLayoutImpl.js | 19 +++++++-------- .../src/component/base/_ChkCollection.js | 13 ---------- client-app/src/component/socket/Task.js | 24 ++++--------------- .../src/component/socket/_IngestData.js | 11 +++------ client-app/src/component/socket/_Report.js | 5 +--- client-app/src/component/socket/_Worms.js | 5 +--- .../src/oldapp/designs/details/Controller.js | 10 ++++++++ .../textSearchFacetsList/Controller.js | 10 ++++++++ client-app/src/util/Credentials.js | 12 ++++++++++ 9 files changed, 51 insertions(+), 58 deletions(-) diff --git a/client-app/src/app/component/layout/InnerLayoutImpl.js b/client-app/src/app/component/layout/InnerLayoutImpl.js index 4e673f52..6eaf4600 100644 --- a/client-app/src/app/component/layout/InnerLayoutImpl.js +++ b/client-app/src/app/component/layout/InnerLayoutImpl.js @@ -186,8 +186,7 @@ define([ parentChannel: this.getChannel() }); - var userRole = Credentials.get('userRole'); - if (userRole !== 'ROLE_GUEST') { + if (!Credentials.userIsGuest()) { new Notification({ parentChannel: this.getChannel() }); @@ -195,17 +194,17 @@ define([ new Socket({ parentChannel: this.getChannel() }); - } - var TaskDefinition = Task; + var TaskDefinition = Task; - if (userRole === 'ROLE_ADMINISTRATOR' || userRole === 'ROLE_OAG') { - TaskDefinition = declare([TaskDefinition, _IngestData]); - } + if (Credentials.userIsEditor()) { + TaskDefinition = declare([TaskDefinition, _IngestData]); + } - new TaskDefinition({ - parentChannel: this.getChannel() - }); + new TaskDefinition({ + parentChannel: this.getChannel() + }); + } this.topbar = new Topbar({ parentChannel: this.getChannel(), diff --git a/client-app/src/component/base/_ChkCollection.js b/client-app/src/component/base/_ChkCollection.js index 7a01f317..f99dc750 100644 --- a/client-app/src/component/base/_ChkCollection.js +++ b/client-app/src/component/base/_ChkCollection.js @@ -1,13 +1,9 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' - , 'src/util/Credentials' - , 'src/util/GuestChecker' ], function( declare , lang - , Credentials - , GuestChecker ) { return declare(null, { @@ -129,15 +125,6 @@ define([ _chkSuccessfulStatus: function(status) { return status >= 200 && status < 400; - }, - - _chkUserIsNotGuest: function() { - - var userIsGuest = Credentials.get("userRole") === "ROLE_GUEST"; - - userIsGuest && GuestChecker.protectFromGuests(); - - return !userIsGuest; } }); }); diff --git a/client-app/src/component/socket/Task.js b/client-app/src/component/socket/Task.js index 848f359d..857c89f3 100644 --- a/client-app/src/component/socket/Task.js +++ b/client-app/src/component/socket/Task.js @@ -71,28 +71,21 @@ define([ _defineSubscriptions: function () { - var commonOpts = this._getSubCommonOpts(); - this.subscriptionsConfig.push({ channel : this.getChannel("REFRESH_STATUS"), - callback: "_subRefreshStatus", - options: commonOpts + callback: "_subRefreshStatus" },{ channel: this.getChannel("SOCKET_CONNECT"), - callback: "_subSocketConnect", - options: commonOpts + callback: "_subSocketConnect" },{ channel : this.getChannel("BUTTON_EVENT"), - callback: "_subButtonEvent", - options: commonOpts + callback: "_subButtonEvent" },{ channel : this.getChannel("REMOVE"), - callback: "_subRemove", - options: commonOpts + callback: "_subRemove" },{ channel : this.getChannel("ALL_TASK"), - callback: "_subAllTask", - options: commonOpts + callback: "_subAllTask" }); }, @@ -107,13 +100,6 @@ define([ }); }, - _getSubCommonOpts: function() { - - return { - predicate: lang.hitch(this, this._chkUserIsNotGuest) - }; - }, - _subRefreshStatus: function() { this._allTaskSocket({ diff --git a/client-app/src/component/socket/_IngestData.js b/client-app/src/component/socket/_IngestData.js index 04ad1d0b..0c300b0b 100644 --- a/client-app/src/component/socket/_IngestData.js +++ b/client-app/src/component/socket/_IngestData.js @@ -54,20 +54,15 @@ define([ _defineIngestDataSubscriptions: function () { - var commonOpts = this._getSubCommonOpts(); - this.subscriptionsConfig.push({ channel : this.getChannel("INGEST_DATA_RUN"), - callback: "_subIngestDataRun", - options: commonOpts + callback: "_subIngestDataRun" },{ channel : this.getChannel("INGEST_DATA_RESUME"), - callback: "_subIngestDataResume", - options: commonOpts + callback: "_subIngestDataResume" },{ channel : this.getChannel("INGEST_DATA_STOP"), - callback: "_subIngestDataStop", - options: commonOpts + callback: "_subIngestDataStop" }); }, diff --git a/client-app/src/component/socket/_Report.js b/client-app/src/component/socket/_Report.js index 079665fb..bc0cd3be 100644 --- a/client-app/src/component/socket/_Report.js +++ b/client-app/src/component/socket/_Report.js @@ -59,12 +59,9 @@ define([ _defineReportSubscriptions: function () { - var commonOpts = this._getSubCommonOpts(); - this.subscriptionsConfig.push({ channel : this.getChannel("GET_REPORT"), - callback: "_subGetReport", - options: commonOpts + callback: "_subGetReport" }); }, diff --git a/client-app/src/component/socket/_Worms.js b/client-app/src/component/socket/_Worms.js index 8f2ddb47..7807067c 100644 --- a/client-app/src/component/socket/_Worms.js +++ b/client-app/src/component/socket/_Worms.js @@ -49,12 +49,9 @@ define([ _defineWormsSubscriptions: function () { - var commonOpts = this._getSubCommonOpts(); - this.subscriptionsConfig.push({ channel : this.getChannel("WORMS_RUN"), - callback: "_subWormsRun", - options: commonOpts + callback: "_subWormsRun" }); }, diff --git a/client-app/src/oldapp/designs/details/Controller.js b/client-app/src/oldapp/designs/details/Controller.js index 7d953bff..a4c23d10 100644 --- a/client-app/src/oldapp/designs/details/Controller.js +++ b/client-app/src/oldapp/designs/details/Controller.js @@ -10,6 +10,8 @@ define([ , "put-selector/put" , "src/component/base/_Store" , "src/component/base/_Window" + , 'src/util/Credentials' + , 'src/util/GuestChecker' , "./_ControllerItfc" ], function( _Controller @@ -23,6 +25,8 @@ define([ , put , _Store , _Window + , Credentials + , GuestChecker , _ControllerItfc ) { @@ -445,6 +449,12 @@ define([ _reportClicked: function() { // TODO: eso es para casos concretos, debería separarse + // TODO abstraer para hacerlo implícitamente + if (Credentials.userIsGuest()) { + GuestChecker.protectFromGuests(); + return; + } + this._publish(this._buildChannel(this.taskChannel, this.actions.GET_REPORT), { target: this.selectionTarget ? this.selectionTarget : this.target, serviceTag: this.reportService, diff --git a/client-app/src/oldapp/designs/textSearchFacetsList/Controller.js b/client-app/src/oldapp/designs/textSearchFacetsList/Controller.js index 976f331a..c80812d1 100644 --- a/client-app/src/oldapp/designs/textSearchFacetsList/Controller.js +++ b/client-app/src/oldapp/designs/textSearchFacetsList/Controller.js @@ -9,6 +9,8 @@ define([ , "src/component/browser/bars/Pagination" , "src/component/search/FacetsImpl" , "src/component/search/TextImpl" + , 'src/util/Credentials' + , 'src/util/GuestChecker' , "./_AddFilter" ], function ( _OnShownAndRefresh @@ -21,6 +23,8 @@ define([ , Pagination , FacetsImpl , TextImpl + , Credentials + , GuestChecker , _AddFilter ){ return declare([_Controller, _Browser, _Store, _AddFilter, _OnShownAndRefresh], { @@ -108,6 +112,12 @@ define([ _subDownloadFile: function(request) { + // TODO abstraer para hacerlo implícitamente + if (Credentials.userIsGuest()) { + GuestChecker.protectFromGuests(); + return; + } + this._emitEvt('DOWNLOAD_FILE', { target: this.selectionTarget ? this.selectionTarget : this.target, serviceTag: this.reportService, diff --git a/client-app/src/util/Credentials.js b/client-app/src/util/Credentials.js index c076cb34..81ac3230 100644 --- a/client-app/src/util/Credentials.js +++ b/client-app/src/util/Credentials.js @@ -112,6 +112,18 @@ define([ // Objeto a emitir. this.emit(name, obj); + }, + + userIsGuest: function() { + + return this.get('userRole') === 'ROLE_GUEST'; + }, + + userIsEditor: function() { + + var userRole = this.get('userRole'); + + return userRole === 'ROLE_ADMINISTRATOR' || userRole === 'ROLE_OAG'; } }); -- GitLab From 29d9db7ea4b961dcbd4164d2aea748bdbe45e383 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Mon, 12 Aug 2024 11:51:18 +0100 Subject: [PATCH 071/249] =?UTF-8?q?Actualiza=20subm=C3=B3dulos?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client-app/dep/templates | 2 +- client-app/style | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client-app/dep/templates b/client-app/dep/templates index 04512eac..8654348a 160000 --- a/client-app/dep/templates +++ b/client-app/dep/templates @@ -1 +1 @@ -Subproject commit 04512eacc2aaed8cce2a5d975382a7a7d16fa777 +Subproject commit 8654348acce45a178bcf73f5766a009fb9c278ad diff --git a/client-app/style b/client-app/style index 467576f3..e2e386e4 160000 --- a/client-app/style +++ b/client-app/style @@ -1 +1 @@ -Subproject commit 467576f36928ddf377aa2188c1dfe1f39b77a088 +Subproject commit e2e386e4f5f03f8743399c9b9525a3d04a3b9f01 -- GitLab From 2093a4450c24463c1c794777d0a381bbb55c05ea Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Mon, 12 Aug 2024 12:27:18 +0100 Subject: [PATCH 072/249] =?UTF-8?q?Evita=20definici=C3=B3n=20din=C3=A1mica?= =?UTF-8?q?=20de=20Task,=20revisa=20permisos?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit En lugar de construir dinámicamente la definición del componente Task en función del rol del usuario, carga todas las bases de código siempre. Logra controlar en tiempo de ejecución si el usuario está autorizado a emplear las acciones que ofrece o no, omitiendo la creación de suscripciones y llamadas a métodos. --- client-app/src/app/component/layout/InnerLayoutImpl.js | 10 +--------- client-app/src/component/socket/Task.js | 4 +++- client-app/src/component/socket/_IngestData.js | 6 ++++++ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/client-app/src/app/component/layout/InnerLayoutImpl.js b/client-app/src/app/component/layout/InnerLayoutImpl.js index 6eaf4600..38c597a7 100644 --- a/client-app/src/app/component/layout/InnerLayoutImpl.js +++ b/client-app/src/app/component/layout/InnerLayoutImpl.js @@ -10,7 +10,6 @@ define([ , 'src/app/component/Topbar' , 'src/component/notification/Notification' , 'src/component/selection/Selector' - , 'src/component/socket/_IngestData' , 'src/component/socket/Socket' , 'src/component/socket/Task' ], function( @@ -25,7 +24,6 @@ define([ , Topbar , Notification , Selector - , _IngestData , Socket , Task ) { @@ -195,13 +193,7 @@ define([ parentChannel: this.getChannel() }); - var TaskDefinition = Task; - - if (Credentials.userIsEditor()) { - TaskDefinition = declare([TaskDefinition, _IngestData]); - } - - new TaskDefinition({ + new Task({ parentChannel: this.getChannel() }); } diff --git a/client-app/src/component/socket/Task.js b/client-app/src/component/socket/Task.js index 857c89f3..4d78a219 100644 --- a/client-app/src/component/socket/Task.js +++ b/client-app/src/component/socket/Task.js @@ -4,6 +4,7 @@ define([ , "src/component/base/_Module" , "src/component/base/_Store" , "src/component/base/_Selection" + , 'src/component/socket/_IngestData' , 'src/component/socket/_Report' , 'src/component/socket/_Worms' , "src/util/Credentials" @@ -13,11 +14,12 @@ define([ , _Module , _Store , _Selection + , _IngestData , _Report , _Worms , Credentials ){ - return declare([_Module, _Store, _Selection, _Report, _Worms], { + return declare([_Module, _Store, _Selection, _Report, _Worms, _IngestData], { // Summary: // Módulo para gestionar la ejecución de tareas en segundo plano via sockets diff --git a/client-app/src/component/socket/_IngestData.js b/client-app/src/component/socket/_IngestData.js index 0c300b0b..e4d1e1c0 100644 --- a/client-app/src/component/socket/_IngestData.js +++ b/client-app/src/component/socket/_IngestData.js @@ -3,11 +3,13 @@ define([ , "dojo/_base/lang" , "dojo/aspect" , 'src/redmicConfig' + , 'src/util/Credentials' ], function( declare , lang , aspect , redmicConfig + , Credentials ){ return declare(null, { // Summary: @@ -16,6 +18,10 @@ define([ constructor: function(args) { + if (!Credentials.userIsEditor()) { + return; + } + this.config = { // own actions ingestDataActions: { -- GitLab From 7ec2492df32cc7df163e58d861f42f46ee75241f Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Mon, 12 Aug 2024 13:44:48 +0100 Subject: [PATCH 073/249] Instala dependencias de wicket al construir --- grunt/config/buildModules.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/grunt/config/buildModules.js b/grunt/config/buildModules.js index aa9b59ca..06c0877a 100644 --- a/grunt/config/buildModules.js +++ b/grunt/config/buildModules.js @@ -6,9 +6,9 @@ module.exports = function(grunt) { 'client-app/dep/pruneCluster': preBuildCmds.concat([ 'grunt build:dist --force' ]), - 'client-app/dep/wicket': [ + 'client-app/dep/wicket': preBuildCmds.concat([ 'npm run build' - ], + ]), 'client-app/dep/templates': preBuildCmds.concat([ 'grunt build' ]), -- GitLab From 1fda36a21be7139739d4a2f7ade1826470d746a0 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Tue, 13 Aug 2024 11:16:24 +0100 Subject: [PATCH 074/249] Renombra compilado y corrige rutas a recursos MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Renombra el directorio destino del código compilado para acortar rutas, además de actualizar las referencias necesarias. Se expone variable global para conocer si se hace uso de la aplicación compilada o no, para facilitar las comprobaciones en tiempo de ejecución. Actualiza las rutas hacia recursos que dependen de si se usa versión compilada o no, ya que ahora no coinciden en el nombre (desde que se comenzó la restructuración). Actualiza submódulo. --- Gruntfile.js | 2 +- client-app/app.profile.js | 2 +- client-app/src/component/components/PDFViewer/PDFViewer.js | 2 +- client-app/src/component/map/LeafletImpl.js | 2 +- client-app/style | 2 +- server-app/views/layout.pug | 5 +++-- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 0f991fb7..60086602 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -16,7 +16,7 @@ module.exports = function(grunt) { depPath: 'client-app/dep', testPath: 'client-app/test', distPath: 'dist', - destDir: 'javascript' + destDir: 'js' }, pkg: grunt.file.readJSON('package.json') }); diff --git a/client-app/app.profile.js b/client-app/app.profile.js index e650f7c0..d5571fab 100644 --- a/client-app/app.profile.js +++ b/client-app/app.profile.js @@ -27,7 +27,7 @@ var declarativeTagger = function(filename) { var profileObj = { basePath: '.', releaseDir: '../dist', - releaseName: 'javascript', + releaseName: 'js', action: 'release', layerOptimize: 'closure', optimize: 'closure', diff --git a/client-app/src/component/components/PDFViewer/PDFViewer.js b/client-app/src/component/components/PDFViewer/PDFViewer.js index 1879af02..b3d32a75 100644 --- a/client-app/src/component/components/PDFViewer/PDFViewer.js +++ b/client-app/src/component/components/PDFViewer/PDFViewer.js @@ -98,7 +98,7 @@ define([ this.lastPDF = url; - var path = '/javascript/pdfjs/web/viewer.html?file=' + url; + var path = '/' + ((/true/i).test(envUseBuilt) ? 'js' : 'dep') + '/pdfjs/web/viewer.html?file=' + url; if (!this.roleGuestActive) { path += '?access_token%3D' + Credentials.get("accessToken"); diff --git a/client-app/src/component/map/LeafletImpl.js b/client-app/src/component/map/LeafletImpl.js index 75eb1797..83f5e463 100644 --- a/client-app/src/component/map/LeafletImpl.js +++ b/client-app/src/component/map/LeafletImpl.js @@ -48,7 +48,7 @@ define([ _initialize: function() { - L.Icon.Default.imagePath = "/javascript/leaflet/dist/images/"; + L.Icon.Default.imagePath = '/' + ((/true/i).test(envUseBuilt) ? 'js' : 'dep') + '/leaflet/dist/images/'; this.mapParentNode = put("div.map"); this.mapNode = put(this.mapParentNode, "div.map"); diff --git a/client-app/style b/client-app/style index e2e386e4..2d21ed27 160000 --- a/client-app/style +++ b/client-app/style @@ -1 +1 @@ -Subproject commit e2e386e4f5f03f8743399c9b9525a3d04a3b9f01 +Subproject commit 2d21ed27dd4e6dcea9fd2770e48e9c06b8fe0921 diff --git a/server-app/views/layout.pug b/server-app/views/layout.pug index 168a45f4..87978faf 100644 --- a/server-app/views/layout.pug +++ b/server-app/views/layout.pug @@ -11,6 +11,7 @@ html script. var lang = '#{env.lang}', envApiUrl = '#{env.apiUrl}', + envUseBuilt = '#{env.useBuilt}', envProduction = '#{env.production}', envVersion = '#{env.version}', envDebug = '#{env.debug}'; @@ -30,8 +31,8 @@ html } const basePath = '/' + (env.useBuilt ? 'dist' : 'client-app'), - dojoConfigPath = basePath + '/' + (env.useBuilt ? 'javascript' : 'src') + '/dojoConfig.js', - dojoJsPath = basePath + '/' + (env.useBuilt ? 'javascript' : 'dep') + '/dojo/dojo.js'; + dojoConfigPath = basePath + '/' + (env.useBuilt ? 'js' : 'src') + '/dojoConfig.js', + dojoJsPath = basePath + '/' + (env.useBuilt ? 'js' : 'dep') + '/dojo/dojo.js'; meta(name = 'og:locale' content = locale) meta(name = 'og:locale:alternate' content = altLocale1) -- GitLab From d45bd562a21cb517908952664a7bb39d0948591d Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Tue, 13 Aug 2024 11:40:17 +0100 Subject: [PATCH 075/249] Revisa uso de variables globales y comprobaciones --- client-app/src/component/base/Manager.js | 2 +- client-app/src/component/base/_Itfc.js | 2 +- client-app/src/component/components/PDFViewer/PDFViewer.js | 5 ++++- client-app/src/component/layout/wizard/_WizardStep.js | 2 +- client-app/src/component/map/LeafletImpl.js | 5 ++++- client-app/src/component/model/ModelImpl.js | 2 +- client-app/src/util/ReCaptcha.js | 2 +- 7 files changed, 13 insertions(+), 7 deletions(-) diff --git a/client-app/src/component/base/Manager.js b/client-app/src/component/base/Manager.js index 7fa01119..1713e34e 100644 --- a/client-app/src/component/base/Manager.js +++ b/client-app/src/component/base/Manager.js @@ -132,7 +132,7 @@ function( _checkDomainToAddMessage: function() { - if (redmicConfig.getEnvVariableValue('envProduction') === 'false') { + if ((/false/i).test(redmicConfig.getEnvVariableValue('envProduction'))) { this._addMessage('.appDev', this.i18n.messageAppDev); } }, diff --git a/client-app/src/component/base/_Itfc.js b/client-app/src/component/base/_Itfc.js index e6dab16a..5f3f8d9d 100644 --- a/client-app/src/component/base/_Itfc.js +++ b/client-app/src/component/base/_Itfc.js @@ -42,7 +42,7 @@ define([ _onNotImplementedMethod: function(method, props) { - if (redmicConfig.getEnvVariableValue('envDebug') === 'true') { + if ((/true/i).test(redmicConfig.getEnvVariableValue('envDebug'))) { // TODO demasiado ruido y no aporta casi nada, quitar si no se echa en falta //this._showNotImplementedMethodWarning(method, props); } diff --git a/client-app/src/component/components/PDFViewer/PDFViewer.js b/client-app/src/component/components/PDFViewer/PDFViewer.js index b3d32a75..2be2df1f 100644 --- a/client-app/src/component/components/PDFViewer/PDFViewer.js +++ b/client-app/src/component/components/PDFViewer/PDFViewer.js @@ -6,6 +6,7 @@ define([ , "src/component/base/_Show" , "src/component/layout/templateDisplayer/TemplateDisplayer" , "put-selector/put" + , 'src/redmicConfig' , "templates/DocumentAuthFailed" , "templates/DocumentNotAvailable" ], function( @@ -16,6 +17,7 @@ define([ , _Show , TemplateDisplayer , put + , redmicConfig , TemplateAuthFailed , TemplateNoAvailable ) { @@ -98,7 +100,8 @@ define([ this.lastPDF = url; - var path = '/' + ((/true/i).test(envUseBuilt) ? 'js' : 'dep') + '/pdfjs/web/viewer.html?file=' + url; + var useBuilt = (/true/i).test(redmicConfig.getEnvVariableValue('envUseBuilt')), + path = '/' + (useBuilt ? 'js' : 'dep') + '/pdfjs/web/viewer.html?file=' + url; if (!this.roleGuestActive) { path += '?access_token%3D' + Credentials.get("accessToken"); diff --git a/client-app/src/component/layout/wizard/_WizardStep.js b/client-app/src/component/layout/wizard/_WizardStep.js index 1146a7e3..53365924 100644 --- a/client-app/src/component/layout/wizard/_WizardStep.js +++ b/client-app/src/component/layout/wizard/_WizardStep.js @@ -452,7 +452,7 @@ define([ this._isValidProperty = !propErrors; - if (redmicConfig.getEnvVariableValue('envDebug') === 'true') { + if ((/true/i).test(redmicConfig.getEnvVariableValue('envDebug'))) { console.warn('Wizard step validation', { property: this.propertyName, isValid: this._isValidProperty, diff --git a/client-app/src/component/map/LeafletImpl.js b/client-app/src/component/map/LeafletImpl.js index 83f5e463..c7df2364 100644 --- a/client-app/src/component/map/LeafletImpl.js +++ b/client-app/src/component/map/LeafletImpl.js @@ -6,6 +6,7 @@ define([ , "dojo/query" , 'leaflet/leaflet' , "put-selector/put" + , 'src/redmicConfig' , "./_LeafletImplItfc" , './_LeafletWidgetsManagement' , "./_ListenContainers" @@ -19,6 +20,7 @@ define([ , query , L , put + , redmicConfig , _LeafletImplItfc , _LeafletWidgetsManagement , _ListenContainers @@ -48,7 +50,8 @@ define([ _initialize: function() { - L.Icon.Default.imagePath = '/' + ((/true/i).test(envUseBuilt) ? 'js' : 'dep') + '/leaflet/dist/images/'; + var useBuilt = (/true/i).test(redmicConfig.getEnvVariableValue('envUseBuilt')); + L.Icon.Default.imagePath = '/' + (useBuilt ? 'js' : 'dep') + '/leaflet/dist/images/'; this.mapParentNode = put("div.map"); this.mapNode = put(this.mapParentNode, "div.map"); diff --git a/client-app/src/component/model/ModelImpl.js b/client-app/src/component/model/ModelImpl.js index 0d079d6b..f7338d3b 100644 --- a/client-app/src/component/model/ModelImpl.js +++ b/client-app/src/component/model/ModelImpl.js @@ -61,7 +61,7 @@ define([ var isValid = this.modelInstance.get('isValid'); - if (redmicConfig.getEnvVariableValue('envDebug') === 'true') { + if ((/true/i).test(redmicConfig.getEnvVariableValue('envDebug'))) { console.warn('Model validation errors', { target: this.target, isValid: isValid, diff --git a/client-app/src/util/ReCaptcha.js b/client-app/src/util/ReCaptcha.js index a1f658bf..b7fc3087 100644 --- a/client-app/src/util/ReCaptcha.js +++ b/client-app/src/util/ReCaptcha.js @@ -43,7 +43,7 @@ define([ _onLoadReCaptcha = null; - var isProduction = redmicConfig.getEnvVariableValue('envProduction') === 'true', + var isProduction = (/true/i).test(redmicConfig.getEnvVariableValue('envProduction')), siteKey = isProduction ? this._siteKey : this._siteKeyForDebug; this._instanceId = grecaptcha.render(this.node, { -- GitLab From 563e7063d54aef6264f4e0595f03c5541044dee3 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Tue, 13 Aug 2024 13:27:08 +0100 Subject: [PATCH 076/249] Cambia directorio destino de compilado, optimiza MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Mueve la generación de contenido compilado hacia dentro del directorio 'client-app/', ya que se trata de una salida que es exclusiva de esta parte de la plataforma. Adapta configuraciones y rutas para funcionar correctamente con la nueva ubicación. Aprovecha para dejar de copiar innecesariamente los contenidos de 'client-app/res/', ya que ahora están disponibles en el mismo sitio para que el empaquetado los recoja y para referenciarlos al trabajar sin compilar. --- .gitignore | 2 +- Gruntfile.js | 2 +- README.md | 2 +- client-app/app.profile.js | 2 +- .../src/component/components/PDFViewer/PDFViewer.js | 2 +- client-app/src/component/map/LeafletImpl.js | 2 +- grunt/config/clean.js | 4 +++- grunt/config/copy.js | 10 ---------- grunt/task/build.js | 2 +- package.json | 2 +- server-app/src/exposure.js | 7 +++---- server-app/views/layout.pug | 11 ++++++----- 12 files changed, 20 insertions(+), 28 deletions(-) diff --git a/.gitignore b/.gitignore index 3334fd7a..50f557a9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ node_modules -dist +client-app/dist test_reports .gitmodules.old build-report.txt diff --git a/Gruntfile.js b/Gruntfile.js index 60086602..3ca62a89 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -15,7 +15,7 @@ module.exports = function(grunt) { srcPath: 'client-app/src', depPath: 'client-app/dep', testPath: 'client-app/test', - distPath: 'dist', + distPath: 'client-app/dist', destDir: 'js' }, pkg: grunt.file.readJSON('package.json') diff --git a/README.md b/README.md index 4515e4e3..1beea832 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ npm pack > Internamente se lanzarán otros comandos orquestados mediante **Grunt** (que también podrían ejecutarse de manera concreta si fuera necesario). -Esto generará un directorio con el código compilado de salida (`dist/`) junto con un fichero comprimido que contiene dicha salida y otros recursos necesarios para lanzar la aplicación (`redmic-project-web-.tgz`). +Esto generará un directorio con el código compilado de salida (`client-app/dist/`) junto con un fichero comprimido que contiene dicha salida y otros recursos necesarios para lanzar la aplicación (`redmic-project-web-.tgz`). Más información en . diff --git a/client-app/app.profile.js b/client-app/app.profile.js index d5571fab..f2ef7cda 100644 --- a/client-app/app.profile.js +++ b/client-app/app.profile.js @@ -26,7 +26,7 @@ var declarativeTagger = function(filename) { var profileObj = { basePath: '.', - releaseDir: '../dist', + releaseDir: '../client-app/dist', releaseName: 'js', action: 'release', layerOptimize: 'closure', diff --git a/client-app/src/component/components/PDFViewer/PDFViewer.js b/client-app/src/component/components/PDFViewer/PDFViewer.js index 2be2df1f..c69e6bec 100644 --- a/client-app/src/component/components/PDFViewer/PDFViewer.js +++ b/client-app/src/component/components/PDFViewer/PDFViewer.js @@ -101,7 +101,7 @@ define([ this.lastPDF = url; var useBuilt = (/true/i).test(redmicConfig.getEnvVariableValue('envUseBuilt')), - path = '/' + (useBuilt ? 'js' : 'dep') + '/pdfjs/web/viewer.html?file=' + url; + path = '/' + (useBuilt ? 'dist/js' : 'dep') + '/pdfjs/web/viewer.html?file=' + url; if (!this.roleGuestActive) { path += '?access_token%3D' + Credentials.get("accessToken"); diff --git a/client-app/src/component/map/LeafletImpl.js b/client-app/src/component/map/LeafletImpl.js index c7df2364..cb0a65e1 100644 --- a/client-app/src/component/map/LeafletImpl.js +++ b/client-app/src/component/map/LeafletImpl.js @@ -51,7 +51,7 @@ define([ _initialize: function() { var useBuilt = (/true/i).test(redmicConfig.getEnvVariableValue('envUseBuilt')); - L.Icon.Default.imagePath = '/' + (useBuilt ? 'js' : 'dep') + '/leaflet/dist/images/'; + L.Icon.Default.imagePath = '/' + (useBuilt ? 'dist/js' : 'dep') + '/leaflet/dist/images/'; this.mapParentNode = put("div.map"); this.mapNode = put(this.mapParentNode, "div.map"); diff --git a/grunt/config/clean.js b/grunt/config/clean.js index ae99b8cd..24141ea8 100644 --- a/grunt/config/clean.js +++ b/grunt/config/clean.js @@ -1,7 +1,9 @@ module.exports = function(grunt) { + var distPath = grunt.config('redmicConfig.distPath'); + grunt.config('clean', { - build: ['dist'], + build: [distPath], test: ['test_reports'] }); }; diff --git a/grunt/config/copy.js b/grunt/config/copy.js index ed8de3c3..c914a677 100644 --- a/grunt/config/copy.js +++ b/grunt/config/copy.js @@ -8,8 +8,6 @@ module.exports = function(grunt) { destDir = grunt.config('redmicConfig.destDir'), publicPath = srcPath.split('/')[0], - resourcesPath = 'res/**', - stylesPath = publicPath + '/style', stylesDistPath = stylesPath + '/dist', distStylesSubPath = distPath + '/style', @@ -25,14 +23,6 @@ module.exports = function(grunt) { pdfjsBuildName = 'build'; grunt.config('copy', { - resources: { - files: [{ - cwd: publicPath, - src: resourcesPath, - dest: distPath + '/', - expand: true - }] - }, stylesDist: { files: [{ cwd: stylesDistPath, diff --git a/grunt/task/build.js b/grunt/task/build.js index 6e3eaaa8..40c5f9ea 100644 --- a/grunt/task/build.js +++ b/grunt/task/build.js @@ -1,5 +1,5 @@ module.exports = function(grunt) { grunt.registerTask('build', - ['clean:build', 'buildStyles', 'copy:resources', 'copy:leaflet', 'copy:pdfjs', 'buildApp']); + ['clean:build', 'buildStyles', 'copy:leaflet', 'copy:pdfjs', 'buildApp']); }; diff --git a/package.json b/package.json index cca3582e..fa8208ab 100644 --- a/package.json +++ b/package.json @@ -84,7 +84,7 @@ "tv4": "1.3.0", "wicket": "1.3.8" }, - "files": ["server-app", "dist"], + "files": ["server-app", "client-app/dist", "client-app/res"], "engines": { "node": ">=20.16", "npm": ">=10.8" diff --git a/server-app/src/exposure.js b/server-app/src/exposure.js index db266f68..7ee8dcbb 100644 --- a/server-app/src/exposure.js +++ b/server-app/src/exposure.js @@ -124,14 +124,13 @@ function expose(app) { app.use(express.urlencoded({ extended: false })); - if (params.useBuilt) { - exposeContents(app, 'dist'); - } else { + if (!params.useBuilt) { require('./styles')(app); - exposeContents(app, 'client-app'); exposeContents(app, 'node_modules'); } + exposeContents(app, 'client-app'); + app.set('view engine', 'pug') .set('views', path.join(__dirname, '..', 'views')); diff --git a/server-app/views/layout.pug b/server-app/views/layout.pug index 87978faf..4e3f83da 100644 --- a/server-app/views/layout.pug +++ b/server-app/views/layout.pug @@ -30,9 +30,10 @@ html altLocale1 = esLocale; } - const basePath = '/' + (env.useBuilt ? 'dist' : 'client-app'), - dojoConfigPath = basePath + '/' + (env.useBuilt ? 'js' : 'src') + '/dojoConfig.js', - dojoJsPath = basePath + '/' + (env.useBuilt ? 'js' : 'dep') + '/dojo/dojo.js'; + const basePath = '/client-app/', + codeBasePath = basePath + (env.useBuilt ? 'dist/' : ''), + dojoConfigPath = codeBasePath + (env.useBuilt ? 'js' : 'src') + '/dojoConfig.js', + dojoJsPath = codeBasePath + (env.useBuilt ? 'js' : 'dep') + '/dojo/dojo.js'; meta(name = 'og:locale' content = locale) meta(name = 'og:locale:alternate' content = altLocale1) @@ -44,7 +45,7 @@ html script(src = dojoConfigPath) script(src = dojoJsPath data-dojo-config = 'locale:"' + env.lang + '"') - link(rel='shortcut icon', href=basePath + '/res/images/favicon.ico') + link(rel='shortcut icon', href=basePath + 'res/images/favicon.ico') body(class=['db']) //- Contenedor de carga de la aplicación @@ -58,4 +59,4 @@ if !env.useBuilt link(rel='stylesheet', href='https://fonts.googleapis.com/css?family=Open+Sans:400italic,600,400') link(rel='stylesheet', href='https://fonts.googleapis.com/css?family=Exo+2:700') -link(rel='stylesheet', href=basePath + '/style/style.css') +link(rel='stylesheet', href=codeBasePath + 'style/style.css') -- GitLab From 7280c42706eee86ca179e7c7e21508d7c296a32f Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Wed, 14 Aug 2024 07:47:42 +0100 Subject: [PATCH 077/249] Actualiza rutas hacia logs de compilado MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Añade prefijo para llegar al fichero, tanto para ignorar en el repo como para cargarlo como artifact en CI. --- .gitignore | 2 +- .gitlab-ci/build.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 50f557a9..45c5be89 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ node_modules client-app/dist +client-app/build-report.txt test_reports .gitmodules.old -build-report.txt *.tgz *.log diff --git a/.gitlab-ci/build.yml b/.gitlab-ci/build.yml index 9ede004a..6611361f 100644 --- a/.gitlab-ci/build.yml +++ b/.gitlab-ci/build.yml @@ -52,7 +52,7 @@ prepare-built-version: paths: - package-lock.json - redmic-project-web-*.tgz - - build-report.txt + - client-app/build-report.txt rules: - if: $CI_MERGE_REQUEST_ID || $CI_PIPELINE_SOURCE == "schedule" -- GitLab From aa7ad96ca9b840f91c04ffda5029c34080670a5f Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Wed, 14 Aug 2024 08:20:52 +0100 Subject: [PATCH 078/249] =?UTF-8?q?Actualiza=20subm=C3=B3dulos?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client-app/dep/templates | 2 +- client-app/style | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client-app/dep/templates b/client-app/dep/templates index 8654348a..eb6e8152 160000 --- a/client-app/dep/templates +++ b/client-app/dep/templates @@ -1 +1 @@ -Subproject commit 8654348acce45a178bcf73f5766a009fb9c278ad +Subproject commit eb6e8152c459f9853c9e42be3929c7c60cba20eb diff --git a/client-app/style b/client-app/style index 2d21ed27..b3c45f8e 160000 --- a/client-app/style +++ b/client-app/style @@ -1 +1 @@ -Subproject commit 2d21ed27dd4e6dcea9fd2770e48e9c06b8fe0921 +Subproject commit b3c45f8e36472b56a26f1ad751a81c17492fe836 -- GitLab From 135123b46cdaa6682cfb4ebe3edb8193017a35a3 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Wed, 14 Aug 2024 10:18:56 +0100 Subject: [PATCH 079/249] =?UTF-8?q?Refactoriza=20gesti=C3=B3n=20de=20boton?= =?UTF-8?q?es=20de=20edici=C3=B3n=20en=20row?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/component/browser/_EditionTable.js | 18 +++-- .../oldapp/base/views/extensions/_Edition.js | 68 +++++++++++-------- 2 files changed, 48 insertions(+), 38 deletions(-) diff --git a/client-app/src/component/browser/_EditionTable.js b/client-app/src/component/browser/_EditionTable.js index 6373a038..aa31b341 100644 --- a/client-app/src/component/browser/_EditionTable.js +++ b/client-app/src/component/browser/_EditionTable.js @@ -57,21 +57,19 @@ define([ aspect.after(this, "_defineSubscriptions", lang.hitch(this, this._defineEditionViewSubscriptions)); }, - _existListButton: function() { + _getBrowserButtons: function() { - if (this.rowConfig && this.rowConfig.buttonsConfig && this.rowConfig.buttonsConfig.listButton) { - return true; - } - - return null; - }, + var buttonsConfig = this.rowConfig && this.rowConfig.buttonsConfig, + buttonsList = buttonsConfig && buttonsConfig.listButton; - _getListButton: function() { + if (buttonsList) { + return buttonsList; + } - return this.rowConfig.buttonsConfig.listButton; + return []; }, - _setListButton: function(listButton) { + _setBrowserButtons: function(listButton) { this.rowConfig = this._merge([{ buttonsConfig: { diff --git a/client-app/src/oldapp/base/views/extensions/_Edition.js b/client-app/src/oldapp/base/views/extensions/_Edition.js index 75c3efa7..d4e00180 100644 --- a/client-app/src/oldapp/base/views/extensions/_Edition.js +++ b/client-app/src/oldapp/base/views/extensions/_Edition.js @@ -29,13 +29,15 @@ define([ }, editionViewActions: { UPDATE_TARGET_FORM: "updateTargetForm" - } + }, + + _editionGroupId: 'edition' }; lang.mixin(this, this.config); aspect.before(this, "_mixEventsAndActions", lang.hitch(this, this._mixEditionEventsAndActions)); - aspect.before(this, "_afterSetConfigurations", lang.hitch(this, this._addListButtonsEdition)); + aspect.after(this, "_afterSetConfigurations", lang.hitch(this, this._addListButtonsEdition)); aspect.after(this, "_mixEventsAndActions", lang.hitch(this, this._setEditionOwnCallbacksForEvents)); aspect.after(this, "_defineSubscriptions", lang.hitch(this, this._defineEditionSubscriptions)); aspect.after(this, "_definePublications", lang.hitch(this, this._defineEditionPublications)); @@ -43,44 +45,54 @@ define([ _addListButtonsEdition: function() { - if (this._existListButton()) { - for (var i = (this._getListButton().length - 1); i >= 0; i--) { - for (var s = (this.listButtonsEdition.length - 1); s >= 0; s--) { - if (this._getListButton()[i].groupId == this.listButtonsEdition[s].groupId) { - for (var k = (this.listButtonsEdition[s].icons.length - 1); k >= 0; k--) { - this._getListButton()[i].icons.unshift(this.listButtonsEdition[s].icons[k]); - } + var browserRowButtons = this._getBrowserButtons(); - this.listButtonsEdition.splice(s, 1); - } - } - } - - for (var n = (this.listButtonsEdition.length - 1); n >= 0; n--) { - this._getListButton().unshift(this.listButtonsEdition[n]); - } + if (browserRowButtons && browserRowButtons.length) { + this._mergeInEditionButtons(browserRowButtons); } else { - this._setListButton(lang.clone(this.listButtonsEdition)); + this._setBrowserButtons(lang.clone(this.listButtonsEdition)); } delete this.listButtonsEdition; }, - _existListButton: function() { + _mergeInEditionButtons: function(browserRowButtons) { - var browserConfig = this._getBrowserConfig(); + var findIndexCallback = lang.hitch(this, function(button) { - if (browserConfig && browserConfig.rowConfig && browserConfig.rowConfig.buttonsConfig && - browserConfig.rowConfig.buttonsConfig.listButton) { - return true; - } + return button.groupId && button.groupId === this._editionGroupId; + }); - return null; + var rowButtonIndex = browserRowButtons.findIndex(findIndexCallback); + + if (rowButtonIndex !== -1) { + var rowButtonEditionGroup = browserRowButtons[rowButtonIndex]; + + var editionButtonIndex = this.listButtonsEdition.findIndex(findIndexCallback); + + if (editionButtonIndex !== -1) { + var editionButtonEditionGroup = this.listButtonsEdition[editionButtonIndex]; + + rowButtonEditionGroup.icons = rowButtonEditionGroup.icons.concat(editionButtonEditionGroup.icons); + this.listButtonsEdition.splice(editionButtonIndex, 1); + } + } else if (this.listButtonsEdition.length) { + browserRowButtons = browserRowButtons.concat(this.listButtonsEdition); + } }, - _getListButton: function() { + _getBrowserButtons: function() { + + var browserConfig = this._getBrowserConfig(), + rowConfig = browserConfig && browserConfig.rowConfig, + buttonsConfig = rowConfig && rowConfig.buttonsConfig, + buttonsList = buttonsConfig && buttonsConfig.listButton; + + if (buttonsList) { + return buttonsList; + } - return this._getBrowserConfig().rowConfig.buttonsConfig.listButton; + return []; }, _getBrowserConfig: function() { @@ -93,7 +105,7 @@ define([ this.browserConfig = browserConfig; }, - _setListButton: function(listButton) { + _setBrowserButtons: function(listButton) { this._setBrowserConfig(this._merge([{ rowConfig: { -- GitLab From 2984e045911fb8400343839774098891a8cb8fd7 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Wed, 14 Aug 2024 13:37:32 +0100 Subject: [PATCH 080/249] =?UTF-8?q?Actualiza=20subm=C3=B3dulo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client-app/dep/templates | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client-app/dep/templates b/client-app/dep/templates index eb6e8152..3f294742 160000 --- a/client-app/dep/templates +++ b/client-app/dep/templates @@ -1 +1 @@ -Subproject commit eb6e8152c459f9853c9e42be3929c7c60cba20eb +Subproject commit 3f2947421b1e4c3a6d92eb87741b4a8d85840d77 -- GitLab From 5833458cae35471ee9f24002082d563bfea107c3 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Wed, 14 Aug 2024 13:43:35 +0100 Subject: [PATCH 081/249] =?UTF-8?q?Estrena=20vista=20unificada=20de=20cat?= =?UTF-8?q?=C3=A1logo=20de=20actividades?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Migra desde main de diseño con la lógica relativa a activity hacia nueva vista con su lógica, común a parte pública y administrativa. Se gestionan los permisos de qué se puede mostrar en tiempo de ejecución, en lugar de generar 2 vistas independientes. Sólo se importa la funcionalidad relativa a la edición si el usuario tiene permisos suficientes para ello. Simplifica las antiguas vistas al máximo para simplemente importar a la nueva, se eliminará cuando se migre a las nuevas rutas. Controla casos de error para ser menos vulnerable a los entresijos del ciclo de vida. --- .../catalog/activity/ActivityCatalogView.js | 136 ++++++++++++++++ .../src/catalog/activity/_ActivityEdition.js | 115 ++++++++++++++ .../administrative/views/ActivityView.js | 150 +----------------- .../oldapp/base/views/extensions/_Edition.js | 23 +-- .../catalog/views/ActivitiesCatalogView.js | 46 +----- .../textSearchFacetsList/main/Activity.js | 83 ---------- 6 files changed, 273 insertions(+), 280 deletions(-) create mode 100644 client-app/src/catalog/activity/ActivityCatalogView.js create mode 100644 client-app/src/catalog/activity/_ActivityEdition.js delete mode 100644 client-app/src/oldapp/designs/textSearchFacetsList/main/Activity.js diff --git a/client-app/src/catalog/activity/ActivityCatalogView.js b/client-app/src/catalog/activity/ActivityCatalogView.js new file mode 100644 index 00000000..4d48bf5f --- /dev/null +++ b/client-app/src/catalog/activity/ActivityCatalogView.js @@ -0,0 +1,136 @@ +define([ + 'app/designs/base/_Main' + , 'app/base/views/extensions/_AddCompositeSearchInTooltipFromTextSearch' + , 'app/designs/textSearchFacetsList/Controller' + , 'app/designs/textSearchFacetsList/Layout' + , 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'src/catalog/activity/_ActivityEdition' + , 'src/component/browser/_Select' + , 'src/component/browser/bars/Order' + , 'src/component/browser/bars/SelectionBox' + , 'src/component/browser/bars/Total' + , 'src/redmicConfig' + , 'src/util/Credentials' + , 'templates/ActivityList' +], function( + _Main + , _AddComposite + , Controller + , Layout + , declare + , lang + , _ActivityEdition + , _Select + , Order + , SelectionBox + , Total + , redmicConfig + , Credentials + , templateList +) { + + var declareItems = [Layout, Controller, _Main, _AddComposite]; + + if (Credentials.userIsEditor()) { + declareItems.push(_ActivityEdition); + } + + return declare(declareItems, { + // summary: + // Vista de catálogo de actividades. + + constructor: function(args) { + + this.config = { + title: this.i18n.activitiesCatalogView, + ownChannel: "activitiesCatalog", + + mask: {"download":{}}, + reportService: "activity", + + activityTarget: redmicConfig.services.activity, + selectionTarget: redmicConfig.services.activity, + activityProjectTarget: redmicConfig.services.activityProject, + perms: null, + + browserExts: [_Select] + }; + + lang.mixin(this, this.config, args); + + this.target = this.activityTarget; + }, + + _setMainConfigurations: function() { + + this.filterConfig = this._merge([{ + initQuery: { + returnFields: redmicConfig.returnFields.activity + } + }, this.filterConfig || {}]); + + this.browserConfig = this._merge([{ + selectionTarget: this.selectionTarget, + template: templateList, + rowConfig: { + buttonsConfig: { + listButton: [{ + icon: "fa-info-circle", + btnId: "details", + title: "info", + href: this.viewPaths.activityCatalogDetails + }] + } + }, + bars: [{ + instance: Total + },{ + instance: SelectionBox + },{ + instance: Order, + config: 'orderConfig' + }], + orderConfig: { + options: [ + {value: 'name'}, + {value: 'code'}, + {value: 'activityType.name', label: this.i18n.activityType}, + {value: 'startDate'}, + {value: 'endDate'}, + {value: 'updated'} + ] + } + }, this.browserConfig || {}]); + + this.facetsConfig = this._merge([{ + aggs: redmicConfig.aggregations.activity + }, this.facetsConfig || {}]); + + this.textSearchConfig = this._merge([{ + showExpandIcon: true + }, this.textSearchConfig || {}]); + }, + + _setOwnCallbacksForEvents: function() { + + this._onEvt('CONNECT', this._createTarget); + }, + + _createTarget: function() { + + var target = this.activityTarget; + + if (this.pathVariableId && Number.isInteger(parseInt(this.pathVariableId, 10))) { + target = lang.replace(this.activityProjectTarget, { + id: this.pathVariableId + }); + } + + this._publish(this.getChannel('UPDATE_TARGET'), { + target: target, + refresh: true + }); + } + }); +}); diff --git a/client-app/src/catalog/activity/_ActivityEdition.js b/client-app/src/catalog/activity/_ActivityEdition.js new file mode 100644 index 00000000..012ee3ab --- /dev/null +++ b/client-app/src/catalog/activity/_ActivityEdition.js @@ -0,0 +1,115 @@ +define([ + 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'dojo/aspect' + , 'app/base/views/extensions/_EditionWizardView' +], function( + declare + , lang + , aspect + , _EditionWizardView +) { + + return declare(_EditionWizardView, { + // summary: + // Extensión de vista de catálogo de actividades para añadir funcionalidad relativa a la edición de + // registros. + + constructor: function(args) { + + this.config = { + addPath: this.viewPaths.activityAdd + }; + + lang.mixin(this, this.config, args); + + aspect.after(this, '_setConfigurations', lang.hitch(this, this._setActivityEditionConfigurations)); + aspect.before(this, '_setBrowserButtons', lang.hitch(this, this._setActivityEditionBrowserButtons)); + }, + + _setActivityEditionConfigurations: function() { + + if (!this.listButtonsEdition) { + console.warn('Tried to add activity load data button, but edition buttons config was not found!'); + return; + } + + this.listButtonsEdition.push({ + icon: 'fa-keyboard-o', + btnId: 'goToChildren', + href: [ + lang.replace(this.viewPaths.activityGeoDataAdd, { + activityid: '{id}', + id: 'new' + }), + this.viewPaths.activityCitation, + this.viewPaths.activitySurveyStation, + this.viewPaths.activityObjectCollection, + this.viewPaths.activityTracking, + this.viewPaths.activityInfrastructure, + this.viewPaths.activityArea + ], + chooseHref: function(item) { + + var activityTypeId = item.activityType.id, + activityCategory = item.activityCategory, + validActivityTypeCitation = [2, 10]; + + if (activityCategory === 'ci' || validActivityTypeCitation.indexOf(activityTypeId) !== -1) { + return 1; + } + if (activityCategory === 'ft') { + return 2; + } + if (activityCategory === 'oc') { + return 3; + } + if (['at', 'pt', 'tr'].indexOf(activityCategory) !== -1) { + return 4; + } + if (activityCategory === 'if') { + return 5; + } + if (activityCategory === 'ar') { + return 6; + } + + return 0; + }, + title: 'data-loader' + }); + }, + + _setActivityEditionBrowserButtons: function() { + + if (!this.listButtonsEdition) { + console.warn('Tried to add activity edition buttons, but edition buttons config was not found!'); + return; + } + + var findIndexCallback = lang.hitch(this, function(button) { + + return button.groupId && button.groupId === this._editionGroupId; + }); + + var editionButtonIndex = this.listButtonsEdition.findIndex(findIndexCallback); + + if (editionButtonIndex !== -1) { + this.listButtonsEdition[editionButtonIndex].icons.push({ + icon: 'fa-edit', + btnId: 'edit', + title: 'edit', + option: 'default', + href: this.viewPaths.activityEdit + },{ + icon: 'fa-copy', + btnId: 'copy', + title: 'copy', + href: this.viewPaths.activityAdd + }); + } else { + console.warn('Tried to add activity edition buttons, but edition button group config was not found!'); + } + } + }); +}); diff --git a/client-app/src/oldapp/administrative/views/ActivityView.js b/client-app/src/oldapp/administrative/views/ActivityView.js index 254fb6b8..5809e5b1 100644 --- a/client-app/src/oldapp/administrative/views/ActivityView.js +++ b/client-app/src/oldapp/administrative/views/ActivityView.js @@ -1,147 +1,7 @@ define([ - "app/designs/textSearchFacetsList/main/Activity" - , "app/base/views/extensions/_EditionWizardView" - , 'src/redmicConfig' - , "dojo/_base/declare" - , "dojo/_base/lang" - , "dojo/aspect" -], function( - ActivityMain - , _EditionWizardView - , redmicConfig - , declare - , lang - , aspect -){ - return declare([ActivityMain, _EditionWizardView], { - // summary: - // Vista de Activity. - // description: - // Muestra la información. - - constructor: function (args) { - //this.authenticate(); - - this.config = { - addPath: this.viewPaths.activityAdd, - activityTarget: redmicConfig.services.activity, - selectionTarget: redmicConfig.services.activity, - activityProjectTarget: redmicConfig.services.activityProject, - perms: null - }; - - lang.mixin(this, this.config, args); - - this.target = this.activityTarget; - }, - - _setConfigurations: function() { - - this.browserConfig = this._merge([{ - selectionTarget: this.selectionTarget, - rowConfig: { - buttonsConfig: { - listButton: [{ - groupId: "edition", - icons: [{ - icon: "fa-edit", - btnId: "edit", - title: "edit", - option: "default", - href: this.viewPaths.activityEdit - },{ - icon: "fa-copy", - btnId: "copy", - title: "copy", - href: this.viewPaths.activityAdd - }] - },{ - icon: "fa-info-circle", - btnId: "details", - title: "info", - href: this.viewPaths.activityDetails - },{ - icon: "fa-keyboard-o", - btnId: "goToChildren", - href: [ - lang.replace(this.viewPaths.activityGeoDataAdd, { - activityid: "{id}", - id: "new" - }), - this.viewPaths.activityCitation, - this.viewPaths.activitySurveyStation, - this.viewPaths.activityObjectCollection, - this.viewPaths.activityTracking, - this.viewPaths.activityInfrastructure, - this.viewPaths.activityArea - ], - condition: function(item) { - - return true; - /*var validActivityType = [2, 10, 6, 31, 32, 7, 13, 19]; - return (item.activityType && validActivityType.indexOf(item.activityType.id) !== -1);*/ - }, - chooseHref: function(item) { - - var activityTypeId = item.activityType.id, - activityCategory = item.activityCategory, - validActivityTypeCitation = [2, 10]; - - if (activityCategory === "ci" || validActivityTypeCitation.indexOf(activityTypeId) !== -1) { - return 1; - } - if (activityCategory === "ft") { - return 2; - } - if (activityCategory === "oc") { - return 3; - } - if (["at", "pt", "tr"].indexOf(activityCategory) !== -1) { - return 4; - } - if (activityCategory === "if") { - return 5; - } - if (activityCategory === "ar") { - return 6; - } - - return 0; - }, - title: "data-loader" - }] - } - } - }, this.browserConfig || {}]); - - this.filterConfig = this._merge([{ - initQuery: { - vFlags: null, - qFlags: null, - accessibilityIds: null - } - }, this.filterConfig || {}]); - }, - - _setOwnCallbacksForEvents: function() { - - this._onEvt('CONNECT', this._createTarget); - }, - - _createTarget: function() { - - var target = this.activityTarget; - - if (this.pathVariableId && Number.isInteger(parseInt(this.pathVariableId, 10))) { - target = lang.replace(this.activityProjectTarget, { - id: this.pathVariableId - }); - } - - this._publish(this.getChannel('UPDATE_TARGET'), { - target: target, - refresh: true - }); - } - }); + 'src/catalog/activity/ActivityCatalogView' +], function ( + ActivityCatalogView +) { + return ActivityCatalogView; }); diff --git a/client-app/src/oldapp/base/views/extensions/_Edition.js b/client-app/src/oldapp/base/views/extensions/_Edition.js index d4e00180..d729ca5a 100644 --- a/client-app/src/oldapp/base/views/extensions/_Edition.js +++ b/client-app/src/oldapp/base/views/extensions/_Edition.js @@ -45,14 +45,16 @@ define([ _addListButtonsEdition: function() { - var browserRowButtons = this._getBrowserButtons(); + var browserRowButtons = this._getBrowserButtons(), + buttons; if (browserRowButtons && browserRowButtons.length) { - this._mergeInEditionButtons(browserRowButtons); + buttons = this._mergeInEditionButtons(browserRowButtons); } else { - this._setBrowserButtons(lang.clone(this.listButtonsEdition)); + buttons = lang.clone(this.listButtonsEdition); } + this._setBrowserButtons(buttons); delete this.listButtonsEdition; }, @@ -79,6 +81,8 @@ define([ } else if (this.listButtonsEdition.length) { browserRowButtons = browserRowButtons.concat(this.listButtonsEdition); } + + return browserRowButtons; }, _getBrowserButtons: function() { @@ -107,13 +111,12 @@ define([ _setBrowserButtons: function(listButton) { - this._setBrowserConfig(this._merge([{ - rowConfig: { - buttonsConfig: { - listButton: listButton - } - } - }, this._getBrowserConfig() || {}])); + if (!this.browserConfig || !this.browserConfig.rowConfig || !this.browserConfig.rowConfig.buttonsConfig) { + console.warn('Tried to add edition buttons to browser row config, but base config was not found!'); + return; + } + + this.browserConfig.rowConfig.buttonsConfig.listButton = listButton; }, _mixEditionEventsAndActions: function() { diff --git a/client-app/src/oldapp/catalog/views/ActivitiesCatalogView.js b/client-app/src/oldapp/catalog/views/ActivitiesCatalogView.js index 988c446d..5809e5b1 100644 --- a/client-app/src/oldapp/catalog/views/ActivitiesCatalogView.js +++ b/client-app/src/oldapp/catalog/views/ActivitiesCatalogView.js @@ -1,45 +1,7 @@ define([ - "app/designs/textSearchFacetsList/main/Activity" - , 'src/redmicConfig' - , "dojo/_base/declare" - , "dojo/_base/lang" + 'src/catalog/activity/ActivityCatalogView' ], function ( - ActivityMain - , redmicConfig - , declare - , lang -){ - return declare(ActivityMain, { - // summary: - // Vista de Activity Catalog. - - constructor: function (args) { - - this.config = { - mask: {"download":{}}, - target: redmicConfig.services.activity, - reportService: "activity", - title: this.i18n.activitiesCatalogView, - ownChannel: "activitiesCatalog" - }; - - lang.mixin(this, this.config, args); - }, - - _setConfigurations: function() { - - this.browserConfig = this._merge([{ - rowConfig: { - buttonsConfig: { - listButton: [{ - icon: "fa-info-circle", - btnId: "details", - title: "info", - href: this.viewPaths.activityCatalogDetails - }] - } - } - }, this.browserConfig || {}]); - } - }); + ActivityCatalogView +) { + return ActivityCatalogView; }); diff --git a/client-app/src/oldapp/designs/textSearchFacetsList/main/Activity.js b/client-app/src/oldapp/designs/textSearchFacetsList/main/Activity.js deleted file mode 100644 index 82b147ef..00000000 --- a/client-app/src/oldapp/designs/textSearchFacetsList/main/Activity.js +++ /dev/null @@ -1,83 +0,0 @@ -define([ - "app/designs/base/_Main" - , 'app/base/views/extensions/_AddCompositeSearchInTooltipFromTextSearch' - , "app/designs/textSearchFacetsList/Controller" - , "app/designs/textSearchFacetsList/Layout" - , 'src/redmicConfig' - , "dojo/_base/declare" - , "dojo/_base/lang" - , "templates/ActivityList" - , "src/component/browser/_Select" - , "src/component/browser/bars/SelectionBox" - , "src/component/browser/bars/Order" - , "src/component/browser/bars/Total" -], function( - _Main - , _AddComposite - , Controller - , Layout - , redmicConfig - , declare - , lang - , templateList - , _Select - , SelectionBox - , Order - , Total -){ - return declare([Layout, Controller, _Main, _AddComposite], { - // summary: - // Extensión para establecer la configuración de las vistas de activity. - // description: - // - - constructor: function(args) { - - this.config = { - browserExts: [_Select], - title: this.i18n.activities - }; - - lang.mixin(this, this.config, args); - }, - - _setMainConfigurations: function() { - - this.filterConfig = this._merge([{ - initQuery: { - returnFields: redmicConfig.returnFields.activity - } - }, this.filterConfig || {}]); - - this.browserConfig = this._merge([{ - template: templateList, - bars: [{ - instance: Total - },{ - instance: SelectionBox - },{ - instance: Order, - config: 'orderConfig' - }], - orderConfig: { - options: [ - {value: "name"}, - {value: "code"}, - {value: "activityType.name", label: this.i18n.activityType}, - {value: "startDate"}, - {value: "endDate"}, - {value: "updated"} - ] - } - }, this.browserConfig || {}]); - - this.facetsConfig = this._merge([{ - aggs: redmicConfig.aggregations.activity - }, this.facetsConfig || {}]); - - this.textSearchConfig = this._merge([{ - showExpandIcon: true - }, this.textSearchConfig || {}]); - } - }); -}); -- GitLab From 97088fad1f8a701cec569ae2faeaadfe6e512f6b Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Wed, 14 Aug 2024 13:53:42 +0100 Subject: [PATCH 082/249] Corrige listado de hijos en detalle de programa Muestra proyectos dentro del programa, en lugar de ir a buscar por actividades dentro de proyecto. --- client-app/src/oldapp/designs/details/main/Program.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client-app/src/oldapp/designs/details/main/Program.js b/client-app/src/oldapp/designs/details/main/Program.js index d18bedb7..f341c2d7 100644 --- a/client-app/src/oldapp/designs/details/main/Program.js +++ b/client-app/src/oldapp/designs/details/main/Program.js @@ -24,7 +24,7 @@ define([ this.config = { target: redmicConfig.services.program, reportService: "program", - _targetListRank: redmicConfig.services.activityProject, + _targetListRank: redmicConfig.services.projectProgram, _indexListRank: 4 }; -- GitLab From 397cf5868fcc4a67b6266145f1567ba8f6178728 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Wed, 14 Aug 2024 14:10:57 +0100 Subject: [PATCH 083/249] Elimina enlace redundante en listado de documentos MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Para los listados de documentos que se muestran en vistas detalle de otros elementos, se mostraba un botón con icono de PDF que actualmente hacía lo mismo que el de más información (antiguamente había una vista detalle adicional para mostrar el documento). Se ha eliminado este botón olvidado. --- client-app/src/detail/_WidgetDefinition.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/client-app/src/detail/_WidgetDefinition.js b/client-app/src/detail/_WidgetDefinition.js index a0893e73..1d72a3d7 100644 --- a/client-app/src/detail/_WidgetDefinition.js +++ b/client-app/src/detail/_WidgetDefinition.js @@ -157,12 +157,6 @@ define([ rowConfig: { buttonsConfig: { listButton: [{ - icon: 'fa-file-pdf-o', - btnId: 'downloadPdf', - title: this.i18n.download, - condition: 'url', - href: redmicConfig.viewPaths.bibliographyDetails - },{ icon: 'fa-info-circle', btnId: 'details', title: this.i18n.info, -- GitLab From c3ddc1abc8a85efb2a02aed302fe5b71c376bd81 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Wed, 14 Aug 2024 14:14:26 +0100 Subject: [PATCH 084/249] =?UTF-8?q?Actualiza=20subm=C3=B3dulo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client-app/dep/templates | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client-app/dep/templates b/client-app/dep/templates index 3f294742..7ff4137b 160000 --- a/client-app/dep/templates +++ b/client-app/dep/templates @@ -1 +1 @@ -Subproject commit 3f2947421b1e4c3a6d92eb87741b4a8d85840d77 +Subproject commit 7ff4137ba12e82208bb94730aa9ba67434ec4f89 -- GitLab From c76ba5f49e8d0dfafc7d2a70f55cd744a5aba4de Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Wed, 14 Aug 2024 14:25:06 +0100 Subject: [PATCH 085/249] =?UTF-8?q?Actualiza=20subm=C3=B3dulo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client-app/dep/templates | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client-app/dep/templates b/client-app/dep/templates index 7ff4137b..df8b107e 160000 --- a/client-app/dep/templates +++ b/client-app/dep/templates @@ -1 +1 @@ -Subproject commit 7ff4137ba12e82208bb94730aa9ba67434ec4f89 +Subproject commit df8b107e7cc6c7e45406cf548c95ed2ddbf6449c -- GitLab From 20303ce7ec8e3bc87097687fe0f1846b716bc795 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Fri, 16 Aug 2024 08:29:06 +0100 Subject: [PATCH 086/249] Aplica sufijo View a nueva vista de ActivityDetail MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Recupera el sufijo para esta vista ya generada, para seguir un criterio uniforme en todas las nuevas. Añade comentarios TODO a los wrappers que van quedando en 'src/oldApp/'. --- ...ctivityDetail.js => ActivityDetailView.js} | 18 ++++++++++ .../administrative/views/ActivityView.js | 2 ++ .../catalog/views/ActivitiesCatalogView.js | 2 ++ .../views/ActivityCatalogDetailsView.js | 25 +++---------- .../details/views/ActivityDetailsView.js | 35 +++---------------- 5 files changed, 30 insertions(+), 52 deletions(-) rename client-app/src/detail/activity/{ActivityDetail.js => ActivityDetailView.js} (88%) diff --git a/client-app/src/detail/activity/ActivityDetail.js b/client-app/src/detail/activity/ActivityDetailView.js similarity index 88% rename from client-app/src/detail/activity/ActivityDetail.js rename to client-app/src/detail/activity/ActivityDetailView.js index 7bc00a94..7d7faa66 100644 --- a/client-app/src/detail/activity/ActivityDetail.js +++ b/client-app/src/detail/activity/ActivityDetailView.js @@ -35,6 +35,24 @@ define([ _setMainConfigurations: function() { + this._titleRightButtonsList = [{ + icon: 'fa-edit', + href: redmicConfig.viewPaths.activityEdit, + title: this.i18n.edit + }]; + + this.shownOptionInfo = { + id: true + }; + + this.viewPathsWidgets = { + organisations: redmicConfig.viewPaths.organisationCatalogDetails, + platforms: redmicConfig.viewPaths.platformCatalogDetails, + documents: redmicConfig.viewPaths.bibliographyDetails + }; + + this.pathParent = redmicConfig.viewPaths.activityCatalog; + this.widgetConfigs = this._merge([{ info: this._getInfoConfig({ height: 4, diff --git a/client-app/src/oldapp/administrative/views/ActivityView.js b/client-app/src/oldapp/administrative/views/ActivityView.js index 5809e5b1..e845e2fb 100644 --- a/client-app/src/oldapp/administrative/views/ActivityView.js +++ b/client-app/src/oldapp/administrative/views/ActivityView.js @@ -3,5 +3,7 @@ define([ ], function ( ActivityCatalogView ) { + + // TODO placeholder hasta que se referencien las vistas a partir de src/ return ActivityCatalogView; }); diff --git a/client-app/src/oldapp/catalog/views/ActivitiesCatalogView.js b/client-app/src/oldapp/catalog/views/ActivitiesCatalogView.js index 5809e5b1..e845e2fb 100644 --- a/client-app/src/oldapp/catalog/views/ActivitiesCatalogView.js +++ b/client-app/src/oldapp/catalog/views/ActivitiesCatalogView.js @@ -3,5 +3,7 @@ define([ ], function ( ActivityCatalogView ) { + + // TODO placeholder hasta que se referencien las vistas a partir de src/ return ActivityCatalogView; }); diff --git a/client-app/src/oldapp/details/views/ActivityCatalogDetailsView.js b/client-app/src/oldapp/details/views/ActivityCatalogDetailsView.js index da7214a4..7d7b3a49 100644 --- a/client-app/src/oldapp/details/views/ActivityCatalogDetailsView.js +++ b/client-app/src/oldapp/details/views/ActivityCatalogDetailsView.js @@ -1,26 +1,9 @@ define([ - 'src/redmicConfig' - , 'dojo/_base/declare' - , 'src/detail/activity/ActivityDetail' + 'src/detail/activity/ActivityDetailView' ], function( - redmicConfig - , declare - , ActivityDetail + ActivityDetailView ) { - return declare(ActivityDetail, { - // summary: - // - - _setConfigurations: function() { - - this.viewPathsWidgets = { - organisations: redmicConfig.viewPaths.organisationCatalogDetails, - platforms: redmicConfig.viewPaths.platformCatalogDetails, - documents: redmicConfig.viewPaths.bibliographyDetails - }; - - this.pathParent = redmicConfig.viewPaths.activityCatalog; - } - }); + // TODO placeholder hasta que se referencien las vistas a partir de src/ + return ActivityDetailView; }); diff --git a/client-app/src/oldapp/details/views/ActivityDetailsView.js b/client-app/src/oldapp/details/views/ActivityDetailsView.js index a682b9d1..7d7b3a49 100644 --- a/client-app/src/oldapp/details/views/ActivityDetailsView.js +++ b/client-app/src/oldapp/details/views/ActivityDetailsView.js @@ -1,36 +1,9 @@ define([ - 'src/redmicConfig' - , 'dojo/_base/declare' - , 'src/detail/activity/ActivityDetail' + 'src/detail/activity/ActivityDetailView' ], function( - redmicConfig - , declare - , ActivityDetail + ActivityDetailView ) { - return declare(ActivityDetail, { - // summary: - // - - _setConfigurations: function() { - - this._titleRightButtonsList = [{ - icon: 'fa-edit', - href: redmicConfig.viewPaths.activityEdit, - title: this.i18n.edit - }]; - - this.shownOptionInfo = { - id: true - }; - - this.viewPathsWidgets = { - organisations: redmicConfig.viewPaths.organisationDetails, - platforms: redmicConfig.viewPaths.platformDetails, - documents: redmicConfig.viewPaths.documentDetails - }; - - this.pathParent = redmicConfig.viewPaths.activity; - } - }); + // TODO placeholder hasta que se referencien las vistas a partir de src/ + return ActivityDetailView; }); -- GitLab From 7761e11bbdab319df1807b54705bf4dc09399385 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Fri, 16 Aug 2024 09:00:36 +0100 Subject: [PATCH 087/249] =?UTF-8?q?Separa=20ajustes=20de=20edici=C3=B3n=20?= =?UTF-8?q?desde=20vista=20detalle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/detail/activity/ActivityDetailView.js | 24 +++++----- .../src/detail/activity/_ActivityEdition.js | 45 +++++++++++++++++++ 2 files changed, 57 insertions(+), 12 deletions(-) create mode 100644 client-app/src/detail/activity/_ActivityEdition.js diff --git a/client-app/src/detail/activity/ActivityDetailView.js b/client-app/src/detail/activity/ActivityDetailView.js index 7d7faa66..d48dafc8 100644 --- a/client-app/src/detail/activity/ActivityDetailView.js +++ b/client-app/src/detail/activity/ActivityDetailView.js @@ -4,7 +4,9 @@ define([ , 'dojo/_base/declare' , 'dojo/_base/lang' , 'src/component/base/_ExternalConfig' + , 'src/detail/activity/_ActivityEdition' , 'src/detail/activity/_ActivityLayoutWidget' + , 'src/util/Credentials' , 'templates/ActivityInfo' ], function( redmicConfig @@ -12,13 +14,21 @@ define([ , declare , lang , _ExternalConfig + , _ActivityEdition , _ActivityLayoutWidget + , Credentials , TemplateInfo ) { - return declare([_ActivityBase, _ActivityLayoutWidget, _ExternalConfig], { + var declareItems = [_ActivityBase, _ActivityLayoutWidget, _ExternalConfig]; + + if (Credentials.userIsEditor()) { + declareItems.push(_ActivityEdition); + } + + return declare(declareItems, { // summary: - // Layout para detalle de actividad con metadatos. + // Vista de detalle de actividades. constructor: function(args) { @@ -35,16 +45,6 @@ define([ _setMainConfigurations: function() { - this._titleRightButtonsList = [{ - icon: 'fa-edit', - href: redmicConfig.viewPaths.activityEdit, - title: this.i18n.edit - }]; - - this.shownOptionInfo = { - id: true - }; - this.viewPathsWidgets = { organisations: redmicConfig.viewPaths.organisationCatalogDetails, platforms: redmicConfig.viewPaths.platformCatalogDetails, diff --git a/client-app/src/detail/activity/_ActivityEdition.js b/client-app/src/detail/activity/_ActivityEdition.js new file mode 100644 index 00000000..cd42919b --- /dev/null +++ b/client-app/src/detail/activity/_ActivityEdition.js @@ -0,0 +1,45 @@ +define([ + 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'dojo/aspect' + , 'src/redmicConfig' +], function( + declare + , lang + , aspect + , redmicConfig +) { + + return declare(null, { + // summary: + // Extensión de vista de detalle de actividades para añadir funcionalidad relativa a la edición de + // registros. + + constructor: function(args) { + + this.config = { + }; + + lang.mixin(this, this.config, args); + + aspect.after(this, '_setConfigurations', lang.hitch(this, this._setActivityEditionConfigurations)); + }, + + _setActivityEditionConfigurations: function() { + + if (!this._titleRightButtonsList) { + this._titleRightButtonsList = []; + } + + this._titleRightButtonsList.push({ + icon: 'fa-edit', + href: redmicConfig.viewPaths.activityEdit, + title: this.i18n.edit + }); + + this.shownOptionInfo = { + id: true + }; + } + }); +}); -- GitLab From f1a23c41942bba14f949c0d3f252679ace11ebde Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Fri, 16 Aug 2024 09:21:18 +0100 Subject: [PATCH 088/249] Erradica vista detalle de parte administrativa MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Aunque por ahora se sigan recibiendo permisos para acceder a la vista de detalle de actividad vinculada a la parte administrativa, ya no queda ningún enlace en la aplicación que apunte a la misma. En su lugar, se vincula todo hacia la vista de detalle de actividad vinculada a la parte pública o de catálogo. Se ha elegido esta última porque es la que está indexada por buscadores y a la que accede todo el mundo, y ahora que cuenta con capacidades de edición si el usuario tiene permisos, cumple con todos los requisitos. Se elimina el fichero wrapper y la compilación relativa a la vista eliminada. --- client-app/app.profile.js | 1 - client-app/src/catalog/activity/ActivityCatalogView.js | 2 +- client-app/src/home/item/SearchResultsWidget.js | 2 +- .../designs/mapWithSideContent/main/_TrackingWithList.js | 2 +- .../src/oldapp/details/views/ActivityDetailsView.js | 9 --------- .../src/oldapp/details/views/BibliographyDetailsView.js | 2 +- .../details/views/OrganisationCatalogDetailsView.js | 2 +- .../oldapp/details/views/PlatformCatalogDetailsView.js | 2 +- .../oldapp/details/views/ProjectCatalogDetailsView.js | 2 +- .../oldapp/details/views/SpeciesCatalogDetailsView.js | 2 +- client-app/src/oldapp/viewers/views/ChartsView.js | 2 +- .../src/oldapp/viewers/views/RealTimeDashboardView.js | 2 +- client-app/src/oldapp/viewers/views/TrackingView.js | 2 +- client-app/src/redmicConfig.js | 3 +-- 14 files changed, 12 insertions(+), 23 deletions(-) delete mode 100644 client-app/src/oldapp/details/views/ActivityDetailsView.js diff --git a/client-app/app.profile.js b/client-app/app.profile.js index f2ef7cda..6cb54961 100644 --- a/client-app/app.profile.js +++ b/client-app/app.profile.js @@ -517,7 +517,6 @@ var viewLayers = { , 'app/details/views/ProjectCatalogDetailsView': {} , 'app/details/views/ProgramCatalogDetailsView': {} , 'app/details/views/PlatformDetailsView': {} - , 'app/details/views/ActivityDetailsView': {} , 'app/details/views/SpeciesDetailsView': {} , 'app/details/views/ActivityCatalogDetailsView': {} , 'app/details/views/PlatformCatalogDetailsView': {} diff --git a/client-app/src/catalog/activity/ActivityCatalogView.js b/client-app/src/catalog/activity/ActivityCatalogView.js index 4d48bf5f..86c812b2 100644 --- a/client-app/src/catalog/activity/ActivityCatalogView.js +++ b/client-app/src/catalog/activity/ActivityCatalogView.js @@ -79,7 +79,7 @@ define([ icon: "fa-info-circle", btnId: "details", title: "info", - href: this.viewPaths.activityCatalogDetails + href: this.viewPaths.activityDetails }] } }, diff --git a/client-app/src/home/item/SearchResultsWidget.js b/client-app/src/home/item/SearchResultsWidget.js index e8241677..fd4092c0 100644 --- a/client-app/src/home/item/SearchResultsWidget.js +++ b/client-app/src/home/item/SearchResultsWidget.js @@ -80,7 +80,7 @@ define([ icon: 'fa-info-circle', btnId: 'info', title: 'info', - href: redmicConfig.viewPaths.activityCatalogDetails + href: redmicConfig.viewPaths.activityDetails }] } } diff --git a/client-app/src/oldapp/designs/mapWithSideContent/main/_TrackingWithList.js b/client-app/src/oldapp/designs/mapWithSideContent/main/_TrackingWithList.js index 554925ad..1c3f3dec 100644 --- a/client-app/src/oldapp/designs/mapWithSideContent/main/_TrackingWithList.js +++ b/client-app/src/oldapp/designs/mapWithSideContent/main/_TrackingWithList.js @@ -81,7 +81,7 @@ define([ btnId: "details", title: "info", href: [ - redmicConfig.viewPaths.activityCatalogDetails, + redmicConfig.viewPaths.activityDetails, redmicConfig.viewPaths.platformCatalogDetails ], chooseHref: function(item) { diff --git a/client-app/src/oldapp/details/views/ActivityDetailsView.js b/client-app/src/oldapp/details/views/ActivityDetailsView.js deleted file mode 100644 index 7d7b3a49..00000000 --- a/client-app/src/oldapp/details/views/ActivityDetailsView.js +++ /dev/null @@ -1,9 +0,0 @@ -define([ - 'src/detail/activity/ActivityDetailView' -], function( - ActivityDetailView -) { - - // TODO placeholder hasta que se referencien las vistas a partir de src/ - return ActivityDetailView; -}); diff --git a/client-app/src/oldapp/details/views/BibliographyDetailsView.js b/client-app/src/oldapp/details/views/BibliographyDetailsView.js index e2d3594f..23c176ef 100644 --- a/client-app/src/oldapp/details/views/BibliographyDetailsView.js +++ b/client-app/src/oldapp/details/views/BibliographyDetailsView.js @@ -14,7 +14,7 @@ define([ _setConfigurations: function() { this.viewPathsWidgets = { - activities: redmicConfig.viewPaths.activityCatalogDetails + activities: redmicConfig.viewPaths.activityDetails }; this.pathParent = redmicConfig.viewPaths.bibliography; diff --git a/client-app/src/oldapp/details/views/OrganisationCatalogDetailsView.js b/client-app/src/oldapp/details/views/OrganisationCatalogDetailsView.js index 5189897b..d535e2a2 100644 --- a/client-app/src/oldapp/details/views/OrganisationCatalogDetailsView.js +++ b/client-app/src/oldapp/details/views/OrganisationCatalogDetailsView.js @@ -14,7 +14,7 @@ define([ _setConfigurations: function() { this.viewPathsWidgets = { - activities: redmicConfig.viewPaths.activityCatalogDetails + activities: redmicConfig.viewPaths.activityDetails }; this.pathParent = redmicConfig.viewPaths.organisationCatalog; diff --git a/client-app/src/oldapp/details/views/PlatformCatalogDetailsView.js b/client-app/src/oldapp/details/views/PlatformCatalogDetailsView.js index a0c59ea2..39e0f701 100644 --- a/client-app/src/oldapp/details/views/PlatformCatalogDetailsView.js +++ b/client-app/src/oldapp/details/views/PlatformCatalogDetailsView.js @@ -14,7 +14,7 @@ define([ _setConfigurations: function() { this.viewPathsWidgets = { - activities: redmicConfig.viewPaths.activityCatalogDetails + activities: redmicConfig.viewPaths.activityDetails }; this.pathParent = redmicConfig.viewPaths.platformCatalog; diff --git a/client-app/src/oldapp/details/views/ProjectCatalogDetailsView.js b/client-app/src/oldapp/details/views/ProjectCatalogDetailsView.js index b1575274..bf37de11 100644 --- a/client-app/src/oldapp/details/views/ProjectCatalogDetailsView.js +++ b/client-app/src/oldapp/details/views/ProjectCatalogDetailsView.js @@ -17,7 +17,7 @@ define([ organisations: redmicConfig.viewPaths.organisationCatalogDetails, platforms: redmicConfig.viewPaths.platformCatalogDetails, documents: redmicConfig.viewPaths.bibliographyDetails, - activities: redmicConfig.viewPaths.activityCatalogDetails + activities: redmicConfig.viewPaths.activityDetails }; this.pathParent = redmicConfig.viewPaths.project; diff --git a/client-app/src/oldapp/details/views/SpeciesCatalogDetailsView.js b/client-app/src/oldapp/details/views/SpeciesCatalogDetailsView.js index 6c0ec39c..0f09a66d 100644 --- a/client-app/src/oldapp/details/views/SpeciesCatalogDetailsView.js +++ b/client-app/src/oldapp/details/views/SpeciesCatalogDetailsView.js @@ -15,7 +15,7 @@ define([ this.viewPathsWidgets = { documents: redmicConfig.viewPaths.bibliographyDetails, - activities: redmicConfig.viewPaths.activityCatalogDetails + activities: redmicConfig.viewPaths.activityDetails }; this.pathParent = redmicConfig.viewPaths.speciesCatalog; diff --git a/client-app/src/oldapp/viewers/views/ChartsView.js b/client-app/src/oldapp/viewers/views/ChartsView.js index 6bad6275..272f11f3 100644 --- a/client-app/src/oldapp/viewers/views/ChartsView.js +++ b/client-app/src/oldapp/viewers/views/ChartsView.js @@ -150,7 +150,7 @@ define([ return item.activityId; }, - href: lang.replace(redmicConfig.viewPaths.activityCatalogDetails, { + href: lang.replace(redmicConfig.viewPaths.activityDetails, { id: '{activityId}' }) }] diff --git a/client-app/src/oldapp/viewers/views/RealTimeDashboardView.js b/client-app/src/oldapp/viewers/views/RealTimeDashboardView.js index 40b83d3d..7fa8f361 100644 --- a/client-app/src/oldapp/viewers/views/RealTimeDashboardView.js +++ b/client-app/src/oldapp/viewers/views/RealTimeDashboardView.js @@ -316,7 +316,7 @@ define([ var platformData = { activityName: activityData.name, - activityUrl: lang.replace(redmicConfig.viewPaths.activityCatalogDetails, { + activityUrl: lang.replace(redmicConfig.viewPaths.activityDetails, { id: activityData.id }), description: activityData.description, diff --git a/client-app/src/oldapp/viewers/views/TrackingView.js b/client-app/src/oldapp/viewers/views/TrackingView.js index 34171a89..7dad1be4 100644 --- a/client-app/src/oldapp/viewers/views/TrackingView.js +++ b/client-app/src/oldapp/viewers/views/TrackingView.js @@ -90,7 +90,7 @@ define([ icon: "fa-info-circle", btnId: "details", title: "info", - href: redmicConfig.viewPaths.activityCatalogDetails + href: redmicConfig.viewPaths.activityDetails }] } }, diff --git a/client-app/src/redmicConfig.js b/client-app/src/redmicConfig.js index 15aa6057..106153b8 100644 --- a/client-app/src/redmicConfig.js +++ b/client-app/src/redmicConfig.js @@ -10,9 +10,8 @@ define([], function() { retObj.viewPaths = { 'activityCatalog': '/catalog/activities-catalog', - 'activityCatalogDetails': '/catalog/activity-info/{id}', + 'activityDetails': '/catalog/activity-info/{id}', 'activityCatalogDetailsRegister': '/catalog/activity-info/{properties.activityId}', - 'activityDetails': '/admin/activity-info/{id}', 'activityAdd': '/admin/activity-add/{id}', 'activityEdit': '/admin/activity-edit/{id}', 'activityCitation': '/data-loader/activity/{id}/citation', -- GitLab From 1786ecb56a5fed02c0452522289fa9cb74a1aa0c Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Fri, 16 Aug 2024 11:57:16 +0100 Subject: [PATCH 089/249] Acota detalle de proyectos y refactoriza MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Elimina contenidos innecesarios en la vista de detalle de proyectos, siguiendo las instrucciones de #91. Aprovecha para limpiar un poco el código y recortar datos innecesarios en las peticiones de actividades. Refactoriza métodos de base de vistas detalle para permitir sobreescribir de manera más concreta y evitar repetición de código. Permite definir mediante config las dimensiones del contenedor del listado de actividades. --- client-app/src/detail/_WidgetDefinition.js | 4 +- .../oldapp/designs/details/main/Project.js | 76 +++++++++++-------- .../designs/details/main/_DetailsBase.js | 12 +++ 3 files changed, 59 insertions(+), 33 deletions(-) diff --git a/client-app/src/detail/_WidgetDefinition.js b/client-app/src/detail/_WidgetDefinition.js index 1d72a3d7..f53b2d23 100644 --- a/client-app/src/detail/_WidgetDefinition.js +++ b/client-app/src/detail/_WidgetDefinition.js @@ -171,8 +171,8 @@ define([ _getActivitiesOrProjectsConfig: function(config) { return { - width: 3, - height: 2, + width: config.width || 3, + height: config.height || 2, type: declare([ListImpl, _Framework, _ButtonsInRow, _Filter]), props: { title: config.title, diff --git a/client-app/src/oldapp/designs/details/main/Project.js b/client-app/src/oldapp/designs/details/main/Project.js index 924708fc..be72d3bb 100644 --- a/client-app/src/oldapp/designs/details/main/Project.js +++ b/client-app/src/oldapp/designs/details/main/Project.js @@ -1,21 +1,18 @@ define([ - 'src/redmicConfig' - , "dojo/_base/declare" - , "dojo/_base/lang" - , "templates/ActivityList" - , "templates/ProjectInfo" - , 'src/detail/_WidgetDefinition' - , "./_ActivityBase" + 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'src/oldapp/designs/details/main/_DetailsBase' + , 'src/redmicConfig' + , 'templates/ProjectInfo' ], function( - redmicConfig - , declare + declare , lang - , TemplateActivities + , _DetailsBase + , redmicConfig , TemplateInfo - , _WidgetDefinition - , _ActivityBase -){ - return declare([_ActivityBase, _WidgetDefinition], { +) { + + return declare(_DetailsBase, { // summary: // Vista detalle de Project. @@ -23,9 +20,14 @@ define([ this.config = { target: redmicConfig.services.project, - reportService: "project", - _targetListRank: redmicConfig.services.activityProject, - _indexListRank: 4 + activitiesTargetBase: redmicConfig.services.activityProject, + templateInfo: TemplateInfo, + _titleRightButtonsList: [{ + icon: 'fa-print', + btnId: 'report', + title: this.i18n.printToPdf + }], + reportService: 'project' }; lang.mixin(this, this.config, args); @@ -33,20 +35,32 @@ define([ _setMainConfigurations: function() { - this.widgetConfigs = this._merge([{ - info: this._getInfoConfig({ - template: TemplateInfo - }), - childActivitiesOrProjects: this._getActivitiesOrProjectsConfig({ - title: this.i18n.activities, - template: TemplateActivities, - href: this.viewPathsWidgets.activities - }), - organisationList: this._getOrganisationsConfig(), - platformList: this._getPlatformsConfig(), - contactList: this._getContactsConfig(), - documentList: this._getDocumentsConfig() - }, this.widgetConfigs || {}]); + this.inherited(arguments); + + this.widgetConfigs = this._merge([this.widgetConfigs || {}, { + activityList: { + height: 6 + } + }]); + }, + + _getActivityTargetData: function() { + + this._emitEvt('REQUEST', { + method: 'POST', + target: this.target[1], + action: '_search', + query: { + returnFields: redmicConfig.returnFields.activity + } + }); + }, + + _dataAvailable: function(res, resWrapper) { + + if (resWrapper.target === this.target[1]) { + this._dataToActivities(res); + } } }); }); diff --git a/client-app/src/oldapp/designs/details/main/_DetailsBase.js b/client-app/src/oldapp/designs/details/main/_DetailsBase.js index 1a0e4c0c..db0d1211 100644 --- a/client-app/src/oldapp/designs/details/main/_DetailsBase.js +++ b/client-app/src/oldapp/designs/details/main/_DetailsBase.js @@ -61,16 +61,28 @@ define([ _refreshModules: function() { this._checkPathVariableId(); + this._getMainTargetData(); + this._prepareActivityTarget(); + this._getActivityTargetData(); + }, + + _getMainTargetData: function() { this._emitEvt('GET', { target: this.target[0], requesterId: this.ownChannel, id: this.pathVariableId }); + }, + + _prepareActivityTarget: function() { this.target[1] = lang.replace(this.activitiesTargetBase, { id: this.pathVariableId }); + }, + + _getActivityTargetData: function() { this._emitEvt('GET', { target: this.target[1], -- GitLab From 8691a0bf4456ea7419fb79ffb735ef547445d61d Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Fri, 16 Aug 2024 12:18:54 +0100 Subject: [PATCH 090/249] =?UTF-8?q?Mueve=20l=C3=B3gica=20de=20detalle=20de?= =?UTF-8?q?=20proyecto=20a=20nueva=20vista?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Migra desde el antiguo esquema de main de diseño hacia nueva vista unificada, donde la lógica está donde esperas encontrarla. Combina las configuraciones de acceso desde catálogo o parte administrativa, al igual que se hizo con actividad. Ahora ambas rutas cargan la misma vista, que obtiene la configuración relativa a la edición desde una extensión asociada. Convierte las antiguas vistas en envoltorios de la nueva. --- .../project/ProjectDetailView.js} | 13 ++++-- .../src/detail/project/_ProjectEdition.js | 41 +++++++++++++++++++ .../views/ProjectCatalogDetailsView.js | 25 ++--------- .../details/views/ProjectDetailsView.js | 31 ++------------ 4 files changed, 59 insertions(+), 51 deletions(-) rename client-app/src/{oldapp/designs/details/main/Project.js => detail/project/ProjectDetailView.js} (78%) create mode 100644 client-app/src/detail/project/_ProjectEdition.js diff --git a/client-app/src/oldapp/designs/details/main/Project.js b/client-app/src/detail/project/ProjectDetailView.js similarity index 78% rename from client-app/src/oldapp/designs/details/main/Project.js rename to client-app/src/detail/project/ProjectDetailView.js index be72d3bb..53b6f3bf 100644 --- a/client-app/src/oldapp/designs/details/main/Project.js +++ b/client-app/src/detail/project/ProjectDetailView.js @@ -1,20 +1,22 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' + , 'src/detail/project/_ProjectEdition' , 'src/oldapp/designs/details/main/_DetailsBase' , 'src/redmicConfig' , 'templates/ProjectInfo' ], function( declare , lang + , _ProjectEdition , _DetailsBase , redmicConfig , TemplateInfo ) { - return declare(_DetailsBase, { + return declare([_DetailsBase, _ProjectEdition], { // summary: - // Vista detalle de Project. + // Vista de detalle de proyectos. constructor: function(args) { @@ -27,7 +29,8 @@ define([ btnId: 'report', title: this.i18n.printToPdf }], - reportService: 'project' + reportService: 'project', + pathParent: redmicConfig.viewPaths.projectCatalog }; lang.mixin(this, this.config, args); @@ -35,6 +38,10 @@ define([ _setMainConfigurations: function() { + this.viewPathsWidgets = { + activities: redmicConfig.viewPaths.activityDetails + }; + this.inherited(arguments); this.widgetConfigs = this._merge([this.widgetConfigs || {}, { diff --git a/client-app/src/detail/project/_ProjectEdition.js b/client-app/src/detail/project/_ProjectEdition.js new file mode 100644 index 00000000..bfd638a8 --- /dev/null +++ b/client-app/src/detail/project/_ProjectEdition.js @@ -0,0 +1,41 @@ +define([ + 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'dojo/aspect' + , 'src/redmicConfig' +], function( + declare + , lang + , aspect + , redmicConfig +) { + + return declare(null, { + // summary: + // Extensión de vista de detalle de proyectos para añadir funcionalidad relativa a la edición de + // registros. + + constructor: function(args) { + + this.config = { + }; + + lang.mixin(this, this.config, args); + + aspect.after(this, '_setConfigurations', lang.hitch(this, this._setProjectEditionConfigurations)); + }, + + _setProjectEditionConfigurations: function() { + + if (!this._titleRightButtonsList) { + this._titleRightButtonsList = []; + } + + this._titleRightButtonsList.push({ + icon: 'fa-edit', + href: redmicConfig.viewPaths.projectEdit, + title: this.i18n.edit + }); + } + }); +}); diff --git a/client-app/src/oldapp/details/views/ProjectCatalogDetailsView.js b/client-app/src/oldapp/details/views/ProjectCatalogDetailsView.js index bf37de11..7b05b16a 100644 --- a/client-app/src/oldapp/details/views/ProjectCatalogDetailsView.js +++ b/client-app/src/oldapp/details/views/ProjectCatalogDetailsView.js @@ -1,26 +1,9 @@ define([ - "app/designs/details/main/Project" - , 'src/redmicConfig' - , "dojo/_base/declare" + 'src/detail/project/ProjectDetailView' ], function( - Project - , redmicConfig - , declare + ProjectDetailView ){ - return declare(Project, { - // summary: - // - _setConfigurations: function() { - - this.viewPathsWidgets = { - organisations: redmicConfig.viewPaths.organisationCatalogDetails, - platforms: redmicConfig.viewPaths.platformCatalogDetails, - documents: redmicConfig.viewPaths.bibliographyDetails, - activities: redmicConfig.viewPaths.activityDetails - }; - - this.pathParent = redmicConfig.viewPaths.project; - } - }); + // TODO placeholder hasta que se referencien las vistas a partir de src/ + return ProjectDetailView; }); diff --git a/client-app/src/oldapp/details/views/ProjectDetailsView.js b/client-app/src/oldapp/details/views/ProjectDetailsView.js index 98bded1c..7b05b16a 100644 --- a/client-app/src/oldapp/details/views/ProjectDetailsView.js +++ b/client-app/src/oldapp/details/views/ProjectDetailsView.js @@ -1,32 +1,9 @@ define([ - "app/designs/details/main/Project" - , 'src/redmicConfig' - , "dojo/_base/declare" + 'src/detail/project/ProjectDetailView' ], function( - Project - , redmicConfig - , declare + ProjectDetailView ){ - return declare(Project, { - // summary: - // - _setConfigurations: function() { - - this._titleRightButtonsList = [{ - icon: "fa-edit", - href: redmicConfig.viewPaths.projectEdit, - title: this.i18n.edit - }]; - - this.viewPathsWidgets = { - organisations: redmicConfig.viewPaths.organisationDetails, - platforms: redmicConfig.viewPaths.platformDetails, - documents: redmicConfig.viewPaths.documentDetails, - activities: redmicConfig.viewPaths.activityDetails - }; - - this.pathParent = redmicConfig.viewPaths.projectCatalog; - } - }); + // TODO placeholder hasta que se referencien las vistas a partir de src/ + return ProjectDetailView; }); -- GitLab From 8014c373f085cbfb568b7a826b26516e2f702853 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Fri, 16 Aug 2024 12:30:50 +0100 Subject: [PATCH 091/249] Erradica vista detalle de proyecto para admin --- client-app/app.profile.js | 1 - .../src/oldapp/catalog/views/ProjectsCatalogView.js | 2 +- .../oldapp/details/views/ProgramCatalogDetailsView.js | 2 +- .../src/oldapp/details/views/ProgramDetailsView.js | 2 +- .../src/oldapp/details/views/ProjectDetailsView.js | 9 --------- client-app/src/redmicConfig.js | 3 +-- 6 files changed, 4 insertions(+), 15 deletions(-) delete mode 100644 client-app/src/oldapp/details/views/ProjectDetailsView.js diff --git a/client-app/app.profile.js b/client-app/app.profile.js index 6cb54961..f91f208b 100644 --- a/client-app/app.profile.js +++ b/client-app/app.profile.js @@ -520,7 +520,6 @@ var viewLayers = { , 'app/details/views/SpeciesDetailsView': {} , 'app/details/views/ActivityCatalogDetailsView': {} , 'app/details/views/PlatformCatalogDetailsView': {} - , 'app/details/views/ProjectDetailsView': {} , 'app/details/views/ServiceOGCCatalogDetailsView': {} , 'app/details/views/ProgramDetailsView': {} , 'app/details/views/DocumentDetailsView': {} diff --git a/client-app/src/oldapp/catalog/views/ProjectsCatalogView.js b/client-app/src/oldapp/catalog/views/ProjectsCatalogView.js index 2a5f154c..f5d6c238 100644 --- a/client-app/src/oldapp/catalog/views/ProjectsCatalogView.js +++ b/client-app/src/oldapp/catalog/views/ProjectsCatalogView.js @@ -35,7 +35,7 @@ define([ icon: "fa-info-circle", btnId: "details", title: "info", - href: this.viewPaths.projectCatalogDetails + href: this.viewPaths.projectDetails }] } } diff --git a/client-app/src/oldapp/details/views/ProgramCatalogDetailsView.js b/client-app/src/oldapp/details/views/ProgramCatalogDetailsView.js index df21b401..02f847e0 100644 --- a/client-app/src/oldapp/details/views/ProgramCatalogDetailsView.js +++ b/client-app/src/oldapp/details/views/ProgramCatalogDetailsView.js @@ -17,7 +17,7 @@ define([ organisations: redmicConfig.viewPaths.organisationCatalogDetails, platforms: redmicConfig.viewPaths.platformCatalogDetails, documents: redmicConfig.viewPaths.bibliographyDetails, - projects: redmicConfig.viewPaths.projectCatalogDetails + projects: redmicConfig.viewPaths.projectDetails }; this.pathParent = redmicConfig.viewPaths.programCatalog; diff --git a/client-app/src/oldapp/details/views/ProgramDetailsView.js b/client-app/src/oldapp/details/views/ProgramDetailsView.js index 700cfd47..64adbb97 100644 --- a/client-app/src/oldapp/details/views/ProgramDetailsView.js +++ b/client-app/src/oldapp/details/views/ProgramDetailsView.js @@ -23,7 +23,7 @@ define([ organisations: redmicConfig.viewPaths.organisationCatalogDetails, platforms: redmicConfig.viewPaths.platformCatalogDetails, documents: redmicConfig.viewPaths.bibliographyDetails, - projects: redmicConfig.viewPaths.projectCatalogDetails + projects: redmicConfig.viewPaths.projectDetails }; this.pathParent = redmicConfig.viewPaths.program; diff --git a/client-app/src/oldapp/details/views/ProjectDetailsView.js b/client-app/src/oldapp/details/views/ProjectDetailsView.js deleted file mode 100644 index 7b05b16a..00000000 --- a/client-app/src/oldapp/details/views/ProjectDetailsView.js +++ /dev/null @@ -1,9 +0,0 @@ -define([ - 'src/detail/project/ProjectDetailView' -], function( - ProjectDetailView -){ - - // TODO placeholder hasta que se referencien las vistas a partir de src/ - return ProjectDetailView; -}); diff --git a/client-app/src/redmicConfig.js b/client-app/src/redmicConfig.js index 106153b8..9d8d7bf8 100644 --- a/client-app/src/redmicConfig.js +++ b/client-app/src/redmicConfig.js @@ -77,8 +77,7 @@ define([], function() { 'programProject': '/admin/project/program/{id}', 'program': '/admin/program', 'projectCatalog': '/catalog/project-catalog', - 'projectCatalogDetails': '/catalog/project-info/{id}', - 'projectDetails': '/admin/project-info/{id}', + 'projectDetails': '/catalog/project-info/{id}', 'projectAdd': '/admin/project-add/{id}', 'projectEdit': '/admin/project-edit/{id}', 'projectActivity': '/admin/activity/project/{id}', -- GitLab From c896e652c73529cf9af49bc74bb2416c49681403 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Fri, 16 Aug 2024 13:24:20 +0100 Subject: [PATCH 092/249] Acota detalle de programas y refactoriza MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Retoca vista de detalle de proyectos, antes de aplicar la misma lógica a programas. Evita combinar llamada a método parcial con sobreescritura. Elimina contenidos innecesarios en la vista de detalle de programas, siguiendo las instrucciones de #91. Aprovecha para limpiar un poco el código y recortar datos innecesarios en las peticiones de proyectos. Migra desde el antiguo esquema de main de diseño hacia nueva vista unificada, donde la lógica está donde esperas encontrarla. Combina las configuraciones de acceso desde catálogo o parte administrativa, al igual que se hizo con proyecto. Ahora ambas rutas cargan la misma vista, que obtiene la configuración relativa a la edición desde una extensión asociada. Convierte las antiguas vistas en envoltorios de la nueva. --- .../src/detail/program/ProgramDetailView.js | 78 +++++++++++++++++++ .../src/detail/program/_ProgramEdition.js | 41 ++++++++++ .../src/detail/project/ProjectDetailView.js | 25 +++--- .../oldapp/designs/details/main/Program.js | 52 ------------- .../views/ProgramCatalogDetailsView.js | 27 ++----- .../details/views/ProgramDetailsView.js | 33 ++------ 6 files changed, 144 insertions(+), 112 deletions(-) create mode 100644 client-app/src/detail/program/ProgramDetailView.js create mode 100644 client-app/src/detail/program/_ProgramEdition.js delete mode 100644 client-app/src/oldapp/designs/details/main/Program.js diff --git a/client-app/src/detail/program/ProgramDetailView.js b/client-app/src/detail/program/ProgramDetailView.js new file mode 100644 index 00000000..6fd6093d --- /dev/null +++ b/client-app/src/detail/program/ProgramDetailView.js @@ -0,0 +1,78 @@ +define([ + 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'src/detail/program/_ProgramEdition' + , 'src/oldapp/designs/details/main/_DetailsBase' + , 'src/redmicConfig' + , 'templates/ProgramInfo' + , 'templates/ProjectList' +], function( + declare + , lang + , _ProgramEdition + , _DetailsBase + , redmicConfig + , TemplateInfo + , TemplateProjects +) { + + return declare([_DetailsBase, _ProgramEdition], { + // summary: + // Vista de detalle de programas. + + constructor: function(args) { + + this.config = { + target: redmicConfig.services.program, + activitiesTargetBase: redmicConfig.services.projectProgram, + _titleRightButtonsList: [{ + icon: 'fa-print', + btnId: 'report', + title: this.i18n.printToPdf + }], + reportService: 'program', + pathParent: redmicConfig.viewPaths.programCatalog + }; + + lang.mixin(this, this.config, args); + }, + + _setMainConfigurations: function() { + + this.target = [this.target]; + + this.widgetConfigs = this._merge([{ + info: this._getInfoConfig({ + template: TemplateInfo, + target: this.target[0] + }), + projectList: this._getActivitiesOrProjectsConfig({ + title: this.i18n.projects, + target: this.activityTarget, + template: TemplateProjects, + href: redmicConfig.viewPaths.projectDetails, + height: 6 + }) + }, this.widgetConfigs || {}]); + }, + + _getActivityTargetData: function() { + + this._emitEvt('REQUEST', { + method: 'POST', + target: this.target[1], + action: '_search', + query: { + returnFields: redmicConfig.returnFields.project + } + }); + }, + + _dataAvailable: function(res, resWrapper) { + + if (resWrapper.target === this.target[1]) { + this._dataToActivities(res); + } + } + }); +}); diff --git a/client-app/src/detail/program/_ProgramEdition.js b/client-app/src/detail/program/_ProgramEdition.js new file mode 100644 index 00000000..d84414e8 --- /dev/null +++ b/client-app/src/detail/program/_ProgramEdition.js @@ -0,0 +1,41 @@ +define([ + 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'dojo/aspect' + , 'src/redmicConfig' +], function( + declare + , lang + , aspect + , redmicConfig +) { + + return declare(null, { + // summary: + // Extensión de vista de detalle de programas para añadir funcionalidad relativa a la edición de + // registros. + + constructor: function(args) { + + this.config = { + }; + + lang.mixin(this, this.config, args); + + aspect.after(this, '_setConfigurations', lang.hitch(this, this._setProgramEditionConfigurations)); + }, + + _setProgramEditionConfigurations: function() { + + if (!this._titleRightButtonsList) { + this._titleRightButtonsList = []; + } + + this._titleRightButtonsList.push({ + icon: 'fa-edit', + href: redmicConfig.viewPaths.programEdit, + title: this.i18n.edit + }); + } + }); +}); diff --git a/client-app/src/detail/project/ProjectDetailView.js b/client-app/src/detail/project/ProjectDetailView.js index 53b6f3bf..929334f1 100644 --- a/client-app/src/detail/project/ProjectDetailView.js +++ b/client-app/src/detail/project/ProjectDetailView.js @@ -4,6 +4,7 @@ define([ , 'src/detail/project/_ProjectEdition' , 'src/oldapp/designs/details/main/_DetailsBase' , 'src/redmicConfig' + , 'templates/ActivityList' , 'templates/ProjectInfo' ], function( declare @@ -11,6 +12,7 @@ define([ , _ProjectEdition , _DetailsBase , redmicConfig + , TemplateActivities , TemplateInfo ) { @@ -23,7 +25,6 @@ define([ this.config = { target: redmicConfig.services.project, activitiesTargetBase: redmicConfig.services.activityProject, - templateInfo: TemplateInfo, _titleRightButtonsList: [{ icon: 'fa-print', btnId: 'report', @@ -38,17 +39,21 @@ define([ _setMainConfigurations: function() { - this.viewPathsWidgets = { - activities: redmicConfig.viewPaths.activityDetails - }; - - this.inherited(arguments); + this.target = [this.target]; - this.widgetConfigs = this._merge([this.widgetConfigs || {}, { - activityList: { + this.widgetConfigs = this._merge([{ + info: this._getInfoConfig({ + template: TemplateInfo, + target: this.target[0] + }), + activityList: this._getActivitiesOrProjectsConfig({ + title: this.i18n.activities, + target: this.activityTarget, + template: TemplateActivities, + href: redmicConfig.viewPaths.activityDetails, height: 6 - } - }]); + }) + }, this.widgetConfigs || {}]); }, _getActivityTargetData: function() { diff --git a/client-app/src/oldapp/designs/details/main/Program.js b/client-app/src/oldapp/designs/details/main/Program.js deleted file mode 100644 index f341c2d7..00000000 --- a/client-app/src/oldapp/designs/details/main/Program.js +++ /dev/null @@ -1,52 +0,0 @@ -define([ - 'src/redmicConfig' - , "dojo/_base/declare" - , "dojo/_base/lang" - , "templates/ProjectInfo" - , "templates/ProjectList" - , 'src/detail/_WidgetDefinition' - , "./_ActivityBase" -], function( - redmicConfig - , declare - , lang - , TemplateInfo - , TemplateProjects - , _WidgetDefinition - , _ActivityBase -){ - return declare([_ActivityBase, _WidgetDefinition], { - // summary: - // Vista detalle de Program. - - constructor: function(args) { - - this.config = { - target: redmicConfig.services.program, - reportService: "program", - _targetListRank: redmicConfig.services.projectProgram, - _indexListRank: 4 - }; - - lang.mixin(this, this.config, args); - }, - - _setMainConfigurations: function() { - - this.widgetConfigs = this._merge([{ - info: this._getInfoConfig({ - template: TemplateInfo - }), - childActivitiesOrProjects: this._getActivitiesOrProjectsConfig({ - title: this.i18n.projects, - template: TemplateProjects, - href: this.viewPathsWidgets.projects - }), - organisationList: this._getOrganisationsConfig(), - platformList: this._getPlatformsConfig(), - contactList: this._getContactsConfig(), - documentList: this._getDocumentsConfig() - }, this.widgetConfigs || {}]); - } - }); -}); diff --git a/client-app/src/oldapp/details/views/ProgramCatalogDetailsView.js b/client-app/src/oldapp/details/views/ProgramCatalogDetailsView.js index 02f847e0..a79d3ffe 100644 --- a/client-app/src/oldapp/details/views/ProgramCatalogDetailsView.js +++ b/client-app/src/oldapp/details/views/ProgramCatalogDetailsView.js @@ -1,26 +1,9 @@ define([ - "app/designs/details/main/Program" - , 'src/redmicConfig' - , "dojo/_base/declare" + 'src/detail/program/ProgramDetailView' ], function( - Program - , redmicConfig - , declare -){ - return declare(Program, { - // summary: - // + ProgramDetailView +) { - _setConfigurations: function() { - - this.viewPathsWidgets = { - organisations: redmicConfig.viewPaths.organisationCatalogDetails, - platforms: redmicConfig.viewPaths.platformCatalogDetails, - documents: redmicConfig.viewPaths.bibliographyDetails, - projects: redmicConfig.viewPaths.projectDetails - }; - - this.pathParent = redmicConfig.viewPaths.programCatalog; - } - }); + // TODO placeholder hasta que se referencien las vistas a partir de src/ + return ProgramDetailView; }); diff --git a/client-app/src/oldapp/details/views/ProgramDetailsView.js b/client-app/src/oldapp/details/views/ProgramDetailsView.js index 64adbb97..a79d3ffe 100644 --- a/client-app/src/oldapp/details/views/ProgramDetailsView.js +++ b/client-app/src/oldapp/details/views/ProgramDetailsView.js @@ -1,32 +1,9 @@ define([ - "app/designs/details/main/Program" - , 'src/redmicConfig' - , "dojo/_base/declare" + 'src/detail/program/ProgramDetailView' ], function( - Program - , redmicConfig - , declare -){ - return declare(Program, { - // summary: - // + ProgramDetailView +) { - _setConfigurations: function() { - - this._titleRightButtonsList = [{ - icon: "fa-edit", - href: redmicConfig.viewPaths.programEdit, - title: this.i18n.edit - }]; - - this.viewPathsWidgets = { - organisations: redmicConfig.viewPaths.organisationCatalogDetails, - platforms: redmicConfig.viewPaths.platformCatalogDetails, - documents: redmicConfig.viewPaths.bibliographyDetails, - projects: redmicConfig.viewPaths.projectDetails - }; - - this.pathParent = redmicConfig.viewPaths.program; - } - }); + // TODO placeholder hasta que se referencien las vistas a partir de src/ + return ProgramDetailView; }); -- GitLab From 4f0cd199f956a91c958c63b243d8d859c46d1beb Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Fri, 16 Aug 2024 13:35:08 +0100 Subject: [PATCH 093/249] Erradica vista detalle de programas para admin Limpia vista detalle que ya no se va a usar. Agrega accesibilidad en datos de respuesta de proyectos. --- client-app/app.profile.js | 1 - .../src/oldapp/catalog/views/ProgramsCatalogView.js | 2 +- .../src/oldapp/details/views/ProgramDetailsView.js | 9 --------- client-app/src/redmicConfig.js | 5 ++--- 4 files changed, 3 insertions(+), 14 deletions(-) delete mode 100644 client-app/src/oldapp/details/views/ProgramDetailsView.js diff --git a/client-app/app.profile.js b/client-app/app.profile.js index f91f208b..032beb0a 100644 --- a/client-app/app.profile.js +++ b/client-app/app.profile.js @@ -521,7 +521,6 @@ var viewLayers = { , 'app/details/views/ActivityCatalogDetailsView': {} , 'app/details/views/PlatformCatalogDetailsView': {} , 'app/details/views/ServiceOGCCatalogDetailsView': {} - , 'app/details/views/ProgramDetailsView': {} , 'app/details/views/DocumentDetailsView': {} , 'app/details/views/BibliographyDetailsView': {} , 'app/details/views/ContactDetailsView': {} diff --git a/client-app/src/oldapp/catalog/views/ProgramsCatalogView.js b/client-app/src/oldapp/catalog/views/ProgramsCatalogView.js index ae25ff3d..ef29116d 100644 --- a/client-app/src/oldapp/catalog/views/ProgramsCatalogView.js +++ b/client-app/src/oldapp/catalog/views/ProgramsCatalogView.js @@ -35,7 +35,7 @@ define([ icon: "fa-info-circle", btnId: "details", title: "info", - href: this.viewPaths.programCatalogDetails + href: this.viewPaths.programDetails }] } } diff --git a/client-app/src/oldapp/details/views/ProgramDetailsView.js b/client-app/src/oldapp/details/views/ProgramDetailsView.js deleted file mode 100644 index a79d3ffe..00000000 --- a/client-app/src/oldapp/details/views/ProgramDetailsView.js +++ /dev/null @@ -1,9 +0,0 @@ -define([ - 'src/detail/program/ProgramDetailView' -], function( - ProgramDetailView -) { - - // TODO placeholder hasta que se referencien las vistas a partir de src/ - return ProgramDetailView; -}); diff --git a/client-app/src/redmicConfig.js b/client-app/src/redmicConfig.js index 9d8d7bf8..9aa2bcd0 100644 --- a/client-app/src/redmicConfig.js +++ b/client-app/src/redmicConfig.js @@ -70,8 +70,7 @@ define([], function() { 'platformEdit': '/admin/platform-edit/{id}', 'platform': '/admin/platform', 'programCatalog': '/catalog/program-catalog', - 'programCatalogDetails': '/catalog/program-info/{id}', - 'programDetails': '/admin/program-info/{id}', + 'programDetails': '/catalog/program-info/{id}', 'programAdd': '/admin/program-add/{id}', 'programEdit': '/admin/program-edit/{id}', 'programProject': '/admin/project/program/{id}', @@ -528,7 +527,7 @@ define([], function() { document: ['id', 'title', 'author', 'year', 'documentType', 'language', 'url'], organisation: ['id', 'name', 'acronym', 'logo', 'organisationType', 'webpage'], program: ['id', 'name', 'code', 'endDate'], - project: ['id', 'name', 'code', 'endDate', 'projectGroup'], + project: ['accessibility', 'id', 'name', 'code', 'endDate', 'projectGroup'], species: [ 'aphia', 'authorship', 'commonName', 'groupIcon', 'id', 'peculiarity.popularNames', 'scientificName', 'status' -- GitLab From c211fa1d139770e6cf8f38b49fc518f921184347 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Mon, 19 Aug 2024 09:01:53 +0100 Subject: [PATCH 094/249] =?UTF-8?q?Corrige=20compilado,=20oculta=20edici?= =?UTF-8?q?=C3=B3n=20a=20no=20editores?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix #91. --- client-app/src/detail/program/ProgramDetailView.js | 12 ++++++++++-- client-app/src/detail/project/ProjectDetailView.js | 12 ++++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/client-app/src/detail/program/ProgramDetailView.js b/client-app/src/detail/program/ProgramDetailView.js index 6fd6093d..f7fd0776 100644 --- a/client-app/src/detail/program/ProgramDetailView.js +++ b/client-app/src/detail/program/ProgramDetailView.js @@ -2,8 +2,9 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' , 'src/detail/program/_ProgramEdition' - , 'src/oldapp/designs/details/main/_DetailsBase' + , 'app/designs/details/main/_DetailsBase' , 'src/redmicConfig' + , 'src/util/Credentials' , 'templates/ProgramInfo' , 'templates/ProjectList' ], function( @@ -12,11 +13,18 @@ define([ , _ProgramEdition , _DetailsBase , redmicConfig + , Credentials , TemplateInfo , TemplateProjects ) { - return declare([_DetailsBase, _ProgramEdition], { + var declareItems = [_DetailsBase]; + + if (Credentials.userIsEditor()) { + declareItems.push(_ProgramEdition); + } + + return declare(declareItems, { // summary: // Vista de detalle de programas. diff --git a/client-app/src/detail/project/ProjectDetailView.js b/client-app/src/detail/project/ProjectDetailView.js index 929334f1..df157f9c 100644 --- a/client-app/src/detail/project/ProjectDetailView.js +++ b/client-app/src/detail/project/ProjectDetailView.js @@ -2,8 +2,9 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' , 'src/detail/project/_ProjectEdition' - , 'src/oldapp/designs/details/main/_DetailsBase' + , 'app/designs/details/main/_DetailsBase' , 'src/redmicConfig' + , 'src/util/Credentials' , 'templates/ActivityList' , 'templates/ProjectInfo' ], function( @@ -12,11 +13,18 @@ define([ , _ProjectEdition , _DetailsBase , redmicConfig + , Credentials , TemplateActivities , TemplateInfo ) { - return declare([_DetailsBase, _ProjectEdition], { + var declareItems = [_DetailsBase]; + + if (Credentials.userIsEditor()) { + declareItems.push(_ProjectEdition); + } + + return declare(declareItems, { // summary: // Vista de detalle de proyectos. -- GitLab From 1375f02138c5de52ffe76bda661228ccf73165b6 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Mon, 19 Aug 2024 13:54:57 +0100 Subject: [PATCH 095/249] Une catalog y admin de program y project, limpia MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Combina las vistas de catálogo y de administración de las entidades de proyecto y programa, al igual que se hizo con actividad. Aprovecha para limpiar una funcionalidad en desuso, para acceder a la parte administrativa filtrando por programa o proyecto los elementos listados. Sólo existía en la parte interna, por lo que los usuarios no lo echarán de menos y se simplifica la gestión de vistas. --- .../catalog/activity/ActivityCatalogView.js | 28 +---- .../program/ProgramCatalogView.js} | 37 ++++++- .../src/catalog/program/_ProgramEdition.js | 61 +++++++++++ .../project/ProjectCatalogView.js} | 36 +++++- .../src/catalog/project/_ProjectEdition.js | 61 +++++++++++ .../administrative/views/ProgramView.js | 76 +------------ .../administrative/views/ProjectView.js | 103 +----------------- .../catalog/views/ProgramsCatalogView.js | 46 +------- .../catalog/views/ProjectsCatalogView.js | 46 +------- client-app/src/redmicConfig.js | 2 - 10 files changed, 206 insertions(+), 290 deletions(-) rename client-app/src/{oldapp/designs/textSearchFacetsList/main/Program.js => catalog/program/ProgramCatalogView.js} (65%) create mode 100644 client-app/src/catalog/program/_ProgramEdition.js rename client-app/src/{oldapp/designs/textSearchFacetsList/main/Project.js => catalog/project/ProjectCatalogView.js} (67%) create mode 100644 client-app/src/catalog/project/_ProjectEdition.js diff --git a/client-app/src/catalog/activity/ActivityCatalogView.js b/client-app/src/catalog/activity/ActivityCatalogView.js index 86c812b2..2746172f 100644 --- a/client-app/src/catalog/activity/ActivityCatalogView.js +++ b/client-app/src/catalog/activity/ActivityCatalogView.js @@ -49,17 +49,13 @@ define([ mask: {"download":{}}, reportService: "activity", - activityTarget: redmicConfig.services.activity, - selectionTarget: redmicConfig.services.activity, - activityProjectTarget: redmicConfig.services.activityProject, + target: redmicConfig.services.activity, perms: null, browserExts: [_Select] }; lang.mixin(this, this.config, args); - - this.target = this.activityTarget; }, _setMainConfigurations: function() { @@ -71,7 +67,6 @@ define([ }, this.filterConfig || {}]); this.browserConfig = this._merge([{ - selectionTarget: this.selectionTarget, template: templateList, rowConfig: { buttonsConfig: { @@ -110,27 +105,6 @@ define([ this.textSearchConfig = this._merge([{ showExpandIcon: true }, this.textSearchConfig || {}]); - }, - - _setOwnCallbacksForEvents: function() { - - this._onEvt('CONNECT', this._createTarget); - }, - - _createTarget: function() { - - var target = this.activityTarget; - - if (this.pathVariableId && Number.isInteger(parseInt(this.pathVariableId, 10))) { - target = lang.replace(this.activityProjectTarget, { - id: this.pathVariableId - }); - } - - this._publish(this.getChannel('UPDATE_TARGET'), { - target: target, - refresh: true - }); } }); }); diff --git a/client-app/src/oldapp/designs/textSearchFacetsList/main/Program.js b/client-app/src/catalog/program/ProgramCatalogView.js similarity index 65% rename from client-app/src/oldapp/designs/textSearchFacetsList/main/Program.js rename to client-app/src/catalog/program/ProgramCatalogView.js index 264feddb..d3d1b2d1 100644 --- a/client-app/src/oldapp/designs/textSearchFacetsList/main/Program.js +++ b/client-app/src/catalog/program/ProgramCatalogView.js @@ -6,10 +6,12 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "templates/ProgramList" + , 'src/catalog/program/_ProgramEdition' , "src/component/browser/_Select" , "src/component/browser/bars/SelectionBox" , "src/component/browser/bars/Order" , "src/component/browser/bars/Total" + , 'src/util/Credentials' ], function( _Main , Controller @@ -18,22 +20,35 @@ define([ , declare , lang , templateList + , _ProgramEdition , _Select , SelectionBox , Order , Total -){ - return declare([Layout, Controller, _Main], { + , Credentials +) { + + var declareItems = [Layout, Controller, _Main]; + + if (Credentials.userIsEditor()) { + declareItems.push(_ProgramEdition); + } + + return declare(declareItems, { // summary: - // Extensión para establecer la configuración de las vistas de program. - // description: - // + // Vista de catálogo de programas. constructor: function(args) { this.config = { browserExts: [_Select], - title: this.i18n.programs + mask: {"download":{}}, + reportService: "program", + title: this.i18n.programCatalogView, + ownChannel: "programCatalog", + target: redmicConfig.services.program, + perms: null, + idProperty: "id" }; lang.mixin(this, this.config, args); @@ -47,6 +62,16 @@ define([ this.browserConfig = this._merge([{ template: templateList, + rowConfig: { + buttonsConfig: { + listButton: [{ + icon: "fa-info-circle", + btnId: "details", + title: "info", + href: this.viewPaths.programDetails + }] + } + }, bars: [{ instance: Total },{ diff --git a/client-app/src/catalog/program/_ProgramEdition.js b/client-app/src/catalog/program/_ProgramEdition.js new file mode 100644 index 00000000..dfe7afc2 --- /dev/null +++ b/client-app/src/catalog/program/_ProgramEdition.js @@ -0,0 +1,61 @@ +define([ + 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'dojo/aspect' + , 'app/base/views/extensions/_EditionWizardView' +], function( + declare + , lang + , aspect + , _EditionWizardView +) { + + return declare(_EditionWizardView, { + // summary: + // Extensión de vista de catálogo de programas para añadir funcionalidad relativa a la edición de + // registros. + + constructor: function(args) { + + this.config = { + addPath: this.viewPaths.programAdd + }; + + lang.mixin(this, this.config, args); + + aspect.before(this, '_setBrowserButtons', lang.hitch(this, this._setProgramEditionBrowserButtons)); + }, + + _setProgramEditionBrowserButtons: function() { + + if (!this.listButtonsEdition) { + console.warn('Tried to add program edition buttons, but edition buttons config was not found!'); + return; + } + + var findIndexCallback = lang.hitch(this, function(button) { + + return button.groupId && button.groupId === this._editionGroupId; + }); + + var editionButtonIndex = this.listButtonsEdition.findIndex(findIndexCallback); + + if (editionButtonIndex !== -1) { + this.listButtonsEdition[editionButtonIndex].icons.push({ + icon: 'fa-edit', + btnId: 'edit', + title: 'edit', + option: 'default', + href: this.viewPaths.programEdit + },{ + icon: 'fa-copy', + btnId: 'copy', + title: 'copy', + href: this.viewPaths.programAdd + }); + } else { + console.warn('Tried to add program edition buttons, but edition button group config was not found!'); + } + } + }); +}); diff --git a/client-app/src/oldapp/designs/textSearchFacetsList/main/Project.js b/client-app/src/catalog/project/ProjectCatalogView.js similarity index 67% rename from client-app/src/oldapp/designs/textSearchFacetsList/main/Project.js rename to client-app/src/catalog/project/ProjectCatalogView.js index 3a9271e8..d96136bf 100644 --- a/client-app/src/oldapp/designs/textSearchFacetsList/main/Project.js +++ b/client-app/src/catalog/project/ProjectCatalogView.js @@ -6,10 +6,12 @@ define([ , "dojo/_base/declare" , "dojo/_base/lang" , "templates/ProjectList" + , 'src/catalog/project/_ProjectEdition' , "src/component/browser/_Select" , "src/component/browser/bars/SelectionBox" , "src/component/browser/bars/Order" , "src/component/browser/bars/Total" + , 'src/util/Credentials' ], function( _Main , Controller @@ -18,22 +20,34 @@ define([ , declare , lang , templateList + , _ProjectEdition , _Select , SelectionBox , Order , Total -){ - return declare([Layout, Controller, _Main], { + , Credentials +) { + + var declareItems = [Layout, Controller, _Main]; + + if (Credentials.userIsEditor()) { + declareItems.push(_ProjectEdition); + } + + return declare(declareItems, { // summary: - // Extensión para establecer la configuración de las vistas de project. - // description: - // + // Vista de catálogo de proyectos. constructor: function(args) { this.config = { browserExts: [_Select], - title: this.i18n.projects + target: redmicConfig.services.project, + perms: null, + mask: {"download":{}}, + reportService: "project", + title: this.i18n.projectCatalogView, + ownChannel: "projectCatalog" }; lang.mixin(this, this.config, args); @@ -46,6 +60,16 @@ define([ }, this.filterConfig || {}]); this.browserConfig = this._merge([{ + rowConfig: { + buttonsConfig: { + listButton: [{ + icon: "fa-info-circle", + btnId: "details", + title: "info", + href: this.viewPaths.projectDetails + }] + } + }, template: templateList, bars: [{ instance: Total diff --git a/client-app/src/catalog/project/_ProjectEdition.js b/client-app/src/catalog/project/_ProjectEdition.js new file mode 100644 index 00000000..c7141acc --- /dev/null +++ b/client-app/src/catalog/project/_ProjectEdition.js @@ -0,0 +1,61 @@ +define([ + 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'dojo/aspect' + , 'app/base/views/extensions/_EditionWizardView' +], function( + declare + , lang + , aspect + , _EditionWizardView +) { + + return declare(_EditionWizardView, { + // summary: + // Extensión de vista de catálogo de proyectos para añadir funcionalidad relativa a la edición de + // registros. + + constructor: function(args) { + + this.config = { + addPath: this.viewPaths.projectAdd + }; + + lang.mixin(this, this.config, args); + + aspect.before(this, '_setBrowserButtons', lang.hitch(this, this._setProjectEditionBrowserButtons)); + }, + + _setProjectEditionBrowserButtons: function() { + + if (!this.listButtonsEdition) { + console.warn('Tried to add project edition buttons, but edition buttons config was not found!'); + return; + } + + var findIndexCallback = lang.hitch(this, function(button) { + + return button.groupId && button.groupId === this._editionGroupId; + }); + + var editionButtonIndex = this.listButtonsEdition.findIndex(findIndexCallback); + + if (editionButtonIndex !== -1) { + this.listButtonsEdition[editionButtonIndex].icons.push({ + icon: 'fa-edit', + btnId: 'edit', + title: 'edit', + option: 'default', + href: this.viewPaths.projectEdit + },{ + icon: 'fa-copy', + btnId: 'copy', + title: 'copy', + href: this.viewPaths.projectAdd + }); + } else { + console.warn('Tried to add project edition buttons, but edition button group config was not found!'); + } + } + }); +}); diff --git a/client-app/src/oldapp/administrative/views/ProgramView.js b/client-app/src/oldapp/administrative/views/ProgramView.js index c65454f4..48810bb1 100644 --- a/client-app/src/oldapp/administrative/views/ProgramView.js +++ b/client-app/src/oldapp/administrative/views/ProgramView.js @@ -1,73 +1,9 @@ define([ - "app/designs/textSearchFacetsList/main/Program" - , "app/base/views/extensions/_EditionWizardView" - , 'src/redmicConfig' - , "dojo/_base/declare" - , "dojo/_base/lang" -], function( - ProgramMain - , _EditionWizardView - , redmicConfig - , declare - , lang -){ - return declare([ProgramMain, _EditionWizardView], { - // summary: - // Vista de Program. - // description: - // Muestra la información. + 'src/catalog/program/ProgramCatalogView' +], function ( + ProgramCatalogView +) { - constructor: function (args) { - - this.config = { - addPath: this.viewPaths.programAdd, - target: redmicConfig.services.program, - perms: null, - idProperty: "id" - }; - - lang.mixin(this, this.config, args); - }, - - _setConfigurations: function() { - - this.browserConfig = this._merge([{ - rowConfig: { - buttonsConfig: { - listButton: [{ - groupId: "edition", - icons: [{ - icon: "fa-edit", - btnId: "edit", - title: "edit", - option: "default", - href: this.viewPaths.programEdit - },{ - icon: "fa-copy", - btnId: "copy", - title: "copy", - href: this.viewPaths.programAdd - }] - },{ - icon: "fa-info-circle", - btnId: "details", - title: "info", - href: this.viewPaths.programDetails - },{ - icon: "fa-briefcase", - btnId: "goToChildren", - title: "projects", - href: this.viewPaths.programProject - }] - } - } - }, this.browserConfig || {}]); - - this.filterConfig = this._merge([{ - initQuery: { - accessibilityIds: null - } - }, this.filterConfig || {}]); - } - }); + // TODO placeholder hasta que se referencien las vistas a partir de src/ + return ProgramCatalogView; }); diff --git a/client-app/src/oldapp/administrative/views/ProjectView.js b/client-app/src/oldapp/administrative/views/ProjectView.js index 54a2f805..f9ac631a 100644 --- a/client-app/src/oldapp/administrative/views/ProjectView.js +++ b/client-app/src/oldapp/administrative/views/ProjectView.js @@ -1,100 +1,9 @@ define([ - "app/designs/textSearchFacetsList/main/Project" - , "app/base/views/extensions/_EditionWizardView" - , 'src/redmicConfig' - , "dojo/_base/declare" - , "dojo/_base/lang" - , "dojo/aspect" -], function( - ProjectMain - , _EditionWizardView - , redmicConfig - , declare - , lang - , aspect -){ - return declare([ProjectMain, _EditionWizardView], { - // summary: - // Vista de Project. - // description: - // Muestra la información. + 'src/catalog/project/ProjectCatalogView' +], function ( + ProjectCatalogView +) { - constructor: function (args) { - - this.config = { - addPath: this.viewPaths.projectAdd, - projectTarget: redmicConfig.services.project, - selectionTarget: redmicConfig.services.project, - projectProgramTarget: redmicConfig.services.projectProgram, - perms: null - }; - - lang.mixin(this, this.config, args); - - this.target = this.projectTarget; - }, - - _setConfigurations: function() { - - this.browserConfig = this._merge([{ - selectionTarget: this.selectionTarget, - rowConfig: { - buttonsConfig: { - listButton: [{ - groupId: "edition", - icons: [{ - icon: "fa-edit", - btnId: "edit", - title: "edit", - option: "default", - href: this.viewPaths.projectEdit - },{ - icon: "fa-copy", - btnId: "copy", - title: "copy", - href: this.viewPaths.projectAdd - }] - },{ - icon: "fa-info-circle", - btnId: "details", - title: "info", - href: this.viewPaths.projectDetails - },{ - icon: "fa-tasks", - btnId: "goToChildren", - title: "activity", - href: this.viewPaths.projectActivity - }] - } - } - }, this.browserConfig || {}]); - - this.filterConfig = this._merge([{ - initQuery: { - accessibilityIds: null - } - }, this.filterConfig || {}]); - }, - - _setOwnCallbacksForEvents: function() { - - this._onEvt('CONNECT', this._createTarget); - }, - - _createTarget: function() { - - var target = this.projectTarget; - - if (this.pathVariableId && Number.isInteger(parseInt(this.pathVariableId, 10))) { - target = lang.replace(this.projectProgramTarget, { - id: this.pathVariableId - }); - } - - this._publish(this.getChannel('UPDATE_TARGET'), { - target: target, - refresh: true - }); - } - }); + // TODO placeholder hasta que se referencien las vistas a partir de src/ + return ProjectCatalogView; }); diff --git a/client-app/src/oldapp/catalog/views/ProgramsCatalogView.js b/client-app/src/oldapp/catalog/views/ProgramsCatalogView.js index ef29116d..48810bb1 100644 --- a/client-app/src/oldapp/catalog/views/ProgramsCatalogView.js +++ b/client-app/src/oldapp/catalog/views/ProgramsCatalogView.js @@ -1,45 +1,9 @@ define([ - "app/designs/textSearchFacetsList/main/Program" - , 'src/redmicConfig' - , "dojo/_base/declare" - , "dojo/_base/lang" + 'src/catalog/program/ProgramCatalogView' ], function ( - ProgramMain - , redmicConfig - , declare - , lang -){ - return declare(ProgramMain, { - // summary: - // Vista de Program Catalog. + ProgramCatalogView +) { - constructor: function (args) { - - this.config = { - mask: {"download":{}}, - target: redmicConfig.services.program, - reportService: "program", - title: this.i18n.programCatalogView, - ownChannel: "programCatalog" - }; - - lang.mixin(this, this.config, args); - }, - - _setConfigurations: function() { - - this.browserConfig = this._merge([{ - rowConfig: { - buttonsConfig: { - listButton: [{ - icon: "fa-info-circle", - btnId: "details", - title: "info", - href: this.viewPaths.programDetails - }] - } - } - }, this.browserConfig || {}]); - } - }); + // TODO placeholder hasta que se referencien las vistas a partir de src/ + return ProgramCatalogView; }); diff --git a/client-app/src/oldapp/catalog/views/ProjectsCatalogView.js b/client-app/src/oldapp/catalog/views/ProjectsCatalogView.js index f5d6c238..f9ac631a 100644 --- a/client-app/src/oldapp/catalog/views/ProjectsCatalogView.js +++ b/client-app/src/oldapp/catalog/views/ProjectsCatalogView.js @@ -1,45 +1,9 @@ define([ - "app/designs/textSearchFacetsList/main/Project" - , 'src/redmicConfig' - , "dojo/_base/declare" - , "dojo/_base/lang" + 'src/catalog/project/ProjectCatalogView' ], function ( - ProjectMain - , redmicConfig - , declare - , lang -){ - return declare(ProjectMain, { - // summary: - // Vista de Project Catalog. + ProjectCatalogView +) { - constructor: function (args) { - - this.config = { - mask: {"download":{}}, - target: redmicConfig.services.project, - reportService: "project", - title: this.i18n.projectCatalogView, - ownChannel: "projectCatalog" - }; - - lang.mixin(this, this.config, args); - }, - - _setConfigurations: function() { - - this.browserConfig = this._merge([{ - rowConfig: { - buttonsConfig: { - listButton: [{ - icon: "fa-info-circle", - btnId: "details", - title: "info", - href: this.viewPaths.projectDetails - }] - } - } - }, this.browserConfig || {}]); - } - }); + // TODO placeholder hasta que se referencien las vistas a partir de src/ + return ProjectCatalogView; }); diff --git a/client-app/src/redmicConfig.js b/client-app/src/redmicConfig.js index 9aa2bcd0..9bfb71b0 100644 --- a/client-app/src/redmicConfig.js +++ b/client-app/src/redmicConfig.js @@ -73,13 +73,11 @@ define([], function() { 'programDetails': '/catalog/program-info/{id}', 'programAdd': '/admin/program-add/{id}', 'programEdit': '/admin/program-edit/{id}', - 'programProject': '/admin/project/program/{id}', 'program': '/admin/program', 'projectCatalog': '/catalog/project-catalog', 'projectDetails': '/catalog/project-info/{id}', 'projectAdd': '/admin/project-add/{id}', 'projectEdit': '/admin/project-edit/{id}', - 'projectActivity': '/admin/activity/project/{id}', 'project': '/admin/project', /*'serviceOGCCatalog': '/products/service-ogc-catalog', 'serviceOGCCatalogDetails': '/products/service-ogc-info/{id}',*/ -- GitLab From ca56abf1fb9aab858460e315387a45272ba0fd06 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Mon, 19 Aug 2024 14:02:10 +0100 Subject: [PATCH 096/249] Elimina vistas administrativas ya migradas MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Evita la compilación de vistas en desuso, porque su equivalente en catálogo ofrece la misma funcionalidad. Si se accede a la sección fallará, hasta que se corrijan los módulos permitidos desde base de datos para cada usuario. --- client-app/app.profile.js | 3 --- .../src/oldapp/administrative/views/ActivityView.js | 9 --------- .../src/oldapp/administrative/views/ProgramView.js | 9 --------- .../src/oldapp/administrative/views/ProjectView.js | 9 --------- 4 files changed, 30 deletions(-) delete mode 100644 client-app/src/oldapp/administrative/views/ActivityView.js delete mode 100644 client-app/src/oldapp/administrative/views/ProgramView.js delete mode 100644 client-app/src/oldapp/administrative/views/ProjectView.js diff --git a/client-app/app.profile.js b/client-app/app.profile.js index 032beb0a..ffa0ba5f 100644 --- a/client-app/app.profile.js +++ b/client-app/app.profile.js @@ -411,9 +411,6 @@ var viewLayers = { , 'app/catalog/views/ProgramsCatalogView': {} , 'app/catalog/views/OrganisationsCatalogView': {} - , 'app/administrative/views/ActivityView': {} - , 'app/administrative/views/ProjectView': {} - , 'app/administrative/views/ProgramView': {} , 'app/administrative/views/OrganisationView': {} , 'app/administrative/views/ContactView': {} , 'app/administrative/views/PlatformView': {} diff --git a/client-app/src/oldapp/administrative/views/ActivityView.js b/client-app/src/oldapp/administrative/views/ActivityView.js deleted file mode 100644 index e845e2fb..00000000 --- a/client-app/src/oldapp/administrative/views/ActivityView.js +++ /dev/null @@ -1,9 +0,0 @@ -define([ - 'src/catalog/activity/ActivityCatalogView' -], function ( - ActivityCatalogView -) { - - // TODO placeholder hasta que se referencien las vistas a partir de src/ - return ActivityCatalogView; -}); diff --git a/client-app/src/oldapp/administrative/views/ProgramView.js b/client-app/src/oldapp/administrative/views/ProgramView.js deleted file mode 100644 index 48810bb1..00000000 --- a/client-app/src/oldapp/administrative/views/ProgramView.js +++ /dev/null @@ -1,9 +0,0 @@ -define([ - 'src/catalog/program/ProgramCatalogView' -], function ( - ProgramCatalogView -) { - - // TODO placeholder hasta que se referencien las vistas a partir de src/ - return ProgramCatalogView; -}); diff --git a/client-app/src/oldapp/administrative/views/ProjectView.js b/client-app/src/oldapp/administrative/views/ProjectView.js deleted file mode 100644 index f9ac631a..00000000 --- a/client-app/src/oldapp/administrative/views/ProjectView.js +++ /dev/null @@ -1,9 +0,0 @@ -define([ - 'src/catalog/project/ProjectCatalogView' -], function ( - ProjectCatalogView -) { - - // TODO placeholder hasta que se referencien las vistas a partir de src/ - return ProjectCatalogView; -}); -- GitLab From 1975f8d8cc5c6e1ed3a5d7e3037c29bb5fb4ceae Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Tue, 20 Aug 2024 09:06:36 +0100 Subject: [PATCH 097/249] =?UTF-8?q?Actualiza=20dependencias=20y=20subm?= =?UTF-8?q?=C3=B3dulos?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client-app/dep/templates | 2 +- client-app/style | 2 +- package-lock.json | 239 ++++++++++++++++++--------------------- package.json | 6 +- 4 files changed, 115 insertions(+), 134 deletions(-) diff --git a/client-app/dep/templates b/client-app/dep/templates index df8b107e..17feb30d 160000 --- a/client-app/dep/templates +++ b/client-app/dep/templates @@ -1 +1 @@ -Subproject commit df8b107e7cc6c7e45406cf548c95ed2ddbf6449c +Subproject commit 17feb30def9a58ad31ab3b67ca5e23357de817b6 diff --git a/client-app/style b/client-app/style index b3c45f8e..f29b52ea 160000 --- a/client-app/style +++ b/client-app/style @@ -1 +1 @@ -Subproject commit b3c45f8e36472b56a26f1ad751a81c17492fe836 +Subproject commit f29b52ea203079ae2d4c773ddd68b5b7df93a195 diff --git a/package-lock.json b/package-lock.json index 3cc8b2d7..4a9069a1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -33,7 +33,7 @@ "dojox": "1.17.3", "draggabilly": "2.4.1", "dropzone": "5.9.3", - "glob": "10.4.1", + "glob": "11.0.0", "grunt": "1.6.1", "grunt-contrib-clean": "2.0.1", "grunt-contrib-copy": "1.0.0", @@ -56,8 +56,8 @@ "moment": "2.30.1", "nib": "1.2.0", "packery": "2.1.2", - "pdfjs-dist-viewer-min": "2.12.313", - "proj4": "2.11.0", + "pdfjs-dist-viewer-min": "3.11.174", + "proj4": "2.12.0", "prunecluster": "https://github.com/pedroetb/PruneCluster.git", "put-selector": "0.3.6", "sockjs-client": "1.6.1", @@ -542,35 +542,6 @@ "node": ">=12" } }, - "node_modules/@isaacs/cliui/node_modules/ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" - } - }, - "node_modules/@isaacs/cliui/node_modules/strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^6.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, "node_modules/@istanbuljs/schema": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", @@ -628,6 +599,17 @@ "node": ">=8.0.0" } }, + "node_modules/@pkgjs/parseargs": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", + "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", + "dev": true, + "license": "MIT", + "optional": true, + "engines": { + "node": ">=14" + } + }, "node_modules/@theintern/common": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/@theintern/common/-/common-0.3.0.tgz", @@ -2762,9 +2744,9 @@ "license": "ISC" }, "node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", "dev": true, "license": "MIT" }, @@ -3431,23 +3413,24 @@ } }, "node_modules/glob": { - "version": "10.4.1", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.1.tgz", - "integrity": "sha512-2jelhlq3E4ho74ZyVLN03oKdAZVUa6UDZzFLVH1H7dnoax+y9qyaq8zBkfDIggjniU19z0wU18y16jMB2eyVIw==", + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-11.0.0.tgz", + "integrity": "sha512-9UiX/Bl6J2yaBbxKoEBRm4Cipxgok8kQYcOPEhScPwebu2I0HoQOuYdIO6S3hLuWoZgpDpwQZMzTFxgpkyT76g==", "dev": true, "license": "ISC", "dependencies": { "foreground-child": "^3.1.0", - "jackspeak": "^3.1.2", - "minimatch": "^9.0.4", + "jackspeak": "^4.0.1", + "minimatch": "^10.0.0", "minipass": "^7.1.2", - "path-scurry": "^1.11.1" + "package-json-from-dist": "^1.0.0", + "path-scurry": "^2.0.0" }, "bin": { "glob": "dist/esm/bin.mjs" }, "engines": { - "node": ">=16 || 14 >=14.18" + "node": "20 || >=22" }, "funding": { "url": "https://github.com/sponsors/isaacs" @@ -3464,16 +3447,16 @@ } }, "node_modules/glob/node_modules/minimatch": { - "version": "9.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz", - "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==", + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.1.tgz", + "integrity": "sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==", "dev": true, "license": "ISC", "dependencies": { "brace-expansion": "^2.0.1" }, "engines": { - "node": ">=16 || 14 >=14.17" + "node": "20 || >=22" }, "funding": { "url": "https://github.com/sponsors/isaacs" @@ -4887,16 +4870,16 @@ } }, "node_modules/jackspeak": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.0.tgz", - "integrity": "sha512-JVYhQnN59LVPFCEcVa2C3CrEKYacvjRfqIQl+h8oi91aLYQVWRYbxjPcv1bUiUy/kLmQaANrYfNMCO3kuEDHfw==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-4.0.1.tgz", + "integrity": "sha512-cub8rahkh0Q/bw1+GxP7aeSe29hHHn2V4m29nnDlvCdlgU+3UGxkZp7Z53jLUdpX3jdTO0nJZUDl3xvbWc2Xog==", "dev": true, "license": "BlueOak-1.0.0", "dependencies": { "@isaacs/cliui": "^8.0.2" }, "engines": { - "node": ">=14" + "node": "20 || >=22" }, "funding": { "url": "https://github.com/sponsors/isaacs" @@ -5304,13 +5287,13 @@ } }, "node_modules/lru-cache": { - "version": "10.2.2", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.2.tgz", - "integrity": "sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==", + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.0.0.tgz", + "integrity": "sha512-Qv32eSV1RSCfhY3fpPE2GNZ8jgM9X7rdAfemLWqTUxwiyIC4jJ6Sy0fZ8H+oLWevO6i4/bizg7c8d8i6bxrzbA==", "dev": true, "license": "ISC", "engines": { - "node": "14 || >=16.14" + "node": "20 || >=22" } }, "node_modules/make-dir": { @@ -5817,6 +5800,13 @@ "node": ">=6" } }, + "node_modules/package-json-from-dist": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz", + "integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==", + "dev": true, + "license": "BlueOak-1.0.0" + }, "node_modules/packery": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/packery/-/packery-2.1.2.tgz", @@ -5929,32 +5919,22 @@ } }, "node_modules/path-scurry": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", - "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.0.tgz", + "integrity": "sha512-ypGJsmGtdXUOeM5u93TyeIEfEhM6s+ljAhrk5vAvSx8uyY/02OvrZnA0YNGUrPXfpJMgI1ODd3nwz8Npx4O4cg==", "dev": true, "license": "BlueOak-1.0.0", "dependencies": { - "lru-cache": "^10.2.0", - "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" + "lru-cache": "^11.0.0", + "minipass": "^7.1.2" }, "engines": { - "node": ">=16 || 14 >=14.18" + "node": "20 || >=22" }, "funding": { "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/path-scurry/node_modules/minipass": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz", - "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, "node_modules/path-to-regexp": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", @@ -5972,9 +5952,9 @@ } }, "node_modules/pdfjs-dist-viewer-min": { - "version": "2.12.313", - "resolved": "https://registry.npmjs.org/pdfjs-dist-viewer-min/-/pdfjs-dist-viewer-min-2.12.313.tgz", - "integrity": "sha512-Li6SwOH5hj9G4hn7EsepVe/BWy+xKfMRmwJ6EbdIcmFUHDuoB6ISGJNBH7QsYk8fY8mGMZlFzP4B892u59YeGw==", + "version": "3.11.174", + "resolved": "https://registry.npmjs.org/pdfjs-dist-viewer-min/-/pdfjs-dist-viewer-min-3.11.174.tgz", + "integrity": "sha512-kqbAoDchc87zyTe/XLoKyLHh3Aa3KSbiRd0eHyRoJFgUIYSB3uaMZ1Hvqqf4/y6hbV8K5f7slnmLVauVLzF/iw==", "dev": true, "license": "Apache-2.0" }, @@ -6085,9 +6065,9 @@ "license": "MIT" }, "node_modules/proj4": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/proj4/-/proj4-2.11.0.tgz", - "integrity": "sha512-SasuTkAx8HnWQHfIyhkdUNJorSJqINHAN3EyMWYiQRVorftz9DHz650YraFgczwgtHOxqnfuDxSNv3C8MUnHeg==", + "version": "2.12.0", + "resolved": "https://registry.npmjs.org/proj4/-/proj4-2.12.0.tgz", + "integrity": "sha512-cQJxcVX7+fmAhOxoazKgk76GkGYQ5HcLod4rdy2MizhPvLdrZQJThxsHoz/TjjdxUvTm/rbozMgE0q9mdXKWIw==", "dev": true, "license": "MIT", "dependencies": { @@ -6941,53 +6921,50 @@ "node": ">=8" } }, - "node_modules/string-width/node_modules/ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "node_modules/string-width-cjs/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true, "license": "MIT", "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" + "node": ">=8" } }, - "node_modules/string-width/node_modules/emoji-regex": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "node_modules/string-width-cjs/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", "dev": true, "license": "MIT" }, - "node_modules/string-width/node_modules/strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "node_modules/string-width-cjs/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "dev": true, "license": "MIT", "dependencies": { - "ansi-regex": "^6.0.1" + "ansi-regex": "^5.0.1" }, "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" + "node": ">=8" } }, "node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", "dev": true, "license": "MIT", "dependencies": { - "ansi-regex": "^5.0.1" + "ansi-regex": "^6.0.1" }, "engines": { - "node": ">=8" + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" } }, "node_modules/strip-ansi-cjs": { @@ -7015,13 +6992,16 @@ } }, "node_modules/strip-ansi/node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", "dev": true, "license": "MIT", "engines": { - "node": ">=8" + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" } }, "node_modules/strip-bom": { @@ -7784,6 +7764,23 @@ "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, + "node_modules/wrap-ansi-cjs/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true, + "license": "MIT" + }, "node_modules/wrap-ansi-cjs/node_modules/string-width": { "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", @@ -7799,17 +7796,17 @@ "node": ">=8" } }, - "node_modules/wrap-ansi/node_modules/ansi-regex": { + "node_modules/wrap-ansi-cjs/node_modules/strip-ansi": { "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "dev": true, "license": "MIT", - "engines": { - "node": ">=12" + "dependencies": { + "ansi-regex": "^5.0.1" }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" + "engines": { + "node": ">=8" } }, "node_modules/wrap-ansi/node_modules/ansi-styles": { @@ -7825,22 +7822,6 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/wrap-ansi/node_modules/strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^6.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", diff --git a/package.json b/package.json index fa8208ab..6c00f6f5 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "dojox": "1.17.3", "draggabilly": "2.4.1", "dropzone": "5.9.3", - "glob": "10.4.1", + "glob": "11.0.0", "grunt": "1.6.1", "grunt-contrib-clean": "2.0.1", "grunt-contrib-copy": "1.0.0", @@ -74,8 +74,8 @@ "nib": "1.2.0", "uuid": "8.3.2", "packery": "2.1.2", - "pdfjs-dist-viewer-min": "2.12.313", - "proj4": "2.11.0", + "pdfjs-dist-viewer-min": "3.11.174", + "proj4": "2.12.0", "prunecluster": "https://github.com/pedroetb/PruneCluster.git", "put-selector": "0.3.6", "sockjs-client": "1.6.1", -- GitLab From 19a498e7d849aca88cb8fef10e7bc964fc03f8eb Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Tue, 20 Aug 2024 09:12:59 +0100 Subject: [PATCH 098/249] =?UTF-8?q?Aplica=20auditor=C3=ADa=20npm=20y=20act?= =?UTF-8?q?ualiza=20subm=C3=B3dulos?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client-app/dep/templates | 2 +- client-app/style | 2 +- package-lock.json | 872 +++++++++++---------------------------- 3 files changed, 250 insertions(+), 626 deletions(-) diff --git a/client-app/dep/templates b/client-app/dep/templates index 17feb30d..351da247 160000 --- a/client-app/dep/templates +++ b/client-app/dep/templates @@ -1 +1 @@ -Subproject commit 17feb30def9a58ad31ab3b67ca5e23357de817b6 +Subproject commit 351da247466058c15279a7cf7b6941df16147002 diff --git a/client-app/style b/client-app/style index f29b52ea..dfd7a358 160000 --- a/client-app/style +++ b/client-app/style @@ -1 +1 @@ -Subproject commit f29b52ea203079ae2d4c773ddd68b5b7df93a195 +Subproject commit dfd7a358410dac513da0a13b8e8c273489d6f1de diff --git a/package-lock.json b/package-lock.json index 4a9069a1..3f98a4a3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -93,13 +93,14 @@ } }, "node_modules/@babel/code-frame": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz", - "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz", + "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/highlight": "^7.16.7" + "@babel/highlight": "^7.24.7", + "picocolors": "^1.0.0" }, "engines": { "node": ">=6.9.0" @@ -172,30 +173,21 @@ "license": "MIT" }, "node_modules/@babel/generator": { - "version": "7.17.9", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.9.tgz", - "integrity": "sha512-rAdDousTwxbIxbz5I7GEQ3lUip+xVCXooZNbsydCWs3xA7ZsYOv+CFRdzGxRX78BmQHu9B1Eso59AOZQOJDEdQ==", + "version": "7.25.0", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.0.tgz", + "integrity": "sha512-3LEEcj3PVW8pW2R1SR1M89g/qrYk/m/mB/tLqn7dn4sbBUQyTqnlod+II2U4dqiGtUmkcnAmkMDralTFZttRiw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/types": "^7.17.0", - "jsesc": "^2.5.1", - "source-map": "^0.5.0" + "@babel/types": "^7.25.0", + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.25", + "jsesc": "^2.5.1" }, "engines": { "node": ">=6.9.0" } }, - "node_modules/@babel/generator/node_modules/source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true, - "license": "BSD-3-Clause", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/@babel/helper-compilation-targets": { "version": "7.17.7", "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.7.tgz", @@ -228,33 +220,6 @@ "node": ">=6.9.0" } }, - "node_modules/@babel/helper-function-name": { - "version": "7.17.9", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz", - "integrity": "sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/template": "^7.16.7", - "@babel/types": "^7.17.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-hoist-variables": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz", - "integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/types": "^7.16.7" - }, - "engines": { - "node": ">=6.9.0" - } - }, "node_modules/@babel/helper-module-imports": { "version": "7.16.7", "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz", @@ -314,11 +279,19 @@ "node": ">=6.9.0" } }, + "node_modules/@babel/helper-string-parser": { + "version": "7.24.8", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz", + "integrity": "sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==", + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz", - "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==", - "dev": true, + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz", + "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==", "license": "MIT", "engines": { "node": ">=6.9.0" @@ -350,15 +323,16 @@ } }, "node_modules/@babel/highlight": { - "version": "7.17.9", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.9.tgz", - "integrity": "sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz", + "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-validator-identifier": "^7.16.7", - "chalk": "^2.0.0", - "js-tokens": "^4.0.0" + "@babel/helper-validator-identifier": "^7.24.7", + "chalk": "^2.4.2", + "js-tokens": "^4.0.0", + "picocolors": "^1.0.0" }, "engines": { "node": ">=6.9.0" @@ -395,7 +369,7 @@ "node_modules/@babel/highlight/node_modules/has-flag": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", "dev": true, "license": "MIT", "engines": { @@ -416,11 +390,13 @@ } }, "node_modules/@babel/parser": { - "version": "7.17.9", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.17.9.tgz", - "integrity": "sha512-vqUSBLP8dQHFPdPi9bc5GK9vRkYHJ49fsZdtoJ8EQ8ibpwk5rPKfvNIwChB0KVXcIjcepEBBd2VHC5r9Gy8ueg==", - "dev": true, + "version": "7.25.3", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.3.tgz", + "integrity": "sha512-iLTJKDbJ4hMvFPgQwwsVoxtHyWpKKPBrxkANrSYewDPaPpT5py5yeVkgPIJ7XYXhndxJpaA3PyALSXQ7u8e/Dw==", "license": "MIT", + "dependencies": { + "@babel/types": "^7.25.2" + }, "bin": { "parser": "bin/babel-parser.js" }, @@ -429,36 +405,33 @@ } }, "node_modules/@babel/template": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz", - "integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==", + "version": "7.25.0", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.0.tgz", + "integrity": "sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q==", "dev": true, "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.16.7", - "@babel/parser": "^7.16.7", - "@babel/types": "^7.16.7" + "@babel/code-frame": "^7.24.7", + "@babel/parser": "^7.25.0", + "@babel/types": "^7.25.0" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { - "version": "7.17.9", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.9.tgz", - "integrity": "sha512-PQO8sDIJ8SIwipTPiR71kJQCKQYB5NGImbOviK8K+kg5xkNSYXLBupuX9QhatFowrsvo9Hj8WgArg3W7ijNAQw==", + "version": "7.25.3", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.3.tgz", + "integrity": "sha512-HefgyP1x754oGCsKmV5reSmtV7IXj/kpaE1XYY+D9G5PvKKoFfSbiS4M77MdjuwlZKDIKFCffq9rPU+H/s3ZdQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.16.7", - "@babel/generator": "^7.17.9", - "@babel/helper-environment-visitor": "^7.16.7", - "@babel/helper-function-name": "^7.17.9", - "@babel/helper-hoist-variables": "^7.16.7", - "@babel/helper-split-export-declaration": "^7.16.7", - "@babel/parser": "^7.17.9", - "@babel/types": "^7.17.0", - "debug": "^4.1.0", + "@babel/code-frame": "^7.24.7", + "@babel/generator": "^7.25.0", + "@babel/parser": "^7.25.3", + "@babel/template": "^7.25.0", + "@babel/types": "^7.25.2", + "debug": "^4.3.1", "globals": "^11.1.0" }, "engines": { @@ -491,13 +464,13 @@ "license": "MIT" }, "node_modules/@babel/types": { - "version": "7.17.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.0.tgz", - "integrity": "sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==", - "dev": true, + "version": "7.25.2", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.2.tgz", + "integrity": "sha512-YTnYtra7W9e6/oAZEHj0bJehPRUlLH9/fbpT5LfB0NhQXyALCRkRs3zH9v07IYhkgpqX6Z78FnuccZr/l4Fs4Q==", "license": "MIT", "dependencies": { - "@babel/helper-validator-identifier": "^7.16.7", + "@babel/helper-string-parser": "^7.24.8", + "@babel/helper-validator-identifier": "^7.24.7", "to-fast-properties": "^2.0.0" }, "engines": { @@ -552,10 +525,35 @@ "node": ">=8" } }, + "node_modules/@jridgewell/gen-mapping": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz", + "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/set-array": "^1.2.1", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.24" + }, + "engines": { + "node": ">=6.0.0" + } + }, "node_modules/@jridgewell/resolve-uri": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz", - "integrity": "sha512-VPeQ7+wH0itvQxnG+lIzWgkysKIr3L9sslimFW55rHMdGu/qCQ5z5h9zq4gI8uBtqkpHhsF4Z/OwExufUCThew==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", + "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/set-array": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", + "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==", "dev": true, "license": "MIT", "engines": { @@ -563,21 +561,21 @@ } }, "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.4.11", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz", - "integrity": "sha512-Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz", + "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==", "dev": true, "license": "MIT" }, "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.4", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.4.tgz", - "integrity": "sha512-vFv9ttIedivx0ux3QSjhgtCVjPZd5l46ZOMDSCwnH1yUO2e964gO8LZGyv2QkqcgR6TnBU1v+1IFqmeoG+0UJQ==", + "version": "0.3.25", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", + "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", "dev": true, "license": "MIT", "dependencies": { - "@jridgewell/resolve-uri": "^3.0.3", - "@jridgewell/sourcemap-codec": "^1.4.10" + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" } }, "node_modules/@lweller/leaflet-areaselect": { @@ -622,9 +620,9 @@ } }, "node_modules/@theintern/digdug": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/@theintern/digdug/-/digdug-2.6.2.tgz", - "integrity": "sha512-r9P7zkIp8L2LYKOUfcKl+KOHUTWrIZ9X6Efsb7Tn+OtiIv4oRlXorcoj/5vmrRLO5JF8jFj26HyeSWBNQA2uwg==", + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/@theintern/digdug/-/digdug-2.6.3.tgz", + "integrity": "sha512-xeyy/LSXDgGZKhvoSz1iuzKU3phAkKeaD3vl8f76PAG79uuXVam5nlIH+Ub54RDNTkrMbwSE7X2QWLXchomTMw==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -763,18 +761,6 @@ "@types/node": "*" } }, - "node_modules/@types/body-parser/node_modules/@types/express": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/@types/express/-/express-4.11.0.tgz", - "integrity": "sha512-N1Wdp3v4KmdO3W/CM7KXrDwM4xcVZjlHF2dAOs7sNrTUX8PY3G4n9NkaHlfjGFEfgFeHmRRjywoBd4VkujDs9w==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/body-parser": "*", - "@types/express-serve-static-core": "*", - "@types/serve-static": "*" - } - }, "node_modules/@types/chai": { "version": "4.2.22", "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.2.22.tgz", @@ -892,16 +878,6 @@ "@types/istanbul-lib-report": "*" } }, - "node_modules/@types/istanbul-reports/node_modules/@types/istanbul-lib-report": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-1.1.0.tgz", - "integrity": "sha512-nW5QuzmMhr7fHPijtaGOemFFI8Ctrxb/dIXgouSlKmWT16RxWlGLEX/nGghIBOReKe9hPFZXoNh338nFQk2xcA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/istanbul-lib-coverage": "*" - } - }, "node_modules/@types/leaflet": { "version": "1.7.9", "resolved": "https://registry.npmjs.org/@types/leaflet/-/leaflet-1.7.9.tgz", @@ -1216,29 +1192,6 @@ "node": ">= 10.0.0" } }, - "node_modules/babel-walk/node_modules/@babel/helper-validator-identifier": { - "version": "7.12.11", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz", - "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==", - "license": "MIT" - }, - "node_modules/babel-walk/node_modules/@babel/types": { - "version": "7.13.14", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.14.tgz", - "integrity": "sha512-A2aa3QTkWoyqsZZFl56MLUsfmh7O0gN41IPvXAE/++8ojpbz12SszD7JEGYVdn4f9Kt4amIei07swF1h4AqmmQ==", - "license": "MIT", - "dependencies": { - "@babel/helper-validator-identifier": "^7.12.11", - "lodash": "^4.17.19", - "to-fast-properties": "^2.0.0" - } - }, - "node_modules/babel-walk/node_modules/lodash": { - "version": "4.17.20", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", - "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==", - "license": "MIT" - }, "node_modules/balanced-match": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", @@ -1285,82 +1238,72 @@ "platform": "^1.3.3" } }, - "node_modules/benchmark/node_modules/lodash": { - "version": "4.17.4", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", - "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=", - "dev": true, - "license": "MIT" - }, - "node_modules/benchmark/node_modules/platform": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/platform/-/platform-1.3.5.tgz", - "integrity": "sha512-TuvHS8AOIZNAlE77WUDiR4rySV/VMptyMfcfeoMgs4P8apaZM3JrnbzBiixKUv+XR6i+BXrQh8WAnjaSPFO65Q==", - "dev": true, - "license": "MIT" - }, "node_modules/bintrees": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/bintrees/-/bintrees-1.0.1.tgz", "integrity": "sha1-DmVcm5wkNeqraL9AJyJtK1WjRSQ=" }, "node_modules/bl": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.1.tgz", - "integrity": "sha1-ysMo977kVzDUBLaSID/LWQ4XLV4=", + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.3.tgz", + "integrity": "sha512-pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww==", "dev": true, "license": "MIT", "dependencies": { - "readable-stream": "^2.0.5" + "readable-stream": "^2.3.5", + "safe-buffer": "^5.1.1" } }, "node_modules/body-parser": { - "version": "1.19.0", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz", - "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==", + "version": "1.19.2", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.2.tgz", + "integrity": "sha512-SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw==", "dev": true, "license": "MIT", "dependencies": { - "bytes": "3.1.0", + "bytes": "3.1.2", "content-type": "~1.0.4", "debug": "2.6.9", "depd": "~1.1.2", - "http-errors": "1.7.2", + "http-errors": "1.8.1", "iconv-lite": "0.4.24", "on-finished": "~2.3.0", - "qs": "6.7.0", - "raw-body": "2.4.0", - "type-is": "~1.6.17" + "qs": "6.9.7", + "raw-body": "2.4.3", + "type-is": "~1.6.18" }, "engines": { "node": ">= 0.8" } }, "node_modules/body-parser/node_modules/http-errors": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz", - "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==", + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz", + "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==", "dev": true, "license": "MIT", "dependencies": { "depd": "~1.1.2", - "inherits": "2.0.3", - "setprototypeof": "1.1.1", + "inherits": "2.0.4", + "setprototypeof": "1.2.0", "statuses": ">= 1.5.0 < 2", - "toidentifier": "1.0.0" + "toidentifier": "1.0.1" }, "engines": { "node": ">= 0.6" } }, "node_modules/body-parser/node_modules/qs": { - "version": "6.7.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", - "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==", + "version": "6.9.7", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz", + "integrity": "sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==", "dev": true, "license": "BSD-3-Clause", "engines": { "node": ">=0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/brace-expansion": { @@ -1375,13 +1318,13 @@ } }, "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, "license": "MIT", "dependencies": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" }, "engines": { "node": ">=8" @@ -1447,10 +1390,9 @@ "license": "MIT" }, "node_modules/bytes": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", - "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==", - "dev": true, + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", + "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", "license": "MIT", "engines": { "node": ">= 0.8" @@ -1505,7 +1447,7 @@ "node_modules/cbtree/node_modules/dijit": { "version": "1.8.14", "resolved": "https://registry.npmjs.org/dijit/-/dijit-1.8.14.tgz", - "integrity": "sha1-1cZRsNCJTJMX0LcYLjCbKr4BkAM=", + "integrity": "sha512-cYCHGrF+ZsDuc1+++DewtFkThDRCkCbonSY9IS8+jRFKAMzBJLfZ4j1TeMvJMIY7W214Iv8E7rSUsskDLLKjnA==", "dev": true, "dependencies": { "dojo": "1.8.14" @@ -1514,7 +1456,7 @@ "node_modules/cbtree/node_modules/dojo": { "version": "1.8.14", "resolved": "https://registry.npmjs.org/dojo/-/dojo-1.8.14.tgz", - "integrity": "sha1-jCOd0yHoXmpV0DMpuXu4i7pT+zM=", + "integrity": "sha512-KSNz/0DBuLq9DLQAvOwM5OttBqwbN6+F3mGYEC2njKz0DrN849tySofJ7nITYSKe748OVikRLnfSfqU5mgyjqQ==", "dev": true, "license": "BSD-3-Clause OR AFL-2.1" }, @@ -1726,41 +1668,6 @@ "@babel/types": "^7.6.1" } }, - "node_modules/constantinople/node_modules/@babel/helper-validator-identifier": { - "version": "7.12.11", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz", - "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==", - "license": "MIT" - }, - "node_modules/constantinople/node_modules/@babel/parser": { - "version": "7.13.15", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.15.tgz", - "integrity": "sha512-b9COtcAlVEQljy/9fbcMHpG+UIW9ReF+gpaxDHTlZd0c6/UU9ng8zdySAW9sRTzpvcdCHn6bUcbuYUgGzLAWVQ==", - "license": "MIT", - "bin": { - "parser": "bin/babel-parser.js" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/constantinople/node_modules/@babel/types": { - "version": "7.13.14", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.14.tgz", - "integrity": "sha512-A2aa3QTkWoyqsZZFl56MLUsfmh7O0gN41IPvXAE/++8ojpbz12SszD7JEGYVdn4f9Kt4amIei07swF1h4AqmmQ==", - "license": "MIT", - "dependencies": { - "@babel/helper-validator-identifier": "^7.12.11", - "lodash": "^4.17.19", - "to-fast-properties": "^2.0.0" - } - }, - "node_modules/constantinople/node_modules/lodash": { - "version": "4.17.20", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", - "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==", - "license": "MIT" - }, "node_modules/content-disposition": { "version": "0.5.4", "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", @@ -2521,16 +2428,6 @@ "node": ">=0.12" } }, - "node_modules/deep-eql/node_modules/type-detect": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.7.tgz", - "integrity": "sha512-4Rh17pAMVdMWzktddFhISRnUnFIStObtUMNGzDwlA6w/77bmGv3aBbRdCmQR6IjzfkTo9otnW+2K/cDRhKSxDA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, "node_modules/deepmerge": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.0.tgz", @@ -2952,15 +2849,6 @@ "node": ">= 0.6" } }, - "node_modules/express/node_modules/bytes": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", - "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, "node_modules/express/node_modules/depd": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", @@ -3041,12 +2929,6 @@ "node": ">= 0.8.0" } }, - "node_modules/express/node_modules/setprototypeof": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", - "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", - "license": "ISC" - }, "node_modules/express/node_modules/statuses": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", @@ -3126,9 +3008,9 @@ } }, "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, "license": "MIT", "dependencies": { @@ -3250,9 +3132,9 @@ "license": "MIT" }, "node_modules/follow-redirects": { - "version": "1.14.9", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz", - "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==", + "version": "1.15.6", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz", + "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==", "dev": true, "funding": [ { @@ -3359,9 +3241,9 @@ } }, "node_modules/get-func-name": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz", - "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz", + "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==", "dev": true, "license": "MIT", "engines": { @@ -4094,18 +3976,6 @@ "node": ">= 0.8" } }, - "node_modules/http-errors/node_modules/inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "license": "ISC" - }, - "node_modules/http-errors/node_modules/setprototypeof": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", - "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", - "license": "ISC" - }, "node_modules/http-errors/node_modules/statuses": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", @@ -4115,15 +3985,6 @@ "node": ">= 0.8" } }, - "node_modules/http-errors/node_modules/toidentifier": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", - "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", - "license": "MIT", - "engines": { - "node": ">=0.6" - } - }, "node_modules/http-parser-js": { "version": "0.4.9", "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.9.tgz", @@ -4169,20 +4030,17 @@ } }, "node_modules/inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", "license": "ISC" }, "node_modules/ini": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", - "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", + "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", "dev": true, - "license": "ISC", - "engines": { - "node": "*" - } + "license": "ISC" }, "node_modules/intern": { "version": "4.10.1", @@ -4241,60 +4099,10 @@ "dev": true, "license": "MIT" }, - "node_modules/intern/node_modules/accepts": { - "version": "1.3.7", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz", - "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==", - "dev": true, - "license": "MIT", - "dependencies": { - "mime-types": "~2.1.24", - "negotiator": "0.6.2" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/intern/node_modules/accepts/node_modules/mime-db": { - "version": "1.45.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.45.0.tgz", - "integrity": "sha512-CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/intern/node_modules/accepts/node_modules/mime-types": { - "version": "2.1.28", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.28.tgz", - "integrity": "sha512-0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "mime-db": "1.45.0" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/intern/node_modules/content-disposition": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz", - "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==", - "dev": true, - "license": "MIT", - "dependencies": { - "safe-buffer": "5.1.2" - }, - "engines": { - "node": ">= 0.6" - } - }, "node_modules/intern/node_modules/cookie": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz", - "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==", + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz", + "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==", "dev": true, "license": "MIT", "engines": { @@ -4302,18 +4110,18 @@ } }, "node_modules/intern/node_modules/express": { - "version": "4.17.1", - "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz", - "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==", + "version": "4.17.3", + "resolved": "https://registry.npmjs.org/express/-/express-4.17.3.tgz", + "integrity": "sha512-yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg==", "dev": true, "license": "MIT", "dependencies": { - "accepts": "~1.3.7", + "accepts": "~1.3.8", "array-flatten": "1.1.1", - "body-parser": "1.19.0", - "content-disposition": "0.5.3", + "body-parser": "1.19.2", + "content-disposition": "0.5.4", "content-type": "~1.0.4", - "cookie": "0.4.0", + "cookie": "0.4.2", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "~1.1.2", @@ -4327,13 +4135,13 @@ "on-finished": "~2.3.0", "parseurl": "~1.3.3", "path-to-regexp": "0.1.7", - "proxy-addr": "~2.0.5", - "qs": "6.7.0", + "proxy-addr": "~2.0.7", + "qs": "6.9.7", "range-parser": "~1.2.1", - "safe-buffer": "5.1.2", - "send": "0.17.1", - "serve-static": "1.14.1", - "setprototypeof": "1.1.1", + "safe-buffer": "5.2.1", + "send": "0.17.2", + "serve-static": "1.14.2", + "setprototypeof": "1.2.0", "statuses": "~1.5.0", "type-is": "~1.6.18", "utils-merge": "1.0.1", @@ -4362,16 +4170,6 @@ "node": ">= 0.8" } }, - "node_modules/intern/node_modules/forwarded": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz", - "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, "node_modules/intern/node_modules/glob": { "version": "7.1.7", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz", @@ -4410,20 +4208,6 @@ "node": ">= 0.6" } }, - "node_modules/intern/node_modules/http-errors/node_modules/inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/intern/node_modules/http-errors/node_modules/setprototypeof": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", - "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", - "dev": true, - "license": "ISC" - }, "node_modules/intern/node_modules/istanbul-lib-coverage": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.2.tgz", @@ -4434,13 +4218,6 @@ "node": ">=8" } }, - "node_modules/intern/node_modules/lodash": { - "version": "4.17.20", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", - "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==", - "dev": true, - "license": "MIT" - }, "node_modules/intern/node_modules/mime-db": { "version": "1.52.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", @@ -4464,73 +4241,56 @@ "node": ">= 0.6" } }, - "node_modules/intern/node_modules/negotiator": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", - "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/intern/node_modules/proxy-addr": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz", - "integrity": "sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==", - "dev": true, - "license": "MIT", - "dependencies": { - "forwarded": "~0.1.2", - "ipaddr.js": "1.9.1" - }, - "engines": { - "node": ">= 0.10" - } - }, "node_modules/intern/node_modules/qs": { - "version": "6.7.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", - "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==", + "version": "6.9.7", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz", + "integrity": "sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==", "dev": true, "license": "BSD-3-Clause", "engines": { "node": ">=0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/intern/node_modules/safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], "license": "MIT" }, "node_modules/intern/node_modules/serve-static": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz", - "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==", + "version": "1.14.2", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.2.tgz", + "integrity": "sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ==", "dev": true, "license": "MIT", "dependencies": { "encodeurl": "~1.0.2", "escape-html": "~1.0.3", "parseurl": "~1.3.3", - "send": "0.17.1" + "send": "0.17.2" }, "engines": { "node": ">= 0.8.0" } }, - "node_modules/intern/node_modules/toidentifier": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", - "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.6" - } - }, "node_modules/internmap": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz", @@ -4680,17 +4440,6 @@ "node": ">= 0.4" } }, - "node_modules/is-regex/node_modules/has": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz", - "integrity": "sha1-hGFzP1OLCDfJNh45qauelwTcLyg=", - "dependencies": { - "function-bind": "^1.0.2" - }, - "engines": { - "node": ">= 0.8.0" - } - }, "node_modules/is-relative": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz", @@ -4960,9 +4709,9 @@ } }, "node_modules/json5": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz", - "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==", + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", + "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", "dev": true, "license": "MIT", "bin": { @@ -4995,39 +4744,6 @@ "set-immediate-shim": "~1.0.1" } }, - "node_modules/jszip/node_modules/process-nextick-args": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", - "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==", - "dev": true, - "license": "MIT" - }, - "node_modules/jszip/node_modules/readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "dev": true, - "license": "MIT", - "dependencies": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "node_modules/jszip/node_modules/string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "license": "MIT", - "dependencies": { - "safe-buffer": "~5.1.0" - } - }, "node_modules/kind-of": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", @@ -5110,13 +4826,6 @@ "leaflet": "^1.6.0" } }, - "node_modules/leaflet.nontiledlayer/node_modules/leaflet": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/leaflet/-/leaflet-1.7.1.tgz", - "integrity": "sha512-/xwPEBidtg69Q3HlqPdU3DnrXQOvQU/CCHA1tcDQVzOwm91YMYaILjNp7L4Eaw5Z4sOYdbBz6koWyibppd8Zqw==", - "dev": true, - "license": "BSD-2-Clause" - }, "node_modules/lie": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz", @@ -5176,26 +4885,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/liftup/node_modules/is-glob": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", - "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", - "dev": true, - "license": "MIT", - "dependencies": { - "is-extglob": "^2.1.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/liftup/node_modules/path-parse": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", - "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", - "dev": true, - "license": "MIT" - }, "node_modules/liftup/node_modules/resolve": { "version": "1.22.0", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz", @@ -5449,9 +5138,9 @@ } }, "node_modules/minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.8.tgz", + "integrity": "sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==", "dev": true, "license": "ISC", "dependencies": { @@ -5890,9 +5579,9 @@ } }, "node_modules/path-parse": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", - "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", "license": "MIT" }, "node_modules/path-root": { @@ -6058,9 +5747,9 @@ } }, "node_modules/process-nextick-args": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", - "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", "dev": true, "license": "MIT" }, @@ -6285,14 +5974,14 @@ } }, "node_modules/raw-body": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz", - "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.3.tgz", + "integrity": "sha512-UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g==", "dev": true, "license": "MIT", "dependencies": { - "bytes": "3.1.0", - "http-errors": "1.7.2", + "bytes": "3.1.2", + "http-errors": "1.8.1", "iconv-lite": "0.4.24", "unpipe": "1.0.0" }, @@ -6301,35 +5990,35 @@ } }, "node_modules/raw-body/node_modules/http-errors": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz", - "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==", + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz", + "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==", "dev": true, "license": "MIT", "dependencies": { "depd": "~1.1.2", - "inherits": "2.0.3", - "setprototypeof": "1.1.1", + "inherits": "2.0.4", + "setprototypeof": "1.2.0", "statuses": ">= 1.5.0 < 2", - "toidentifier": "1.0.0" + "toidentifier": "1.0.1" }, "engines": { "node": ">= 0.6" } }, "node_modules/readable-stream": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", - "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", + "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", "dev": true, "license": "MIT", "dependencies": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", "isarray": "~1.0.0", - "process-nextick-args": "~1.0.6", + "process-nextick-args": "~2.0.0", "safe-buffer": "~5.1.1", - "string_decoder": "~1.0.3", + "string_decoder": "~1.1.1", "util-deprecate": "~1.0.1" } }, @@ -6359,13 +6048,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/rechoir/node_modules/path-parse": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", - "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", - "dev": true, - "license": "MIT" - }, "node_modules/rechoir/node_modules/resolve": { "version": "1.22.0", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz", @@ -6559,9 +6241,9 @@ } }, "node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "license": "ISC", "bin": { @@ -6569,9 +6251,9 @@ } }, "node_modules/send": { - "version": "0.17.1", - "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz", - "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==", + "version": "0.17.2", + "resolved": "https://registry.npmjs.org/send/-/send-0.17.2.tgz", + "integrity": "sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww==", "dev": true, "license": "MIT", "dependencies": { @@ -6582,9 +6264,9 @@ "escape-html": "~1.0.3", "etag": "~1.8.1", "fresh": "0.5.2", - "http-errors": "~1.7.2", + "http-errors": "1.8.1", "mime": "1.6.0", - "ms": "2.1.1", + "ms": "2.1.3", "on-finished": "~2.3.0", "range-parser": "~1.2.1", "statuses": "~1.5.0" @@ -6596,41 +6278,27 @@ "node_modules/send/node_modules/destroy": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", - "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=", + "integrity": "sha512-3NdhDuEXnfun/z7x9GOElY49LoqVHoGScmOKwmxhsS8N5Y+Z8KyPPDnaSzqWgYt/ji4mqwfTS34Htrk0zPIXVg==", "dev": true, "license": "MIT" }, "node_modules/send/node_modules/http-errors": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz", - "integrity": "sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==", + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz", + "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==", "dev": true, "license": "MIT", "dependencies": { "depd": "~1.1.2", "inherits": "2.0.4", - "setprototypeof": "1.1.1", + "setprototypeof": "1.2.0", "statuses": ">= 1.5.0 < 2", - "toidentifier": "1.0.0" + "toidentifier": "1.0.1" }, "engines": { "node": ">= 0.6" } }, - "node_modules/send/node_modules/inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/send/node_modules/ms": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", - "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", - "dev": true, - "license": "MIT" - }, "node_modules/serve-static": { "version": "1.15.0", "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz", @@ -6711,10 +6379,9 @@ } }, "node_modules/setprototypeof": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz", - "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==", - "dev": true, + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", + "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", "license": "ISC" }, "node_modules/shebang-command": { @@ -6813,13 +6480,6 @@ "ms": "^2.1.1" } }, - "node_modules/sockjs-client/node_modules/inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true, - "license": "ISC" - }, "node_modules/source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", @@ -6878,9 +6538,9 @@ } }, "node_modules/string_decoder": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", - "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "license": "MIT", "dependencies": { @@ -7203,10 +6863,9 @@ } }, "node_modules/toidentifier": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz", - "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==", - "dev": true, + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", + "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", "license": "MIT", "engines": { "node": ">=0.6" @@ -7497,11 +7156,11 @@ } }, "node_modules/websocket-extensions": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz", - "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==", + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz", + "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==", "dev": true, - "license": "MIT", + "license": "Apache-2.0", "engines": { "node": ">=0.8.0" } @@ -7678,41 +7337,6 @@ "node": ">= 10.0.0" } }, - "node_modules/with/node_modules/@babel/helper-validator-identifier": { - "version": "7.12.11", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz", - "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==", - "license": "MIT" - }, - "node_modules/with/node_modules/@babel/parser": { - "version": "7.13.15", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.15.tgz", - "integrity": "sha512-b9COtcAlVEQljy/9fbcMHpG+UIW9ReF+gpaxDHTlZd0c6/UU9ng8zdySAW9sRTzpvcdCHn6bUcbuYUgGzLAWVQ==", - "license": "MIT", - "bin": { - "parser": "bin/babel-parser.js" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/with/node_modules/@babel/types": { - "version": "7.13.14", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.14.tgz", - "integrity": "sha512-A2aa3QTkWoyqsZZFl56MLUsfmh7O0gN41IPvXAE/++8ojpbz12SszD7JEGYVdn4f9Kt4amIei07swF1h4AqmmQ==", - "license": "MIT", - "dependencies": { - "@babel/helper-validator-identifier": "^7.12.11", - "lodash": "^4.17.19", - "to-fast-properties": "^2.0.0" - } - }, - "node_modules/with/node_modules/lodash": { - "version": "4.17.20", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", - "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==", - "license": "MIT" - }, "node_modules/wkt-parser": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/wkt-parser/-/wkt-parser-1.3.3.tgz", @@ -7830,9 +7454,9 @@ "license": "ISC" }, "node_modules/ws": { - "version": "7.5.7", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz", - "integrity": "sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==", + "version": "7.5.10", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz", + "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==", "dev": true, "license": "MIT", "engines": { -- GitLab From 8209a61b7d2c40497444632d9c4128a372eaf7a5 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Tue, 20 Aug 2024 09:29:56 +0100 Subject: [PATCH 099/249] =?UTF-8?q?Fuerza=20arreglos=20de=20auditor=C3=ADa?= =?UTF-8?q?=20con=20excepci=C3=B3n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Omite sugerencia de pasar la dependencia intern desde versión 4 hacia versión 3, que provoca más vulnerabilidades de las que ya hay presentes. --- package-lock.json | 960 +++++++++++++++++++++++++--------------------- package.json | 14 +- 2 files changed, 522 insertions(+), 452 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3f98a4a3..207900c0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -80,13 +80,14 @@ "license": "MIT" }, "node_modules/@ampproject/remapping": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.1.2.tgz", - "integrity": "sha512-hoyByceqwKirw7w3Z7gnIIZC3Wx3J484Y3L/cMpXFbr7d9ZQj2mODrirNzcJa+SM3UlpWXYvKV4RlRpFXlWgXg==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz", + "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==", "dev": true, "license": "Apache-2.0", "dependencies": { - "@jridgewell/trace-mapping": "^0.3.0" + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.24" }, "engines": { "node": ">=6.0.0" @@ -107,9 +108,9 @@ } }, "node_modules/@babel/compat-data": { - "version": "7.17.7", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.7.tgz", - "integrity": "sha512-p8pdE6j0a29TNGebNm7NzYZWB3xVZJBZ7XGs42uAKzQo8VQ3F0By/cQCtUEABwIqw5zo6WA4NbmxsfzADzMKnQ==", + "version": "7.25.2", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.2.tgz", + "integrity": "sha512-bYcppcpKBvX4znYaPEeFau03bp89ShqNMLs+rmdptMw+heSZh9+z84d2YG+K7cYLbWwzdjtDoW/uqZmPjulClQ==", "dev": true, "license": "MIT", "engines": { @@ -117,27 +118,27 @@ } }, "node_modules/@babel/core": { - "version": "7.17.9", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.17.9.tgz", - "integrity": "sha512-5ug+SfZCpDAkVp9SFIZAzlW18rlzsOcJGaetCjkySnrXXDUw9AR8cDUm1iByTmdWM6yxX6/zycaV76w3YTF2gw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@ampproject/remapping": "^2.1.0", - "@babel/code-frame": "^7.16.7", - "@babel/generator": "^7.17.9", - "@babel/helper-compilation-targets": "^7.17.7", - "@babel/helper-module-transforms": "^7.17.7", - "@babel/helpers": "^7.17.9", - "@babel/parser": "^7.17.9", - "@babel/template": "^7.16.7", - "@babel/traverse": "^7.17.9", - "@babel/types": "^7.17.0", - "convert-source-map": "^1.7.0", + "version": "7.25.2", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.2.tgz", + "integrity": "sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@ampproject/remapping": "^2.2.0", + "@babel/code-frame": "^7.24.7", + "@babel/generator": "^7.25.0", + "@babel/helper-compilation-targets": "^7.25.2", + "@babel/helper-module-transforms": "^7.25.2", + "@babel/helpers": "^7.25.0", + "@babel/parser": "^7.25.0", + "@babel/template": "^7.25.0", + "@babel/traverse": "^7.25.2", + "@babel/types": "^7.25.2", + "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", - "json5": "^2.2.1", - "semver": "^6.3.0" + "json5": "^2.2.3", + "semver": "^6.3.1" }, "engines": { "node": ">=6.9.0" @@ -148,9 +149,9 @@ } }, "node_modules/@babel/core/node_modules/debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz", + "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==", "dev": true, "license": "MIT", "dependencies": { @@ -189,91 +190,74 @@ } }, "node_modules/@babel/helper-compilation-targets": { - "version": "7.17.7", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.7.tgz", - "integrity": "sha512-UFzlz2jjd8kroj0hmCFV5zr+tQPi1dpC2cRsDV/3IEW8bJfCPrPpmcSN6ZS8RqIq4LXcmpipCQFPddyFA5Yc7w==", + "version": "7.25.2", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.2.tgz", + "integrity": "sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/compat-data": "^7.17.7", - "@babel/helper-validator-option": "^7.16.7", - "browserslist": "^4.17.5", - "semver": "^6.3.0" + "@babel/compat-data": "^7.25.2", + "@babel/helper-validator-option": "^7.24.8", + "browserslist": "^4.23.1", + "lru-cache": "^5.1.1", + "semver": "^6.3.1" }, "engines": { "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0" } }, - "node_modules/@babel/helper-environment-visitor": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz", - "integrity": "sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==", + "node_modules/@babel/helper-compilation-targets/node_modules/lru-cache": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", "dev": true, - "license": "MIT", + "license": "ISC", "dependencies": { - "@babel/types": "^7.16.7" - }, - "engines": { - "node": ">=6.9.0" + "yallist": "^3.0.2" } }, "node_modules/@babel/helper-module-imports": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz", - "integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz", + "integrity": "sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/types": "^7.16.7" + "@babel/traverse": "^7.24.7", + "@babel/types": "^7.24.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-transforms": { - "version": "7.17.7", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.17.7.tgz", - "integrity": "sha512-VmZD99F3gNTYB7fJRDTi+u6l/zxY0BE6OIxPSU7a50s6ZUQkHwSDmV92FfM+oCG0pZRVojGYhkR8I0OGeCVREw==", + "version": "7.25.2", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.2.tgz", + "integrity": "sha512-BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-environment-visitor": "^7.16.7", - "@babel/helper-module-imports": "^7.16.7", - "@babel/helper-simple-access": "^7.17.7", - "@babel/helper-split-export-declaration": "^7.16.7", - "@babel/helper-validator-identifier": "^7.16.7", - "@babel/template": "^7.16.7", - "@babel/traverse": "^7.17.3", - "@babel/types": "^7.17.0" + "@babel/helper-module-imports": "^7.24.7", + "@babel/helper-simple-access": "^7.24.7", + "@babel/helper-validator-identifier": "^7.24.7", + "@babel/traverse": "^7.25.2" }, "engines": { "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-simple-access": { - "version": "7.17.7", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz", - "integrity": "sha512-txyMCGroZ96i+Pxr3Je3lzEJjqwaRC9buMUgtomcrLe5Nd0+fk1h0LLA+ixUF5OW7AhHuQ7Es1WcQJZmZsz2XA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/types": "^7.17.0" }, - "engines": { - "node": ">=6.9.0" + "peerDependencies": { + "@babel/core": "^7.0.0" } }, - "node_modules/@babel/helper-split-export-declaration": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz", - "integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==", + "node_modules/@babel/helper-simple-access": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz", + "integrity": "sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/types": "^7.16.7" + "@babel/traverse": "^7.24.7", + "@babel/types": "^7.24.7" }, "engines": { "node": ">=6.9.0" @@ -298,9 +282,9 @@ } }, "node_modules/@babel/helper-validator-option": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz", - "integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==", + "version": "7.24.8", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz", + "integrity": "sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==", "dev": true, "license": "MIT", "engines": { @@ -308,15 +292,14 @@ } }, "node_modules/@babel/helpers": { - "version": "7.17.9", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.9.tgz", - "integrity": "sha512-cPCt915ShDWUEzEp3+UNRktO2n6v49l5RSnG9M5pS24hA+2FAc5si+Pn1i4VVbQQ+jh+bIZhPFQOJOzbrOYY1Q==", + "version": "7.25.0", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.0.tgz", + "integrity": "sha512-MjgLZ42aCm0oGjJj8CtSM3DB8NOOf8h2l7DCTePJs29u+v7yO/RBX9nShlKMgFnRks/Q4tBAe7Hxnov9VkGwLw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/template": "^7.16.7", - "@babel/traverse": "^7.17.9", - "@babel/types": "^7.17.0" + "@babel/template": "^7.25.0", + "@babel/types": "^7.25.0" }, "engines": { "node": ">=6.9.0" @@ -439,9 +422,9 @@ } }, "node_modules/@babel/traverse/node_modules/debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz", + "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==", "dev": true, "license": "MIT", "dependencies": { @@ -648,30 +631,30 @@ } }, "node_modules/@tsconfig/node10": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.8.tgz", - "integrity": "sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg==", + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz", + "integrity": "sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==", "dev": true, "license": "MIT" }, "node_modules/@tsconfig/node12": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.9.tgz", - "integrity": "sha512-/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw==", + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz", + "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==", "dev": true, "license": "MIT" }, "node_modules/@tsconfig/node14": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.1.tgz", - "integrity": "sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz", + "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==", "dev": true, "license": "MIT" }, "node_modules/@tsconfig/node16": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.2.tgz", - "integrity": "sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz", + "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==", "dev": true, "license": "MIT" }, @@ -737,27 +720,27 @@ } }, "node_modules/@types/babel-types": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@types/babel-types/-/babel-types-7.0.0.tgz", - "integrity": "sha512-PyWcbX0W4r4GcgXLI0Vu4jyJ/Erueo3PwjgvQcOmWAOBW0ObhzBBciEX+sHvjkNE0umI6nqD192FDKvYZTL91A==", + "version": "7.0.15", + "resolved": "https://registry.npmjs.org/@types/babel-types/-/babel-types-7.0.15.tgz", + "integrity": "sha512-JUgfZHUOMbtjopxiOQaaF+Uovk5wpDqpXR+XLWiOivCWSy1FccO30lvNNpCt8geFwq8VmGT2y9OMkOpA0g5O5g==", "dev": true, "license": "MIT" }, "node_modules/@types/benchmark": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/@types/benchmark/-/benchmark-2.1.1.tgz", - "integrity": "sha512-XmdNOarpSSxnb3DE2rRFOFsEyoqXLUL+7H8nSGS25vs+JS0018bd+cW5Ma9vdlkPmoTHSQ6e8EUFMFMxeE4l+g==", + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@types/benchmark/-/benchmark-2.1.5.tgz", + "integrity": "sha512-cKio2eFB3v7qmKcvIHLUMw/dIx/8bhWPuzpzRT4unCPRTD8VdA9Zb0afxpcxOqR4PixRS7yT42FqGS8BYL8g1w==", "dev": true, "license": "MIT" }, "node_modules/@types/body-parser": { - "version": "1.16.8", - "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.16.8.tgz", - "integrity": "sha512-BdN2PXxOFnTXFcyONPW6t0fHjz2fvRZHVMFpaS0wYr+Y8fWEaNOs4V8LEu/fpzQlMx+ahdndgTaGTwPC+J/EeA==", + "version": "1.19.5", + "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz", + "integrity": "sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==", "dev": true, "license": "MIT", "dependencies": { - "@types/express": "*", + "@types/connect": "*", "@types/node": "*" } }, @@ -769,56 +752,49 @@ "license": "MIT" }, "node_modules/@types/charm": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@types/charm/-/charm-1.0.3.tgz", - "integrity": "sha512-FpNoSOkloETr+ZJ0RsZpB+a/tqJkniIN+9Enn6uPIbhiNptOWtZzV7FkaqxTRjvvlHeUKMR331Wj9tOmqG10TA==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/@types/charm/-/charm-1.0.6.tgz", + "integrity": "sha512-zImdWnElQme4wOsRE+WzwpDBaKcLZVkHiVAEiOJ2gtP7cQ45uzsM3nZMgfBgwZmp+Tu0ajinDqrlLe3Xsy7w1w==", "dev": true, "license": "MIT", "dependencies": { "@types/node": "*" } }, - "node_modules/@types/events": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@types/events/-/events-1.1.0.tgz", - "integrity": "sha512-y3bR98mzYOo0pAZuiLari+cQyiKk3UXRuT45h1RjhfeCzqkjaVsfZJNaxdgtk7/3tzOm1ozLTqEqMP3VbI48jw==", + "node_modules/@types/connect": { + "version": "3.4.38", + "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz", + "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==", "dev": true, - "license": "MIT" + "license": "MIT", + "dependencies": { + "@types/node": "*" + } }, "node_modules/@types/express": { - "version": "4.17.13", - "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.13.tgz", - "integrity": "sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA==", + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz", + "integrity": "sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==", "dev": true, "license": "MIT", "dependencies": { "@types/body-parser": "*", - "@types/express-serve-static-core": "^4.17.18", + "@types/express-serve-static-core": "^4.17.33", "@types/qs": "*", "@types/serve-static": "*" } }, "node_modules/@types/express-serve-static-core": { - "version": "4.11.1", - "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.11.1.tgz", - "integrity": "sha512-EehCl3tpuqiM8RUb+0255M8PhhSwTtLfmO7zBBdv0ay/VTd/zmrqDfQdZFsa5z/PVMbH2yCMZPXsnrImpATyIw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/events": "*", - "@types/node": "*" - } - }, - "node_modules/@types/express/node_modules/@types/express-serve-static-core": { - "version": "4.17.18", - "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.18.tgz", - "integrity": "sha512-m4JTwx5RUBNZvky/JJ8swEJPKFd8si08pPF2PfizYjGZOKr/svUWPcoUmLow6MmPzhasphB7gSTINY67xn3JNA==", + "version": "4.19.5", + "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.5.tgz", + "integrity": "sha512-y6W03tvrACO72aijJ5uF02FRq5cgDR9lUxddQ8vyF+GvmjJQqbzDcJngEjURc+ZsG31VI3hODNZJ2URj86pzmg==", "dev": true, "license": "MIT", "dependencies": { "@types/node": "*", "@types/qs": "*", - "@types/range-parser": "*" + "@types/range-parser": "*", + "@types/send": "*" } }, "node_modules/@types/geojson": { @@ -828,17 +804,24 @@ "dev": true, "license": "MIT" }, + "node_modules/@types/http-errors": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz", + "integrity": "sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==", + "dev": true, + "license": "MIT" + }, "node_modules/@types/istanbul-lib-coverage": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-1.1.0.tgz", - "integrity": "sha512-ohkhb9LehJy+PA40rDtGAji61NCgdtKLAlFoYp4cnuuQEswwdK3vz9SOIkkyc3wrk8dzjphQApNs56yyXLStaQ==", + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz", + "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==", "dev": true, "license": "MIT" }, "node_modules/@types/istanbul-lib-instrument": { - "version": "1.7.4", - "resolved": "https://registry.npmjs.org/@types/istanbul-lib-instrument/-/istanbul-lib-instrument-1.7.4.tgz", - "integrity": "sha512-1i1VVkU2KrpZCmti+t5J/zBb2KLKxHgU1EYL+0QtnDnVyZ59aSKcpnG6J0I6BZGDON566YzPNIlNfk7m+9l1JA==", + "version": "1.7.7", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-instrument/-/istanbul-lib-instrument-1.7.7.tgz", + "integrity": "sha512-xyV3cVIhVuVAT7wyJXT+lliOo4b7BpfsnfCDy0/nuuAX+J7RB2rWNDV/7hkmv62vwqAD2XQ2Fgt6OwWGWEYfvg==", "dev": true, "license": "MIT", "dependencies": { @@ -848,9 +831,9 @@ } }, "node_modules/@types/istanbul-lib-report": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", - "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz", + "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==", "dev": true, "license": "MIT", "dependencies": { @@ -858,9 +841,9 @@ } }, "node_modules/@types/istanbul-lib-source-maps": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@types/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz", - "integrity": "sha512-WH6e5naLXI3vB2Px3whNeYxzDgm6S6sk3Ht8e3/BiWwEnzZi72wja3bWzWwcgbFTFp8hBLB7NT2p3lNJgxCxvA==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.4.tgz", + "integrity": "sha512-p+nSH0hBMLvuqgnT0rbBnDcfO3IuOZrLU+Yf4x0BhGVmXynB+gm9D35gAvWeMuk+riik5Rj12NBQm8rnzIPH3g==", "dev": true, "license": "MIT", "dependencies": { @@ -869,9 +852,9 @@ } }, "node_modules/@types/istanbul-reports": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz", - "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz", + "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==", "dev": true, "license": "MIT", "dependencies": { @@ -889,9 +872,9 @@ } }, "node_modules/@types/mime": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@types/mime/-/mime-2.0.0.tgz", - "integrity": "sha512-A2TAGbTFdBw9azHbpVd+/FkdW2T6msN1uct1O9bH3vTerEHKZhTXJUQXy+hNq1B0RagfU8U+KBdqiZpxjhOUQA==", + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz", + "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==", "dev": true, "license": "MIT" }, @@ -903,35 +886,50 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "9.3.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-9.3.0.tgz", - "integrity": "sha512-wNBfvNjzsJl4tswIZKXCFQY0lss9nKUyJnG6T94X/eqjRgI2jHZ4evdjhQYBSan/vGtF6XVXPApOmNH2rf0KKw==", + "version": "22.4.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.4.1.tgz", + "integrity": "sha512-1tbpb9325+gPnKK0dMm+/LMriX0vKxf6RnB0SZUqfyVkQ4fMgUSySqhxE/y8Jvs4NyF1yHzTfG9KlnkIODxPKg==", "dev": true, - "license": "MIT" + "license": "MIT", + "dependencies": { + "undici-types": "~6.19.2" + } }, "node_modules/@types/qs": { - "version": "6.9.5", - "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.5.tgz", - "integrity": "sha512-/JHkVHtx/REVG0VVToGRGH2+23hsYLHdyG+GrvoUGlGAd0ErauXDyvHtRI/7H7mzLm+tBCKA7pfcpkQ1lf58iQ==", + "version": "6.9.15", + "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.15.tgz", + "integrity": "sha512-uXHQKES6DQKKCLh441Xv/dwxOq1TVS3JPUMlEqoEglvlhR6Mxnlew/Xq/LRVHpLyk7iK3zODe1qYHIMltO7XGg==", "dev": true, "license": "MIT" }, "node_modules/@types/range-parser": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.3.tgz", - "integrity": "sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==", + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz", + "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==", "dev": true, "license": "MIT" }, + "node_modules/@types/send": { + "version": "0.17.4", + "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz", + "integrity": "sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/mime": "^1", + "@types/node": "*" + } + }, "node_modules/@types/serve-static": { - "version": "1.13.1", - "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.1.tgz", - "integrity": "sha512-jDMH+3BQPtvqZVIcsH700Dfi8Q3MIcEx16g/VdxjoqiGR/NntekB10xdBpirMKnPe9z2C5cBmL0vte0YttOr3Q==", + "version": "1.15.7", + "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.7.tgz", + "integrity": "sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==", "dev": true, "license": "MIT", "dependencies": { - "@types/express-serve-static-core": "*", - "@types/mime": "*" + "@types/http-errors": "*", + "@types/node": "*", + "@types/send": "*" } }, "node_modules/@types/ws": { @@ -964,27 +962,6 @@ "node": ">= 0.6" } }, - "node_modules/accepts/node_modules/mime-db": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", - "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/accepts/node_modules/mime-types": { - "version": "2.1.35", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", - "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "license": "MIT", - "dependencies": { - "mime-db": "1.52.0" - }, - "engines": { - "node": ">= 0.6" - } - }, "node_modules/acorn": { "version": "7.4.1", "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", @@ -1200,14 +1177,25 @@ "license": "MIT" }, "node_modules/base64-js": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz", - "integrity": "sha1-EQHpVE9KdrG8OybUUsqW16NeeXg=", + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.4" - } + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" }, "node_modules/basic-auth": { "version": "2.0.1", @@ -1221,16 +1209,10 @@ "node": ">= 0.8" } }, - "node_modules/basic-auth/node_modules/safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "license": "MIT" - }, "node_modules/benchmark": { "version": "2.1.4", "resolved": "https://registry.npmjs.org/benchmark/-/benchmark-2.1.4.tgz", - "integrity": "sha1-CfPeMckWQl1JjMLuVloOvzwqVik=", + "integrity": "sha512-l9MlfN4M1K/H2fbhfMy3B7vJd6AGKJVQn2h6Sg/Yx+KckoUA7ewS5Vv6TjSq18ooE1kS9hhAlQRH3AkXIh/aOQ==", "dev": true, "license": "MIT", "dependencies": { @@ -1331,9 +1313,9 @@ } }, "node_modules/browserslist": { - "version": "4.20.2", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.2.tgz", - "integrity": "sha512-CQOBCqp/9pDvDbx3xfMi+86pr4KXIf2FDkTTdeuYw8OxS9t898LA1Khq57gtufFILXpfgsSx5woNgsBgvGjpsA==", + "version": "4.23.3", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.3.tgz", + "integrity": "sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==", "dev": true, "funding": [ { @@ -1343,15 +1325,18 @@ { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" } ], "license": "MIT", "dependencies": { - "caniuse-lite": "^1.0.30001317", - "electron-to-chromium": "^1.4.84", - "escalade": "^3.1.1", - "node-releases": "^2.0.2", - "picocolors": "^1.0.0" + "caniuse-lite": "^1.0.30001646", + "electron-to-chromium": "^1.5.4", + "node-releases": "^2.0.18", + "update-browserslist-db": "^1.1.0" }, "bin": { "browserslist": "cli.js" @@ -1361,31 +1346,69 @@ } }, "node_modules/buffer": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-3.6.0.tgz", - "integrity": "sha1-pyyTb3e5a/UvX357RnGAYoVR3vs=", + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", + "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "dependencies": { + "base64-js": "^1.3.1", + "ieee754": "^1.1.13" + } + }, + "node_modules/buffer-alloc": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz", + "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==", "dev": true, "license": "MIT", "dependencies": { - "base64-js": "0.0.8", - "ieee754": "^1.1.4", - "isarray": "^1.0.0" + "buffer-alloc-unsafe": "^1.1.0", + "buffer-fill": "^1.0.0" } }, + "node_modules/buffer-alloc-unsafe": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz", + "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==", + "dev": true, + "license": "MIT" + }, "node_modules/buffer-crc32": { "version": "0.2.13", "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", - "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=", + "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==", "dev": true, "license": "MIT", "engines": { "node": "*" } }, - "node_modules/buffer-from": { + "node_modules/buffer-fill": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.0.0.tgz", - "integrity": "sha512-83apNb8KK0Se60UE1+4Ukbe3HbfELJ6UlI4ldtOGs7So4KD26orJM8hIY9lxdzP+UpItH1Yh/Y8GUvNFWFFRxA==", + "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz", + "integrity": "sha512-T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/buffer-from": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", + "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", "dev": true, "license": "MIT" }, @@ -1419,9 +1442,9 @@ "license": "MIT" }, "node_modules/caniuse-lite": { - "version": "1.0.30001331", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001331.tgz", - "integrity": "sha512-Y1xk6paHpUXKP/P6YjQv1xqyTbgAP05ycHBcRdQjTcyXlWol868sJJPlmk5ylOekw2BrucWes5jk+LvVd7WZ5Q==", + "version": "1.0.30001651", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001651.tgz", + "integrity": "sha512-9Cf+Xv1jJNe1xPZLGuUXLNkE1BoDkqRqYyFJ9TDYSqhduqA4hu4oR9HluGoWYQC/aj8WHjsGVV+bwkh0+tegRg==", "dev": true, "funding": [ { @@ -1431,6 +1454,10 @@ { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" } ], "license": "CC-BY-4.0" @@ -1461,19 +1488,19 @@ "license": "BSD-3-Clause OR AFL-2.1" }, "node_modules/chai": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.6.tgz", - "integrity": "sha512-bbcp3YfHCUzMOvKqsztczerVgBKSsEijCySNlHHbX3VG1nskvqjz5Rfso1gGwD6w6oOV3eI60pKuMOV5MV7p3Q==", + "version": "4.3.10", + "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.10.tgz", + "integrity": "sha512-0UXG04VuVbruMUYbJ6JctvH0YnC/4q3/AkT18q4NaITo91CUm0liMS9VqzT9vZhVQ/1eqPanMWjBM+Juhfb/9g==", "dev": true, "license": "MIT", "dependencies": { "assertion-error": "^1.1.0", - "check-error": "^1.0.2", - "deep-eql": "^3.0.1", - "get-func-name": "^2.0.0", - "loupe": "^2.3.1", + "check-error": "^1.0.3", + "deep-eql": "^4.1.3", + "get-func-name": "^2.0.2", + "loupe": "^2.3.6", "pathval": "^1.1.1", - "type-detect": "^4.0.5" + "type-detect": "^4.0.8" }, "engines": { "node": ">=4" @@ -1508,7 +1535,7 @@ "node_modules/charm": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/charm/-/charm-1.0.2.tgz", - "integrity": "sha1-it02cVOm2aWBMxBSxAkJkdqZXjU=", + "integrity": "sha512-wqW3VdPnlSWT4eRiYX+hcs+C6ViBPUWk1qTCd+37qw9kEm/a5n2qcyQDMBWvSYKN/ctqZzeXNQaeBjOetJJUkw==", "dev": true, "license": "MIT", "dependencies": { @@ -1516,11 +1543,14 @@ } }, "node_modules/check-error": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz", - "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz", + "integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==", "dev": true, "license": "MIT", + "dependencies": { + "get-func-name": "^2.0.2" + }, "engines": { "node": "*" } @@ -1645,7 +1675,7 @@ "node_modules/concurrent": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/concurrent/-/concurrent-0.3.2.tgz", - "integrity": "sha1-DqoAEaFXmMVjURKPIiR/biMX9Q4=", + "integrity": "sha512-KoUIH3pHceLMOeviiAnOzdQ8630lNclszDv8IGXx2Gn+5xXZroLqSWWzisweX//X7LyYOCKy10398bb0ksjvsA==", "dev": true, "license": "MIT" }, @@ -1710,14 +1740,11 @@ } }, "node_modules/convert-source-map": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz", - "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", "dev": true, - "license": "MIT", - "dependencies": { - "safe-buffer": "~5.1.1" - } + "license": "MIT" }, "node_modules/cookie": { "version": "0.6.0", @@ -2369,7 +2396,7 @@ "node_modules/decompress-unzip": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-4.0.1.tgz", - "integrity": "sha1-3qrM39FK6vhVePczroIQ+bSEj2k=", + "integrity": "sha512-1fqeluvxgnn86MOh66u8FjbtJpAFv5wgCT9Iw8rcBqQcCo5tO8eiJw7NNTrvt9n4CRBVq7CstiS922oPgyGLrw==", "dev": true, "license": "MIT", "dependencies": { @@ -2385,47 +2412,24 @@ "node_modules/decompress-unzip/node_modules/file-type": { "version": "3.9.0", "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz", - "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=", + "integrity": "sha512-RLoqTXE8/vPmMuTI88DAzhMYC99I8BWv7zYP4A1puo5HIjEJ5EX48ighy4ZyKMG9EDXxBgW6e++cn7d1xuFghA==", "dev": true, "license": "MIT", "engines": { "node": ">=0.10.0" } }, - "node_modules/decompress/node_modules/make-dir": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.1.0.tgz", - "integrity": "sha512-0Pkui4wLJ7rxvmfUvs87skoEaxmu0hCUApF8nonzpl7q//FWp9zu8W61Scz4sd/kUiqDxvUhtoam2efDyiBzcA==", - "dev": true, - "license": "MIT", - "dependencies": { - "pify": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/decompress/node_modules/make-dir/node_modules/pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, "node_modules/deep-eql": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz", - "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==", + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.4.tgz", + "integrity": "sha512-SUwdGfqdKOwxCPeVYjwSyRpJ7Z+fhpwIAtmCUdZIWZ/YP5R9WAsyuSgpLVDi9bjWoN2LXHNss/dk3urXtdQxGg==", "dev": true, "license": "MIT", "dependencies": { "type-detect": "^4.0.0" }, "engines": { - "node": ">=0.12" + "node": ">=6" } }, "node_modules/deepmerge": { @@ -2439,9 +2443,9 @@ } }, "node_modules/default-require-extensions": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-3.0.0.tgz", - "integrity": "sha512-ek6DpXq/SCpvjhpFsLFRVtIxJCRw6fUR42lYMVZuUMK7n8eMz4Uh5clckdBjEpLhn/gEBZo7hDJnJcwdKLKQjg==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-3.0.1.tgz", + "integrity": "sha512-eXTJmRbm2TIt9MgWTsOH1wEuhew6XGZcMeGKCtLedIg/NCsg1iBePXkceTdK4Fii7pzmN9tGsZhKzZ4h7O/fxw==", "dev": true, "license": "MIT", "dependencies": { @@ -2449,6 +2453,9 @@ }, "engines": { "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/delaunator": { @@ -2634,9 +2641,9 @@ "license": "MIT" }, "node_modules/electron-to-chromium": { - "version": "1.4.107", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.107.tgz", - "integrity": "sha512-Huen6taaVrUrSy8o7mGStByba8PfOWWluHNxSHGBrCgEdFVLtvdQDBr9LBCF9Uci8SYxh28QNNMO0oC17wbGAg==", + "version": "1.5.12", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.12.tgz", + "integrity": "sha512-tIhPkdlEoCL1Y+PToq3zRNehUaKp3wBX/sr7aclAWdIWjvqAe/Im/H0SiCM4c1Q8BLPHCdoJTol+ZblflydehA==", "dev": true, "license": "ISC" }, @@ -2663,9 +2670,9 @@ } }, "node_modules/end-of-stream": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz", - "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==", + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", + "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", "dev": true, "license": "MIT", "dependencies": { @@ -2680,9 +2687,9 @@ "license": "BSD-like" }, "node_modules/escalade": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", + "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==", "dev": true, "license": "MIT", "engines": { @@ -2959,9 +2966,9 @@ } }, "node_modules/fd-slicer": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz", - "integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", + "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==", "dev": true, "license": "MIT", "dependencies": { @@ -3000,7 +3007,7 @@ "node_modules/file-type": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz", - "integrity": "sha1-LdvqfHP/42No365J3DOMBYwritY=", + "integrity": "sha512-Iq1nJ6D2+yIO4c8HHg4fyVb8mAJieo1Oloy1mLLaB2PvezNedhBVm+QU7g0qM42aiMbRXTxKKwGD17rjKNJYVQ==", "dev": true, "license": "MIT", "engines": { @@ -3217,6 +3224,13 @@ "node": ">= 0.6" } }, + "node_modules/fs-constants": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", + "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", + "dev": true, + "license": "MIT" + }, "node_modules/fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", @@ -3274,7 +3288,7 @@ "node_modules/get-stream": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz", - "integrity": "sha1-Xzj5PzRgCWZu4BUKBUFn+Rvdld4=", + "integrity": "sha512-AUGhbbemXxrZJRD5cDvKtQxLuYaIbNtDTK8YqupCI393Q2KSTreEsLUN3ZxAWFGiKTzL6nKuzfcIvieflUX9qA==", "dev": true, "license": "MIT", "dependencies": { @@ -3400,21 +3414,11 @@ } }, "node_modules/graceful-fs": { - "version": "4.1.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", - "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", "dev": true, - "license": "ISC", - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/graceful-readlink": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz", - "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=", - "dev": true, - "license": "MIT" + "license": "ISC" }, "node_modules/grunt": { "version": "1.6.1", @@ -4005,16 +4009,30 @@ } }, "node_modules/ieee754": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz", - "integrity": "sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q=", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", + "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], "license": "BSD-3-Clause" }, "node_modules/immediate": { "version": "3.0.6", "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz", - "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=", + "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==", "dev": true, "license": "MIT" }, @@ -4092,13 +4110,6 @@ "intern": "bin/intern.js" } }, - "node_modules/intern/node_modules/@types/istanbul-lib-coverage": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz", - "integrity": "sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==", - "dev": true, - "license": "MIT" - }, "node_modules/intern/node_modules/cookie": { "version": "0.4.2", "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz", @@ -4174,6 +4185,7 @@ "version": "7.1.7", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz", "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==", + "deprecated": "Glob versions prior to v9 are no longer supported", "dev": true, "license": "ISC", "dependencies": { @@ -4208,39 +4220,6 @@ "node": ">= 0.6" } }, - "node_modules/intern/node_modules/istanbul-lib-coverage": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.2.tgz", - "integrity": "sha512-o5+eTUYzCJ11/+JhW5/FUCdfsdoYVdQ/8I/OveE2XsjehYn5DdeSnNQAbjYaO8gQ6hvGTN6GM6ddQqpTVG5j8g==", - "dev": true, - "license": "BSD-3-Clause", - "engines": { - "node": ">=8" - } - }, - "node_modules/intern/node_modules/mime-db": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", - "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/intern/node_modules/mime-types": { - "version": "2.1.35", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", - "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "dev": true, - "license": "MIT", - "dependencies": { - "mime-db": "1.52.0" - }, - "engines": { - "node": ">= 0.6" - } - }, "node_modules/intern/node_modules/qs": { "version": "6.9.7", "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz", @@ -4395,7 +4374,7 @@ "node_modules/is-natural-number": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/is-natural-number/-/is-natural-number-4.0.1.tgz", - "integrity": "sha1-q5124dtM7VHjXeDHLr7PCfc0zeg=", + "integrity": "sha512-Y4LTamMe0DDQIIAlaer9eKebAlDSV6huy+TWhJVPlzZh2o4tRP5SQWFlLn5N0To4mDD22/qdOq+veo1cSISLgQ==", "dev": true, "license": "MIT" }, @@ -4456,7 +4435,7 @@ "node_modules/is-stream": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", - "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=", + "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==", "dev": true, "license": "MIT", "engines": { @@ -4489,7 +4468,7 @@ "node_modules/isarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", "dev": true, "license": "MIT" }, @@ -4511,9 +4490,9 @@ } }, "node_modules/istanbul-lib-coverage": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz", - "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.2.tgz", + "integrity": "sha512-o5+eTUYzCJ11/+JhW5/FUCdfsdoYVdQ/8I/OveE2XsjehYn5DdeSnNQAbjYaO8gQ6hvGTN6GM6ddQqpTVG5j8g==", "dev": true, "license": "BSD-3-Clause", "engines": { @@ -4550,18 +4529,47 @@ } }, "node_modules/istanbul-lib-report": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", - "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz", + "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==", "dev": true, "license": "BSD-3-Clause", "dependencies": { "istanbul-lib-coverage": "^3.0.0", - "make-dir": "^3.0.0", + "make-dir": "^4.0.0", "supports-color": "^7.1.0" }, "engines": { - "node": ">=8" + "node": ">=10" + } + }, + "node_modules/istanbul-lib-report/node_modules/make-dir": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz", + "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==", + "dev": true, + "license": "MIT", + "dependencies": { + "semver": "^7.5.3" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/istanbul-lib-report/node_modules/semver": { + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" } }, "node_modules/istanbul-lib-source-maps": { @@ -4580,9 +4588,9 @@ } }, "node_modules/istanbul-lib-source-maps/node_modules/debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz", + "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==", "dev": true, "license": "MIT", "dependencies": { @@ -4966,13 +4974,13 @@ } }, "node_modules/loupe": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.4.tgz", - "integrity": "sha512-OvKfgCC2Ndby6aSTREl5aCCPTNIzlDfQZvZxNUrBrihDhL3xcrYegTblhmEiCrg2kKQz4XsFIaemE5BF4ybSaQ==", + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz", + "integrity": "sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==", "dev": true, "license": "MIT", "dependencies": { - "get-func-name": "^2.0.0" + "get-func-name": "^2.0.1" } }, "node_modules/lru-cache": { @@ -4986,19 +4994,26 @@ } }, "node_modules/make-dir": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", - "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz", + "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==", "dev": true, "license": "MIT", "dependencies": { - "semver": "^6.0.0" + "pify": "^3.0.0" }, "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": ">=4" + } + }, + "node_modules/make-dir/node_modules/pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" } }, "node_modules/make-error": { @@ -5117,21 +5132,21 @@ } }, "node_modules/mime-db": { - "version": "1.45.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.45.0.tgz", - "integrity": "sha512-CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w==", + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", "license": "MIT", "engines": { "node": ">= 0.6" } }, "node_modules/mime-types": { - "version": "2.1.28", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.28.tgz", - "integrity": "sha512-0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ==", + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", "license": "MIT", "dependencies": { - "mime-db": "1.45.0" + "mime-db": "1.52.0" }, "engines": { "node": ">= 0.6" @@ -5264,9 +5279,9 @@ } }, "node_modules/node-releases": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.3.tgz", - "integrity": "sha512-maHFz6OLqYxz+VQyCAtA3PTX4UP/53pa05fyDNc9CwjvJ0yEh6+xBwKsgCxMNhS8taUKBFYxfuiaD9U/55iFaw==", + "version": "2.0.18", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz", + "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==", "dev": true, "license": "MIT" }, @@ -5508,9 +5523,9 @@ } }, "node_modules/pako": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz", - "integrity": "sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==", + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", + "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==", "dev": true, "license": "(MIT AND Zlib)" }, @@ -5650,14 +5665,14 @@ "node_modules/pend": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", - "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=", + "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==", "dev": true, "license": "MIT" }, "node_modules/picocolors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", - "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz", + "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==", "dev": true, "license": "ISC" }, @@ -5677,7 +5692,7 @@ "node_modules/pify": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==", "dev": true, "license": "MIT", "engines": { @@ -5687,7 +5702,7 @@ "node_modules/pinkie": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", - "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=", + "integrity": "sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==", "dev": true, "license": "MIT", "engines": { @@ -5697,7 +5712,7 @@ "node_modules/pinkie-promise": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", - "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", + "integrity": "sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==", "dev": true, "license": "MIT", "dependencies": { @@ -6185,10 +6200,9 @@ "license": "BSD-3-Clause" }, "node_modules/safe-buffer": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", - "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", - "dev": true, + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", "license": "MIT" }, "node_modules/safe-stable-stringify": { @@ -6214,13 +6228,13 @@ "license": "ISC" }, "node_modules/seek-bzip": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.5.tgz", - "integrity": "sha1-z+kXyz0nS8/6x5J1ivUxc+sfq9w=", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.6.tgz", + "integrity": "sha512-e1QtP3YL5tWww8uKaOCQ18UxIT2laNBXHjV/S2WYCiK4udiv8lkG89KRIoCjUagnAmCBurjF4zEVX2ByBbnCjQ==", "dev": true, "license": "MIT", "dependencies": { - "commander": "~2.8.1" + "commander": "^2.8.1" }, "bin": { "seek-bunzip": "bin/seek-bunzip", @@ -6228,17 +6242,11 @@ } }, "node_modules/seek-bzip/node_modules/commander": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz", - "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=", + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", "dev": true, - "license": "MIT", - "dependencies": { - "graceful-readlink": ">= 1.0.0" - }, - "engines": { - "node": ">= 0.6.x" - } + "license": "MIT" }, "node_modules/semver": { "version": "6.3.1", @@ -6371,7 +6379,7 @@ "node_modules/set-immediate-shim": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz", - "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=", + "integrity": "sha512-Li5AOqrZWCVA2n5kryzEmqai6bKSIvpz5oUJHPVj6+dsbD3X1ixtsY5tEnsaNpH3pFAHmG8eIHUrtEtohrg+UQ==", "dev": true, "license": "MIT", "engines": { @@ -6408,11 +6416,14 @@ } }, "node_modules/shell-quote": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.3.tgz", - "integrity": "sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw==", + "version": "1.7.4", + "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.4.tgz", + "integrity": "sha512-8o/QEhSSRb1a5i7TFR0iM4G16Z0vYB2OQVs4G3aAFXjn3T6yEx8AZxy1PgDF7I00LZHYA3WxaSYIf5e5sAX8Rw==", "dev": true, - "license": "MIT" + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, "node_modules/side-channel": { "version": "1.0.4", @@ -6491,9 +6502,9 @@ } }, "node_modules/source-map-support": { - "version": "0.5.19", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz", - "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==", + "version": "0.5.21", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", + "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", "dev": true, "license": "MIT", "dependencies": { @@ -6520,7 +6531,7 @@ "node_modules/statuses": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", - "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=", + "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==", "dev": true, "license": "MIT", "engines": { @@ -6803,15 +6814,18 @@ } }, "node_modules/tar-stream": { - "version": "1.5.5", - "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.5.tgz", - "integrity": "sha512-mQdgLPc/Vjfr3VWqWbfxW8yQNiJCbAZ+Gf6GDu1Cy0bdb33ofyiNGBtAY96jHFhDuivCwgW1H9DgTON+INiXgg==", + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.2.tgz", + "integrity": "sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==", "dev": true, "license": "MIT", "dependencies": { "bl": "^1.0.0", + "buffer-alloc": "^1.2.0", "end-of-stream": "^1.0.0", - "readable-stream": "^2.0.0", + "fs-constants": "^1.0.0", + "readable-stream": "^2.3.0", + "to-buffer": "^1.1.1", "xtend": "^4.0.0" }, "engines": { @@ -6836,7 +6850,14 @@ "node_modules/through": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", - "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=", + "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==", + "dev": true, + "license": "MIT" + }, + "node_modules/to-buffer": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz", + "integrity": "sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==", "dev": true, "license": "MIT" }, @@ -6963,9 +6984,9 @@ } }, "node_modules/type-detect": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", - "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.1.0.tgz", + "integrity": "sha512-Acylog8/luQ8L7il+geoSxhEkazvkslg7PSNKOX59mbB9cOveP5aq9h74Y7YU8yDpJwetzQQrfIwtf4Wp4LKcw==", "dev": true, "license": "MIT", "engines": { @@ -7001,14 +7022,14 @@ } }, "node_modules/unbzip2-stream": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.2.5.tgz", - "integrity": "sha512-izD3jxT8xkzwtXRUZjtmRwKnZoeECrfZ8ra/ketwOcusbZEp4mjULMnJOCfTDZBgGQAAY1AJ/IgxcwkavcX9Og==", + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz", + "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==", "dev": true, "license": "MIT", "dependencies": { - "buffer": "^3.0.1", - "through": "^2.3.6" + "buffer": "^5.2.1", + "through": "^2.3.8" } }, "node_modules/unc-path-regex": { @@ -7035,6 +7056,13 @@ "node": "*" } }, + "node_modules/undici-types": { + "version": "6.19.8", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz", + "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==", + "dev": true, + "license": "MIT" + }, "node_modules/unidragger": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/unidragger/-/unidragger-2.4.0.tgz", @@ -7064,6 +7092,37 @@ "node": ">= 0.8" } }, + "node_modules/update-browserslist-db": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz", + "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "dependencies": { + "escalade": "^3.1.2", + "picocolors": "^1.0.1" + }, + "bin": { + "update-browserslist-db": "cli.js" + }, + "peerDependencies": { + "browserslist": ">= 4.21.0" + } + }, "node_modules/uri-path": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/uri-path/-/uri-path-1.0.0.tgz", @@ -7476,24 +7535,31 @@ } }, "node_modules/xtend": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", - "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", + "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==", "dev": true, "license": "MIT", "engines": { "node": ">=0.4" } }, + "node_modules/yallist": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", + "dev": true, + "license": "ISC" + }, "node_modules/yauzl": { - "version": "2.9.1", - "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.9.1.tgz", - "integrity": "sha1-qBmB6nCleUYTOIPwKcWCGok1mn8=", + "version": "2.10.0", + "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", + "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==", "dev": true, "license": "MIT", "dependencies": { "buffer-crc32": "~0.2.3", - "fd-slicer": "~1.0.1" + "fd-slicer": "~1.1.0" } }, "node_modules/yn": { diff --git a/package.json b/package.json index 6c00f6f5..06c9dc63 100644 --- a/package.json +++ b/package.json @@ -30,13 +30,14 @@ "commander": "11.1.0", "express": "4.19.2", "morgan": "1.10.0", + "prerender-node": "3.8.0", "prom-client": "15.1.2", "pug": "3.0.3", - "prerender-node": "3.8.0", "response-time": "2.3.2", "winston": "3.13.0" }, "devDependencies": { + "@lweller/leaflet-areaselect": "1.3.0", "alertifyjs": "1.14.0", "cbtree": "https://github.com/pjekel/cbtree.git#master", "color-js": "1.0.5", @@ -60,19 +61,17 @@ "intern": "4.10.1", "json-schema-ref-parser": "6.1.0", "leaflet": "1.9.4", - "@lweller/leaflet-areaselect": "1.3.0", - "leaflet.awesome-markers": "2.0.5", "leaflet-draw": "1.0.4", "leaflet-measure": "3.1.0", "leaflet-minimap": "3.6.1", "leaflet-nav": "1.0.3", + "leaflet.awesome-markers": "2.0.5", "leaflet.coordinates": "0.1.5", "leaflet.nontiledlayer": "1.0.9", "load-grunt-tasks": "5.1.0", "mediator-js": "0.11.0", "moment": "2.30.1", "nib": "1.2.0", - "uuid": "8.3.2", "packery": "2.1.2", "pdfjs-dist-viewer-min": "3.11.174", "proj4": "2.12.0", @@ -82,9 +81,14 @@ "stomp-websocket": "2.3.4-next", "stylus": "0.63.0", "tv4": "1.3.0", + "uuid": "8.3.2", "wicket": "1.3.8" }, - "files": ["server-app", "client-app/dist", "client-app/res"], + "files": [ + "server-app", + "client-app/dist", + "client-app/res" + ], "engines": { "node": ">=20.16", "npm": ">=10.8" -- GitLab From b783fa0c1a99aa9aaeca4f79adac1dd61da0ef3b Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Tue, 20 Aug 2024 11:07:32 +0100 Subject: [PATCH 100/249] =?UTF-8?q?Actualiza=20subm=C3=B3dulo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client-app/dep/templates | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client-app/dep/templates b/client-app/dep/templates index 351da247..0f10d48a 160000 --- a/client-app/dep/templates +++ b/client-app/dep/templates @@ -1 +1 @@ -Subproject commit 351da247466058c15279a7cf7b6941df16147002 +Subproject commit 0f10d48ac0a5749cd00b5e28609a53c4a1fadbac -- GitLab From 47a702323c4af43f0c74c7889ec0dbdda2662d6d Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Tue, 20 Aug 2024 14:11:52 +0100 Subject: [PATCH 101/249] =?UTF-8?q?Simplifica=20construcci=C3=B3n=20de=20m?= =?UTF-8?q?=C3=B3dulos=20con=20grunt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ya el propio ciclo de vida de npm se encarga de compilar los submódulos tras ejecutar install, no hace falta repetirlo desde las tareas grunt de la aplicación. --- grunt/config/buildModules.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/grunt/config/buildModules.js b/grunt/config/buildModules.js index 06c0877a..dbb8cee1 100644 --- a/grunt/config/buildModules.js +++ b/grunt/config/buildModules.js @@ -9,11 +9,7 @@ module.exports = function(grunt) { 'client-app/dep/wicket': preBuildCmds.concat([ 'npm run build' ]), - 'client-app/dep/templates': preBuildCmds.concat([ - 'grunt build' - ]), - 'client-app/style': preBuildCmds.concat([ - 'grunt addModules buildModules' - ]) + 'client-app/dep/templates': preBuildCmds, + 'client-app/style': preBuildCmds }); }; -- GitLab From 336ec24423c419d4b697dcf81efe9a11288be45d Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Tue, 20 Aug 2024 14:51:42 +0100 Subject: [PATCH 102/249] =?UTF-8?q?Actualiza=20subm=C3=B3dulo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Avanza en #90. --- client-app/dep/templates | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client-app/dep/templates b/client-app/dep/templates index 0f10d48a..b04a3287 160000 --- a/client-app/dep/templates +++ b/client-app/dep/templates @@ -1 +1 @@ -Subproject commit 0f10d48ac0a5749cd00b5e28609a53c4a1fadbac +Subproject commit b04a32879c94f8f76d28bb72417087acee94923c -- GitLab From 3346ff917cd53747583b6b4a0f3b4475ea1031ac Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Wed, 21 Aug 2024 11:02:22 +0100 Subject: [PATCH 103/249] Elimina valores de rol literales para centralizar --- .../src/component/components/PDFViewer/PDFViewer.js | 2 +- client-app/src/component/selection/SelectionBox.js | 2 +- client-app/src/component/user/UserArea.js | 2 +- client-app/src/detail/_WidgetDefinition.js | 5 ++--- client-app/src/home/HomeView.js | 2 +- client-app/src/oldapp/designs/details/main/Document.js | 2 +- client-app/src/oldapp/user/views/FeedbackView.js | 2 +- client-app/src/oldapp/user/views/LoginView.js | 2 +- client-app/src/util/GuestChecker.js | 9 ++++----- 9 files changed, 13 insertions(+), 15 deletions(-) diff --git a/client-app/src/component/components/PDFViewer/PDFViewer.js b/client-app/src/component/components/PDFViewer/PDFViewer.js index c69e6bec..2499debc 100644 --- a/client-app/src/component/components/PDFViewer/PDFViewer.js +++ b/client-app/src/component/components/PDFViewer/PDFViewer.js @@ -122,7 +122,7 @@ define([ _authChecker: function() { - if (!this.roleGuestActive && Credentials.get("userRole") === "ROLE_GUEST") { + if (!this.roleGuestActive && Credentials.userIsGuest()) { if (this.templateDisplayerPdfError) { this._publish(this.templateDisplayerPdfError.getChannel("CHANGE_TEMPLATE"), { template: TemplateAuthFailed diff --git a/client-app/src/component/selection/SelectionBox.js b/client-app/src/component/selection/SelectionBox.js index 548f5e3a..ad1724d6 100644 --- a/client-app/src/component/selection/SelectionBox.js +++ b/client-app/src/component/selection/SelectionBox.js @@ -174,7 +174,7 @@ define([ _isRegisteredUser: function(item) { - return Credentials.get('userRole') !== 'ROLE_GUEST'; + return !Credentials.userIsGuest(); }, _select: function(item, total) { diff --git a/client-app/src/component/user/UserArea.js b/client-app/src/component/user/UserArea.js index 8df73199..d548be4a 100644 --- a/client-app/src/component/user/UserArea.js +++ b/client-app/src/component/user/UserArea.js @@ -219,7 +219,7 @@ define([ _checkUserIsRegistered: function() { - return Credentials.get('userRole') !== 'ROLE_GUEST'; + return !Credentials.userIsGuest(); }, _startLoading: function() { diff --git a/client-app/src/detail/_WidgetDefinition.js b/client-app/src/detail/_WidgetDefinition.js index f53b2d23..75a26739 100644 --- a/client-app/src/detail/_WidgetDefinition.js +++ b/client-app/src/detail/_WidgetDefinition.js @@ -195,10 +195,9 @@ define([ var accessibilityId = item && item.accessibility && item.accessibility.id, browseableAccesibilities = [2], // libre accessibilityIsBrowseable = accessibilityId && - browseableAccesibilities.indexOf(accessibilityId) !== -1, - userRoleIsAdmin = Credentials.get('userRole') === 'ROLE_ADMINISTRATOR'; + browseableAccesibilities.indexOf(accessibilityId) !== -1; - return accessibilityIsBrowseable || userRoleIsAdmin; + return accessibilityIsBrowseable || Credentials.userIsEditor(); } }] } diff --git a/client-app/src/home/HomeView.js b/client-app/src/home/HomeView.js index dfc03d6a..391566c4 100644 --- a/client-app/src/home/HomeView.js +++ b/client-app/src/home/HomeView.js @@ -245,7 +245,7 @@ define([ info: '' }; - if (Credentials.get('userRole') === 'ROLE_GUEST') { + if (Credentials.userIsGuest()) { obj.roleGuest = this.i18n.contentInfo1 + ' '; obj.roleGuest += this.i18n.visitor; obj.roleGuest += this.i18n.contentInfo2; diff --git a/client-app/src/oldapp/designs/details/main/Document.js b/client-app/src/oldapp/designs/details/main/Document.js index 9572213d..d215a62b 100644 --- a/client-app/src/oldapp/designs/details/main/Document.js +++ b/client-app/src/oldapp/designs/details/main/Document.js @@ -83,7 +83,7 @@ define([ pdfUrl = documentData.internalUrl, privatePdf = documentData.privateInternalUrl; - if (!pdfUrl || (privatePdf && Credentials.get('userRole') !== 'ROLE_ADMINISTRATOR')) { + if (!pdfUrl || (privatePdf && !Credentials.userIsEditor())) { this._hideWidget('pdf'); } else { this._showWidget('pdf'); diff --git a/client-app/src/oldapp/user/views/FeedbackView.js b/client-app/src/oldapp/user/views/FeedbackView.js index 41a88fa2..d0a8f95b 100644 --- a/client-app/src/oldapp/user/views/FeedbackView.js +++ b/client-app/src/oldapp/user/views/FeedbackView.js @@ -108,7 +108,7 @@ define([ this._createReCaptcha(); - if (Credentials.get("userRole") !== "ROLE_GUEST") { + if (!Credentials.userIsGuest()) { if (Credentials.get("userEmail")) { this._emitEvt('SET_VALUE', { email: Credentials.get("userEmail") diff --git a/client-app/src/oldapp/user/views/LoginView.js b/client-app/src/oldapp/user/views/LoginView.js index 2a4dc514..3e4eb571 100644 --- a/client-app/src/oldapp/user/views/LoginView.js +++ b/client-app/src/oldapp/user/views/LoginView.js @@ -48,7 +48,7 @@ define([ this.inherited(arguments); // Si hemos entrado anteriormente, pone el correo usado por última vez - if (Credentials.get("userRole") !== "ROLE_GUEST") { + if (!Credentials.userIsGuest("userRole")) { this.template.emailInputForm.set("value", Credentials.get("userEmail")); } // Si hemos activado la cuenta anteriormente, informa al usuario diff --git a/client-app/src/util/GuestChecker.js b/client-app/src/util/GuestChecker.js index 2d7eea95..88b00e12 100644 --- a/client-app/src/util/GuestChecker.js +++ b/client-app/src/util/GuestChecker.js @@ -47,7 +47,7 @@ define([ // url: // URL a controlar. - if (Credentials.get("userRole") === this.guestRole) { + if (Credentials.userIsGuest()) { alertify.alert(this.title, this.banIcon + this.banMessageDocument); } else { window.open(url + '?access_token=' + Credentials.get("accessToken"),'_blank'); @@ -59,12 +59,11 @@ define([ // Si el usuario es invitado, cambia su comportamiento. // - if (Credentials.get("userRole") === this.guestRole) { + var userIsGuest = Credentials.userIsGuest(); + if (userIsGuest) { alertify.alert(this.title, this.banIcon + this.banMessage); - return false; - } else { - return true; } + return !userIsGuest; } }); -- GitLab From 0ecd3dc2858b54bc496f29ec48306d3e73b7c3e1 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Thu, 22 Aug 2024 15:18:39 +0100 Subject: [PATCH 104/249] =?UTF-8?q?Actualiza=20subm=C3=B3dulo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client-app/dep/templates | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client-app/dep/templates b/client-app/dep/templates index b04a3287..62305f52 160000 --- a/client-app/dep/templates +++ b/client-app/dep/templates @@ -1 +1 @@ -Subproject commit b04a32879c94f8f76d28bb72417087acee94923c +Subproject commit 62305f520db4c982ed2b56a51491a674f090de70 -- GitLab From a6844ba0c3e078982e332f93a92a4e3450105c55 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Thu, 22 Aug 2024 15:19:04 +0100 Subject: [PATCH 105/249] =?UTF-8?q?Agrega=20primera=20versi=C3=B3n=20de=20?= =?UTF-8?q?selector=20de=20widget?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Amplía la vista detalle de actividad para incluir un nuevo selector del widget a enfocar, haciendo uso de anchors. Primer paso para #92. --- .../src/detail/activity/ActivityDetailView.js | 4 +- .../src/oldapp/designs/details/Controller.js | 12 +- .../src/oldapp/designs/details/_AddTitle.js | 1 + .../designs/details/_AddWidgetSelector.js | 131 ++++++++++++++++++ 4 files changed, 144 insertions(+), 4 deletions(-) create mode 100644 client-app/src/oldapp/designs/details/_AddWidgetSelector.js diff --git a/client-app/src/detail/activity/ActivityDetailView.js b/client-app/src/detail/activity/ActivityDetailView.js index d48dafc8..33b87511 100644 --- a/client-app/src/detail/activity/ActivityDetailView.js +++ b/client-app/src/detail/activity/ActivityDetailView.js @@ -6,6 +6,7 @@ define([ , 'src/component/base/_ExternalConfig' , 'src/detail/activity/_ActivityEdition' , 'src/detail/activity/_ActivityLayoutWidget' + , 'src/oldapp/designs/details/_AddWidgetSelector' , 'src/util/Credentials' , 'templates/ActivityInfo' ], function( @@ -16,11 +17,12 @@ define([ , _ExternalConfig , _ActivityEdition , _ActivityLayoutWidget + , _AddWidgetSelector , Credentials , TemplateInfo ) { - var declareItems = [_ActivityBase, _ActivityLayoutWidget, _ExternalConfig]; + var declareItems = [_ActivityBase, _AddWidgetSelector, _ActivityLayoutWidget, _ExternalConfig]; if (Credentials.userIsEditor()) { declareItems.push(_ActivityEdition); diff --git a/client-app/src/oldapp/designs/details/Controller.js b/client-app/src/oldapp/designs/details/Controller.js index a4c23d10..cf725a0d 100644 --- a/client-app/src/oldapp/designs/details/Controller.js +++ b/client-app/src/oldapp/designs/details/Controller.js @@ -245,9 +245,15 @@ define([ return; } - var moduleProps = this._merge([this.propsWidget || {}, config.props || {}]); - moduleProps.ownChannel = key; - moduleProps.parentChannel = this.getChannel(); + var moduleProps = this._merge([ + this.propsWidget || {}, + config.props || {}, + { + ownChannel: key, + parentChannel: this.getChannel(), + windowTitle: key + } + ]); var moduleType = config.type, moduleDefinition = declare(moduleType).extend(_Window), diff --git a/client-app/src/oldapp/designs/details/_AddTitle.js b/client-app/src/oldapp/designs/details/_AddTitle.js index 8cd594bb..1c973ce6 100644 --- a/client-app/src/oldapp/designs/details/_AddTitle.js +++ b/client-app/src/oldapp/designs/details/_AddTitle.js @@ -103,6 +103,7 @@ define([ _updateDataTitle: function() { + // TODO no setear a lo bruto, es un component!! this.data = this.titleWidget.data; }, diff --git a/client-app/src/oldapp/designs/details/_AddWidgetSelector.js b/client-app/src/oldapp/designs/details/_AddWidgetSelector.js new file mode 100644 index 00000000..4f34b521 --- /dev/null +++ b/client-app/src/oldapp/designs/details/_AddWidgetSelector.js @@ -0,0 +1,131 @@ +define([ + 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'dojo/aspect' + , 'put-selector/put' + , 'src/component/form/input/SelectImpl' +], function ( + declare + , lang + , aspect + , put + , SelectImpl +) { + + return declare(null, { + // summary: + // Extensión para añadir un componente selector de widget a enfocar + + constructor: function(args) { + + this.config = { + _widgetSelector: null, + widgetSelectorClass: 'detailWidgetSelector' + }; + + lang.mixin(this, this.config, args); + + aspect.after(this, '_generateWidgets', lang.hitch(this, this._afterGenerateWidgetsAddSelector)); + aspect.after(this, '_addWidget', lang.hitch(this, this._afterAddWidgetUpdateSelector)); + aspect.after(this, '_addDataInTitle', lang.hitch(this, this._afterAddDataInTitleShowSelector)); + aspect.after(this, '_onLayoutComplete', lang.hitch(this, this._afterLayoutCompleteApplyAnchor)); + aspect.after(this, '_onControllerMeOrAncestorShown', + lang.hitch(this, this._afterControllerOrAncestorShownUpdateSelectorInstance)); + }, + + _afterGenerateWidgetsAddSelector: function() { + + this._addWidgetsToSelector(); + }, + + _afterAddWidgetUpdateSelector: function(retValue, params) { + + this._addWidgetToSelector(params[0]); + }, + + _afterAddDataInTitleShowSelector: function() { + + this._showWidgetSelector(); + }, + + _afterLayoutCompleteApplyAnchor: function() { + + this._applyCurrentAnchor(); + }, + + _afterControllerOrAncestorShownUpdateSelectorInstance: function() { + + this._addWidgetsToSelector(); + }, + + _applyCurrentAnchor: function() { + + if (!location.hash) { + return; + } + + var hash = location.hash; + location.hash = ''; + location.hash = hash; + }, + + _addWidgetsToSelector: function() { + + if (this._widgetSelector) { + this._publish(this._widgetSelector.getChannel('DESTROY')); + } + + this._widgetKeys = Object.keys(this._widgets); + + this._widgetSelector = new SelectImpl({ + parentChannel: this.getChannel(), + includeEmptyValue: false, + _inputProps: { + options: this._widgetKeys + } + }); + + this._setSubscription({ + channel: this._widgetSelector.getChannel('VALUE_CHANGED'), + callback: lang.hitch(this, this._onWidgetSelectorValueChanged) + }); + + if (this._getPreviouslyShown()) { + this._showWidgetSelector(); + } + }, + + _showWidgetSelector: function() { + + if (!this._titleLeftNode) { + return; + } + + if (!this._widgetSelectorNode) { + this._widgetSelectorNode = put('div.' + this.widgetSelectorClass); + } + + put(this._titleLeftNode, this._widgetSelectorNode); + + this._publish(this._widgetSelector.getChannel('SHOW'), { + node: this._widgetSelectorNode + }); + }, + + _addWidgetToSelector: function(key) { + + this._widgetKeys.push(key); + + this._publish(this._widgetSelector.getChannel('SET_OPTIONS'), { + options: this._widgetKeys + }); + }, + + _onWidgetSelectorValueChanged: function(res) { + + var value = res.value || ''; + + location.href = '#' + value; + } + }); +}); -- GitLab From 37cf364a507f23df476005ec470fc732761dbc52 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Fri, 23 Aug 2024 09:05:03 +0100 Subject: [PATCH 106/249] =?UTF-8?q?Corrige=20require=20hacia=20ruta=20no?= =?UTF-8?q?=20v=C3=A1lida=20para=20compilar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client-app/src/detail/activity/ActivityDetailView.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client-app/src/detail/activity/ActivityDetailView.js b/client-app/src/detail/activity/ActivityDetailView.js index 33b87511..788548b5 100644 --- a/client-app/src/detail/activity/ActivityDetailView.js +++ b/client-app/src/detail/activity/ActivityDetailView.js @@ -6,7 +6,7 @@ define([ , 'src/component/base/_ExternalConfig' , 'src/detail/activity/_ActivityEdition' , 'src/detail/activity/_ActivityLayoutWidget' - , 'src/oldapp/designs/details/_AddWidgetSelector' + , 'app/designs/details/_AddWidgetSelector' , 'src/util/Credentials' , 'templates/ActivityInfo' ], function( -- GitLab From 94c27352c33bf7284a5191e3b4200d1a7a9c361f Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Fri, 23 Aug 2024 09:14:59 +0100 Subject: [PATCH 107/249] Reubica y cambia traducciones para STAC --- client-app/app.profile.js | 2 +- client-app/src/app/component/meta/metaTagsContent.js | 8 ++++---- .../oldapp/{viewers => catalog}/views/StacBrowserView.js | 0 client-app/src/oldapp/nls/es/translation.js | 6 +++--- client-app/src/oldapp/nls/translation.js | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) rename client-app/src/oldapp/{viewers => catalog}/views/StacBrowserView.js (100%) diff --git a/client-app/app.profile.js b/client-app/app.profile.js index ffa0ba5f..5b612609 100644 --- a/client-app/app.profile.js +++ b/client-app/app.profile.js @@ -410,6 +410,7 @@ var viewLayers = { , 'app/catalog/views/SpeciesCatalogView': {} , 'app/catalog/views/ProgramsCatalogView': {} , 'app/catalog/views/OrganisationsCatalogView': {} + , 'app/catalog/views/StacBrowserView': {} , 'app/administrative/views/OrganisationView': {} , 'app/administrative/views/ContactView': {} @@ -509,7 +510,6 @@ var viewLayers = { , 'app/viewers/views/ChartsView': {} , 'app/viewers/views/RealTimeView': {} , 'app/viewers/views/RealTimeDashboardView': {} - , 'app/viewers/views/StacBrowserView': {} , 'app/details/views/ProjectCatalogDetailsView': {} , 'app/details/views/ProgramCatalogDetailsView': {} diff --git a/client-app/src/app/component/meta/metaTagsContent.js b/client-app/src/app/component/meta/metaTagsContent.js index 9ce06d14..a5d69da0 100644 --- a/client-app/src/app/component/meta/metaTagsContent.js +++ b/client-app/src/app/component/meta/metaTagsContent.js @@ -60,6 +60,10 @@ define({ "title": "{i18n.metaCatalogSpeciesInfoIdTitle} '{scientificName} {authorship}'", "description": "{i18n.metaCatalogSpeciesInfoIdDescription} '{scientificName} {authorship}'. {commonName}." }, + "/catalog/stac-browser": { + "title": "{i18n.metaViewerStacBrowserTitle}", + "description": "{i18n.metaViewerStacBrowserDescription}." + }, "/viewer/species-distribution": { "title": "{i18n.metaViewerSpeciesDistributionTitle}", "description": "{i18n.metaViewerSpeciesDistributionDescription}." @@ -84,10 +88,6 @@ define({ "title": "{i18n.metaViewerRealTimeDashboardIdTitle} '{properties.site.name}'", "description": "{i18n.metaViewerRealTimeDashboardIdDescription} '{properties.site.name}'. {properties.site.description}." }, - "/viewer/stac-browser": { - "title": "{i18n.metaViewerStacBrowserTitle}", - "description": "{i18n.metaViewerStacBrowserDescription}." - }, "/atlas": { "title": "{i18n.metaAtlasTitle}", "description": "{i18n.metaAtlasDescription}." diff --git a/client-app/src/oldapp/viewers/views/StacBrowserView.js b/client-app/src/oldapp/catalog/views/StacBrowserView.js similarity index 100% rename from client-app/src/oldapp/viewers/views/StacBrowserView.js rename to client-app/src/oldapp/catalog/views/StacBrowserView.js diff --git a/client-app/src/oldapp/nls/es/translation.js b/client-app/src/oldapp/nls/es/translation.js index 8b85c432..8ab8bce3 100644 --- a/client-app/src/oldapp/nls/es/translation.js +++ b/client-app/src/oldapp/nls/es/translation.js @@ -842,7 +842,7 @@ define({ , "modeLabel": "Contenido de la cuadrícula" , "pressHere": "Pulse aquí" , "successResetting": "Recuperación de contraseña realizada con éxito" - , "stac-browser": "Teledetección (STAC)" + , "stac-browser": "STAC" , "monday": "lunes" , "mondayShort": "lun" @@ -1377,8 +1377,8 @@ define({ , "metaViewerRealTimeDescription": "Visor de estaciones que proveen datos en tiempo real sobre el entorno marino" , "metaViewerRealTimeDashboardIdTitle": "Datos en tiempo real de la estación" , "metaViewerRealTimeDashboardIdDescription": "Visor de los datos producidos por la estación" - , "metaViewerStacBrowserTitle": "Catálogo de teledetección (STAC)" - , "metaViewerStacBrowserDescription": "Visor de catálogo de recursos espacio-temporales (STAC), integrando la herramienta STAC browser para ofrecer contenido generado mayormente por teledetección desde satélites" + , "metaViewerStacBrowserTitle": "Catálogo STAC" + , "metaViewerStacBrowserDescription": "Catálogo de recursos espacio-temporales distribuidos bajo la especificación STAC, integrando la herramienta STAC Browser para ofrecer y describir contenido geoespacial, generado mayormente por teledetección desde satélites" , "metaAtlasTitle": "Atlas" , "metaAtlasDescription": "Atlas marino de Canarias, con una selección de capas de datos marinos georeferenciados de interés público, agrupadas por temáticas" , "metaServiceOgcCatalogTitle": "Catálogo de servicios OGC" diff --git a/client-app/src/oldapp/nls/translation.js b/client-app/src/oldapp/nls/translation.js index 051fbf4e..0a651e5d 100644 --- a/client-app/src/oldapp/nls/translation.js +++ b/client-app/src/oldapp/nls/translation.js @@ -847,7 +847,7 @@ define({ , "noCita": "No citations for this grid size" , "pressHere": "Press here" , "successResetting": "Password recovery completed successfully" - , "stac-browser": "Remote sensing (STAC)" + , "stac-browser": "STAC" , "monday": "Monday" , "mondayShort": "Mon" @@ -1381,8 +1381,8 @@ define({ , "metaViewerRealTimeDescription": "Station viewer that provides realtime data on the marine environment" , "metaViewerRealTimeDashboardIdTitle": "Realtime data from the station" , "metaViewerRealTimeDashboardIdDescription": "Viewer of the data produced by the station" - , "metaViewerStacBrowserTitle": "Remote sensing catalog (STAC)" - , "metaViewerStacBrowserDescription": "Viewer for spatio-temporal assets catalog (STAC), integrating STAC browser tool to serve mostly remote sensing content obtained from satellites" + , "metaViewerStacBrowserTitle": "STAC catalog" + , "metaViewerStacBrowserDescription": "Catalog for spatio-temporal assets distributed under the STAC specification, integrating the STAC Browser tool to offer and describe geospatial content, generated mostly by remote sensing from satellites" , "metaAtlasTitle": "Atlas" , "metaAtlasDescription": "Marine Atlas of the Canary Islands, with a selection of georeferenced marine data layers of public interest, grouped by theme" , "metaServiceOgcCatalogTitle": "OGC service catalog" -- GitLab From ec81fcba7820c8c55529999ecc27feb3f8735199 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Fri, 23 Aug 2024 10:17:32 +0100 Subject: [PATCH 108/249] Implementa ajuste de altura de window al contenido Permite asignar un valor concreto de altura a un componente mostrado como widget de vista detalle (que usa _Window) para que su altura se ajuste a la altura de su contenido, evitando scroll. --- client-app/src/component/base/_Window.js | 7 ++++++- .../src/oldapp/designs/details/Controller.js | 16 +++++++++------- client-app/style | 2 +- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/client-app/src/component/base/_Window.js b/client-app/src/component/base/_Window.js index 723a5ccb..1ab5ce4e 100644 --- a/client-app/src/component/base/_Window.js +++ b/client-app/src/component/base/_Window.js @@ -59,6 +59,7 @@ define([ omitTitleCloseButton: false, resizable: true, scrollSensitive: true, + fitHeightToContent: false, _resizableForcedMinWidth: 100, _validSizeInterval: 100, @@ -132,6 +133,10 @@ define([ _limitMaxHeightToAvailableHeight: function() { + if (this.fitHeightToContent) { + return; + } + var currMaxHeight = window.innerHeight; if (this._lastMaxHeight !== currMaxHeight) { @@ -177,7 +182,7 @@ define([ this._windowNode.parentNode.addEventListener('transitionend', this._transitionEndCallback); if (this.scrollSensitive) { - this._windowNode.parentNode.parentNode.addEventListener('scroll', lang.hitch(this, + this._windowNode.parentNode.parentNode.addEventListener('scrollend', lang.hitch(this, this._onGrandParentScroll)); } diff --git a/client-app/src/oldapp/designs/details/Controller.js b/client-app/src/oldapp/designs/details/Controller.js index cf725a0d..60dfff3d 100644 --- a/client-app/src/oldapp/designs/details/Controller.js +++ b/client-app/src/oldapp/designs/details/Controller.js @@ -49,6 +49,7 @@ define([ idProperty: "id", hiddenClass: "hidden", + _heightFitContentValue: 'fitContent', _rowsParameterName: "data-rows", _colsParameterName: "data-cols", _updateInteractiveTimeout: 100, @@ -251,22 +252,23 @@ define([ { ownChannel: key, parentChannel: this.getChannel(), - windowTitle: key + windowTitle: key, + fitHeightToContent: config.height === this._heightFitContentValue } ]); var moduleType = config.type, - moduleDefinition = declare(moduleType).extend(_Window), - moduleInstance = new moduleDefinition(moduleProps); + WidgetDefinition = declare(moduleType).extend(_Window), + widgetInstance = new WidgetDefinition(moduleProps); - this._widgets[key] = moduleInstance; - this._listenModule(moduleInstance); + this._widgets[key] = widgetInstance; + this._listenWidget(widgetInstance); }, - _listenModule: function(moduleInstance) { + _listenWidget: function(widgetInstance) { this._setSubscription({ - channel: moduleInstance.getChannel("RESIZED"), + channel: widgetInstance.getChannel("RESIZED"), callback: "_subModuleResized" }); }, diff --git a/client-app/style b/client-app/style index dfd7a358..284fcacf 160000 --- a/client-app/style +++ b/client-app/style @@ -1 +1 @@ -Subproject commit dfd7a358410dac513da0a13b8e8c273489d6f1de +Subproject commit 284fcacf34e1ae3ce63f2f687148dbb339904d38 -- GitLab From 196b88d68e31c0e65a6e3d48ae0591f35648d01d Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Fri, 23 Aug 2024 11:36:36 +0100 Subject: [PATCH 109/249] Aplica widget sin limitar a info de detalles --- client-app/src/detail/_WidgetDefinition.js | 12 ++++++------ client-app/src/detail/activity/ActivityDetailView.js | 1 - 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/client-app/src/detail/_WidgetDefinition.js b/client-app/src/detail/_WidgetDefinition.js index 75a26739..36a765b7 100644 --- a/client-app/src/detail/_WidgetDefinition.js +++ b/client-app/src/detail/_WidgetDefinition.js @@ -72,7 +72,7 @@ define([ return { width: 3, - height: 2, + height: 4, type: declare([ListImpl, _Framework, _ButtonsInRow]), props: { title: this.i18n.organisations, @@ -100,7 +100,7 @@ define([ return { width: 3, - height: 2, + height: 4, type: declare([ListImpl, _Framework, _ButtonsInRow]), props: { title: this.i18n.platforms, @@ -128,7 +128,7 @@ define([ return { width: 3, - height: 2, + height: 4, type: declare([ListImpl, _Framework]), props: { title: this.i18n.contacts, @@ -145,7 +145,7 @@ define([ return { width: 3, - height: 2, + height: 4, type: declare([ListImpl, _Framework, _ButtonsInRow]), props: { title: this.i18n.documents, @@ -172,7 +172,7 @@ define([ return { width: config.width || 3, - height: config.height || 2, + height: config.height || 4, type: declare([ListImpl, _Framework, _ButtonsInRow, _Filter]), props: { title: config.title, @@ -210,7 +210,7 @@ define([ return { width: config.width || 3, - height: config.height || 6, + height: config.height || 'fitContent', type: TemplateDisplayer, props: { title: this.i18n.info, diff --git a/client-app/src/detail/activity/ActivityDetailView.js b/client-app/src/detail/activity/ActivityDetailView.js index 788548b5..e5d5ce09 100644 --- a/client-app/src/detail/activity/ActivityDetailView.js +++ b/client-app/src/detail/activity/ActivityDetailView.js @@ -57,7 +57,6 @@ define([ this.widgetConfigs = this._merge([{ info: this._getInfoConfig({ - height: 4, template: TemplateInfo }), spatialExtensionMap: this._getSpatialExtensionMapConfig(), -- GitLab From e78514319da7e07aca7a3fc7704bab6b7d01ce5d Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Fri, 23 Aug 2024 12:02:45 +0100 Subject: [PATCH 110/249] =?UTF-8?q?Refactoriza=20y=20aumenta=20m=C3=ADnimo?= =?UTF-8?q?=20para=20redimensionar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Incrementa el umbral de ancho disponible en los widgets para provocar su maximizado automático. --- client-app/src/component/base/_Window.js | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/client-app/src/component/base/_Window.js b/client-app/src/component/base/_Window.js index 1ab5ce4e..53e67ccf 100644 --- a/client-app/src/component/base/_Window.js +++ b/client-app/src/component/base/_Window.js @@ -43,7 +43,7 @@ define([ hiddenClass: 'hidden', titleHeight: 2, - minWidth: 200, + minWidth: 300, widthByColsAttr: 'data-cols', minWidthCols: 1, @@ -230,13 +230,10 @@ define([ windowBottom = windowTop + parent.offsetHeight, windowTopAboveVisibleBottom = gParentVisibleBottom >= windowTop, - windowBottomUnderVisibleTop = gParentVisibleTop <= windowBottom; + windowBottomUnderVisibleTop = gParentVisibleTop <= windowBottom, + windowIsVisible = windowBottomUnderVisibleTop && windowTopAboveVisibleBottom; - if (windowBottomUnderVisibleTop && windowTopAboveVisibleBottom) { - this._setVisibleIntoParent(true); - } else { - this._setVisibleIntoParent(false); - } + this._setVisibleIntoParent(windowIsVisible); }, _unsetWindowParentNodeSize: function() { -- GitLab From e1c7936f70dfc67979b5c4de81389455f9a52d9d Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Fri, 23 Aug 2024 14:40:45 +0100 Subject: [PATCH 111/249] Revisa manejo de botones en vista detalle MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Refactoriza y optimiza la gestión de los botones del título de las vistas de detalle. Evita recorrer inútilmente listas de nodos y corrige problema de duplicados. Esto requiere versiones más modernas de navegadores, pero está justificado. --- .../src/oldapp/designs/details/_AddTitle.js | 54 +++++++------------ 1 file changed, 18 insertions(+), 36 deletions(-) diff --git a/client-app/src/oldapp/designs/details/_AddTitle.js b/client-app/src/oldapp/designs/details/_AddTitle.js index 1c973ce6..ca39abbc 100644 --- a/client-app/src/oldapp/designs/details/_AddTitle.js +++ b/client-app/src/oldapp/designs/details/_AddTitle.js @@ -112,7 +112,13 @@ define([ var leftButtons = this._titleLeftButtonsList.concat(this.titleLeftButtonsList || []), rightButtons = this._titleRightButtonsList.concat(this.titleRightButtonsList || []); - this._insertButtonsIcons(leftButtons.reverse(), rightButtons.reverse()); + var evaluateButton = lang.hitch(this, this._evaluateButton), + filteredLeftButtons = leftButtons.filter(evaluateButton), + filteredRightButtons = rightButtons.filter(evaluateButton); + + put(this._titleRightNode, (filteredRightButtons.length ? '!' : '.') + this.hiddenClass); + + this._insertButtonsIcons(filteredLeftButtons.reverse(), filteredRightButtons.reverse()); }, _createTitle: function() { @@ -172,48 +178,22 @@ define([ _insertButtonsIcons: function(leftButtons, rightButtons) { - var i; - - if (this._titleLeftNode.children.length !== 0) { - for (i = 0; i < this._titleLeftNode.children.length; i++) { - put('!', this._titleLeftNode.children[i]); - } - } - for (i = 0; i < leftButtons.length; i++) { - this._preInsertIcon(leftButtons[i], this._titleLeftNode); - } - - if (this._titleRightNode.children.length !== 0) { - for (i = 0; i < this._titleRightNode.children.length; i++) { - put('!', this._titleRightNode.children[i]); - } - } + var getIconNode = lang.hitch(this, this._getIconNode); + leftButtonsNodes = leftButtons.map(getIconNode), + rightButtonsNodes = rightButtons.map(getIconNode); - if (rightButtons.length === 0) { - put(this._titleRightNode, '.' + this.hiddenClass); - } else { - put(this._titleRightNode, '!' + this.hiddenClass); - } - - for (i = 0; i < rightButtons.length; i++) { - this._preInsertIcon(rightButtons[i], this._titleRightNode); - } + this._titleLeftNode.replaceChildren.apply(this._titleLeftNode, leftButtonsNodes); + this._titleRightNode.replaceChildren.apply(this._titleRightNode, rightButtonsNodes); }, - _preInsertIcon: function(buttonProp, node) { + _evaluateButton: function(config) { - if (!buttonProp.condition || (this.data && this.data[buttonProp.condition])) { - this._insertIcon(buttonProp, node); - } + return !config.condition || this._evaluateCondition(config.condition); }, - _insertIcon: function(config, node) { + _getIconNode: function(config) { - if (config.condition && this._evaluateCondition(config.condition)) { - return; - } - - var iconNode = put(node, (config.href ? 'a' : 'i') + ".iconList." + config.icon.split("-")[0] + "." + config.icon); + var iconNode = put((config.href ? 'a' : 'i') + ".iconList." + config.icon.split("-")[0] + "." + config.icon); if (config.title) { iconNode.setAttribute("title", config.title); @@ -227,6 +207,8 @@ define([ if (config.btnId) { iconNode.onclick = lang.hitch(this, this._emitEvt, 'BUTTON_EVENT', config.btnId); } + + return iconNode; } }); }); -- GitLab From 86d02d5cf48ef7bfad52e96dfd1dabf812d2159c Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Fri, 23 Aug 2024 14:49:11 +0100 Subject: [PATCH 112/249] =?UTF-8?q?Aumenta=20requisitos=20de=20versi=C3=B3?= =?UTF-8?q?n=20de=20navegador?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client-app/src/app/component/CheckBrowser.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/client-app/src/app/component/CheckBrowser.js b/client-app/src/app/component/CheckBrowser.js index 02fd4cd7..2e10ddf4 100644 --- a/client-app/src/app/component/CheckBrowser.js +++ b/client-app/src/app/component/CheckBrowser.js @@ -7,16 +7,16 @@ define([ return { _supportedBrowsersAndMinVersion: [{ name: 'chrome', - version: 31 + version: 86 },{ name: 'ff', - version: 28 + version: 78 },{ name: 'edge', - version: 12 + version: 86 },{ name: 'safari', - version: 8 + version: 14 },{ name: 'webkit', version: 537.36 -- GitLab From 14ed7f883db583293062f312d0e6c162eb5922df Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Mon, 26 Aug 2024 11:02:36 +0100 Subject: [PATCH 113/249] =?UTF-8?q?Actualiza=20comprobaci=C3=B3n=20de=20bo?= =?UTF-8?q?ts=20y=20browsers?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Simplifica y optimiza la comprobación de nombres de bot y de versión de navegador. Añade nuevos bots admitidos y normaliza su comprobación usando minúsculas. Elimina posibilidad de aceptar un navegador por su versión de webkit, ya que actualmente es un valor legacy que todos cumplen. Elimina enlace de descarga de Safari y añade el de Edge. Actualiza logos de navegadores recomendados. --- client-app/res/images/browsers/chrome.png | Bin 14480 -> 19412 bytes client-app/res/images/browsers/edge.png | Bin 0 -> 14866 bytes client-app/res/images/browsers/ff.png | Bin 26644 -> 0 bytes client-app/res/images/browsers/firefox.png | Bin 0 -> 25460 bytes client-app/res/images/browsers/ie.png | Bin 21468 -> 0 bytes client-app/res/images/browsers/opera.png | Bin 13519 -> 5139 bytes client-app/res/images/browsers/safari.png | Bin 26324 -> 0 bytes client-app/src/app/component/CheckBrowser.js | 45 ++++++++++-------- .../views/templates/NoSupportBrowser.html | 10 ++-- 9 files changed, 29 insertions(+), 26 deletions(-) create mode 100644 client-app/res/images/browsers/edge.png delete mode 100644 client-app/res/images/browsers/ff.png create mode 100644 client-app/res/images/browsers/firefox.png delete mode 100644 client-app/res/images/browsers/ie.png delete mode 100644 client-app/res/images/browsers/safari.png diff --git a/client-app/res/images/browsers/chrome.png b/client-app/res/images/browsers/chrome.png index a4dd10f5aa6e4753ac6fb723fa3fa006624e5c4d..2d08a85b9989bb0b85fc02bcd0da93657d90227c 100644 GIT binary patch literal 19412 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 literal 14480 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 literal 0 HcmV?d00001 diff --git a/client-app/res/images/browsers/ff.png b/client-app/res/images/browsers/ff.png deleted file mode 100644 index c3159a6af069522223263d4e5f3ff2711795762f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 26644 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 diff --git a/client-app/res/images/browsers/firefox.png b/client-app/res/images/browsers/firefox.png new file mode 100644 index 0000000000000000000000000000000000000000..d6b31db7f250ce228e88c2a1047a99f8e29d491f GIT binary patch literal 25460 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 P0|SGntDnm{r-UW|M(LO* diff --git a/client-app/res/images/browsers/opera.png b/client-app/res/images/browsers/opera.png index 300a6823d798843ec8c7e15d1beeaa47667dc9ab..9af1d42d10b23369b6384e2fb70c1e2d1b6614cc 100644 GIT binary patch literal 5139 zcmeAS@N?(olHy`uVBq!ia0y~yU}ykg4mJh`hQoG=rx_R+TQi-V13aCb6$*;-(=u~X z85lGs)=sqbI2<6->L0z-Rg14|!lMZbyP8=81&>FyDur-tbz04*rvJBDjn}iQd+~#) zf)D8%Up;uVW_9yw1&)6W7SY`?Jpb>iTtcOB0L^s0*mi$cs24eZ+Y7 zv~!j7Ee@TUeP72?q+|A)Ws{52gv-(8*$RWAHax-GBlP#~URn)Cbjjcw8D4i6-ET(bHX zB|PJ=%HE3?liUv+Fe@m$d+~|wgCcf`s!OWQMN1f_?vG%(cmBofPX`|8UfBNZ+}hf{ z%j^o?o4xKcu(uz`=-hPO_MYskdAIkM-}?NU@lj*Z<;OGDY-3d%*Z zJge9Kc9bi5clUSww~BN34BV1UplGMZByRbYTe;cyUuLbch-UCL6xeUjp1ZYa$;t=38zgoxM({mJU(wmi?9W`z6s;PSf1IJ9o>`oAVa%?VrC&pGoz|*dSrzIM$erNgo)eC*IuBt-a+f|&q?}fB^;Zp8+SL{4t}fS#l@=MIP1Ub zge{&cuV2fz&5z%6-t0@c@Y`&2Ls^c$6FV+G+-&w>o#Pg({by#!ne^RiO42&~bK!&h za>j7x*+EY=ytvB$<{l{L^SoiPyk%AIvFg3wt8S;p*Snvn+qBtzs@5Ubdv_*j%?*vv zTB^3@z}^G)OP!=WxLWFkJ}_)B2yJ@5b>8>5_~o_Rci%kn#z8~%wu7TfiCf^(awkt! z;X|y}EbAs@{Qb6u#bLoGefD>Zr-BrJ*uAc_{$=&%+&gAPe&5v`$wiJkx35^TYPHq+ z4^ocuCKt<1vKba^<^Ie(wZ2x%X*Xl&?$!G*uYRA$rMkxS@b>3nx+#xcUyBg#wFASyTOwlB#~F(~`=bt@ zX3`Ejn&d0V&agJtg4dq6YEkyOt<{~4Yh!yaz5FWOTJ|6_WIj_IlN96X1F0Kt$mbk% zW@T+YDb09{ak;`K8xJ4f=~o&T%B|SFW&eJ~WCj6_|B(+WuHX5kac_3T+U15%R^DA% zV7@`>YM=M--|i_t%^z2ckj;4WN%Qo63ra*BI3ul zv-_ImYee4f@d}+EfAjKVm1Dn4GhgaF2>+ozDdtjC<5cZkyB}vVHz=I^oPVG^c9k3d z)~|nM_1|=EkKedxwf3u92KHfLVG=dp?{`_>cW9ii^l9(<@-jK&8whX-EKJmD;oq=m_3C(+b)pmN1qA(F3O;mn#OT|d4_?pMbmyPgon_^v{~i9< z=f2JVbfoj=R=#C+h6wm%+QxZ2z0+^?+a-`}P%Dy(?5x99O8zy7NJoR`)G zPd{y&W|8US9~R;vpmp!1LC6~SCq3M^Z|$1Ptgzv?{qgnbyLrBw$#40{t@h^rRqt6B zZ=Lc|{Lu-hIKt(D>@VZl3?AFHGs)TmFS!nxpjicsOSc^D{-iKacJ*#mC&cWc23H zMUUL8zJ0Ch51gH;P}8vM+O=k-qNNg--)k7nXg|^Gcj&-_FYikGDu3;7+&|GU#U;+L zV7cJIi^YF8o0@)hzskb${M&!_A8pB3>$_ZD*Soh}Y@0Pp$R&>1uVBlQ^{jf9%U7Q4 zo5p4#yWi&3q<80B9y0&=*~o0GRMgxN;U4usNzk%3#K&R7@BD*rm-cFWSf66RnPZ^j zZ~ckYNvY`bvy+q0W@I!R{qeP6df)y19$WU=PG;P&W#h%J6K9ns6)a?RNm<#UY zwB$VR4qKj&f^}PUAD=uBt@NpdTQ|X_r{m5Cr`)wF!OS`b_Ah-s>0j)kueLWC8uZ`a zUhejUubp-AQ@0dHBgO*Jy!9FKXQti#&mQmagjcZg;zZ*a`by!dtPGCV-WwhNQ^oTC zNZz#z^G!`6l#AwftWeh7@M@`~@u^7*8P6Smf97GA&4cipHx~K2C@F2aFUYX!==8fM z7zHfqR~J+>e9C>GyJ>>h`@6Tbl~&8nWHeM-z3uEQ)#Hm8SACQ=+PUPa(Aw`Of{c__ zyB@K+#FXCc@pU7^gP1?kMtWEO=buOtns~qKM4Wrnf)hWCWb7E2zSi$c{`z0=bLsJn%tmt= zz49W3%Z&?}7D(-Xy370bep_)ilRpPd4wt#CQ8uovWd8NB;e7%`!@c&uTyZ zl@qU=X7KMr&#{G8jh|&dA7l9tJ8$lNWaJ89vp2F<>og$f4Dmd>B=*G0Q7 zxv0pnY{ua`L0s~V+CBxm4KZB|e1^>IO&lj$cgoIL{X~|Rq3OQydDX4iZ=Ft>3UqXw z7C!&9o%z;8hJZ&i#P2>)==9j`oW46{1p~*!aHiNG9e3Y`)9=(+8*_x6KQhLcJ71Bx z%E0M<{W$wmD-~V?H$LZsA?C_^o?FVEy>XW+MYe|t$#=fqKs z105m@R_XoXT$#lqn6JSQ@JI7jC|_mZti@^zu1w`u*ymHag5kx1T&o>Q;)@vsR~GDu zI3B=gU?F;2_3D!qoGS{S{@2*ju}U^eWW#w=1`D5AMzdG`JY&o{ zUmJVl!3_DyAM)kDKfUnIo!MA>@&4b8QffIj7dc;Ls4fU!!tg)j%#(z>F&qE8B`jNf zcYPJhJvmN>b?nm8e;j>xvNQVyy7RM# z_4|S=Of_$coEg+vmrpEmWu7DQhTXI|E$}|(4c?d z#qvg`w0)ZH9UJ(#89J}6Hh+2~yg`(&(ulvFBe-}Q_x|*gLd}b3hch0C)4aLGvwbn+ zhEv`@JQc&2KCHQLxncRHd;g?^m#(URlwsLzZ!q~GBSS6s|8;R&o$VjIiD76skR+&C zvL$A9o!jZT%1jQS$z11|#jT&5wXB`&$02I^?!>E}1syuYGm;lYE*guC~>io80D&!06urc-`J(Zw|-_Fx;YRSvH}Mq~OF|MOzjkNi1)Xhqie z2Rsn@lXyjMg}>{(pFZ_ZH10WX4mFGZdOX*ss84R8!86LB^$e=X4*W+^s zqrtkDv0Gm_i-mSSdJ&m%@qGH?4_nu*yV0?x2MLbd~|>MpMeOTGEd{KsY2SjOLq zoi4ljBpDjTek|204BfxZ;uU{L)R*YUZNLAESey>s!1$-g!*k`rrISjQFW+@9_~_N- zsjI*D&JUlZx;wt%{lmOF=c@Vw{z?lnsBL`{=K6laiqZ_OWtzXPM{fG<&!$&0)28K18u4>Jev1(45DlNULZ}q7Uck>(MAHK^us`jVxo{A_#F#o=E(ZA{4ReW0y zq^$n+y;}QuT9HeE-i9+5qvQ%!yC^L-Hou^CJEZc^Oyd;^52d;{pNia6UeB3#{G>f& zj%-?5QN@_<(OC1FwCi}dCva(QpAtS1Ia%!9xZ>-% z9W$3|L^rnb`7*LTbo31vHy%|E{OifcaNu^Tu|Lx` zhEzStIK$*W&B4#F)ZMn(X*Nym(0}U(%XfHxFJnyiRN3@5qRul&NGE^lxgAXPS61(S z7UWj)sY$c{`jwD4&DTnIHAVJuI_;IW{8PvMXR3?R|JpM-K9i#A4*XiUaQEltu+;nS z{>IzixVH7&wX43~6F+n}{4da{VSUFW=W$HmJF4qz@1&PMxv~qwzkCp!lU{Od(adV? zQ(o(s=1FG>s&F2f&;2J|;Qj6;TMu}3x;)BcWoWqWy=?l*Pdo)}!2&I=>GMsD!z|Z* zse8~a)VZa9(Sy$o`Rw=VmL@;UXPxG)a%tw8_!(c6POmmQ!0FIlA$ z%YUV}?Stgo{#!v7rHdBz@BYTgaOh~I)$<=Ox9wV_qcXqZd>li=T?gh1ZS}cY`X`dF zJnAo)*?E7D;??H@acp5K(QmDp84h%}ZcSZf(=lJV{M-f3&Bv;Xm-$aSv}c2&^NCei z;rah3D+=#gl=J!6x{EQVJ00ff&zQ7+-{&uPLvCCMaEwSlH$N#`J!IAd!_4Yk9*y7L z-K*HL@#{Ngd9(U@&z%1&=GPY->+$^=%<_Y~HU5D`u8l{lXlvQGIhs}*i{=si%7AH1D_* zOU{_ASj4`&de7e9vn+31*v5QS`&{Sy`|m!<25sV=cXoEnssia3_ZwP*x4u8bnmE^H z^({ZScu&{DiG>&U#W((|IFz09{z``P<}X{mX`I;0^nZuW#`~4N%Bfiewf9sUBNx@J znfGZPgR7`(SyJxQu<6qS<6@?SoJ|Pby4yZ4diSoaFCAuYdH>!dE3_e&DO@=xYF>tq zXYraTw-0($1Zfs5UUdC&UBuPIlP%6salu*ITBjw#V>~hw8CxqWC&}|E?t8D$eCGF* zD<%&srM!7E@^$>e<9oiHle@)N;;~1)PGdn8>rU<+d-E1-)Sh~OmRaA0;Dw!^Me2BB zT%`Io2@3k$xUuJu!Ozx8sZ-pYhDo7<`3IB*r6;)5H#P21Klsj0rt-jJCi@)+vTscl zyFb;>Cr)}+hKQ~2L$L(S1fzY~3(hBU+o%_;R=BPAWmZnr-ndy8g_j*;SiZXc$SS`5 zlPlDMWGbTmoK}q1-^89%^~l)wrD3q{fto3+MZzAQ7xnm_oz!*z&8I}cckE?rH=NB} zecb5Txw}#;^;lnt=pBBq9x=!5{rVr@#mu;ESX{!gio?}Dm_F8vU6;5f!VimrfS3oODPCVPKwuw+zN#!??A_e7d4{UzVK zXA=K1w(|WE+Zp(0(nq;JKRI_d$-a-Bb&%Mh&0-53 hfB}uflxY05cb#^>?R3eVcm@Ur22WQ%mvv4FO#ldX^FZNcYW~cY9J(V-GD}9DUT))s(-tCudc6SJ#ynC9@3X`mGIG ztvc0h@uo-}v&A=awnwbpv~<;~O{;e7*s@@aj{NpTt1eyY{*`w2Qqt`$mT_vQmoI+& zXj6RD#zRG0Z%gX@Jk0o@JM;3PBK;VNIeXI2Z;&f2JS=2g`s(r~=k^mDc37+oEHTM& za^4s!bR*YnL-g8HYPa8>Do_2nX`=TJ$zL)}OadYcE@i!BK9#m|MZ>B;H5#YSY>Bt3 z-lk!ztZe%B(NWvKYmO5 z*B6~-OnAHbyw~#YZ)Yc*I92uZ*X=y%J5?7HJl#@f2fW;p&(V5am4$<;QBTRKvbOMh zp5@E$_b2P$dRuJGEA!*BxBb72eYdW^SR3>Ap2(BGj?HY*n>Ih^nPHZj(0y<3!H~Fh zJAP!xnn-kg;b=RQd|ct>?)QFkjAq~Wkui9%{KyQ6-*>si<1XJkYRcG<|L@E48?~>m zos}#9e)s#)UYV6fiyq~!_|Xt)eY9j-c+1X`i6Ym+Uu?f(CEH?>$Mch&|In_~(`AlM zhm4um?f*C7X3n(b`f)YBOb=HvKUjKg?fW+(^7|K@cjk8uj@cd(c5T1ol7gfk9#2G; zoo8$~wAF#@v2@4rL+O7+x5n{TJ>kk+9X@;d|KImNv)?T`J-g7*@alJ+sFJgVEvwlY zTqmo!%G}=bb8)9}nvKJ|eYn(FDkM|L*}xx^=<9v zKkNkNG1fcFi?X`qTyOjNxqtfhoXY!OYk$cYO7(tgpRT(*ZO_3_#sh~uC*P6`3J&kD z_;@t#itx2nTKj{|e@#1b$t>^dBegOjrl4n@ub9#dkPbr_KV-zvT~BHPSmC+i{+A! z?YXloGx+o3)6;KD?fM_P)RFOn&+4$pc`vTNZ(kR@tR-Ab?Aq)ng{PmNQhU1k;-f1| zD$3?P+9>w8@afU+fRZm7QgoRa zGg)9z=c)qRdHQU|g{_M6) z3#B$sNGRc{WReZl=Vkj*c5TgDS5D6IBPMwqq&MicWo~<}AO<`cc{4 zDb;rUX0wY48k>@5{eFCA=I_tKLTcuHJvuQHrj&%T&1vFm(9heuwRzQ+lJfQJ@;!zk zB3Dko{hYsw^=bBur`bC`t&Hhj_w7czyi-_^kde>o$)92wA8@fS=bcsaX*d_W%t5uS zWkHDCMee|lCz=+%m>#)#l786>15G8HJr6$r{VgrS;>dbnQK#@?p3KbM`87|ct`lAH zry)k?Xx_oMlb>cwFr4`0JRwKc{b_pMeLf)}tMI40wc?JN>A9TcWVyKgKA-Hdp2k&^ zCjH{oyL##7uMGwoj((qhx68jf@8>f|=HiOLhm)M!r9?oMoDK}M|MPPG|2bJM;%C}Z zUYBk>^VNDve^1wh?ItPyR9W-w5gX}tAT^KzA!34J>Aw?583 z!|x=dvNAY*_ul>Yl3reW+A4k}apT5>qdJNSvhSFdxpCas{QBC#X`!pXrEbr+U+I~V z@o`h~aVZ`aN9F_FYolz-KJWcrCw6O*tAo{q=fATI-zhU}(fM{+BUUx)^1qv#MJF8< zt!3p1xacW$cGcERdvuOxojnq4Qs6A>=i;NusBpq$Zt1Rf+gsZ96<>dI)0Rhqi|N`$ zr^s3JyEE>|d^xW=k~=VC$HQyG<>Rk>9RBnizDNKIs0m@kGZ(3m(R4ZRGLsY zrLO&WRnVRnj2&Oz{y%QNK*Lt{3WFa5!?yJStM$)KUn1@wy>{h~Nou7bCX5DVD;XPN zB_AHX&%?BuHVCS+{-&$k9~%r zrQN<)$BUmg&68!3VUX{UU$5oodDH0U+U;%y z6Zu!5g6wMR|tJ#`!t4)P!Gc=|=e{$fRW$}X*I`w;mlwZVKm6_;y`15CN)Of(~ zVd8xwpd*ibVw_SYF>kzx-NXLA)g1>VZvZPI$Z1wl^Ouf-K=St_b{E*e3<0miq z{dw)R&p$S85VmCIVO8I=;=AAbOH0r0xVF|mh|8OGNkfSldxN*df`AEK3U>>=G)qFax#O|rs^nY>xwpAxibFX;){M~%*xNe02VuoA$!LCi&^rvS!VB#PiO69c)C3M(Z1`S5@k1&mEGOdRdWBy^Zch6f*cqPHv7)Lo?rFnqq&Y)x6uKi z72Hok?PdLcpJ0CAW@s(KxZ(fR@P#s*3ft@W7Gm}+k2JF%^%G371Ekr^7i2j%iQX} zr5d{`1pAn3{uv**|E{}l-LG963?9@dBt%u|>b-kgSpW0%ea+|V^&^Yks@QE=oqQ@h z$o`I0;u)KtC)FoxuHD`IvzXsuwWHmYm-FuCnyo*4cu(D=ka;?%>&hQ=uZ`Ys_w(iQ z`zzM1;E34$BTmRoPjpfDoHm=NOHHgMI=O$v61;YX?M|KH7yj2dHPyk{(SgCB{LhbL zf~l$LyZq+f+M>l^x%r0YoxhWh7BdulTCV)*`z7xLJ)M#WTXv^)VbzaZSAUh;ts@@O z?&+{ieqH<&@!wxw8n1EhpVGl6yTsv4a0zRJ3QuNmv{F)X;_=z}PH|;sp=$m*3=+0B zI%_h5p>}@AIz8?DJ)7iX>|s*g`~h#$_ZIK`;ky(tFWx>SVOy9R{Da4Zy2`t-ein1oY~shoUYI6RYIv8&Qo-qY`6 zy!wXvqW{YcQg`jhoSgJk>8Ej~NoD=ir?*$-ZkuDFQXlzsOP!wap+nPbjf$VuK5bl; z|KWbZx_H$yxeIC~wiUk4Uhf#_$k-bwqBvRhmfLFE`ZGx@`6A@6e`mk<=5F;G*t%U-tOe^$xFMPG#_wzam@{M~ucf}8&{n|IL7yhy%| zqc%d)zaQ-7x8HN*P`Co?ie8(`g|p7JtTT@uGtZbgIT|+q=yZs^WW2Ykbni;<>B)(mos)C}UW*=?#lXCqnZ;ziqKSyvzsK?c zk(2AD)iW8e*jH~0n8v)xZeyHPb^VzcAC|E>hqZSK&(;Xt#IU zS=7v~$oqIPmt{LggV5Y}UyQ?E%bM-}8$B_v$N*e$=+T?yZq+K1c#nq z^*}UN)XggN&=fPJ=5{f?7UOn)?YG{HGq$rmSnH`3`cuEGdhcF`y(VV6!`FLW=a=6X zY+%O`Z!g*jw%1L?3SD-thUdKcl1X;xN|F3~bw{E}3Hzxo&&;>TvFP zJpA!>-&e1{Cw$?YfK{vimkGSU5%V+_CRqp<20Wm6EQ9gM7#XUa{f4BMZK-|qcp?+3#=j1p(1}@f#96uJv*Rn3> zlL-(B<0;5sJka9OQ}OcanSwvpZoRgx;*qI4wp}s*ZkXQbgU_N>U4&l^(;4vZ5@vOs#=rwS(-ur__2ScQ{JwgdEwFh`@eo4 z4Np$q-c$YON`m{FEZLX zxCuP6KPel#`_-|Q_V_IOtdQVjg@f;z7(|&HX00vi%DT$+?c8j3aU&yDz*m2M22}mo zG5Pm#{%~7XgI#yhtZ&ONc;RqXX8(c{?46zM>-WE27snQ5ec-w*+lsqh!7+>t>oY%T z@K!Bd6B+zj^3FcS9e+&@T$_E7JLkh^p+8Iqx?^{LlfJh1H>0VRvc$*vMCQ^l3!DrtY|2Ur`p2BKtKwcjopZEA2> zUeDmCn&9=!ef67+Zu7$eYfx+#j`;+e(SiXZ_5N(k45D7gzpXf8PH8 z_agI`>(!4|^KxutI5yS4+D825Ce=4TA26Rd*wf%!v$ck=;Ie87+hRlM8&BBZ{ke26 z`g-j4>>FQRI-g?RaPIx7Z`{rY^cVty9JcIgmakm)IXvw@G%hFAirLNQdz;{Uo|I$}isyt?! zJwGfY{P$e5D*tiQx8>^?HDnqX984Kf4(+rqKeRHwuCVLBnWs?#TfySUX`Az=EqTQI zb;hr!y?d_j{QToyGuz*^L)mM3vnsfGmY*+V*x;q0-%_ZQ;rwp%*UA1eE&{ayY|EOH z1%CWo{+FZHj`_h)zqxF^Z*CTE=Usbo`po^MQFbxg7^Y5OD&k*|Sj=D?zP@eqAsL5T z(^p?jkK1rN-!=6~5?g@S8J>nGJN@Ri^}WAczI-Oz!K|Gdr)+ zsL!kW9=jrG^W;u;9R`WE5|dn!vZHD8l?~?^Dz*nNx31!o+_b4{N<8-Qh@ZX;1eOycmc_FvA&3t8+tD@CX`S{iAUuQ&Z8m=?7s1{_|8SO}7o#SS7;y177 z`}Ox3{`gn3G^}@iV8{I6V@F5+@;mkaP0B3|+*4w6_FwyM!7gCaz|rvc#Xqm&;<;h} z*IdfFe{;2`+BJZl+9ZgW=BEGXz^&S{;wx+`OUqsn^E;IWstU zj{7`#!qKqlt=$=+Pn-<;-(N27)YQ9oJ@w0reQamkUk7FEWjL_BaWeaYoeWc$TwM?H zu{dlkU>B%5cl>wOSKXOr(Oi=jEPA5Q$5d3gD*1TF>{+JT9GUmy&f7Y~7T%Y3usGL! z)gjSvjggVp)eC=WZhZTCz0YJ$#f9k%+vl_2uoPO5vYLNpgFnNJYuj>9@M?t?{T5W- zRj9h-x8eTtn|U0La`21VRY=Y!X_hpd|2_2ygf3^vi9v)Fzr z`>U$8^=DmM6EJ_m15t)OwdZviT5ew8Vu&!zI6X@_Z(1X zxFahrZWgiFvs2z`OR(wg)!X&G)_4i z`~EG~50Ta;O+NA!6V@|u$S=AmlVe>`khHbnv+H&FFRVQ4BpaOGMf{yz%y5)>g8Blj z8+Udl7)i;hTu}3L&1dRaH|eQPN&V93*OuPbq$~9dH)=8|gbRx=-@0o_W9hE){Bzvj z9m)z68%0)M{F)!NL*NWg%@uJ^hWU9+71nYKKFr}yX4=QNz<2hAgIT3se4h+-7BX!8oOm;S&Q7!|Z2gira6zb89#;3dwpTy(;3gs z>U*q>Uj2F%bH(C{a+w313_c&{@C3cuJ&{2{;DRv2{r?;v%-I;$2PfXQaF}hjtC8Wi za2wy-(4#gDulp;k!ly46a6fcK=XvO=h935e2-kwg$K|aV9HOUsm6k2LYbUt1E>ptc z=eYxC&aDca_x^%nSxHIBHZDemHir7xeY;HrSojXyK7ZWJb#n)U2Enpi#+GHj~*#B?R&j&|t&^LEU}wtj83 z>tmLB%}(8ZzpeeJ^T(&_*ccAXfBg7xUhbV88v>o2I3^z0W#bSVcR-rK;t<1EPR0kH z&mUB&U^v6Dt%mi30CU6js{!+0GrT`~?A^Pn$Gy!wIYukg1uBAy);0)uD&#Jy5oD0~ zeJ%O0=J#j&Begt_-=Fx@vm(MkVnI?lGsA;*J1p*A>FD@#Y_64SqVMA$w>Rv94B`ym^bUF}GaON1_*Q+B-;Vjg%o8W#kM+q`N6(aI zxRM@!`Q2%T2P?{159~VHeXwO?|NruhDzg6^rY(13W_r-R&^dJ5o;_#8?(W{caLSeF zqt(1Dd<=HV9ghCSL7KB6e1WZj7&;iwr~o|1u!Vw zd&aWoJHysWMs*Q3G^Zi|?3`5MG z&YxS~#xfrG-FV%FgJFwC+2if^t(LV;RA87S$nb=-`*)(f3OhGLe_N}qY3h#;KcAlA z?Y4jNt~55~Lzk^ISD5kj<}x)SkTbkuz=~o z+qAQ4QXK6Tf`t!pFlT>o!HBR$ieAMxb zm!o0o$B)aCcbB{jcv|%Q!mgOQ*yplx4Z8fnHVo_xc?%ytOgM3>Nq7IBM_=~$u=q76 zFhBUXVg=*h*=Bc_cXb4~y*LuNrfbpB=s6qqzSa$#%5Kj2B6QzzIjNTsvZrI^itDqk z{V<*JFJ!^(r{eRtHzX?_Xf_dNU<|k_!0;pW0K>_kfP!U}%l$r1VZHM7+v~3XdD@L@ zxK^ZX6}Z*G(q@{+)9T)T=-k=abEmXtJ~+3O;k&t8)D=cv#SDfD6{AhA*SorMX6t0j zoDw$s`0r02BQFzs{XF^2c~y1uXK99=_1gPq&ZAE&FLu<(7XLq$p|ETJSMTXgodIp< z4!0>Yyi1o`;K;CHSG>Kap4O=zKcAjrUdDY9``i;gET8}B5I-}+RmK;2isF+dCEUNa z*ROxqNtPR1coN*K-?XRQ;MY9JbRhoFA(O(ZS8qz~-rKsmyS(@JDyw_tB+brYuFn0lJGIqXxm+SNnF8$}WLGV7_;hM&!LvV=>Q7}^ zeq`|;kbZkX&8Rt&OYLX3+h^WGP8H)kwogt1 zrgG9}H#aq13bHtIjdj9;_12#m53uws-pOk!@umOS*~jW`?(;XA~yc$q=^)&j*Cj%z&%dY7-fQfq$uO(v&8 zBYe~Pu=j!zPOLtTc9D!`bE+A3c?Jc!wOz^(dei2;#X_hyuFRR2{eS*swY}`oI_)_u zK6gSw<{f>_JZqgRx7$YEcMcCbxp%B)^q9l&C_nhm@+Jve$=)mm=^MF8EDR^+GvArU zJmHe8^Fu@VG`HWZ43i?I&Nh0i-a6ktZ@*r`3JbLMlB)E8aTzsC@; zOF!Z@lgrGN7kzp+M%7Qq4qh^yi@ku4vqt0$BZE@omW@{pXZOpq3(pqxHusI;F__2Z zoOk3{es)9T!TgpMo6Gkz=Dg-&kbK3~bocIa&yP<`R|vQz@N);}wJm%uy-&@~Vd@24 ziT|H(o=VWGWcV%4bfF=l&Yq|FUKnF#{clzNY?HNYw{m8dMPB>0x}yI;p`xP{8^b=A zEcYs_DI0HZ77+g-_23;(gRc3)-?uL@FjVMjz545zntHzbRLSxZe}@lSEVUZ0_)Ys8 z!06M?5O7FgYwh>E0$sbrGymVEKUo&o(OS`P>M$=O!=&=9x1MNpKmFyPHJ`a*x?`ox z6J{k5HohdW31_dVUHZS4?T5D6ujTtZ8u-i(oLcZ*+BE9w+ErPb)?bTPXVCa({6PB; zyQsfngZQD2|8G3}_9eBH3LkjwnZZ7T@k!i=k9mn-nGP^Vy|r(T(pm2$+x1;i#6~n_ z=lWSz&819?4}2UMW%iex{P;8X#A$z}b2Ffl~he`K|p-~QIm^}V`~gOwV81)IW4D<8(%T8pr~3?CMSS#Rh*y6JdW z_oTlcIcmZtbTJ-y$l76|Xwaplov1FPIFD;tlGGpW1E=4x1v>6^zOnyGmaqR-tMF_y z^WxCF+*9k`+FG+Wc>J63X{!#iQnE$OBbFzdxE3%NF;9A6_;dzqsUx$+%f;+##2MxV zuQcJ*3awIJZF(>CduC2uu*AP zdeSb<@hcO<$z-d$dm7U|UoMT@qd(8#r_O#)rOymgxK>7LdCcAT?uzDv?{C&05GjyL zW9psAI{imQGfVu_&u+cPN>;AAmGCj>;kGX^B=Tr^>P`N$2k+GW z_#nz<-4*%L{{&+P!#3Caf+NSRJoYkv=<+Lf4&Pk4{%-T8Y-W}#-|Uo|9yM_Ew_Z{7 zoH?_g^Q_M?fs_jQ1cP7yJ}V3G-)@fJ`DJ1AXX!k)!#UC{=YFNW`*-qiV6^3Db^Zf; z?sZ;X{;g2|d!G9H;on!h3_Q%MDz;jQZf<;cPvgF{{{i*M8Vm_b zJiaiL{Nu4TX}YV`Hr45P@^_g7Asb4(1-c#Qx3;f;m1W@bZTipK2YWwh{#{)5F`ymP zHJHP}#VNwKebAKo^LWXF9O8=uXk#2_F!24IPu?Cjz3e{c7(36uJl-) zYj`W~{Dhos1?AV?^s5(qVAy9cDaZlT|6!RBZ)_wZ>X`HA(bf*vGb~-_*)&CK^pzHU z_6-d^e%5UEDZZ`CE8m@~-c+aX>G-8s-OY6y|I~gsA-KcEUt6?p`mYT21MaU4|Mt3k zmv2w}FhhQ!z5;_nrKQQ2?zpR0`FCsGn0vJPDCZBBz%c#?F%CzA9F;nL8>poj$xYzi zz<&6E>>IyG$DP49n$&#dWCMaW1%#x;I;_zCI(g^U$*EjrSoc!>x0C0t$9r_t7ymxL|3&(2X0`_Ll3nwdb*43!MTS)e?b@DDpwyI;al^22 z3WI|j!};f-p$E;(ELnChui!giP&MV0$CkFWjtWhu7caV2qN6?g#ko_ljSsB+9-RA? zYWB68tyAQCf8P9eO-|LKpUa+~n;XorV1>r7x|u3-tKz4hv1GJOU|=}Mc!E2?{ZG?PhFvL3HNJ=*5Gnb8`*_m-HT(vG zG51ykK0ar5oAqW2m$<0DT(`pt-FMcJ_FLQeD~(@=Z`Lfh@^7tmS;NKDXNF(ThI#%f z*sF7S&6+#!X8io|_#ZPLgGw{=uUS6T7r0ksF*jaMY@BlbP(#<$#-DLX=98=f0vMLx z{LK8F;ml2j5APhdbnInRYuc==yxdnq|Nk|vdC4~6>sBA#EvJ2IxuApMH{s9A@5K8m z*H3wuWUU{&hojx#U-wk|WhSR(JZDYOKYjc)*v3gStN!}m^;ve?R`bqmlZo*Xk*4(( zO7X@El3ufOh?MMO@_Zo0!~CT(<>+sFNBs+uj1$BX{hGf*z~(FcPIvgW{PRkDC;$Jvj_0kt4%5;fBs#|Dygpdf)4(Rfp#SP? zY@34kgty-&+*-3=PyawZ+u9`U?vO)CLUt*q-mlnesL%f?>z!265^1$Z<(Gdc^G8T4 z$bBdb37I~dr){yvi7We_{4EO?*sz2D%r8~9KOJ9JYkqsYEa~XFId5`2N;lTc{Ce7a z(w8rak^gj=?$%2;oD%+;k$!-2L&(xeeOX&SyU+0Pzn1!So=wZ+z=DFG-#*raPCUeT z!?=Z$<4c^PR()(>;Mv2A4Ha*;YCe>m6!OctK~CnQ>*r_l`Olo6|M0wke)<1Xts8ze zEvb3nDqr+7=I5DTFF)Vjp2u2lK7U2PN~8a(r-RRKs?iji8<%Gre6NAI;Yn=ovdrj) z#ff3r+W8`Sa;p#eMihKx(lV2KV9`JSW=s^9Wt#C?;T!#N2}S%Rz3xl~Mn5tyFOzkX zvHMnXK|!>rQj8SSS{!P{Ejbq$jtJb@`8(T4z|o zlsN*{#5475y)vbh_w;K?wrg8*eilDk>K*)N<&Vy*b~BIGCaA_Ay|we{Wbp$54qq8| z-9Ny$r7p5Uiu=F+WEIgfQe(0 zGmHvV90fmhBCX>MA2Tq;*ZQpP-FW!Yh17Sh`UPBuKbQ~PS4*_|;cdIAQIwN&`*-{D zck0%&kG}T&$nb9My@Nk2UnZ}M@BFOuZZ+$5f5lvVq5VO-MD1fT|GqYz#eXeoZTAO* z_2N;FD&Cy(cCpxWvNTl+Uu2EtcxDK_Tv1RmAvoLjCRJhv^Pidqmmn9H-`6H>xgHfK_jXl{zrzaOpEmEbulc`=3$dH6JE!uO z$r4%ncO|la{%eJ3j>Tif#EnB(%<{#;(mFI%Z6pqz~8#Gk( ziJWs(xL4h9Z?S4rh~CjH1>73mOU3^4d^q%YQpm@Z{V5+ja&mH%ch~OLvfsaWMM1vE z`%^!5ep-2pUFY58PoX;RKCgWAG&OZY`R}s!*X1XFC$_qMKBc$1)bvV3ePmVxSF9r| z1LrcGS3YaMy-ZB|EMr}f|2NN;@j25X^98nR1rPL1UNe2~U%M?6_A}m*;Vbwc>ba`w z!fAHTTn~>IHml zYvR@0?>lMf#W&U0vub(b#TR`QkK=lLiz+p#k|X58cW<@d_0uPen%cm2L^Dm6KO<>SDj=-FmhMYFdW|C&Diypx*P%T*lf z@7Ra$ariOiX;RZC(eM5Y38&O2$Q;-a?{r>K?8wJ>j(d@lOl)uG+4oh}$623Y>1QjL zqx^zF;b+jK5OI~2fjwSdv;9|pb@N|yKX~GayD^OIub=lOoGRawR=w3N`L3AMujm~* z^~EuhzQwOux9`gm9qn~VE5la5mleCF>b6{3JlDWRCN}WmyyIN+AMXoz5;(=*`=H0c zIUkKzPrni6lpt&y^!@1ZrC1nL;uAC+ zdfbnDUHWydtXluy^Q~;Y`?kcxc^Zv`NtFIcLp5A$N^3=(P3WKNkuaw(dbBe=H&Wa^c=YIL${7KwW zzNd6%zYSciBc7z8ozb26wxYq^QksWBMPjlkE5q4#uS@xRQzIE0-M{;{_=oIRkW${j zz`y?PTU*cAQ{w$od)Kq1vC7SSWE*L#Ie&_;wB~#>t7qCBoI+`m%e1V_qqzf6qa?W*EpZ!U$?p)jTnX{&_wB{JCe*NFcSN_EP z*IzeZo8_bZA=Oa&CeN*;>8qI-CaG_Xo*;bWi-W)&o`St{bGq%c7G67lo{^t%(WRe8 zg>`*%*$dbjxA&H=u6g%p=cULs;Zx3E|5vQN+}1kGiSa6f#(90+*2BBYn|HV8e*CYP zw8w4v?>E+)e+Jv=xLu2%qTqS#ih>>Y&sB^KPwE9&j-KG0aA%Di{{{VNbHhJ2@rV9t zVU*v##6QHwpZ#dEIq%mc3?FA`%d(iS*O;4YbB$U1LqV(cw=Ek#z5f}!{K1up%6&dZ z@BR<^ZT7Ond-|-ipFhNC9{aoK+YBZ-u1}LMtk+`jkUO?chcV-pNP=Wr^X%UbENwT} zx$g|u_!Z;Guyc|vgX7DRk6UlYP0%}k>0#G%vGbyS$B(?*dDVE?`v5C;mg4VAesp~* zvY0oAXX%W`t8KQ-kN%fm_4iT!nP;pSZ@NBNdjvf_sGu$XK#GCkWbKXI`;0CAj5BUa zKWMaD(c@zG?0n;aLrpXOS<1<(7coqqaG>AO=GmclCm4IKF!sOADPB@)bM5lHWe-FOF8^}v^A!5 zr||AP)l16_J@_Zc?32^<+_mqE3ryzj-Y zSjGcW&-UL;*El!%(fOszwVSQJ7-(L6b+>ej>sr0P9&77z_ut&Zn>8iA>D2lxji=SS z)~!~Xyg_^N#f3@kJ$rZ)7|V)pbA@3P<8mSL|WYa+W^){9Kd z&*9jvf6A1VVG_Hl=T^UIU#HGc^kJ#szP#Y~nj7g7v5Jh17kGo$gqh6kI-0RO&~du; zXm%8v$_sv;Z%@vWy;<^~tdu2DM&#Ru4EyNIGpnYM^kqHe6 z9lIFkGViMsvSmCkCTb9H+%54>Zlgkn>-!5b+mCVd8GP%JHC3MI=ar@)7`xA?rQ2)U z!+Sj&_nb;;+H}fG!|{7uPtLq+&x^mmTUEkvo?*f3(-&V}+RyrAEYk&XO%Oyv?NAI@D$Y7pOJHBTqhiUs^iS8OIlSsk~FmJ zrpz;LaNtsuC!-FE@Z`PYsW8HkO-Q6)= zrT4Y^>B~_}cN(}j1*IRqjrFRD-4S#>%B^Wy=-PE&S6^;hKk@1NzF9u)7gt}nqFeNx zt>^1iiPyT}%GatV+4C^$=y9^0Wfpu7rA}r)d~$w8t^H{hskYtEW{QMOi^d>JkXk9x z3*zhk?*7O1ul)W2{r&&G*ZmD*{5Q8AnY2}AwRrz?JqOp+tbqA*xt^>0w>wI-inKMx zm~k-u`+oVpipA&l2ls9M3H$%QDgI;S{1^ZE*Ph!H|6}I<8`+!Y|1tb6*}t3nWBrrp zS%I^bU0vv!S$^L^>iYA|wcGE0;=X^^KXTpX|F?eZ32zg2pQmwUxq8=UVfE901pZC^ z5#RW~wd`(u)%5@Q`;C52|FnPG-|Vn9|dMZiGq~@HvD=h=$8L9pIW1Byj7# z)qUCe?eBlOpZj)~{mO$y0yR z%hvk5zZ-jF=gc*apE2!~ubsDd`R@8kE&F5t4~yO{{^A<>ukM@8qt_|+JKMhfx%TJH zkv~T|mHpq|{`%ozGke+jvuA6y`yL1XIsS8@X|xpc>Fe9%_y5h_zd`Ab6W4}Mhn};% z4bz@w^($qmo$b9~t*O`aqxU^pd%pf{{@$w3pVz(2yDk=be75Gb>R-=PFXFY~U*F3mxMw5hv?qq^XMB^{ zS-w+kfBKyNecg}VFRJ)9Z{{EG;->{%6DNkp?5lqDTJK^(d1Hja=il%5ls;^a|Mg~i zzntZtnPIEHR)qgQ@#a7mZ*S1jNisXWZ<{YIRkw~w$Nqnpg5RSCyH7*P^%Y|7LsoTc7$-=3>LMrb%K^3lCQqN6M&|7-?%y;rh4nK;{mP8RFYTPrnz~ zC+zY-$J>5)d_j!!dRE8Qf3~_dRf^W@o7cC9>UEh|E&Z`Gz~J;LUMZ&l##gphijUAd`$U^2M6~* zwVxZc=j*4PP8%iUZ`K|^AJViuwBcdtZLVbhH)}ujcZaWwDt#OM@6F@TiX z^qt+s+h^(oWW1BelRM;fd*gPYnl%?#WM;Wqu2*z2Ug)Ot<$#!HoC`rqkoAb@d9<&@Hj zGh3v(yp|Q{`8=%Z44#vea-P%nn!wX1-}|F;P32;4+xVY(t$N+?;OW0CjeF0DFkElG zZmcTMdg99IH81opyI#C_?D@ab`OcjGX3eilD*3GXdAZz9d%JAbh&?|i6?{4&eE00m zl@}jAeE5CO-}C>jzrQb@yJp_J{O+{Fxy#ddAH5TN-?i}bv3prZ&L(}VFqHZ6y5#mF zUWF5jc3JI>duQnq!KvS~BlF*Z#K5U)y(eo{J?J#a^H$-zu{Hfq@s+#YtzNFWYws@F z64~xO;kmh z$9D5VF4m*o5i52)R0;gBdWUoD{tDr0pF{1HdK-V3Y_IrvS10a^7}u$Jsty%K54o2; zG}u+Kz)5`j_w)6y{OiBVA3J{BKJcBajp?4U?7uJG-LBU%_%o9$KsqvPo^@@>1jhTW z>uZ0%|Nr^U=KDKeJxIB`+x>Z+@n#9}>!Ax??YkVY(J`W6fxgM=-aT7)&u(BkaOz|0 zk9QX~?zpkTbI$vqg||+>Kg^V8zQJgbL~D>|i~Po=&NBixt}vX{s@9b3ntT5I<_B6; z_B+_cvMyx=Y>Y}3zbnwlqH|%#K8IF4v4YjA*Eu2+AGytS605uPY>l?oN82k$Hd}m{ zchh#41@B>j#_huW{0j^m9~^MgxPEAFYGTSvPMcUqCysYZuV$RwwX{t<=(CdFOe?YY zIPNrp!|AU>+<ub+`W#^aq!Ts;>#G|+8*_J20kA11XgyAl;^3v9mmk;Nx6#sMU{r`*U z^Kbn4^{_RJZ&{3%oYV`U4ehgy6e1>=`0aPvu{6SA>b>vN^Ff+k5jjm^P7Tu}k?mO}4xtkCFoZrXG>*lA_^)1TkubgAW zyZC-}6^*f2lP+^X)(B<9UCc@2@eA|9)^` z>GS@6`;Q5)pKCe1|1fERo&D{*>(1-GfBm}p{Of+#o%ot_+aka*UmxX@X+@Q`YY`GMwbKMH0(dMEh#$9Ilv(rk9@ z{XUGQ_3H9T4@{%ph`KyvcyQ)Z;aZ2sqJPx67qYmhuGjx`$T2`B`it>{sH0sKOrDW% zKU+U?e{6jq+3(X1lK@t)bgruni;uiB;V<4$SJP*rJb$glGxLpa99!nBe0WqWNo9`7 zGtJh8A-`QVKB?UEYVhLR)_FTD`~_qUJp1=Nf(1#4t#6t7}cYqU(I4Mz`=}0NW1d28{|C{}U6`yJI9y z&ic$G5zWob^khTA4)ciErXS}IJ)IrC^vI))x7$Am$~6UvxA*J)oYQ$e=*sS`(bFDA zbO?X%eed>f!pXqa*&qIjscbILySub??wm%B$V-k^m$@ZQ_}zWKuu4=S`dX4cQ|ntf zh4t13Z2uA~*E+QSduP7y=ZAfJ>reIDS?+q+v@*E=t>^qO#;oSWtvfq|mH#|`Hhtei z^Z%L8T;JR0+nxJ#qwVNp3B42h1gah^eiN>cC;m?I0n0S8RNt$qW&1Vn=PX>U6(*`s zceq%A?{H9%YLJ2oW5rj?e;d~D=}pV^)L zM>6|%HZH9a*s`fhwU4DVa6{SRl|PuLo$q40^Wf$_ozFar7nd`0h&LF9^$162&5<%V zywz&zp-QcjT0iWPjZQ9X`6y^%X}Z_tVcKO-340Pbe&iqe^7dK)rry5E1aG6 ztKXYW@wdC{-t3)A3Fhl=w~Yvb=|OLi2kQ4yOLtnkg@&A;^JM}t-Ntk{vh z_0Nq1Qr!Kq857q}UfJ0x-c+=W=O8z0PM*xE*7>nwER0M0<}E#7)5>Uc*vd;z(%?zS zw!H@H_2%!Dl6ap&_v7ymy}qhi<2*~UTEk@mQ-+QBrv*-tdqjJDoY;2= zhB2-A{9vEH{+|!Q^?zsASo4RpPm`G|Z-1|*iuJ|I_gQEBbf3%X@A~w%{>RbIulmWl z&u8Q|O><4|M7OlbWZIoj z5%&{f|7@6;lsD#i3%fJ~X*3>dzS1e}CG{~|VD;%g`!+g%3krGYn$CS-(F$(86Xyl? zRV;VW6@R$+j{Op^bf)5u;e{?Q7}Ku_zTR53Li; z)S4K&WM6y!+WS9e?yuz*Sx{YZ@?q=7$G!0`jA0#2d)_w3OT>Szsr#(Q>N@Gz)F*0- z-mQw*rgYumj#iAu(qD-S86JK6c+2Oa0YmJe^}1KH?DX|F%s%?nONZr%X{rGCt`81( zBcl&Yj=1!uC5GR{_lV&xh5+^JufM9^I}_pYN8t14L`kPjA0COT>|4HSNsj5F3Cj}t zCY8$UNzwQdwV@;Oj*{t~fD;f_9SY0wpd^hXLyt$J;toX55 zX}$B0oI(i?iO(%d^@O$dFInw=Ih0-HW^qUA;b1q_Nam+*&YY@3Rt5VxivL)x$vkoD z-uCaSzslFXdw>6!|GlfWd%m1FbYtVM^T7>y%NfG=eC03m$=l_2XUnuOW&f#ck!wQD zMb=GTwj(8RkFMGwXMv39OGhUhm$-8B5W5t6q)13gPs3}+8A%HT7(UhbWq#PD5%6yJ z-HeXk(T13g|WySsQ*X1>CA_?Z& z2Oe$?ZrEO1aQw}+)uJJstC#&O6j{;9aAxEGq=(a41+?1bz4CMoqjctri`atWC zL!Q(-X}JeHx5VQXuE>nN;yC}%)I+7mKhH@mxqfA7@HurBkr|@e5{I`Y6mDRtP>U#< zxR%$lHgHvo;ooz|B!e9fmMPvJ9pMb_?@~Iy(;s>0VfU*ovAg79RHVGa(|MnX=fnjA7ic`c4ev4 z`D$LH?(ef)GrU%&w5H#`v@K1zMt9Qpx1tXp>zaoeSAA|{yk&oR*>AtI7n8XgCm66E z7C6^sy?bWRX$F&HtCZBg%{a{0DQNp4;^dtz-<%cQHY;&O9FAJJEKo{r(xhwVPvjOiH8};#EZlr^^%uJjOMlIsZ>!BeLHj`Q zy`KwZgP+GL|EyM67v0L5&oIkuO$ZOWOBHiXZ~(`~qJGCwiF@W88|hnW{X zo~yjLlRGeFrSF0qdHp;id*>^cVr;zwLy}IveYu#UaB6FpSA4?KAlJ{w4hTj*Zoha{ zKtoKAW3PiVo0t5JTkeMT-xgoiy>(Ceg1g+@*4H1mY+9Z9L!w`2@#eX`CqDm`V!LD< z>9FtkjLo7)UYt2FmwA52LyxaYi>F1;xwp!F^DM?>CYyVG#(|Ga3hps*iF@d>#Icxc z)d*a1Ptr@se3sOtADbEMzrOvQ_P4M2D?>m-XQ}>`iX@S>3hBxvEFU7n9t7-ZaOG$` zxG3bqjlXSSC4!8Hk|hF)k1kd?@%y*R^k-XmzbxC(s&VzxeXYH(HG1cbt!hi$)8q#Gfqv7{<^Dh(hsKo zxb2r8F`qtr^;K~8m4FM=k~!|^Hzd~<`D~mrW#U2x(fisL)AX-D+OK@~EwAL{4TmR5 zxd!*LH;FwHloN>4O%RaCel8ICsv~<5pTaIFjiYC$X(@b|<9wj_UftWim21}vm@_-E z&#_zKzH&)w)T$%CkDc9`z6E>#?h@i!pt5pGSZHBFW$Qi0p9*vDTECiBd^+2Ij?g}b z6M{OEMBBFbt@o9RbzYpKXgIZtwf_CgR^j)Idt4_~iv2sM@Xh%-|Ai%6h5ux%(d;g` z=rGal_Y)mc%}-x{^Ob)381Kw$t$zCJ?H*5tgy0tY>)t0e#!7f;FluLKI-Ta3g!9-F@6mfiaQ*URKBOD`=e&y9DgFFM_yv8ldwQ~%Mf z{--};cl0+&$p!iD)7Flfs;aVUih-%BU{lBY#rgNm&s}2vvWe-;6NQ4b+u9~|$9P}1 z1)grNIo;-T`q`sk-8(ZDEUdi{6k)W1am5{-YgasHS)7?XrTX{N(u5bYCP$rT|0OOp zqdrf%sP9CVp{lCSqIry3hkh+yq_2GX{^6J(2e|tz+j-g!&-mA`+dSu6s+`WhiZxHg zlf3<1;w?>_Cr4g1-Mso!^z3O7I{*27<|Th@xt$Q+tHY!@i+#d2{bgrA#wL}9Z0S** zA`-gJ*wQaQB5+Z7ew0i7zt;Rq^D?F!dexv&zWZLl9>tr75BV>ta(&2mK-$5xMb@Qq z=6mix95!9Aqu<>AyR`T_L-@YO{N+CRwL70|R1iH8VgGYO!AXzTJ_d}t3Y#Jr_~a%_ zJG`7WUtCi1$(@}X8x}3`Sy>;jJK>l=$M?P`VH+Ako>}ySG$;xk=4Oq*yTj#5`Wlh!7D=q*1$bI8A?UySySBW>X z&Y1O8T!$y;o!3j=>|dF?=0203BmU)G;o9UC1u8G|63Xz{T*_Op2bK*y@^Y5Y~82`PCv1M?0aC*y`Zr1a+ zE;%$_@sTq3jI>X^b*t;!#QJ5qxvNh27-%p=e%{voULb)nZfU@#Q*)ZUDmseRuA1qz zF{7!^<^eN@bB}kry2ZV(8M7p{y042((-ZKEd-X5jPsPG@Z_d8B*H{;-2O09Tzv&o)#_J6E5&cT~L+z^$n)Q;TP%-`RIhU-k)#!a{Kna z3$ONZ`TF}`-dFqk#k1evE^l;w9(cWrS4d2yq|rZ9>oM0Q4+iz7RfU{~G6f_zN0{d< z(EYHYjLVW;=E8-2C+4wR@Y;m)7d*Xfzacs6wCSyO_6uy2+PAD;7@%1_>*~{gmo6P$ z=f0}y#g$ZUr+56W6aO+~?2ejoQKUbAOT^1>C*rJ2#cv!97j+hy8rQaM`tSC?$9PQc zs(rp(XUys3urSGH{}=IqdAuKrwQB75@88&-_UI2Y`#1TR{O3N4su?uiyC1pEx>vCF z+sa6<$d25K83Cd?FHQ)2SoG}76pkCBg+_~uSigVRYkpH|`&FZ==RdtW?M=^~Ideg7 z+n-qWzKe6$+P$)UFJ#D*D6aY5zvaWk-^}8j3tBCGdf57G3|bb%E}JmR{J<{NOB;fh z%$sXoES4ab&?5TaOQgnu;(LD|%1)lWe%hfvlf-4G-g3_r%wE6e^_tdJCAnSvdQ*+r zOu9IoPEJkzxW-j`)4$rzpJ7~6t!!4hKCEi|D%KEHR$4iIGJD&j#RmC-<(dmbLK4pY zxxCuVIqK%=Jd58iWjB2HJ!+TReQ3|b#j`ITlIwaI{a7mOkU{>tk_v}%W7jJwi6)X9 zUaPKO%HfRT>eW~ucgC9kiQ?Pp=fCV`8NDvg&0Y6`CGnp9 zT#gH$=N^6b_TjhfMNvO`7Z*p`6$04uuO8#s`@BhY z%c8Jp`>h{7=CUr6SFrley68?&-!?8e9Vu7ELcObXx_gUr+)stSc$uD^@9|Wia^Grh zk2BA&i~Mq*qVq_gH8$`hPrJvy>GS5spQ>!w9NM6Lzwm9}%G~u+rseFA55LO%aq_}{ z{j(TOD0Es!6$&q6d%zdRteW(VV?$boQ5?TE`&I4RhaNn$RC(asajjYT!Rvj(5yx+`lRzI1)ku_Oy*%|LEKkD>f@xJ`jsN}0USN`%heSx1L0$dX!o!d{# z%&B*Oe*5WP!M6_$3g4&9ekK&EXHwv?_I^eNNAkNbg@z0*8+`-k-rHBJ+U~sf+mk0t zIONywE&U&8wX?>WJ16A!-3iL3y%#!fU*is#`pwdy>qQn9Yss-)OZ%=%WG)Z5e{G-N zQmv|=Tej}8JFQq0wvOHZ&hBo<2Rqvs8V=0N4X;)+IA!vEy3C#hu@39@pQ~&>u&Z*Z zWy^lA6H_N@ee_){qrJ7^S(91)f(0QV3Cu3M-QhkHk0;y2ZCQ8!#5Xy&yyF`=4UI0P zw|spO?$%urSl^j;^LhW)psXmx=RFfyX1+f&O+eu~he>RS+@Y6_`pI|C+OkGn6}@-#OP?RrLUm!-LOrs18PS41ZGHR)wkS}mK`w*=VLp-@p0p6(c9DAZwW|gJ1?tt zmT39p3NX~XN!q~i;+tl~YYV&Dl_4iuRrA6Un$n zeYerCtD>=6)^7J$9xds+HCX?Ram?=7%n7#|ULV?Ye#M7Uk!3L!0!JUbf1S;G>(qk} z3pZN+dbD_X#ypYE^f#Q@Up1?aKTC`X(*6CH!SBb8_L*+od6xH<-MV&qWp>HR0&Rs3 zfqyPPE_p0ola$$D=$s`Ta&SV^*JPUsp3-y6)VHUr*Z!aXCduu;!mPaJMP<&7+7C_N z?R;Mq){xG?w0zs%n3$T4%hP<>W>zr!e%*59rG%Y;y%%r#tUl2#6)Lj!3ulF-$TXVF zV0yUu!9&RptsfM56}Mfsc-wK-<%uXm-!6p?`^C?B-M)M}Dmp78-Q=PXn^AEwbI-Z6 zQx0BU`*53UOfARTIezCNI?nC4(tlvnRD5vtX~|saH;dNWS9a|yub8!MTJ)D=zTHc1 zJe_x2vnJvLZ+~y__08+2sa=bRsSAAd|8ugs%Zi0p+)h2RT;e~0abeKOu5TCD>Zr)r zyH8=$l-FjjVhaeHW@fD6xpG;;?Elx~>|Ouz*KV%+efM3cV-MR4CB0OBOAe9`wMuCFkp@ z_Ku9s>AKra%t#Fue=Jb8)%({j)v*6250$-lyzQK9viIrED_cusqYD?DRXnO!`Jb(w zAuwV~)zT>2o}0S_y`+nae;y0@xZ#$;q>icTyS^XjF!toU`8ly%-~^8+za{s}rzRiz z{O2T#F$h@f{d@HmM-tPN5?`$*-QMG2sv<@lU)F6bxe#<+g{x7_dzRX?i+X)G?injE zv8@&_+fmW`dgjL;Q9Ye49YG8nt`R{VFUzl8&6xH0kI(bAn|z9Faar5CIcw}#9zElW z_^fWzz-`#)RJNrc>z;byO}77gTW{GOk2~^PT<5XPz7>%N{DtlITu@e5&-A}v_3C*| zyw$%8PT?yzb^EV9GAAfGD`ri&M)Hz$>C$aUj9i0PPPRz1Ul2&=x(kZq^$$r~H>jm4_ue`W1&Fihn zf0o9-#i@yomt_x?8Q$0ImcI4nK+e72;=lA3^u2q~x3$q}%MDe2vt=(f394?4`MpDU z-;ye^U1^r@>fgF_v*}fHPHh(}-_qgE^}>j`?1pBG+l(V$XR2R`h?wwvp@GV8f##+O zz6MG!Ws-UrPP?ZE-pYF2Cb+Qs_9Y*!s~%=&ZtXR{_Ws9{olOVIYYUD)nU?Kx;nswO zd$W!fIksqR+~Xa%qWit0yQM_;h0wRtCh4{G^EX`Cc;)tShwZm_SN5*IrYfRwGI*0D zW95AL&JXtw9IDZP_wvg;i9YwiBRQ>W zn@IGQZQFH@_$~k7`2NtRx#kmg?0;`i8vjS>RotdYmx{Lg$JZY2%(a-fNKneB!1tzb z;D^*y4Nk2lhaU+JsW(`)`nb8hq*6N#+88Eius^Qso73Er_5Du3{?9SC2a4~1ekgnS z`F^MD?@3S7X0pBWdUI~+w=>#dhfMfh^GsSNyRRtlz{#eN4=SZDb>}^{GA-TssQb(P zMjtZ|>&i{Cn?MoYkcdqW}0#^Pk)B?m|Y~aT%_42HnTL|Ey|Gd-iPQ zxrWyte@>aY*5mGiNT>f`XBz1%0SY9oW7bl$NWOV_NKpZ%-gs{Ms+*W?w}$@F{r zM@Md(%FHvZy6U{f^<9-V=bDsH|I{qC?lpZ^&dynzP^`bag2()f)7^i2HXPntUd2-U zFKYdB*PEYzOfGqFB-6^qZs}j<1@oPAZ%?{w;xYTitu{9HjEagGVQb@jQ}=yWTVCnh z>$xjs$L;2geh<%YGm7oPjlVRfH0&~qUDVZA>ZsR$Nc`9T!%g#bSw!x$ zZD5(5wR>sGgXUJHOzq8v<+|S-a{XjwGnf2jT=K6w#>brgw_}Pk&WD&zk?k zLD|dV`@Fav8sFVuVX@BoGhiy?!k5+B- zpPRo{u3jGgTIkZuH4ojrcJFy2P?lXcEsE#Rfw%qFw7$HaKF57^wRY2|`k)`&Z`u-n z_PQPZzxLe6A1lLL!edKCYkz&zO#Hf`*V{opBRa*AS=mg8?X1%0D=7jq7VciLK-xL* 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 OVDNPHb6Mw<&;$UNKl081 diff --git a/client-app/src/app/component/CheckBrowser.js b/client-app/src/app/component/CheckBrowser.js index 2e10ddf4..abc2228c 100644 --- a/client-app/src/app/component/CheckBrowser.js +++ b/client-app/src/app/component/CheckBrowser.js @@ -18,37 +18,40 @@ define([ name: 'safari', version: 14 },{ - name: 'webkit', - version: 537.36 + name: 'opr', + version: 72 }], - _allowedBots: ['Googlebot', 'bingbot'], + _allowedBots: [ + 'googlebot' + , 'duckduckgo' + , 'bingbot', + , 'slurp' + , 'applebot' + ], isSupported: function() { - var userAgent = navigator && navigator.userAgent, - i; + var userAgent = navigator && navigator.userAgent; - if (userAgent) { - for (i = 0; i < this._allowedBots.length; i++) { - var allowedBotFragment = this._allowedBots[i]; - if (userAgent.indexOf(allowedBotFragment) !== -1) { - return true; - } - } + if (userAgent && this._allowedBots.find(lang.hitch(this, this._findBotAgent, userAgent))) { + return true; } - for (i = 0; i < this._supportedBrowsersAndMinVersion.length; i++) { - var item = this._supportedBrowsersAndMinVersion[i], - name = item.name, - version = item.version; + return !!this._supportedBrowsersAndMinVersion.find(lang.hitch(this, this._findSupportedBrowser)); + }, - if (has(name) >= version) { - return true; - } - } + _findBotAgent: function(userAgent, allowedBotFragment) { + + + return userAgent.toLowerCase().includes(allowedBotFragment); + }, + + _findSupportedBrowser: function(item) { + + var browserVersion = has(item.name); - return false; + return browserVersion && browserVersion >= item.version; } }; }); diff --git a/client-app/src/oldapp/views/templates/NoSupportBrowser.html b/client-app/src/oldapp/views/templates/NoSupportBrowser.html index 42025a71..38c53195 100644 --- a/client-app/src/oldapp/views/templates/NoSupportBrowser.html +++ b/client-app/src/oldapp/views/templates/NoSupportBrowser.html @@ -1,16 +1,16 @@

${i18n.noSupport}

- - + + - - + + - +
-- GitLab From efa904533781b0dc5a54c5b6da42dcf065ce3289 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Mon, 26 Aug 2024 11:05:50 +0100 Subject: [PATCH 114/249] =?UTF-8?q?Recalcula=20tama=C3=B1os=20tras=20inyec?= =?UTF-8?q?tar=20datos=20de=20actividad?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Corrige mal posicionamiento de widgets en vista detalle de actividad, causado por la carga dinámica de datos de sus ancestros sin informar de que ha cambiado el contenido para recalcular. --- client-app/src/detail/activity/ActivityDetailView.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/client-app/src/detail/activity/ActivityDetailView.js b/client-app/src/detail/activity/ActivityDetailView.js index e5d5ce09..2e960b80 100644 --- a/client-app/src/detail/activity/ActivityDetailView.js +++ b/client-app/src/detail/activity/ActivityDetailView.js @@ -129,6 +129,8 @@ define([ data: this._activityData, target: this.infoTarget }); + + this._updateInteractive(); }, _prepareSpatialExtension: function() { -- GitLab From f906f333559c25a887f49b2ce6d964fceec65f4d Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Mon, 26 Aug 2024 12:11:25 +0100 Subject: [PATCH 115/249] =?UTF-8?q?Rastrea=20p=C3=A1ginas=20no=20cargadas?= =?UTF-8?q?=20desde=20App?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Permite cargar cookies inmediatamente e importa el componente necesario para ello en vistas ajenas al componente principal App. Hasta ahora no se registraban las visitas a estas páginas, pero resulta crucial saber cuantos accesos hay a la página de error o navegador no soportado, por ejemplo. --- client-app/src/app/component/CookieLoader.js | 30 +++++++++++-------- client-app/src/oldapp/views/404.js | 21 ++++++++----- .../src/oldapp/views/ActivateAccount.js | 10 +++++-- .../src/oldapp/views/NoSupportBrowser.js | 12 ++++---- 4 files changed, 45 insertions(+), 28 deletions(-) diff --git a/client-app/src/app/component/CookieLoader.js b/client-app/src/app/component/CookieLoader.js index 24ae471b..a20bcf9f 100644 --- a/client-app/src/app/component/CookieLoader.js +++ b/client-app/src/app/component/CookieLoader.js @@ -1,10 +1,10 @@ define([ 'alertify/alertify.min' , 'src/redmicConfig' - , "dojo/_base/declare" - , "dojo/_base/lang" - , "dojo/i18n!app/nls/translation" - , "src/util/Credentials" + , 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'dojo/i18n!app/nls/translation' + , 'src/util/Credentials' ], function( alertify , redmicConfig @@ -12,7 +12,8 @@ define([ , lang , i18n , Credentials -){ +) { + return declare(null, { // summary: // Widget encargado de la carga y aviso de cookies. @@ -23,15 +24,17 @@ define([ // Retraso para mostrar el aviso de cookies. // hideTimeout: Integer // Retraso para ocultar el aviso de cookies. + // omitWarning: Boolean + // Procede a cargar las cookies sin preguntar, para casos donde es indispensable. // warningText: String // Contenido a mostrar en el aviso de cookies. - constructor: function(args) { this.config = { showTimeout: 500, hideTimeout: 14500, + omitWarning: false, warningText: ' ' + i18n.cookiesWarning + '' + i18n.here + '.' @@ -48,13 +51,13 @@ define([ // tags: // private - if (!Credentials.has("cookiesAccepted")) { - this._onCookiesAcceptedHandler = Credentials.on("changed:cookiesAccepted", lang.hitch(this, + if (this.omitWarning || Credentials.has('cookiesAccepted')) { + this._loadCookies(); + } else { + this._onCookiesAcceptedHandler = Credentials.on('changed:cookiesAccepted', lang.hitch(this, this._loadCookies)); this._showWarning(); - } else { - this._loadCookies(); } }, @@ -67,7 +70,7 @@ define([ this._showTimeoutHandler = setTimeout(lang.hitch(this, function() { // Si pasa el tiempo de la alerta o le hacemos click, aceptamos // TODO pasar a notification - this._cookiesNotificationHandler = alertify.notify(this.warningText, "message", this.hideTimeout / 1000, + this._cookiesNotificationHandler = alertify.notify(this.warningText, 'message', this.hideTimeout / 1000, lang.hitch(this, this._acceptCookies)); }), this.showTimeout); }, @@ -78,7 +81,7 @@ define([ // tags: // private - Credentials.set("cookiesAccepted", "true"); + Credentials.set('cookiesAccepted', 'true'); }, _loadCookies: function() { @@ -91,7 +94,8 @@ define([ this._onCookiesAcceptedHandler && this._onCookiesAcceptedHandler.remove(); this._cookiesNotificationHandler && this._cookiesNotificationHandler.dismiss(); - if (window.location.hostname.indexOf('redmic.es') !== -1) { + var isProduction = (/true/i).test(redmicConfig.getEnvVariableValue('envProduction')); + if (isProduction) { this._googleAnalytics(); } }, diff --git a/client-app/src/oldapp/views/404.js b/client-app/src/oldapp/views/404.js index bfb0a858..fc077bc6 100644 --- a/client-app/src/oldapp/views/404.js +++ b/client-app/src/oldapp/views/404.js @@ -1,24 +1,31 @@ define([ - "dijit/form/Button" + 'dijit/form/Button' , 'dojo/_base/declare' + , 'src/app/component/CookieLoader' - , "dojo/domReady!" + , 'dojo/domReady!' ], function( Button , declare -){ + , CookieLoader +) { + return declare(null, { constructor: function() { new Button({ - 'class': "primary", - label: "Go back", + 'class': 'primary', + label: 'Go back', onClick: function() { - window.location = "/"; + location.href = '/'; } - }).placeAt("goBack"); + }).placeAt('goBack'); + + new CookieLoader({ + omitWarning: true + }); } }); }); diff --git a/client-app/src/oldapp/views/ActivateAccount.js b/client-app/src/oldapp/views/ActivateAccount.js index 35cb0470..bdfb286f 100644 --- a/client-app/src/oldapp/views/ActivateAccount.js +++ b/client-app/src/oldapp/views/ActivateAccount.js @@ -3,12 +3,14 @@ define([ , 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/request' + , 'src/app/component/CookieLoader' , 'src/util/RedmicLocalStorage' ], function( redmicConfig , declare , lang , request + , CookieLoader , RedmicLocalStorage ) { @@ -22,6 +24,10 @@ define([ token: this.token }; + new CookieLoader({ + omitWarning: true + }); + this._activateAccount(data); }, @@ -59,12 +65,12 @@ define([ _goBack: function() { - window.location = '/'; + location.href = '/'; }, _goError: function() { - window.location = '/404'; + location.href = '/404'; } }); }); diff --git a/client-app/src/oldapp/views/NoSupportBrowser.js b/client-app/src/oldapp/views/NoSupportBrowser.js index c0efe526..151d2ae6 100644 --- a/client-app/src/oldapp/views/NoSupportBrowser.js +++ b/client-app/src/oldapp/views/NoSupportBrowser.js @@ -6,6 +6,7 @@ define([ , "dojo/_base/lang" , "dojo/text!./templates/NoSupportBrowser.html" , "dojo/i18n!./nls/translation" + , 'src/app/component/CookieLoader' ], function( _TemplatedMixin , _WidgetBase @@ -14,6 +15,7 @@ define([ , lang , template , i18n + , CookieLoader ){ return declare([_WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin], { // summary: @@ -26,7 +28,7 @@ define([ // Html template obtenido de la variable template ["dojo/text!./templates/NoSupportBrowser.html"] - constructor: function (args) { + constructor: function(args) { this.config = { templateString: template, @@ -34,12 +36,10 @@ define([ }; lang.mixin(this, this.config, args); - }, - postCreate: function() { - - this.inherited(arguments); + new CookieLoader({ + omitWarning: true + }); } - }); }); -- GitLab From 6095491d72ba7e7c2c16a9b182c5e860b09c12f0 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Mon, 26 Aug 2024 13:01:48 +0100 Subject: [PATCH 116/249] Retoca vistas especiales y reubica elementos MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reubica utilidades CookieLoader y CheckBrowser, ya que no eran componentes ni se usan sólo desde el componente App. Corrige dependencias de CheckBrowser. Controla error producido por la devolución de indefinido en App cuando se comprueba que el navegador no está soportado. Devuelve declare vacío en su lugar para evitarlo. Actualiza vista de NoSupportBrowser y elimina su plantilla y traducciones propias, simplificando su gestión. Elimina vista de UnderConstructionView, ya que no se utiliza. --- client-app/app.profile.js | 1 - client-app/src/app/App.js | 10 ++-- .../app/{component => util}/CheckBrowser.js | 6 +- client-app/src/oldapp/nls/es/translation.js | 2 +- client-app/src/oldapp/nls/translation.js | 2 +- client-app/src/oldapp/views/404.js | 2 +- .../src/oldapp/views/ActivateAccount.js | 2 +- .../src/oldapp/views/NoSupportBrowser.js | 56 ++++++++++--------- .../src/oldapp/views/UnderConstructionView.js | 34 ----------- .../src/oldapp/views/nls/es/translation.js | 3 - .../src/oldapp/views/nls/translation.js | 7 --- .../views/templates/NoSupportBrowser.html | 17 ------ .../{app/component => util}/CookieLoader.js | 0 13 files changed, 43 insertions(+), 99 deletions(-) rename client-app/src/app/{component => util}/CheckBrowser.js (95%) delete mode 100644 client-app/src/oldapp/views/UnderConstructionView.js delete mode 100644 client-app/src/oldapp/views/nls/es/translation.js delete mode 100644 client-app/src/oldapp/views/nls/translation.js delete mode 100644 client-app/src/oldapp/views/templates/NoSupportBrowser.html rename client-app/src/{app/component => util}/CookieLoader.js (100%) diff --git a/client-app/app.profile.js b/client-app/app.profile.js index 5b612609..ca32beec 100644 --- a/client-app/app.profile.js +++ b/client-app/app.profile.js @@ -400,7 +400,6 @@ var viewLayers = { , 'app/views/404': {} , 'app/views/ActivateAccount': {} , 'app/views/NoSupportBrowser': {} - , 'app/views/UnderConstructionView': {} , 'app/home/views/HomeView': {} diff --git a/client-app/src/app/App.js b/client-app/src/app/App.js index 5f0f8c7a..28366c2c 100644 --- a/client-app/src/app/App.js +++ b/client-app/src/app/App.js @@ -5,8 +5,6 @@ define([ , 'dojo/has' , 'put-selector/put' , 'src/app/component/Analytics' - , 'src/app/component/CheckBrowser' - , 'src/app/component/CookieLoader' , 'src/app/component/Credentials' , 'src/app/component/ExternalConfig' , 'src/app/component/layout/InnerLayoutImpl' @@ -15,12 +13,14 @@ define([ , 'src/app/component/meta/MetaTags' , 'src/app/component/ModuleStore' , 'src/app/component/Router' + , 'src/app/util/CheckBrowser' , 'src/component/notification/CommunicationCenter' , 'src/component/notification/Alert' , 'src/component/base/_Module' , 'src/component/base/_Store' , 'src/component/store/RestManagerImpl' , 'src/redmicConfig' + , 'src/util/CookieLoader' , 'templates/LoadingCustom' ], function( declare @@ -29,8 +29,6 @@ define([ , has , put , Analytics - , CheckBrowser - , CookieLoader , Credentials , ExternalConfig , InnerLayoutImpl @@ -39,12 +37,14 @@ define([ , MetaTags , ModuleStore , Router + , CheckBrowser , CommunicationCenter , Alert , _Module , _Store , RestManagerImpl , redmicConfig + , CookieLoader , LoadingCustomTemplate ) { @@ -74,7 +74,7 @@ define([ hideNativeLoadingNode(); getGlobalContext().location.href = '/noSupportBrowser'; - return; + return declare(null); } return declare(_Module, { diff --git a/client-app/src/app/component/CheckBrowser.js b/client-app/src/app/util/CheckBrowser.js similarity index 95% rename from client-app/src/app/component/CheckBrowser.js rename to client-app/src/app/util/CheckBrowser.js index abc2228c..f6c144e1 100644 --- a/client-app/src/app/component/CheckBrowser.js +++ b/client-app/src/app/util/CheckBrowser.js @@ -1,7 +1,9 @@ define([ - 'dojo/sniff' + 'dojo/_base/lang' + , 'dojo/sniff' ], function( - has + lang + , has ) { return { diff --git a/client-app/src/oldapp/nls/es/translation.js b/client-app/src/oldapp/nls/es/translation.js index 8ab8bce3..e6bb5038 100644 --- a/client-app/src/oldapp/nls/es/translation.js +++ b/client-app/src/oldapp/nls/es/translation.js @@ -11,7 +11,6 @@ define({ , "closeActivityConfirmationTitle": "Confirmación de cierre de actividad" , "closeActivityConfirmationMessage": "¿Desea establecer como cerrada esta actividad?" , "viewDocument": "Ver documento" - , "underConstruction": "En construcción" , "notFound": "Cero coincidencias" , "layers": "Capas" , "services": "Servicios" @@ -24,6 +23,7 @@ define({ , "parentalTaxon": "Taxón parental" , "legend": "Leyenda" , "noAssociatedDocuments": "Sin documentos asociados" + , "noSupport": "Por favor, actualice su navegador a una versión más reciente" , "registeredTask1": "Su tarea " , "registeredTask2": " se ha registrado." diff --git a/client-app/src/oldapp/nls/translation.js b/client-app/src/oldapp/nls/translation.js index 0a651e5d..41a2ae2f 100644 --- a/client-app/src/oldapp/nls/translation.js +++ b/client-app/src/oldapp/nls/translation.js @@ -12,7 +12,6 @@ define({ , "closeActivityConfirmationTitle": "Activity closing confirmation" , "closeActivityConfirmationMessage": "Do you want to set this activity as closed?" , "viewDocument": "View document" - , "underConstruction": "Under construction" , "notFound": "No matches" , "layers": "Layers" , "services": "Services" @@ -25,6 +24,7 @@ define({ , "parentalTaxon": "Parental taxon" , "legend": "Legend" , "noAssociatedDocuments": "No associated documents" + , "noSupport": "Please, update your browser to a newer version" , "registeredTask1": "Your task " , "registeredTask2": " has been recorded." diff --git a/client-app/src/oldapp/views/404.js b/client-app/src/oldapp/views/404.js index fc077bc6..823ce0a1 100644 --- a/client-app/src/oldapp/views/404.js +++ b/client-app/src/oldapp/views/404.js @@ -1,7 +1,7 @@ define([ 'dijit/form/Button' , 'dojo/_base/declare' - , 'src/app/component/CookieLoader' + , 'src/util/CookieLoader' , 'dojo/domReady!' ], function( diff --git a/client-app/src/oldapp/views/ActivateAccount.js b/client-app/src/oldapp/views/ActivateAccount.js index bdfb286f..84d1bc05 100644 --- a/client-app/src/oldapp/views/ActivateAccount.js +++ b/client-app/src/oldapp/views/ActivateAccount.js @@ -3,7 +3,7 @@ define([ , 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/request' - , 'src/app/component/CookieLoader' + , 'src/util/CookieLoader' , 'src/util/RedmicLocalStorage' ], function( redmicConfig diff --git a/client-app/src/oldapp/views/NoSupportBrowser.js b/client-app/src/oldapp/views/NoSupportBrowser.js index 151d2ae6..6bd2ab15 100644 --- a/client-app/src/oldapp/views/NoSupportBrowser.js +++ b/client-app/src/oldapp/views/NoSupportBrowser.js @@ -1,45 +1,49 @@ define([ - "dijit/_TemplatedMixin" - , "dijit/_WidgetBase" - , "dijit/_WidgetsInTemplateMixin" - , "dojo/_base/declare" - , "dojo/_base/lang" - , "dojo/text!./templates/NoSupportBrowser.html" - , "dojo/i18n!./nls/translation" - , 'src/app/component/CookieLoader' + 'dijit/_WidgetBase' + , 'dojo/_base/declare' + , 'dojo/i18n!app/nls/translation' + , 'put-selector/put' + , 'src/util/CookieLoader' ], function( - _TemplatedMixin - , _WidgetBase - , _WidgetsInTemplateMixin + _WidgetBase , declare - , lang - , template , i18n + , put , CookieLoader -){ - return declare([_WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin], { +) { + + return declare(_WidgetBase, { // summary: // Widget para cuando el navegador no soporta la aplicación. // // description: // Contiene enlace a la actualización de los navegadores - // templateString: [readonly const] String - // Html template obtenido de la variable template ["dojo/text!./templates/NoSupportBrowser.html"] + constructor: function() { + new CookieLoader({ + omitWarning: true + }); + }, - constructor: function(args) { + postCreate: function() { - this.config = { - templateString: template, - i18n: i18n - }; + this.inherited(arguments); - lang.mixin(this, this.config, args); + var containerNode = put(this.domNode, 'div.fHeight.fWidth.noSupport'); + put(containerNode, 'h2.textNoSupport.titleRedmic', i18n.noSupport); - new CookieLoader({ - omitWarning: true - }); + var firefoxNode = put(containerNode, 'a[href="https://www.mozilla.org/firefox/"][target="_blank"]'); + put(firefoxNode, 'img.iconMargin[src="/res/images/browsers/firefox.png"]'); + + var chromeNode = put(containerNode, 'a[href="https://www.google.com/chrome/"][target="_blank"]'); + put(chromeNode, 'img.iconMargin[src="/res/images/browsers/chrome.png"]'); + + var edgeNode = put(containerNode, 'a[href="https://www.microsoft.com/edge/download/"][target="_blank"]'); + put(edgeNode, 'img.iconMargin[src="/res/images/browsers/edge.png"]'); + + var operaNode = put(containerNode, 'a[href="http://www.opera.com/"][target="_blank"]'); + put(operaNode, 'img.iconMargin[src="/res/images/browsers/opera.png"]'); } }); }); diff --git a/client-app/src/oldapp/views/UnderConstructionView.js b/client-app/src/oldapp/views/UnderConstructionView.js deleted file mode 100644 index b1e63838..00000000 --- a/client-app/src/oldapp/views/UnderConstructionView.js +++ /dev/null @@ -1,34 +0,0 @@ -define([ - "dojo/_base/declare" - , "dojo/_base/lang" - , "put-selector/put" -], function( - declare - , lang - , put -){ - return declare(null, { - // summary: - // Placeholder para vistas pendientes por hacer. - - // title: String - // Título de la vista. - - constructor: function(args) { - - this.config = { - title: this.i18n.underConstruction, - 'class': "underConstructionContainer" - }; - - lang.mixin(this, this.config, args); - }, - - postCreate: function() { - - put(this.domNode, "span.fa.fa-wrench.hatchElement"); - put(this.domNode, "span.expandingOpenElement", this.i18n.underConstruction); - } - - }); -}); diff --git a/client-app/src/oldapp/views/nls/es/translation.js b/client-app/src/oldapp/views/nls/es/translation.js deleted file mode 100644 index 249b655c..00000000 --- a/client-app/src/oldapp/views/nls/es/translation.js +++ /dev/null @@ -1,3 +0,0 @@ -define({ - "noSupport": "Por favor, actualice su navegador a una versión más reciente" -}); \ No newline at end of file diff --git a/client-app/src/oldapp/views/nls/translation.js b/client-app/src/oldapp/views/nls/translation.js deleted file mode 100644 index a3f8ca0e..00000000 --- a/client-app/src/oldapp/views/nls/translation.js +++ /dev/null @@ -1,7 +0,0 @@ -define({ - root: { - "noSupport": "Please, update your browser to a newer version" - }, - - es: true -}); \ No newline at end of file diff --git a/client-app/src/oldapp/views/templates/NoSupportBrowser.html b/client-app/src/oldapp/views/templates/NoSupportBrowser.html deleted file mode 100644 index 38c53195..00000000 --- a/client-app/src/oldapp/views/templates/NoSupportBrowser.html +++ /dev/null @@ -1,17 +0,0 @@ -
-
-

${i18n.noSupport}

- - - - - - - - - - - - -
-
diff --git a/client-app/src/app/component/CookieLoader.js b/client-app/src/util/CookieLoader.js similarity index 100% rename from client-app/src/app/component/CookieLoader.js rename to client-app/src/util/CookieLoader.js -- GitLab From 4d08186b74e7cda7f267e7198abe9a04877c28b7 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Mon, 26 Aug 2024 13:27:17 +0100 Subject: [PATCH 117/249] =?UTF-8?q?Reubica=20p=C3=A1ginas=20de=20error=20y?= =?UTF-8?q?=20activar=20cuenta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client-app/app.profile.js | 7 ++++--- client-app/src/{oldapp/views => error}/404.js | 0 client-app/src/{oldapp/views => error}/NoSupportBrowser.js | 0 client-app/src/{oldapp/views => user}/ActivateAccount.js | 0 server-app/views/404.pug | 2 +- server-app/views/activateAccount.pug | 2 +- server-app/views/noSupportBrowser.pug | 2 +- 7 files changed, 7 insertions(+), 6 deletions(-) rename client-app/src/{oldapp/views => error}/404.js (100%) rename client-app/src/{oldapp/views => error}/NoSupportBrowser.js (100%) rename client-app/src/{oldapp/views => user}/ActivateAccount.js (100%) diff --git a/client-app/app.profile.js b/client-app/app.profile.js index ca32beec..4c9a4147 100644 --- a/client-app/app.profile.js +++ b/client-app/app.profile.js @@ -397,9 +397,10 @@ var profileObj = { var viewLayers = { 'src/app/App': {} - , 'app/views/404': {} - , 'app/views/ActivateAccount': {} - , 'app/views/NoSupportBrowser': {} + , 'src/error/404': {} + , 'src/error/NoSupportBrowser': {} + + , 'src/user/ActivateAccount': {} , 'app/home/views/HomeView': {} diff --git a/client-app/src/oldapp/views/404.js b/client-app/src/error/404.js similarity index 100% rename from client-app/src/oldapp/views/404.js rename to client-app/src/error/404.js diff --git a/client-app/src/oldapp/views/NoSupportBrowser.js b/client-app/src/error/NoSupportBrowser.js similarity index 100% rename from client-app/src/oldapp/views/NoSupportBrowser.js rename to client-app/src/error/NoSupportBrowser.js diff --git a/client-app/src/oldapp/views/ActivateAccount.js b/client-app/src/user/ActivateAccount.js similarity index 100% rename from client-app/src/oldapp/views/ActivateAccount.js rename to client-app/src/user/ActivateAccount.js diff --git a/server-app/views/404.pug b/server-app/views/404.pug index 99767fdb..2b6cf867 100644 --- a/server-app/views/404.pug +++ b/server-app/views/404.pug @@ -9,7 +9,7 @@ block error404 script. require([ - 'app/views/404' + 'src/error/404' ], function( View ){ diff --git a/server-app/views/activateAccount.pug b/server-app/views/activateAccount.pug index 836d1345..e0e894c5 100644 --- a/server-app/views/activateAccount.pug +++ b/server-app/views/activateAccount.pug @@ -5,7 +5,7 @@ block root script. require([ - 'app/views/ActivateAccount' + 'src/user/ActivateAccount' ], function( ActivateAccount ) { diff --git a/server-app/views/noSupportBrowser.pug b/server-app/views/noSupportBrowser.pug index a94bde1a..f2a12775 100644 --- a/server-app/views/noSupportBrowser.pug +++ b/server-app/views/noSupportBrowser.pug @@ -5,7 +5,7 @@ block root script. require([ - 'app/views/NoSupportBrowser' + 'src/error/NoSupportBrowser' ], function( NoSupportBrowser ) { -- GitLab From a87a60e52f4e894ac3493e55a47f8e31d5f0ee7c Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Mon, 26 Aug 2024 14:57:25 +0100 Subject: [PATCH 118/249] =?UTF-8?q?Estiliza=20opciones=20y=20evita=20autos?= =?UTF-8?q?elecci=C3=B3n=20de=20secci=C3=B3n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Permite el paso de un valor específico para que SelectImpl lo use como etiqueta del valor vacío. Añade valor vacío con etiqueta personalizada al selector de secciones de la vista detalle. Impide que se autoseleccione la primera opción del selector de secciones al revisitar la vista detalle de actividad. --- client-app/src/component/form/form/Select.js | 4 +-- .../src/component/form/input/SelectImpl.js | 3 +- .../designs/details/_AddWidgetSelector.js | 34 +++++++++++++------ client-app/src/oldapp/nls/es/translation.js | 2 ++ client-app/src/oldapp/nls/translation.js | 2 ++ client-app/src/user/ActivateAccount.js | 4 +++ 6 files changed, 35 insertions(+), 14 deletions(-) diff --git a/client-app/src/component/form/form/Select.js b/client-app/src/component/form/form/Select.js index 1122d25b..519bd7be 100644 --- a/client-app/src/component/form/form/Select.js +++ b/client-app/src/component/form/form/Select.js @@ -14,11 +14,11 @@ define([ // Widget para sobreescribir dijit/form/Select. // description: // Cambiamos la plantilla para dejar de usar tablas y demás morralla. - // + // // Author: Pedro E. Trujillo Brito //
// Last update: 26/11/2014 - Pedro - // + // // config: Object // Opciones y asignaciones por defecto. diff --git a/client-app/src/component/form/input/SelectImpl.js b/client-app/src/component/form/input/SelectImpl.js index ed403117..dde706e1 100644 --- a/client-app/src/component/form/input/SelectImpl.js +++ b/client-app/src/component/form/input/SelectImpl.js @@ -38,6 +38,7 @@ define([ labelKeyPropertyName: "labelKey", propertyName: "name", includeEmptyValue: true, + emptyValueLabel: ' ', resetValue: false, pathSeparator: '.', _items: {} @@ -195,7 +196,7 @@ define([ if (this.includeEmptyValue) { options.push({ value: null, - label: ' ', + label: this.emptyValueLabel, selected: true }); } diff --git a/client-app/src/oldapp/designs/details/_AddWidgetSelector.js b/client-app/src/oldapp/designs/details/_AddWidgetSelector.js index 4f34b521..573ac038 100644 --- a/client-app/src/oldapp/designs/details/_AddWidgetSelector.js +++ b/client-app/src/oldapp/designs/details/_AddWidgetSelector.js @@ -25,7 +25,6 @@ define([ lang.mixin(this, this.config, args); - aspect.after(this, '_generateWidgets', lang.hitch(this, this._afterGenerateWidgetsAddSelector)); aspect.after(this, '_addWidget', lang.hitch(this, this._afterAddWidgetUpdateSelector)); aspect.after(this, '_addDataInTitle', lang.hitch(this, this._afterAddDataInTitleShowSelector)); aspect.after(this, '_onLayoutComplete', lang.hitch(this, this._afterLayoutCompleteApplyAnchor)); @@ -33,11 +32,6 @@ define([ lang.hitch(this, this._afterControllerOrAncestorShownUpdateSelectorInstance)); }, - _afterGenerateWidgetsAddSelector: function() { - - this._addWidgetsToSelector(); - }, - _afterAddWidgetUpdateSelector: function(retValue, params) { this._addWidgetToSelector(params[0]); @@ -79,12 +73,12 @@ define([ this._widgetSelector = new SelectImpl({ parentChannel: this.getChannel(), - includeEmptyValue: false, - _inputProps: { - options: this._widgetKeys - } + includeEmptyValue: true, + emptyValueLabel: '< ' + this.i18n.noSectionFocused + ' >' }); + this._setWidgetKeysAsSelectorOptions(); + this._setSubscription({ channel: this._widgetSelector.getChannel('VALUE_CHANGED'), callback: lang.hitch(this, this._onWidgetSelectorValueChanged) @@ -116,11 +110,29 @@ define([ this._widgetKeys.push(key); + this._setWidgetKeysAsSelectorOptions(); + }, + + _setWidgetKeysAsSelectorOptions: function() { + + var selectorOptions = this._widgetKeys.map(lang.hitch(this, this._getWidgetOptionObject)); + this._publish(this._widgetSelector.getChannel('SET_OPTIONS'), { - options: this._widgetKeys + options: selectorOptions }); }, + _getWidgetOptionObject: function(widgetKey) { + + var widgetInstance = this._getWidgetInstance(widgetKey), + widgetLabel = (widgetInstance && widgetInstance.get('title')) || this.i18n[widgetKey]; + + return { + value: widgetKey, + label: widgetLabel || widgetKey + }; + }, + _onWidgetSelectorValueChanged: function(res) { var value = res.value || ''; diff --git a/client-app/src/oldapp/nls/es/translation.js b/client-app/src/oldapp/nls/es/translation.js index e6bb5038..2add64ea 100644 --- a/client-app/src/oldapp/nls/es/translation.js +++ b/client-app/src/oldapp/nls/es/translation.js @@ -1335,6 +1335,8 @@ define({ , "leafletForwardButton": "Avanzar en el historial de localizaciones" , "leafletBackButton": "Retroceder en el historial de localizaciones" + , "noSectionFocused": "Sin sección enfocada" + // Meta-tags , "metaDefaultTitle": "Repositorio de Datos Marinos Integrados de Canarias" , "metaDefaultDescription": "REDMIC es una infraestructura de datos marinos de caracter público, que ofrece información sobre el medio biofísico marino de Canarias" diff --git a/client-app/src/oldapp/nls/translation.js b/client-app/src/oldapp/nls/translation.js index 41a2ae2f..5c597774 100644 --- a/client-app/src/oldapp/nls/translation.js +++ b/client-app/src/oldapp/nls/translation.js @@ -1339,6 +1339,8 @@ define({ , "leafletForwardButton": "Go forward in location history" , "leafletBackButton": "Go back in location history" + , "noSectionFocused": "No section focused" + // Meta-tags , "metaDefaultTitle": "Repositorio de Datos Marinos Integrados de Canarias" , "metaDefaultDescription": "REDMIC is a public marine data infrastructure that offers information on the marine biophysical environment of the Canary Islands" diff --git a/client-app/src/user/ActivateAccount.js b/client-app/src/user/ActivateAccount.js index 84d1bc05..aab5fac6 100644 --- a/client-app/src/user/ActivateAccount.js +++ b/client-app/src/user/ActivateAccount.js @@ -14,6 +14,10 @@ define([ , RedmicLocalStorage ) { + // TODO falta aquí solamente por quitar 'dojo/request', el resto se han centralizado en RestManagerImpl. Se podrá + // quitar cuando esto se convierta en una View y se gestione igual que otras vistas de 'src/user/', en lugar de + // gestionar por ruta separada y capturar el valor del token desde plantilla pug + return declare(null, { constructor: function(args) { -- GitLab From 4083edfc6c9dc27f60a9a205768be713192f83e7 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Tue, 27 Aug 2024 07:50:38 +0100 Subject: [PATCH 119/249] Elimina coma duplicada --- client-app/src/app/util/CheckBrowser.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client-app/src/app/util/CheckBrowser.js b/client-app/src/app/util/CheckBrowser.js index f6c144e1..6aeb6bbb 100644 --- a/client-app/src/app/util/CheckBrowser.js +++ b/client-app/src/app/util/CheckBrowser.js @@ -27,7 +27,7 @@ define([ _allowedBots: [ 'googlebot' , 'duckduckgo' - , 'bingbot', + , 'bingbot' , 'slurp' , 'applebot' ], -- GitLab From 37e22eea86ed81e869f794c614385376bf70aff9 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Thu, 29 Aug 2024 13:26:38 +0100 Subject: [PATCH 120/249] =?UTF-8?q?Revisa=20l=C3=B3gica=20de=20dise=C3=B1o?= =?UTF-8?q?=20de=20details=20y=20selector?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cambia traducción de valor vacío del selector de contenido. Refactoriza y limpia el código del controlador del diseño de vista detalle, controlando mejor los eventos y las llamadas a recalcular el layout. Comienza sin transiciones y se aplican cuando ya se han colocado inicialmente los contenidos, para evitar desplazamientos extraños al aplicar anchors. --- .../src/oldapp/designs/details/Controller.js | 129 ++++++++++-------- .../designs/details/_AddWidgetSelector.js | 23 +++- client-app/src/oldapp/nls/es/translation.js | 2 +- client-app/src/oldapp/nls/translation.js | 2 +- .../src/oldapp/viewers/views/TrashCharts.js | 2 +- 5 files changed, 99 insertions(+), 59 deletions(-) diff --git a/client-app/src/oldapp/designs/details/Controller.js b/client-app/src/oldapp/designs/details/Controller.js index 60dfff3d..085ce2fd 100644 --- a/client-app/src/oldapp/designs/details/Controller.js +++ b/client-app/src/oldapp/designs/details/Controller.js @@ -52,7 +52,8 @@ define([ _heightFitContentValue: 'fitContent', _rowsParameterName: "data-rows", _colsParameterName: "data-cols", - _updateInteractiveTimeout: 100, + _transitionDuration: '0.4s', + _restoreTransitionTimeout: 500, _widgets: {}, _nodes: {}, @@ -90,7 +91,8 @@ define([ _initializeController: function() { this.packery = new packery(this.centerNode, { - isInitLayout: false + initLayout: false, + transitionDuration: 0 }); }, @@ -112,7 +114,7 @@ define([ if (!this._widgetsAlreadyGenerated) { this._generateWidgets(); - this._buildVisualization().then(lang.hitch(this, this._updateInteractive)); + this._buildVisualization().then(lang.hitch(this, this._afterBuildVisualization)); } }, @@ -155,9 +157,15 @@ define([ return this._showWidget(key, true); }, + _afterBuildVisualization: function() { + + this._reloadInteractive(); + this._updateInteractive(); + }, + _onControllerResize: function() { - this._getShown() && this._updateInteractive(); + this._updateInteractive(); }, _onButtonEvent: function(evt) { @@ -167,20 +175,8 @@ define([ this[methodName] && this[methodName](evt); }, - /*_onControllerShown: function() { - - if (this._getShown()) { - this._reloadInteractive(); - this._updateInteractive(); - } - - this._clearModules(); - this._refreshModules(); - },*/ - _reloadInteractive: function() { - this.packery.layout(); this.packery.reloadItems(); }, @@ -194,10 +190,8 @@ define([ _onControllerMeOrAncestorShown: function(res) { - if (this._getShown()) { - this._reloadInteractive(); - this._updateInteractive(); - } + this._reloadInteractive(); + this._updateInteractive(); this._clearModules(); this._refreshModules(); @@ -208,15 +202,21 @@ define([ this._clearModules(); }, - /*_getModuleRootNode: function() { + _prepareRestorePackeryTransitionDuration: function() { - return this.containerNode; + if (this.packery.options.transitionDuration === this._transitionDuration) { + return; + } + + clearTimeout(this._restoreTransitionTimeoutHandler); + this._restoreTransitionTimeoutHandler = setTimeout(lang.hitch(this, this._restorePackeryTransitionDuration), + this._restoreTransitionTimeout); }, - _getModuleMainNode: function() { + _restorePackeryTransitionDuration: function() { - return this.centerNode; - },*/ + this.packery.options.transitionDuration = this._transitionDuration; + }, _evaluateCondition: function(condition) { // TODO: eso es para casos concretos (botones), debería separarse @@ -269,7 +269,12 @@ define([ this._setSubscription({ channel: widgetInstance.getChannel("RESIZED"), - callback: "_subModuleResized" + callback: "_subWidgetResized" + }); + + this._setSubscription({ + channel: widgetInstance.getChannel("HIDDEN"), + callback: "_subWidgetHidden" }); }, @@ -304,15 +309,7 @@ define([ var dfd = new Deferred(); - this._once(instance.getChannel("SHOWN"), lang.hitch(this, function(args) { - - put(args.node, "!" + this.hiddenClass); - this._addWidgetInteractivity(args.key); - args.dfd.resolve(); - if (!args.omitReload) { - this._reloadInteractive(); - } - }, { + this._once(instance.getChannel("SHOWN"), lang.hitch(this, this._onceWidgetShown, { key: key, node: node, dfd: dfd, @@ -326,7 +323,20 @@ define([ return dfd; }, - _hideWidget: function(key, omitReload) { + _onceWidgetShown: function(args) { + + put(args.node, "!" + this.hiddenClass); + this._addWidgetInteractivity(args.key); + + args.dfd.resolve(); + + if (!args.omitReload) { + this._updateInteractive(); + this._reloadInteractive(); + } + }, + + _hideWidget: function(key) { var instance = this._getWidgetInstance(key), node = this._nodes[key]; @@ -336,19 +346,6 @@ define([ return; } - this._once(instance.getChannel("HIDDEN"), lang.hitch(this, function(args) { - - put(args.node, "." + this.hiddenClass); - this._removeWidgetInteractivity(args.key); - if (!args.omitReload) { - this._reloadInteractive(); - } - }, { - key: key, - node: node, - omitReload: omitReload - })); - this._publish(instance.getChannel("HIDE"), { node: node }); @@ -426,16 +423,40 @@ define([ delete this._nodesHandlers[key]; }, - _subModuleResized: function() { + _getWidgetKeyByChannel: function(widgetChannel) { + + for (var widgetKey in this._widgets) { + if (this._widgets[widgetKey].getChannel() === widgetChannel) { + return widgetKey; + } + } + + console.error('Tried to get key for non-existent widget channel "%s"', widgetChannel); + }, + + _subWidgetResized: function(res) { + + this._updateInteractive(); + }, + + _subWidgetHidden: function(res, channelObj) { + var widgetChannel = channelObj._parent.namespace, + widgetKey = this._getWidgetKeyByChannel(widgetChannel), + widgetNode = this._nodes[widgetKey]; + + put(widgetNode, '.' + this.hiddenClass); + this._removeWidgetInteractivity(widgetKey); this._updateInteractive(); }, _updateInteractive: function() { - clearTimeout(this._updateInteractiveTimeoutHandler); - this._updateInteractiveTimeoutHandler = setTimeout(lang.hitch(this.packery, this.packery.layout), - this._updateInteractiveTimeout); + if (!this._getShown()) { + return; + } + + this.packery.layout(); }, _onLayoutComplete: function(laidOutItems) { @@ -451,7 +472,7 @@ define([ this._emitEvt("RESIZE"); } - //this._emitEvt("LOADED"); + this._prepareRestorePackeryTransitionDuration(); }, _reportClicked: function() { diff --git a/client-app/src/oldapp/designs/details/_AddWidgetSelector.js b/client-app/src/oldapp/designs/details/_AddWidgetSelector.js index 573ac038..5f911816 100644 --- a/client-app/src/oldapp/designs/details/_AddWidgetSelector.js +++ b/client-app/src/oldapp/designs/details/_AddWidgetSelector.js @@ -20,7 +20,8 @@ define([ this.config = { _widgetSelector: null, - widgetSelectorClass: 'detailWidgetSelector' + widgetSelectorClass: 'detailWidgetSelector', + _restoreTransitionWithSelectorTimeout: 2000 }; lang.mixin(this, this.config, args); @@ -28,6 +29,8 @@ define([ aspect.after(this, '_addWidget', lang.hitch(this, this._afterAddWidgetUpdateSelector)); aspect.after(this, '_addDataInTitle', lang.hitch(this, this._afterAddDataInTitleShowSelector)); aspect.after(this, '_onLayoutComplete', lang.hitch(this, this._afterLayoutCompleteApplyAnchor)); + aspect.before(this, '_prepareRestorePackeryTransitionDuration', + lang.hitch(this, this._beforePrepareRestoreTransitionUpdateTimeout)); aspect.after(this, '_onControllerMeOrAncestorShown', lang.hitch(this, this._afterControllerOrAncestorShownUpdateSelectorInstance)); }, @@ -42,6 +45,16 @@ define([ this._showWidgetSelector(); }, + _beforePrepareRestoreTransitionUpdateTimeout: function() { + + if (!location.hash || this._restoreTransitionTimeoutUpdated) { + return; + } + + this._restoreTransitionTimeout = this._restoreTransitionWithSelectorTimeout; + this._restoreTransitionTimeoutUpdated = true; + }, + _afterLayoutCompleteApplyAnchor: function() { this._applyCurrentAnchor(); @@ -61,6 +74,12 @@ define([ var hash = location.hash; location.hash = ''; location.hash = hash; + + if (this._widgetSelector) { + this._publish(this._widgetSelector.getChannel('SET_VALUE'), { + name: hash.substring(1) + }); + } }, _addWidgetsToSelector: function() { @@ -74,7 +93,7 @@ define([ this._widgetSelector = new SelectImpl({ parentChannel: this.getChannel(), includeEmptyValue: true, - emptyValueLabel: '< ' + this.i18n.noSectionFocused + ' >' + emptyValueLabel: '' + this.i18n.noFixedContent + '' }); this._setWidgetKeysAsSelectorOptions(); diff --git a/client-app/src/oldapp/nls/es/translation.js b/client-app/src/oldapp/nls/es/translation.js index 2add64ea..b02ca4de 100644 --- a/client-app/src/oldapp/nls/es/translation.js +++ b/client-app/src/oldapp/nls/es/translation.js @@ -1335,7 +1335,7 @@ define({ , "leafletForwardButton": "Avanzar en el historial de localizaciones" , "leafletBackButton": "Retroceder en el historial de localizaciones" - , "noSectionFocused": "Sin sección enfocada" + , "noFixedContent": "Sin contenido fijado" // Meta-tags , "metaDefaultTitle": "Repositorio de Datos Marinos Integrados de Canarias" diff --git a/client-app/src/oldapp/nls/translation.js b/client-app/src/oldapp/nls/translation.js index 5c597774..b28b2ced 100644 --- a/client-app/src/oldapp/nls/translation.js +++ b/client-app/src/oldapp/nls/translation.js @@ -1339,7 +1339,7 @@ define({ , "leafletForwardButton": "Go forward in location history" , "leafletBackButton": "Go back in location history" - , "noSectionFocused": "No section focused" + , "noFixedContent": "No fixed content" // Meta-tags , "metaDefaultTitle": "Repositorio de Datos Marinos Integrados de Canarias" diff --git a/client-app/src/oldapp/viewers/views/TrashCharts.js b/client-app/src/oldapp/viewers/views/TrashCharts.js index a4e3c9bc..0afaa03a 100644 --- a/client-app/src/oldapp/viewers/views/TrashCharts.js +++ b/client-app/src/oldapp/viewers/views/TrashCharts.js @@ -178,7 +178,7 @@ define([ if (this._lastDataLength && this._lastDataLength > data.length) { for (i = data.length; i < this._lastDataLength; i++) { widgetKey = "multiPieChartContainer" + i; - this._hideWidget(widgetKey, true); + this._hideWidget(widgetKey); this._disconnectWidget(widgetKey); } -- GitLab From 547ab2219962b2416c4c1c7e2dbb8f703e682504 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Thu, 29 Aug 2024 13:31:13 +0100 Subject: [PATCH 121/249] =?UTF-8?q?Actualiza=20subm=C3=B3dulo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client-app/style | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client-app/style b/client-app/style index 284fcacf..281ad85f 160000 --- a/client-app/style +++ b/client-app/style @@ -1 +1 @@ -Subproject commit 284fcacf34e1ae3ce63f2f687148dbb339904d38 +Subproject commit 281ad85fdb8c0cd065d5e303fa45f54da71009ac -- GitLab From 90270504e941b39007ad140d54137aa83af217a8 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Tue, 3 Sep 2024 09:32:12 +0100 Subject: [PATCH 122/249] =?UTF-8?q?Corrige=20t=C3=ADtulos=20de=20widgets?= =?UTF-8?q?=20de=20detalle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Emplea propiedades diferentes para definir el identificador y la clave de traducción (o valor traducido) del título de cada widget (_Window). De esta manera, no hay conflictos entre aquellos que se configuran usando la clave y los que reciben directamente valores traducidos. Ahora las propiedades que deben recibir los widget para controlar esto son 'title' y 'windowKey'. En caso de no definirse, la vista de detalle se encarga de aplicarlas usando como valor su clave correspondiente dentro del objeto de configuraciones de widgets. Aplica valor resuelto al atributo this.windowTitle de cada widget cuando se evalua. El selector de contenido pregunta ahora por la propiedad 'windowTitle' a cada widget para etiquetar sus opciones. Fix #92. --- client-app/src/component/base/_Window.js | 24 +++++++---------- client-app/src/detail/_WidgetDefinition.js | 26 +++++++++---------- client-app/src/home/HomeView.js | 14 +++++----- .../src/oldapp/designs/details/Controller.js | 12 ++++----- .../designs/details/_AddWidgetSelector.js | 2 +- 5 files changed, 37 insertions(+), 41 deletions(-) diff --git a/client-app/src/component/base/_Window.js b/client-app/src/component/base/_Window.js index 53e67ccf..9e18524f 100644 --- a/client-app/src/component/base/_Window.js +++ b/client-app/src/component/base/_Window.js @@ -390,14 +390,16 @@ define([ _getWindowTitleIdValue: function() { - return this.windowTitle || this.getOwnChannel(); + return this.windowId || this.getOwnChannel(); }, - _getWindowTitleTextValue: function() { + _getWindowTitleTextValue: function(newValue) { - var windowTitle = this.windowTitle || this.getOwnChannel(); + var windowTitle = newValue || this.windowTitle || this.title || this._getWindowTitleIdValue(); - return this.i18n[windowTitle] || this.title || this.getOwnChannel(); + this.windowTitle = this.i18n[windowTitle] || windowTitle; + + return this.windowTitle; }, _createWindowButtons: function() { @@ -643,22 +645,16 @@ define([ this._updateWindowTitleValue(this.title); }, - _onWindowTitlePropSet: function() { - - var windowId = this._getWindowTitleIdValue(); - domAttr.set(this._windowNode, 'id', windowId); - - this._updateWindowTitleValue(this._getWindowTitleTextValue()); - }, - _updateWindowTitleValue: function(newValue) { + var titleTextValue = this._getWindowTitleTextValue(newValue); + if (this.omitTitleBar) { return; } - domAttr.set(this._windowTitleTextNode, 'title', newValue); - this._windowTitleTextNode.innerHTML = newValue; + domAttr.set(this._windowTitleTextNode, 'title', titleTextValue); + this._windowTitleTextNode.innerHTML = titleTextValue; } }; }); diff --git a/client-app/src/detail/_WidgetDefinition.js b/client-app/src/detail/_WidgetDefinition.js index 36a765b7..89adf621 100644 --- a/client-app/src/detail/_WidgetDefinition.js +++ b/client-app/src/detail/_WidgetDefinition.js @@ -75,7 +75,7 @@ define([ height: 4, type: declare([ListImpl, _Framework, _ButtonsInRow]), props: { - title: this.i18n.organisations, + title: 'organisations', target: this.organisationTarget, template: TemplateOrganisation, bars: [{ @@ -103,7 +103,7 @@ define([ height: 4, type: declare([ListImpl, _Framework, _ButtonsInRow]), props: { - title: this.i18n.platforms, + title: 'platforms', target: this.platformTarget, template: TemplatePlatform, bars: [{ @@ -131,7 +131,7 @@ define([ height: 4, type: declare([ListImpl, _Framework]), props: { - title: this.i18n.contacts, + title: 'contacts', target: this.contactTarget, template: TemplateContacts, bars: [{ @@ -148,7 +148,7 @@ define([ height: 4, type: declare([ListImpl, _Framework, _ButtonsInRow]), props: { - title: this.i18n.documents, + title: 'documents', target: this.documentTarget, template: TemplateDocuments, bars: [{ @@ -213,7 +213,7 @@ define([ height: config.height || 'fitContent', type: TemplateDisplayer, props: { - title: this.i18n.info, + title: 'info', template: config.template, 'class': 'containerDetails', classEmptyTemplate: 'contentListNoData', @@ -232,7 +232,7 @@ define([ hidden: true, type: declare([LeafletImpl, _ImportWkt]), props: { - title: this.i18n.spatialExtension, + title: 'spatialExtension', omitContainerSizeCheck: true, maxZoom: 15, coordinatesViewer: false, @@ -251,7 +251,7 @@ define([ height: 6, type: ActivityCitationMapBase, props: { - windowTitle: 'citations', + title: 'citations', pathVariableId: this._activityData.id } }; @@ -264,7 +264,7 @@ define([ height: 6, type: ActivityLayerMapBase, props: { - windowTitle: 'layers', + title: 'layers', pathVariableId: this._activityData.id } }; @@ -277,7 +277,7 @@ define([ height: 6, type: ActivityTrackingMap, props: { - windowTitle: 'tracking', + title: 'tracking', pathVariableId: this._activityData.id } }; @@ -290,7 +290,7 @@ define([ height: 6, type: ActivityInfrastructureMapBase, props: { - windowTitle: 'infrastructures', + title: 'infrastructures', pathVariableId: this._activityData.id } }; @@ -303,7 +303,7 @@ define([ height: 6, type: ActivityAreaMapBase, props: { - windowTitle: 'area', + title: 'area', pathVariableId: this._activityData.id } }; @@ -316,7 +316,7 @@ define([ height: 6, type: ActivityFixedTimeseriesMap, props: { - windowTitle: 'associatedSurveyStation', + title: 'associatedSurveyStation', pathVariableId: this._activityData.id } }; @@ -329,7 +329,7 @@ define([ height: 6, type: ActivityFixedTimeseriesChart, props: { - windowTitle: 'charts', + title: 'charts', pathVariableId: this._activityData.id, timeseriesDataChannel: this._getWidgetInstance(mapKey).getChannel('TIMESERIES_DATA') } diff --git a/client-app/src/home/HomeView.js b/client-app/src/home/HomeView.js index 391566c4..5db9de13 100644 --- a/client-app/src/home/HomeView.js +++ b/client-app/src/home/HomeView.js @@ -79,7 +79,7 @@ define([ height: 4, type: SearchFastFilterWidget, props: { - windowTitle: 'fastFilters', + title: 'fastFilters', omitTitleCloseButton: true, facetsSearchConfig: { query: { @@ -98,7 +98,7 @@ define([ type: SearchResultsWidget, props: { queryChannel: 'stub', - windowTitle: 'starredActivities', + title: 'starredActivities', omitTitleCloseButton: true } }, @@ -107,7 +107,7 @@ define([ height: 2, type: TemplateDisplayer, props: { - windowTitle: 'info', + title: 'info', template: TemplateInfo, 'class': 'mediumSolidContainer.borderRadiusBottom', target: 'initial_info' @@ -118,7 +118,7 @@ define([ height: 6, type: ProductWidget, props: { - windowTitle: 'products' + title: 'products' } }, stats: { @@ -126,7 +126,7 @@ define([ height: 3, type: StatsWidget, props: { - windowTitle: 'statistics' + title: 'statistics' } }, social: { @@ -134,7 +134,7 @@ define([ height: 1, type: SocialWidget, props: { - windowTitle: 'followUs' + title: 'followUs' } } }; @@ -168,7 +168,7 @@ define([ this._once(addedToQueryChannel, lang.hitch(this, function() { this._publish(this._getWidgetInstance('searchResults').getChannel('SET_PROPS'), { - windowTitle: 'searchResults' + title: 'searchResults' }); })); })); diff --git a/client-app/src/oldapp/designs/details/Controller.js b/client-app/src/oldapp/designs/details/Controller.js index 085ce2fd..16751501 100644 --- a/client-app/src/oldapp/designs/details/Controller.js +++ b/client-app/src/oldapp/designs/details/Controller.js @@ -246,15 +246,15 @@ define([ return; } - var moduleProps = this._merge([ - this.propsWidget || {}, - config.props || {}, - { + var moduleProps = this._merge([{ ownChannel: key, parentChannel: this.getChannel(), - windowTitle: key, + windowId: key, + title: key, fitHeightToContent: config.height === this._heightFitContentValue - } + }, + this.propsWidget || {}, + config.props || {} ]); var moduleType = config.type, diff --git a/client-app/src/oldapp/designs/details/_AddWidgetSelector.js b/client-app/src/oldapp/designs/details/_AddWidgetSelector.js index 5f911816..425c2529 100644 --- a/client-app/src/oldapp/designs/details/_AddWidgetSelector.js +++ b/client-app/src/oldapp/designs/details/_AddWidgetSelector.js @@ -144,7 +144,7 @@ define([ _getWidgetOptionObject: function(widgetKey) { var widgetInstance = this._getWidgetInstance(widgetKey), - widgetLabel = (widgetInstance && widgetInstance.get('title')) || this.i18n[widgetKey]; + widgetLabel = (widgetInstance && widgetInstance.get('windowTitle')) || this.i18n[widgetKey]; return { value: widgetKey, -- GitLab From ad21583104cfac1255c334452daa83d3f708a2e2 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Tue, 3 Sep 2024 10:50:37 +0100 Subject: [PATCH 123/249] =?UTF-8?q?Corrige=20m=C3=A1s=20t=C3=ADtulos=20y?= =?UTF-8?q?=20traducciones=20de=20widgets?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client-app/src/detail/_WidgetDefinition.js | 2 +- .../src/detail/activity/ActivityDetailView.js | 12 ++++++------ client-app/src/detail/program/ProgramDetailView.js | 2 +- client-app/src/detail/project/ProjectDetailView.js | 2 +- .../designs/details/main/ActivityLayerMap.js | 2 +- .../src/oldapp/designs/details/main/ActivityMap.js | 2 +- .../src/oldapp/designs/details/main/Document.js | 2 +- .../src/oldapp/designs/details/main/Platform.js | 2 +- .../src/oldapp/designs/details/main/ServiceOGC.js | 14 +++++++------- .../src/oldapp/designs/details/main/Species.js | 2 +- .../oldapp/designs/details/main/SpeciesLocation.js | 2 +- .../src/oldapp/designs/details/main/Statistics.js | 2 +- .../oldapp/designs/details/main/_DetailsBase.js | 2 +- .../src/oldapp/details/views/ActivityChart.js | 2 +- .../src/oldapp/maintenance/views/DomainView.js | 8 ++++---- client-app/src/oldapp/nls/es/translation.js | 1 + client-app/src/oldapp/nls/translation.js | 1 + .../src/oldapp/user/views/UserProfileView.js | 4 ++-- .../oldapp/viewers/views/RealTimeDashboardView.js | 2 +- client-app/src/oldapp/viewers/views/TrashCharts.js | 2 +- client-app/src/oldapp/viewers/views/TrashInfo.js | 6 +++--- 21 files changed, 38 insertions(+), 36 deletions(-) diff --git a/client-app/src/detail/_WidgetDefinition.js b/client-app/src/detail/_WidgetDefinition.js index 89adf621..cdee3b93 100644 --- a/client-app/src/detail/_WidgetDefinition.js +++ b/client-app/src/detail/_WidgetDefinition.js @@ -224,7 +224,7 @@ define([ }; }, - _getSpatialExtensionMapConfig: function(config) { + _getSpatialExtensionConfig: function(config) { return { width: 3, diff --git a/client-app/src/detail/activity/ActivityDetailView.js b/client-app/src/detail/activity/ActivityDetailView.js index 2e960b80..c2f8be20 100644 --- a/client-app/src/detail/activity/ActivityDetailView.js +++ b/client-app/src/detail/activity/ActivityDetailView.js @@ -59,7 +59,7 @@ define([ info: this._getInfoConfig({ template: TemplateInfo }), - spatialExtensionMap: this._getSpatialExtensionMapConfig(), + spatialExtension: this._getSpatialExtensionConfig(), organisationList: this._getOrganisationsConfig(), platformList: this._getPlatformsConfig(), contactList: this._getContactsConfig(), @@ -140,15 +140,15 @@ define([ return; } - var mapInstance = this._getWidgetInstance('spatialExtensionMap'); + var mapInstance = this._getWidgetInstance('spatialExtension'); this._once(mapInstance.getChannel('BBOX_CHANGED'), lang.hitch(this, this._showSpatialExtension, wkt)); - this._showWidget('spatialExtensionMap'); + this._showWidget('spatialExtension'); }, _showSpatialExtension: function(wkt) { - var mapInstance = this._getWidgetInstance('spatialExtensionMap'); + var mapInstance = this._getWidgetInstance('spatialExtension'); this._once(mapInstance.getChannel('WKT_ADDED'), lang.hitch(this, function(res) { @@ -164,14 +164,14 @@ define([ _onActivityDetailsHidden: function() { if (this._lastWktLayer) { - var mapInstance = this._getWidgetInstance('spatialExtensionMap'); + var mapInstance = this._getWidgetInstance('spatialExtension'); this._publish(mapInstance.getChannel('REMOVE_LAYER'), { layer: this._lastWktLayer }); } - this._hideWidget('spatialExtensionMap'); + this._hideWidget('spatialExtension'); this._removeCustomWidgets(); } diff --git a/client-app/src/detail/program/ProgramDetailView.js b/client-app/src/detail/program/ProgramDetailView.js index f7fd0776..99fbfe99 100644 --- a/client-app/src/detail/program/ProgramDetailView.js +++ b/client-app/src/detail/program/ProgramDetailView.js @@ -55,7 +55,7 @@ define([ target: this.target[0] }), projectList: this._getActivitiesOrProjectsConfig({ - title: this.i18n.projects, + title: 'projects', target: this.activityTarget, template: TemplateProjects, href: redmicConfig.viewPaths.projectDetails, diff --git a/client-app/src/detail/project/ProjectDetailView.js b/client-app/src/detail/project/ProjectDetailView.js index df157f9c..1e577183 100644 --- a/client-app/src/detail/project/ProjectDetailView.js +++ b/client-app/src/detail/project/ProjectDetailView.js @@ -55,7 +55,7 @@ define([ target: this.target[0] }), activityList: this._getActivitiesOrProjectsConfig({ - title: this.i18n.activities, + title: 'activities', target: this.activityTarget, template: TemplateActivities, href: redmicConfig.viewPaths.activityDetails, diff --git a/client-app/src/oldapp/designs/details/main/ActivityLayerMap.js b/client-app/src/oldapp/designs/details/main/ActivityLayerMap.js index ea083d00..3a03f554 100644 --- a/client-app/src/oldapp/designs/details/main/ActivityLayerMap.js +++ b/client-app/src/oldapp/designs/details/main/ActivityLayerMap.js @@ -44,7 +44,7 @@ define([ height: 6, type: Geographic, props: { - title: this.i18n.map, + title: 'map', target: this.targetChange, classWindowContent: "view", notTextSearch: true, diff --git a/client-app/src/oldapp/designs/details/main/ActivityMap.js b/client-app/src/oldapp/designs/details/main/ActivityMap.js index 1c5c6e6d..b3c12a1c 100644 --- a/client-app/src/oldapp/designs/details/main/ActivityMap.js +++ b/client-app/src/oldapp/designs/details/main/ActivityMap.js @@ -49,7 +49,7 @@ define([ height: 6, type: Geographic, props: { - title: this.i18n.map, + title: 'map', target: this.targetChange, classWindowContent: "view", filterConfig: { diff --git a/client-app/src/oldapp/designs/details/main/Document.js b/client-app/src/oldapp/designs/details/main/Document.js index d215a62b..b330307f 100644 --- a/client-app/src/oldapp/designs/details/main/Document.js +++ b/client-app/src/oldapp/designs/details/main/Document.js @@ -63,7 +63,7 @@ define([ hidden: true, type: DocumentPDF, props: { - title: this.i18n.document, + title: 'document', pathVariableId: this.pathVariableId } } diff --git a/client-app/src/oldapp/designs/details/main/Platform.js b/client-app/src/oldapp/designs/details/main/Platform.js index 954fa53f..53dd8f1a 100644 --- a/client-app/src/oldapp/designs/details/main/Platform.js +++ b/client-app/src/oldapp/designs/details/main/Platform.js @@ -51,7 +51,7 @@ define([ height: 2, type: declare([ListImpl, _Framework]), props: { - title: this.i18n.contacts, + title: 'contacts', target: this.contactTarget, template: TemplateContacts, bars: [{ diff --git a/client-app/src/oldapp/designs/details/main/ServiceOGC.js b/client-app/src/oldapp/designs/details/main/ServiceOGC.js index bb46c9de..e7bae7c5 100644 --- a/client-app/src/oldapp/designs/details/main/ServiceOGC.js +++ b/client-app/src/oldapp/designs/details/main/ServiceOGC.js @@ -71,7 +71,7 @@ define([ height: 6, type: TemplateDisplayer, props: { - title: this.i18n.sourceInfo, + title: 'sourceInfo', template: TemplateSourceInfo, target: this.sourceInfoLayerTarget, "class": "containerDetails", @@ -83,16 +83,16 @@ define([ activityList: { height: 3, props: { - title: this.i18n.dataSource, + title: 'dataSource', target: this.activityLocalTarget } }, - spatialExtensionMap: { + spatialExtension: { width: 3, height: 3, type: LeafletImpl, props: { - title: this.i18n.geograficFrame, + title: 'geograficFrame', omitContainerSizeCheck: true, maxZoom: 15, coordinatesViewer: false, @@ -107,7 +107,7 @@ define([ height: 4, type: TemplateDisplayer, props: { - title: this.i18n.legend, + title: 'legend', template: TemplateImage, "class": "imageContainer", target: this.atlasTarget, @@ -119,7 +119,7 @@ define([ _publishMapBox: function(action, obj) { - this._publish(this._getWidgetInstance('spatialExtensionMap').getChannel(action), obj); + this._publish(this._getWidgetInstance('spatialExtension').getChannel(action), obj); }, _clearModules: function() { @@ -230,7 +230,7 @@ define([ this.layer = new WmsLayerImpl({ parentChannel: this.getChannel(), - mapChannel: this._getWidgetInstance('spatialExtensionMap').getChannel(), + mapChannel: this._getWidgetInstance('spatialExtension').getChannel(), layerDefinition: layerDefinition }); diff --git a/client-app/src/oldapp/designs/details/main/Species.js b/client-app/src/oldapp/designs/details/main/Species.js index 8d6c71be..b3e0b084 100644 --- a/client-app/src/oldapp/designs/details/main/Species.js +++ b/client-app/src/oldapp/designs/details/main/Species.js @@ -86,7 +86,7 @@ define([ height: 4, type: SpeciesLocation, props: { - title: this.i18n.location, + title: 'location', pathVariableId: this.pathVariableId } } diff --git a/client-app/src/oldapp/designs/details/main/SpeciesLocation.js b/client-app/src/oldapp/designs/details/main/SpeciesLocation.js index 85df4c12..a5b293fe 100644 --- a/client-app/src/oldapp/designs/details/main/SpeciesLocation.js +++ b/client-app/src/oldapp/designs/details/main/SpeciesLocation.js @@ -70,7 +70,7 @@ define([ height: 6, type: declare([LeafletImpl, _PlaceNamesButton]), props: { - title: this.i18n.map, + title: 'map', omitContainerSizeCheck: true } } diff --git a/client-app/src/oldapp/designs/details/main/Statistics.js b/client-app/src/oldapp/designs/details/main/Statistics.js index 2ad89cb8..c91faadf 100644 --- a/client-app/src/oldapp/designs/details/main/Statistics.js +++ b/client-app/src/oldapp/designs/details/main/Statistics.js @@ -59,7 +59,7 @@ define([ height: 6, type: declare([ListImpl, _ButtonsInRow]), props: { - title: this.i18n.administrative, + title: 'administrative', target: this.targetBrowser, //template: TemplateList, template: TemplateTitle, diff --git a/client-app/src/oldapp/designs/details/main/_DetailsBase.js b/client-app/src/oldapp/designs/details/main/_DetailsBase.js index db0d1211..dae7c6e9 100644 --- a/client-app/src/oldapp/designs/details/main/_DetailsBase.js +++ b/client-app/src/oldapp/designs/details/main/_DetailsBase.js @@ -45,7 +45,7 @@ define([ target: this.target[0] }), activityList: this._getActivitiesOrProjectsConfig({ - title: this.i18n.activities, + title: 'activities', target: this.activityTarget, template: TemplateActivities, href: this.viewPathsWidgets.activities diff --git a/client-app/src/oldapp/details/views/ActivityChart.js b/client-app/src/oldapp/details/views/ActivityChart.js index 421a12c4..9bc1208c 100644 --- a/client-app/src/oldapp/details/views/ActivityChart.js +++ b/client-app/src/oldapp/details/views/ActivityChart.js @@ -50,7 +50,7 @@ define([ height: 6, type: [ChartsWithLegendAndToolbarsAndSlider, _ProcessDataDefinitionAndGetTimeSeries], props: { - title: this.i18n.chart, + title: 'chart', target: this.target, filterConfig: { initQuery: { diff --git a/client-app/src/oldapp/maintenance/views/DomainView.js b/client-app/src/oldapp/maintenance/views/DomainView.js index 0bd3d740..6ebf497e 100644 --- a/client-app/src/oldapp/maintenance/views/DomainView.js +++ b/client-app/src/oldapp/maintenance/views/DomainView.js @@ -32,7 +32,7 @@ define([ height: 3, type: _ViewListBase, props: { - title: this.i18n.administrative, + title: 'administrative', "class": "containerDetails", items: { catergoryId: 109, @@ -46,7 +46,7 @@ define([ height: 3, type: _ViewListBase, props: { - title: this.i18n.speciesAndTaxonomy, + title: 'speciesAndTaxonomy', "class": "containerDetails", items: { catergoryId: 110, @@ -59,7 +59,7 @@ define([ height: 3, type: _ViewListBase, props: { - title: this.i18n.dataAndObservations, + title: 'dataAndObservations', "class": "containerDetails", items: { catergoryId: 111, @@ -73,7 +73,7 @@ define([ height: 3, type: _ViewListBase, props: { - title: this.i18n.geometryAndClassifications, + title: 'geometryAndClassifications', "class": "containerDetails", items: { catergoryId: 112, diff --git a/client-app/src/oldapp/nls/es/translation.js b/client-app/src/oldapp/nls/es/translation.js index b02ca4de..47503918 100644 --- a/client-app/src/oldapp/nls/es/translation.js +++ b/client-app/src/oldapp/nls/es/translation.js @@ -1,5 +1,6 @@ define({ "ok": "Aceptar" + , "userData": "Datos de usuario" , "cancel": "Cancelar" , "nextStep": "Siguiente" , "prevStep": "Anterior" diff --git a/client-app/src/oldapp/nls/translation.js b/client-app/src/oldapp/nls/translation.js index b28b2ced..351f3646 100644 --- a/client-app/src/oldapp/nls/translation.js +++ b/client-app/src/oldapp/nls/translation.js @@ -1,6 +1,7 @@ define({ root: { "ok": "Agree" + , "userData": "User data" , "cancel": "Cancel" , "nextStep": "Next" , "prevStep": "Previous" diff --git a/client-app/src/oldapp/user/views/UserProfileView.js b/client-app/src/oldapp/user/views/UserProfileView.js index 57055ba1..5d6ff73e 100644 --- a/client-app/src/oldapp/user/views/UserProfileView.js +++ b/client-app/src/oldapp/user/views/UserProfileView.js @@ -100,7 +100,7 @@ define([ height: 3, type: TemplateDisplayer, props: { - title: this.i18n.image, + title: 'image', template: TemplateImage, "class": "imageContainer.imageContainerEdit", target: this.target, @@ -112,7 +112,7 @@ define([ height: 3, type: declare([ListImpl, _ButtonsInRow, _MultiTemplate]), props: { - title: "Datos de usuario", + title: "userData", target: this.target, idProperty: "dataType", rowConfig: { diff --git a/client-app/src/oldapp/viewers/views/RealTimeDashboardView.js b/client-app/src/oldapp/viewers/views/RealTimeDashboardView.js index 7fa8f361..bcc379ec 100644 --- a/client-app/src/oldapp/viewers/views/RealTimeDashboardView.js +++ b/client-app/src/oldapp/viewers/views/RealTimeDashboardView.js @@ -91,7 +91,7 @@ define([ height: 5, type: TemplateDisplayer, props: { - title: this.i18n.info, + title: 'info', template: RealTimeInfo, "class": "containerDetails", classEmptyTemplate: "contentListNoData", diff --git a/client-app/src/oldapp/viewers/views/TrashCharts.js b/client-app/src/oldapp/viewers/views/TrashCharts.js index 0afaa03a..46cd24df 100644 --- a/client-app/src/oldapp/viewers/views/TrashCharts.js +++ b/client-app/src/oldapp/viewers/views/TrashCharts.js @@ -229,7 +229,7 @@ define([ _ProcessDataDefinitionAndGetTimeSeries ]), props: { - title: this.i18n.collectedItems, + title: 'collectedItems', parentChannel: this.getChannel(), target: redmicConfig.services.objectCollectingSeriesTemporalData, intervalLabelKey: this._intervalLabelKey, diff --git a/client-app/src/oldapp/viewers/views/TrashInfo.js b/client-app/src/oldapp/viewers/views/TrashInfo.js index 0c1ac34b..1ca0c626 100644 --- a/client-app/src/oldapp/viewers/views/TrashInfo.js +++ b/client-app/src/oldapp/viewers/views/TrashInfo.js @@ -54,7 +54,7 @@ define([ height: 2, type: TemplateDisplayer, props: { - title: this.i18n.site, + title: 'site', template: SiteInfoTemplate, "class": "containerDetails", target: this.siteInfoTarget @@ -65,7 +65,7 @@ define([ height: 4, type: declare([HierarchicalImpl, _MultiTemplate]), props: { - title: this.i18n.measurements, + title: 'measurements', target: this.measurementListTarget, typeGroupProperty: this.typeGroupProperty } @@ -75,7 +75,7 @@ define([ height: 6, type: TemplateDisplayer, props: { - title: this.i18n.activity, + title: 'activity', "class": "containerDetails", target: this.activityInfoTarget, template: ActivityInfoTemplate -- GitLab From afbe35a4501fce0399a0f916bbed59aab834977d Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Wed, 4 Sep 2024 08:46:46 +0100 Subject: [PATCH 124/249] Corrige minimizado de widgets sin scroll MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit En lugar de actuar sobre la altura del nodo del componente, cuando se minimiza un widget ahora se actúa sobre el nodo del contenido de la ventana, sobre la que sí se están escuchando eventos para informar al nivel superior de la redimensión. --- client-app/src/component/base/_Window.js | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/client-app/src/component/base/_Window.js b/client-app/src/component/base/_Window.js index 9e18524f..685d97dc 100644 --- a/client-app/src/component/base/_Window.js +++ b/client-app/src/component/base/_Window.js @@ -154,12 +154,10 @@ define([ _createWindowContent: function() { - var contentClass = this.windowContentClass, - contentHeightReduction = this.titleHeight; + var contentClass = this.windowContentClass; if (this.omitTitleBar) { contentClass += '.' + this.windowWithoutTitleContentClass; - contentHeightReduction = 0; } if (this.classWindowContent) { @@ -168,8 +166,14 @@ define([ this._windowContentNode = put(this._windowNode, 'div.' + contentClass); - var contentHeight = 'calc(100% - ' + contentHeightReduction + 'rem)'; - domStyle.set(this._windowContentNode, 'height', contentHeight); + domStyle.set(this._windowContentNode, 'height', this._getWindowContentHeight()); + }, + + _getWindowContentHeight: function() { + + var contentHeightReduction = this.omitTitleBar ? 0 : this.titleHeight; + + return 'calc(100% - ' + contentHeightReduction + 'rem)'; }, _addNodeListeners: function() { @@ -431,7 +435,7 @@ define([ this._prevMinimizeWindowHeight = this._windowNode.clientHeight; - domStyle.set(this._moduleOwnNode, 'height', 0); + domStyle.set(this._windowContentNode, 'height', 0); domStyle.set(this._windowNode.parentNode, 'height', this.titleHeight + 'rem'); }, @@ -443,7 +447,7 @@ define([ this._minimizeButton.onclick = lang.hitch(this, this._minimizeModule); } - domStyle.set(this._moduleOwnNode, 'height', null); + domStyle.set(this._windowContentNode, 'height', this._getWindowContentHeight()); var prevHeight = this._prevMinimizeWindowHeight ? this._prevMinimizeWindowHeight + 'px' : null; domStyle.set(this._windowNode.parentNode, 'height', prevHeight); -- GitLab From 65f20ab3938f2a1d6910e66363af25022c397327 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Thu, 5 Sep 2024 09:49:21 +0100 Subject: [PATCH 125/249] Corrige enfoque de contenido sin guardar historial MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Evita la generación de estados en el historial del navegador con cada cambio de enfoque de contenido. En lugar de actualizar la ruta de la ubicación actual para enfocar, se edita el último estado del historial (para reflejarlo en la caja de URL del navegador) y se enfoca al elemento mediante código, además con efecto de movimiento suave. Esto mejora lo implementado para #92. --- client-app/src/app/component/Router.js | 5 +-- .../designs/details/_AddWidgetSelector.js | 42 +++++++++++++------ 2 files changed, 31 insertions(+), 16 deletions(-) diff --git a/client-app/src/app/component/Router.js b/client-app/src/app/component/Router.js index 11efee44..76b67616 100644 --- a/client-app/src/app/component/Router.js +++ b/client-app/src/app/component/Router.js @@ -244,10 +244,7 @@ define([ _removeQueryParametersFromHref: function() { var locationObj = this.globalContext.location, - locationPort = locationObj.port, - isNotStandardPort = locationPort !== '80', - hrefPort = isNotStandardPort ? (':' + locationPort) : '', - href = locationObj.protocol + '//' + locationObj.hostname + hrefPort + locationObj.pathname + locationObj.hash; + href = locationObj.origin + locationObj.pathname + locationObj.hash; this.globalContext.history.replaceState(null, null, href); } diff --git a/client-app/src/oldapp/designs/details/_AddWidgetSelector.js b/client-app/src/oldapp/designs/details/_AddWidgetSelector.js index 425c2529..2e531fae 100644 --- a/client-app/src/oldapp/designs/details/_AddWidgetSelector.js +++ b/client-app/src/oldapp/designs/details/_AddWidgetSelector.js @@ -65,21 +65,27 @@ define([ this._addWidgetsToSelector(); }, - _applyCurrentAnchor: function() { + _applyHrefValueWithoutHistory: function(hrefValue) { - if (!location.hash) { - return; - } + history.replaceState(null, null, hrefValue); + }, + + _getHrefWithoutHashValue: function() { + + return location.origin + location.pathname + location.search; + }, + + _applyCurrentAnchor: function() { var hash = location.hash; - location.hash = ''; - location.hash = hash; - if (this._widgetSelector) { - this._publish(this._widgetSelector.getChannel('SET_VALUE'), { - name: hash.substring(1) - }); + if (!hash || !this._widgetSelector) { + return; } + + this._publish(this._widgetSelector.getChannel('SET_VALUE'), { + name: hash.substring(1) + }); }, _addWidgetsToSelector: function() { @@ -154,9 +160,21 @@ define([ _onWidgetSelectorValueChanged: function(res) { - var value = res.value || ''; + var value = res.value, + newHref = this._getHrefWithoutHashValue(); - location.href = '#' + value; + if (!value) { + this._applyHrefValueWithoutHistory(newHref); + return; + } + + var newAnchor = '#' + value; + + this._applyHrefValueWithoutHistory(newHref + newAnchor); + + document.querySelector(newAnchor).scrollIntoView({ + behavior: 'smooth' + }); } }); }); -- GitLab From 50d5a0dde8a829b34c3657f4941021a843718a72 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Thu, 5 Sep 2024 10:08:37 +0100 Subject: [PATCH 126/249] Controla enfoque de contenido no disponible --- .../src/oldapp/designs/details/_AddWidgetSelector.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/client-app/src/oldapp/designs/details/_AddWidgetSelector.js b/client-app/src/oldapp/designs/details/_AddWidgetSelector.js index 2e531fae..98e02c44 100644 --- a/client-app/src/oldapp/designs/details/_AddWidgetSelector.js +++ b/client-app/src/oldapp/designs/details/_AddWidgetSelector.js @@ -172,7 +172,14 @@ define([ this._applyHrefValueWithoutHistory(newHref + newAnchor); - document.querySelector(newAnchor).scrollIntoView({ + var contentSelectedElement = document.querySelector(newAnchor); + + if (!contentSelectedElement) { + console.warn('Tried to focus non-existant content:', newAnchor); + return; + } + + contentSelectedElement.scrollIntoView({ behavior: 'smooth' }); } -- GitLab From 102b8a492b7dd53897c68e05ad2b6a4a3b6756c6 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Thu, 5 Sep 2024 12:27:15 +0100 Subject: [PATCH 127/249] =?UTF-8?q?Unifica=20referencias=20al=20=C3=A1mbit?= =?UTF-8?q?o=20global?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Unifica uso del ámbito global, partiendo siempre desde la base. En el navegador se trata de window, pero se usa globalThis como referencia universal (es estándar y se resuelve correctamente para cada entorno). Hace explícitas las referencias a propiedades y funciones del ámbito global o de sus hijos, en aquellos casos en que se referenciaran directamente omitiendo el ámbito global. Elimina comprobaciones innecesarias, ya que la referencia globalThis se resuelve automáticamente. --- client-app/src/app/App.js | 20 ++------- client-app/src/app/component/Analytics.js | 2 +- client-app/src/app/component/Credentials.js | 5 +-- client-app/src/app/component/Router.js | 24 +++++----- client-app/src/app/component/meta/MetaTags.js | 8 ++-- .../src/component/base/_ListenWindowResize.js | 24 +++------- .../src/component/base/_ShowInTooltip.js | 4 +- client-app/src/component/base/_Window.js | 2 +- .../component/browser/_HierarchicalTable.js | 4 +- client-app/src/component/browser/_Table.js | 4 +- .../map/layer/PruneClusterLayerImpl.js | 2 +- .../component/selection/SelectionManager.js | 2 +- .../src/component/user/LanguageSelector.js | 9 ++-- .../detail/activity/_ActivityLayoutWidget.js | 2 +- client-app/src/error/404.js | 2 +- client-app/src/oldapp/base/views/_View.js | 2 +- .../designs/details/_AddWidgetSelector.js | 10 ++--- .../src/oldapp/designs/edition/Controller.js | 2 +- .../designs/textSearchList/main/Selection.js | 2 +- .../views/ActivityInfrastructureMapBase.js | 2 +- .../oldapp/user/views/ConfirmResettingView.js | 4 +- .../src/oldapp/user/views/FeedbackView.js | 2 +- .../src/oldapp/user/views/RegisterView.js | 6 +-- .../src/oldapp/user/views/ResettingView.js | 2 +- .../user/views/TermsAndConditionsView.js | 2 +- .../user/views/_ExternalUserBaseView.js | 14 +++--- client-app/src/user/ActivateAccount.js | 4 +- client-app/src/util/CookieLoader.js | 8 ++-- client-app/src/util/Credentials.js | 19 ++------ client-app/src/util/GuestChecker.js | 2 +- client-app/src/util/Mediator.js | 19 ++------ client-app/src/util/RedmicLocalStorage.js | 18 ++++---- client-app/src/util/tv4.js | 22 ++-------- .../src/util/widgets/FilteringSelect.js | 4 +- client-app/src/util/widgets/ProgressSlider.js | 6 +-- .../src/util/widgets/extensions/_ShowValue.js | 4 +- client-app/test/_intern-functional.js | 4 +- .../component/components/Keypad/testKeypad.js | 2 +- .../components/Keypad/testKeypadScript.js | 2 +- client-app/test/sockTest/stomp.js | 8 ++-- client-app/test/support/pages/List.js | 24 +++++----- .../test/support/pages/ListHierarchical.js | 8 ++-- client-app/test/support/pages/test.html | 2 +- .../component/browser/buttons/testButtons.js | 2 +- .../testInfoChartsContainerImpl.js | 4 +- .../layer/ChartLayer/testLinearChartImpl.js | 2 +- .../unit/component/store/testRestManager.js | 12 ++--- client-app/test/unit/util/testCredentials.js | 2 +- .../test/unit/util/testRedmicLocalStorage.js | 44 +++++++++---------- 49 files changed, 155 insertions(+), 229 deletions(-) diff --git a/client-app/src/app/App.js b/client-app/src/app/App.js index 28366c2c..2c22d77c 100644 --- a/client-app/src/app/App.js +++ b/client-app/src/app/App.js @@ -2,7 +2,6 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/dom' - , 'dojo/has' , 'put-selector/put' , 'src/app/component/Analytics' , 'src/app/component/Credentials' @@ -26,7 +25,6 @@ define([ declare , lang , dom - , has , put , Analytics , Credentials @@ -51,17 +49,6 @@ define([ var rootNode = dom.byId('rootContainer'), nativeLoadingNode = dom.byId('loadingContainer'); - var getGlobalContext = function() { - - if (has('host-browser')) { - return window; - } else if (has('host-node')) { - return global; - } else { - console.error('Environment not supported'); - } - }; - var hideNativeLoadingNode = function() { if (nativeLoadingNode) { @@ -72,7 +59,7 @@ define([ if (!CheckBrowser.isSupported()) { hideNativeLoadingNode(); - getGlobalContext().location.href = '/noSupportBrowser'; + globalThis.location.href = '/noSupportBrowser'; return declare(null); } @@ -108,7 +95,7 @@ define([ constructor: function(args) { // TODO medida temporal de comienzo de migración de identidad - var currDomain = getGlobalContext().location.hostname, + var currDomain = globalThis.location.hostname, ecomarcanDomainPattern = /.*ecomarcan\..+/; this.config = { @@ -134,8 +121,7 @@ define([ var parentChannel = this.getChannel(); this._router = new Router({ - parentChannel: parentChannel, - globalContext: getGlobalContext() + parentChannel: parentChannel }); new CookieLoader(); diff --git a/client-app/src/app/component/Analytics.js b/client-app/src/app/component/Analytics.js index 7de1e157..555903d4 100644 --- a/client-app/src/app/component/Analytics.js +++ b/client-app/src/app/component/Analytics.js @@ -9,7 +9,7 @@ define([ ){ // Constantes para trakear acciones // TODO: sacar a un fichero externo (Necesita ser global) - window.TRACK = { + globalThis.TRACK = { 'type': { 'event': 'event', 'page': 'pageview', diff --git a/client-app/src/app/component/Credentials.js b/client-app/src/app/component/Credentials.js index 79376ac9..20a33914 100644 --- a/client-app/src/app/component/Credentials.js +++ b/client-app/src/app/component/Credentials.js @@ -159,11 +159,10 @@ define([ this._setEmptySelectionIds(); - var location = window.location; - if (location.pathname === this._loginPath) { + if (globalThis.location.pathname === this._loginPath) { this._getCredentials(); } else { - location.reload(); + globalThis.location.reload(); } }, diff --git a/client-app/src/app/component/Router.js b/client-app/src/app/component/Router.js index 76b67616..58c6fdd0 100644 --- a/client-app/src/app/component/Router.js +++ b/client-app/src/app/component/Router.js @@ -25,8 +25,6 @@ define([ // paths: Object // Constantes de rutas base - // globalContext: Object - // Contexto provisto por App para gestionar el entorno de ejecución // _userFound: Boolean // Indica si hay presente algún token de usuario. @@ -94,7 +92,7 @@ define([ // tags: // private - var gCtx = this.globalContext, + var gCtx = globalThis, dCtx = gCtx.document, listenMethod, eventPrefix; @@ -116,7 +114,7 @@ define([ // tags: // private - var event = evt || this.globalContext.event, + var event = evt || globalThis.event, targets = this._getClickTargets(event); for (var i = 0; i < targets.length; i++) { @@ -137,10 +135,8 @@ define([ var url = target.pathname + target.search + target.hash; if (mouse.isMiddle(event)) { - var gCtx = this.globalContext, - newPageUrl = target.protocol + '//' + target.hostname + url; - - gCtx.open(newPageUrl, '_blank'); + var newPageUrl = target.protocol + '//' + target.hostname + url; + globalThis.open(newPageUrl, '_blank'); } else { this._addHistory(url); this._onRouteChange(); @@ -155,12 +151,12 @@ define([ _addHistory: function(value) { - this.globalContext.history.pushState(null, null, value); + globalThis.history.pushState(null, null, value); }, _onRouteChange: function() { - var locationObj = this.globalContext.location, + var locationObj = globalThis.location, locationPath = locationObj.pathname, route = locationPath.substr(1), routeIsEmpty = !route || route === '' || route === this.paths.ROOT, @@ -221,12 +217,12 @@ define([ _goToRootPage: function() { - this.globalContext.location.href = this.paths.ROOT; + globalThis.location.href = this.paths.ROOT; }, _goToErrorPage: function() { - this.globalContext.location.href = this.paths.ERROR; + globalThis.location.href = this.paths.ERROR; }, _handleQueryParameters: function(queryString) { @@ -243,10 +239,10 @@ define([ _removeQueryParametersFromHref: function() { - var locationObj = this.globalContext.location, + var locationObj = globalThis.location, href = locationObj.origin + locationObj.pathname + locationObj.hash; - this.globalContext.history.replaceState(null, null, href); + globalThis.history.replaceState(null, null, href); } }); }); diff --git a/client-app/src/app/component/meta/MetaTags.js b/client-app/src/app/component/meta/MetaTags.js index 66d019be..c409149f 100644 --- a/client-app/src/app/component/meta/MetaTags.js +++ b/client-app/src/app/component/meta/MetaTags.js @@ -37,7 +37,7 @@ define([ ogDescriptionLimit: 200, twitterDescriptionLimit: 200, - _headNode: document.getElementsByTagName('head')[0], + _headNode: globalThis.document.getElementsByTagName('head')[0], _defaultKey: 'default' }; @@ -74,7 +74,7 @@ define([ return; } - var currUrl = window.location.href, + var currUrl = globalThis.location.href, hostname = new URL(currUrl).hostname; viewData.hostname = hostname; @@ -115,7 +115,7 @@ define([ var customTitle = this._getMetaTagValue('title', viewLocaleMetaTags, viewData); // Title nativo - document.title = customTitle + ' | ' + this.nativeTitleSuffix; + globalThis.document.title = customTitle + ' | ' + this.nativeTitleSuffix; // Open Graph var ogTag = 'og:title', @@ -285,7 +285,7 @@ define([ metaTagNode = metaTagNodes[0]; metaTagNode.content = tagContent; } else { - metaTagNode = document.createElement('meta'); + metaTagNode = globalThis.document.createElement('meta'); metaTagNode.setAttribute(tagIdProperty, tagIdValue); metaTagNode.content = tagContent; this._headNode.appendChild(metaTagNode); diff --git a/client-app/src/component/base/_ListenWindowResize.js b/client-app/src/component/base/_ListenWindowResize.js index 56c1a16c..fff1c6d0 100644 --- a/client-app/src/component/base/_ListenWindowResize.js +++ b/client-app/src/component/base/_ListenWindowResize.js @@ -2,12 +2,10 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/aspect' - , 'dojo/has' ], function( declare , lang , aspect - , has ) { return declare(null, { @@ -40,13 +38,12 @@ define([ _doListenWindowResizeEvtFacade: function() { - var globalCtx = this._getGlobalContext(), - resizeMethod = lang.hitch(this, this._groupEventArgs, 'WINDOW_RESIZE'); + var resizeMethod = lang.hitch(this, this._groupEventArgs, 'WINDOW_RESIZE'); - if (!globalCtx.onresize) { - globalCtx.onresize = resizeMethod; + if (!globalThis.onresize) { + globalThis.onresize = resizeMethod; } else { - aspect.after(globalCtx, 'onresize', resizeMethod); + aspect.after(globalThis, 'onresize', resizeMethod); } }, @@ -72,7 +69,7 @@ define([ _evaluateCurrentWindowSize: function() { - this._setLowWidth(this._getGlobalContext().innerWidth < this.lowWidthValue); + this._setLowWidth(globalThis.innerWidth < this.lowWidthValue); }, _getLowWidth: function() { @@ -83,17 +80,6 @@ define([ _setLowWidth: function(value) { this.statusFlags.lowWidth = value; - }, - - _getGlobalContext: function() { - - if (has('host-browser')) { - return window; - } else if (has('host-node')) { - return global; - } else { - console.error('Environment not supported'); - } } }); }); diff --git a/client-app/src/component/base/_ShowInTooltip.js b/client-app/src/component/base/_ShowInTooltip.js index 50da8bf2..c74de917 100644 --- a/client-app/src/component/base/_ShowInTooltip.js +++ b/client-app/src/component/base/_ShowInTooltip.js @@ -155,8 +155,8 @@ define([ _calculateOrientation: function() { - var middleWidth = window.innerWidth / 2, - middleHeight = window.innerHeight / 2, + var middleWidth = globalThis.innerWidth / 2, + middleHeight = globalThis.innerHeight / 2, sourceBounding = this._tooltipSourceNode.getBoundingClientRect(), sourceMiddleWidth = sourceBounding.left + sourceBounding.width / 2, diff --git a/client-app/src/component/base/_Window.js b/client-app/src/component/base/_Window.js index 685d97dc..625d5cc9 100644 --- a/client-app/src/component/base/_Window.js +++ b/client-app/src/component/base/_Window.js @@ -137,7 +137,7 @@ define([ return; } - var currMaxHeight = window.innerHeight; + var currMaxHeight = globalThis.innerHeight; if (this._lastMaxHeight !== currMaxHeight) { this._lastMaxHeight = currMaxHeight; diff --git a/client-app/src/component/browser/_HierarchicalTable.js b/client-app/src/component/browser/_HierarchicalTable.js index c766a5a4..ee66ad74 100644 --- a/client-app/src/component/browser/_HierarchicalTable.js +++ b/client-app/src/component/browser/_HierarchicalTable.js @@ -35,9 +35,9 @@ define([ this.inherited(arguments); - this._hierarchicalTableStyle = document.createElement("style"); + this._hierarchicalTableStyle = globalThis.document.createElement("style"); - document.head.appendChild(this._hierarchicalTableStyle); + globalThis.document.head.appendChild(this._hierarchicalTableStyle); this._hierarchicalTableStyle = this._hierarchicalTableStyle.sheet; }, diff --git a/client-app/src/component/browser/_Table.js b/client-app/src/component/browser/_Table.js index a1402bdb..9d37a4d8 100644 --- a/client-app/src/component/browser/_Table.js +++ b/client-app/src/component/browser/_Table.js @@ -128,9 +128,9 @@ define([ this.inherited(arguments); - this._tableStyle = document.createElement("style"); + this._tableStyle = globalThis.document.createElement("style"); - document.head.appendChild(this._tableStyle); + globalThis.document.head.appendChild(this._tableStyle); this._tableStyle = this._tableStyle.sheet; }, diff --git a/client-app/src/component/map/layer/PruneClusterLayerImpl.js b/client-app/src/component/map/layer/PruneClusterLayerImpl.js index 5f1db081..4b702942 100644 --- a/client-app/src/component/map/layer/PruneClusterLayerImpl.js +++ b/client-app/src/component/map/layer/PruneClusterLayerImpl.js @@ -162,7 +162,7 @@ define([ createIcon: function () { - var e = document.createElement('canvas'); + var e = globalThis.document.createElement('canvas'); this._setIconStyles(e, 'icon'); var s = this.options.iconSize; e.width = s.x; diff --git a/client-app/src/component/selection/SelectionManager.js b/client-app/src/component/selection/SelectionManager.js index 68911334..9f591e18 100644 --- a/client-app/src/component/selection/SelectionManager.js +++ b/client-app/src/component/selection/SelectionManager.js @@ -229,7 +229,7 @@ define([ return; } - var shareUrl = window.location + '?settings-id=' + res.data[this.idProperty]; + var shareUrl = globalThis.location + '?settings-id=' + res.data[this.idProperty]; alertify.message(' ' + this.i18n.copyToClipboard, 0, lang.hitch(this, function(url) { diff --git a/client-app/src/component/user/LanguageSelector.js b/client-app/src/component/user/LanguageSelector.js index 2cb92bae..2387ddb1 100644 --- a/client-app/src/component/user/LanguageSelector.js +++ b/client-app/src/component/user/LanguageSelector.js @@ -75,7 +75,7 @@ define([ put(this.domNode, '[title=$]', this.i18n.language); - var languageIcon = this._getLanguageIcon(window.lang); + var languageIcon = this._getLanguageIcon(globalThis.lang); put(this.domNode, 'i.' + languageIcon); this._publish(this.listMenu.getChannel('ADD_EVT'), { @@ -93,12 +93,11 @@ define([ _changeLanguage: function(itemObj) { var language = itemObj.value, - currentUrl = window.location, - protocol = currentUrl.protocol, - hostname = currentUrl.hostname, + protocol = globalThis.location.protocol, + hostname = globalThis.location.hostname, hostnameWithoutLang = hostname.replace(kernel.locale + '.', ''); - window.location.href = protocol + '//' + language + '.' + hostnameWithoutLang; + globalThis.location.href = protocol + '//' + language + '.' + hostnameWithoutLang; }, _getLanguageIcon: function(currentLanguage) { diff --git a/client-app/src/detail/activity/_ActivityLayoutWidget.js b/client-app/src/detail/activity/_ActivityLayoutWidget.js index e898b70a..73cd5d93 100644 --- a/client-app/src/detail/activity/_ActivityLayoutWidget.js +++ b/client-app/src/detail/activity/_ActivityLayoutWidget.js @@ -173,7 +173,7 @@ define([ for (var i = 0; i < embeddedContents.length; i++) { var embeddedContentObj = embeddedContents[i], embeddedContentValue = embeddedContentObj.embeddedContent, - embeddedContentParentNode = document.createElement('object'); + embeddedContentParentNode = globalThis.document.createElement('object'); embeddedContentParentNode.innerHTML = embeddedContentValue; diff --git a/client-app/src/error/404.js b/client-app/src/error/404.js index 823ce0a1..10ffe5ca 100644 --- a/client-app/src/error/404.js +++ b/client-app/src/error/404.js @@ -19,7 +19,7 @@ define([ label: 'Go back', onClick: function() { - location.href = '/'; + globalThis.location.href = '/'; } }).placeAt('goBack'); diff --git a/client-app/src/oldapp/base/views/_View.js b/client-app/src/oldapp/base/views/_View.js index a95448c4..48b56b84 100644 --- a/client-app/src/oldapp/base/views/_View.js +++ b/client-app/src/oldapp/base/views/_View.js @@ -89,7 +89,7 @@ define([ _goTo404: function() { - window.location.href = "/404"; + globalThis.location.href = "/404"; } }); }); diff --git a/client-app/src/oldapp/designs/details/_AddWidgetSelector.js b/client-app/src/oldapp/designs/details/_AddWidgetSelector.js index 98e02c44..f622b3c5 100644 --- a/client-app/src/oldapp/designs/details/_AddWidgetSelector.js +++ b/client-app/src/oldapp/designs/details/_AddWidgetSelector.js @@ -47,7 +47,7 @@ define([ _beforePrepareRestoreTransitionUpdateTimeout: function() { - if (!location.hash || this._restoreTransitionTimeoutUpdated) { + if (!globalThis.location.hash || this._restoreTransitionTimeoutUpdated) { return; } @@ -67,17 +67,17 @@ define([ _applyHrefValueWithoutHistory: function(hrefValue) { - history.replaceState(null, null, hrefValue); + globalThis.history.replaceState(null, null, hrefValue); }, _getHrefWithoutHashValue: function() { - return location.origin + location.pathname + location.search; + return globalThis.location.origin + globalThis.location.pathname + globalThis.location.search; }, _applyCurrentAnchor: function() { - var hash = location.hash; + var hash = globalThis.location.hash; if (!hash || !this._widgetSelector) { return; @@ -172,7 +172,7 @@ define([ this._applyHrefValueWithoutHistory(newHref + newAnchor); - var contentSelectedElement = document.querySelector(newAnchor); + var contentSelectedElement = globalThis.document.querySelector(newAnchor); if (!contentSelectedElement) { console.warn('Tried to focus non-existant content:', newAnchor); diff --git a/client-app/src/oldapp/designs/edition/Controller.js b/client-app/src/oldapp/designs/edition/Controller.js index e4877489..ebfd6195 100644 --- a/client-app/src/oldapp/designs/edition/Controller.js +++ b/client-app/src/oldapp/designs/edition/Controller.js @@ -287,7 +287,7 @@ define([ if (this.popupBody) { this._publish(this.getChannel("HIDE")); } else { - window.history.go(-1); + globalThis.history.go(-1); } }, diff --git a/client-app/src/oldapp/designs/textSearchList/main/Selection.js b/client-app/src/oldapp/designs/textSearchList/main/Selection.js index 91373e2e..5f48870b 100644 --- a/client-app/src/oldapp/designs/textSearchList/main/Selection.js +++ b/client-app/src/oldapp/designs/textSearchList/main/Selection.js @@ -105,7 +105,7 @@ define([ _shareCallback: function(data) { - var shareUrl = window.location + '?settings-id=' + data.id; + var shareUrl = globalThis.location + '?settings-id=' + data.id; alertify.confirm(shareUrl, lang.hitch(this, function(shareUrl) { diff --git a/client-app/src/oldapp/details/views/ActivityInfrastructureMapBase.js b/client-app/src/oldapp/details/views/ActivityInfrastructureMapBase.js index a278fd1b..d6d1a1f2 100644 --- a/client-app/src/oldapp/details/views/ActivityInfrastructureMapBase.js +++ b/client-app/src/oldapp/details/views/ActivityInfrastructureMapBase.js @@ -60,7 +60,7 @@ define([ }, urlWebcamCallback: function(obj) { - window.open(obj.item.url, '_blank'); + globalThis.open(obj.item.url, '_blank'); } } } diff --git a/client-app/src/oldapp/user/views/ConfirmResettingView.js b/client-app/src/oldapp/user/views/ConfirmResettingView.js index 11ff5967..d126d1d5 100644 --- a/client-app/src/oldapp/user/views/ConfirmResettingView.js +++ b/client-app/src/oldapp/user/views/ConfirmResettingView.js @@ -163,7 +163,7 @@ define([ _goBack: function() { - window.location.href = '/'; + globalThis.location.href = '/'; }, _onGetTokenError: function() { @@ -177,7 +177,7 @@ define([ } }); - window.location.href = '/404'; + globalThis.location.href = '/404'; }, _confirmValidator: function() { diff --git a/client-app/src/oldapp/user/views/FeedbackView.js b/client-app/src/oldapp/user/views/FeedbackView.js index d0a8f95b..c6873db8 100644 --- a/client-app/src/oldapp/user/views/FeedbackView.js +++ b/client-app/src/oldapp/user/views/FeedbackView.js @@ -219,7 +219,7 @@ define([ this.i18n.sendFeedback, lang.hitch(this, function() { this._resetForm(); - window.location.href = "/"; + globalThis.location.href = "/"; }) ); }, diff --git a/client-app/src/oldapp/user/views/RegisterView.js b/client-app/src/oldapp/user/views/RegisterView.js index e98af81c..5c7e7237 100644 --- a/client-app/src/oldapp/user/views/RegisterView.js +++ b/client-app/src/oldapp/user/views/RegisterView.js @@ -179,7 +179,7 @@ define([ // this._resetForm(); - window.location.href = "/"; + globalThis.location.href = "/"; }, _resetForm: function() { @@ -240,7 +240,7 @@ define([ alertify.alert(this.i18n.success, this.i18n.activateAccount, lang.hitch(this, function() { this._resetForm(); - window.location.href = "/"; + globalThis.location.href = "/"; })); }, @@ -279,7 +279,7 @@ define([ } }); - window.location.href = "terms-and-conditions"; + globalThis.location.href = "terms-and-conditions"; } }); }); diff --git a/client-app/src/oldapp/user/views/ResettingView.js b/client-app/src/oldapp/user/views/ResettingView.js index 6ebaeaba..dcabdc64 100644 --- a/client-app/src/oldapp/user/views/ResettingView.js +++ b/client-app/src/oldapp/user/views/ResettingView.js @@ -65,7 +65,7 @@ define([ _goBack: function() { - window.location.href = '/'; + globalThis.location.href = '/'; }, _onSubmitResettingPassword: function(/*Event*/ evt) { diff --git a/client-app/src/oldapp/user/views/TermsAndConditionsView.js b/client-app/src/oldapp/user/views/TermsAndConditionsView.js index 474a482a..736615e0 100644 --- a/client-app/src/oldapp/user/views/TermsAndConditionsView.js +++ b/client-app/src/oldapp/user/views/TermsAndConditionsView.js @@ -38,7 +38,7 @@ define([ // callback private // - window.history.go(-1); + globalThis.history.go(-1); } }); }); diff --git a/client-app/src/oldapp/user/views/_ExternalUserBaseView.js b/client-app/src/oldapp/user/views/_ExternalUserBaseView.js index e6d6191e..ba64a935 100644 --- a/client-app/src/oldapp/user/views/_ExternalUserBaseView.js +++ b/client-app/src/oldapp/user/views/_ExternalUserBaseView.js @@ -85,8 +85,8 @@ define([ _changeLang: function(evt) { - window.location.href = window.location.protocol + '//' + evt.target.dataset.dojoProps + '.' + - window.location.hostname.replace(kernel.locale + '.', ''); + globalThis.location.href = globalThis.location.protocol + '//' + evt.target.dataset.dojoProps + '.' + + globalThis.location.hostname.replace(kernel.locale + '.', ''); }, _onShowWhatIsRedmic: function(event) { @@ -100,10 +100,10 @@ define([ event.stopPropagation(); var path = 'what-is-redmic'; - if (window.location.href.indexOf(path) < 0) { - window.location.href = path; + if (globalThis.location.href.indexOf(path) < 0) { + globalThis.location.href = path; } else { - window.history.back(); + globalThis.history.back(); } }, @@ -117,8 +117,8 @@ define([ // setTimeout(lang.hitch(this, function() { - if (window.location.href.indexOf(this.whatIsRedmicPath) >= 0) { - window.history.back(); + if (globalThis.location.href.indexOf(this.whatIsRedmicPath) >= 0) { + globalThis.history.back(); } }), 200); } diff --git a/client-app/src/user/ActivateAccount.js b/client-app/src/user/ActivateAccount.js index aab5fac6..41fc1a0f 100644 --- a/client-app/src/user/ActivateAccount.js +++ b/client-app/src/user/ActivateAccount.js @@ -69,12 +69,12 @@ define([ _goBack: function() { - location.href = '/'; + globalThis.location.href = '/'; }, _goError: function() { - location.href = '/404'; + globalThis.location.href = '/404'; } }); }); diff --git a/client-app/src/util/CookieLoader.js b/client-app/src/util/CookieLoader.js index a20bcf9f..28c856c8 100644 --- a/client-app/src/util/CookieLoader.js +++ b/client-app/src/util/CookieLoader.js @@ -106,17 +106,17 @@ define([ // tags: // private - var script = document.createElement('script'), + var script = globalThis.document.createElement('script'), gtagId = redmicConfig.googleAnalyticsId; script.async = true; script.src = 'https://www.googletagmanager.com/gtag/js?id=' + gtagId; - document.head.appendChild(script); + globalThis.document.head.appendChild(script); - window.dataLayer = []; + globalThis.dataLayer = []; - window.gtag = function() { + globalThis.gtag = function() { dataLayer.push(arguments); }; diff --git a/client-app/src/util/Credentials.js b/client-app/src/util/Credentials.js index 81ac3230..1b864235 100644 --- a/client-app/src/util/Credentials.js +++ b/client-app/src/util/Credentials.js @@ -2,13 +2,11 @@ define([ 'dojo/_base/declare' , 'dojo/_base/lang' , 'dojo/Evented' - , 'dojo/has' , 'src/util/RedmicLocalStorage' ], function( declare , lang , Evented - , has , RedmicLocalStorage ) { @@ -127,20 +125,9 @@ define([ } }); - var credentialsInstance; - if (has('host-browser')) { - if (!window.credentials) { - window.credentials = new Credentials(); - } - credentialsInstance = window.credentials; - } else if (has('host-node')) { - if (!global.credentials) { - global.credentials = new Credentials(); - } - credentialsInstance = global.credentials; - } else { - console.error('Cannot create a credentials instance, environment not supported'); + if (!globalThis.credentials) { + globalThis.credentials = new Credentials(); } - return credentialsInstance; + return globalThis.credentials; }); diff --git a/client-app/src/util/GuestChecker.js b/client-app/src/util/GuestChecker.js index 88b00e12..b02d71d6 100644 --- a/client-app/src/util/GuestChecker.js +++ b/client-app/src/util/GuestChecker.js @@ -50,7 +50,7 @@ define([ if (Credentials.userIsGuest()) { alertify.alert(this.title, this.banIcon + this.banMessageDocument); } else { - window.open(url + '?access_token=' + Credentials.get("accessToken"),'_blank'); + globalThis.open(url + '?access_token=' + Credentials.get("accessToken"),'_blank'); } }, diff --git a/client-app/src/util/Mediator.js b/client-app/src/util/Mediator.js index 0f42f07a..32fb0c5d 100644 --- a/client-app/src/util/Mediator.js +++ b/client-app/src/util/Mediator.js @@ -1,10 +1,8 @@ define([ "dojo/_base/lang" - , "dojo/has" , 'mediatorjs/mediator.min' ], function( lang - , has , MediatorJS ){ // summary: @@ -69,20 +67,9 @@ define([ } }; - var mediatorInstance; - if (has("host-browser")) { - if (!window.mediator) { - window.mediator = new MediatorJS(); - } - mediatorInstance = window.mediator; - } else if (has("host-node")) { - if (!global.mediator) { - global.mediator = new MediatorJS(); - } - mediatorInstance = global.mediator; - } else { - console.error('Cannot create a mediatorjs instance, environment not supported'); + if (!globalThis.mediator) { + globalThis.mediator = new MediatorJS(); } - return mediatorInstance; + return globalThis.mediator; }); diff --git a/client-app/src/util/RedmicLocalStorage.js b/client-app/src/util/RedmicLocalStorage.js index c7dca2c1..02ab127c 100644 --- a/client-app/src/util/RedmicLocalStorage.js +++ b/client-app/src/util/RedmicLocalStorage.js @@ -70,7 +70,7 @@ define([ return; } - localStorage.setItem(this._prefix + key, value); + globalThis.localStorage.setItem(this._prefix + key, value); this.emit('changed:' + key, { key: key, @@ -86,7 +86,7 @@ define([ // returns: // Valor del campo. - var ret = localStorage.getItem(this._prefix + key); + var ret = globalThis.localStorage.getItem(this._prefix + key); // Si el valor es nulo o sin longitud, se devuelve nulo if (!ret || (ret && !ret.length)) { @@ -107,7 +107,7 @@ define([ // key: // Clave del elemento a eliminar. - localStorage.removeItem(this._prefix + key); + globalThis.localStorage.removeItem(this._prefix + key); this.emit('removed:' + key); }, @@ -143,7 +143,7 @@ define([ // returns: // Clave del elemento. - var ret = localStorage.key(index); + var ret = globalThis.localStorage.key(index); if (ret && ret.length) { ret = this._getKeyWithoutPrefix(ret); // Clave sin prefijo } @@ -158,7 +158,7 @@ define([ // Array de claves. var retArray = [], - allKeys = Object.keys(localStorage), + allKeys = Object.keys(globalThis.localStorage), i; for (i = 0; i < allKeys.length; i++) { @@ -180,7 +180,7 @@ define([ // returns: // Booleano indicando su presencia. - return localStorage.hasOwnProperty(this._prefix + key) && this.getItem(key); // return Boolean + return globalThis.localStorage.hasOwnProperty(this._prefix + key) && this.getItem(key); // return Boolean }, _getKeyWithoutPrefix: function(/*String*/ key) { @@ -196,9 +196,9 @@ define([ }); - if (!window.redmicLocalStorage) { - window.redmicLocalStorage = new RedmicLocalStorage(); + if (!globalThis.redmicLocalStorage) { + globalThis.redmicLocalStorage = new RedmicLocalStorage(); } - return window.redmicLocalStorage; + return globalThis.redmicLocalStorage; }); diff --git a/client-app/src/util/tv4.js b/client-app/src/util/tv4.js index 8444b2d8..792001b6 100644 --- a/client-app/src/util/tv4.js +++ b/client-app/src/util/tv4.js @@ -1,12 +1,10 @@ define([ 'dojo/_base/lang' - , 'dojo/has' , 'RWidgets/Utilities' , 'src/util/stringFormats' , 'tv4/tv4' ], function( lang - , has , Utilities , stringFormats , tv4 @@ -64,22 +62,10 @@ define([ instance.defineKeyword('uniqueItemsByRequiredProperties', lang.hitch(this, _uniqueItemsByRequiredProperties)); } - var tv4Instance; - if (has('host-browser')) { - if (!window.tv4) { - _customizeTv4(tv4); - window.tv4 = tv4; - } - tv4Instance = window.tv4; - } else if (has('host-node')) { - if (!global.tv4) { - _customizeTv4(tv4); - global.tv4 = tv4; - } - tv4Instance = global.tv4; - } else { - console.error('Cannot create a tv4 instance, environment not supported'); + if (!globalThis.tv4) { + _customizeTv4(tv4); + globalThis.tv4 = tv4; } - return tv4Instance; + return globalThis.tv4; }); diff --git a/client-app/src/util/widgets/FilteringSelect.js b/client-app/src/util/widgets/FilteringSelect.js index d9caeafc..d866fe6a 100644 --- a/client-app/src/util/widgets/FilteringSelect.js +++ b/client-app/src/util/widgets/FilteringSelect.js @@ -481,7 +481,7 @@ define([ Results = Results.data; if (!this.dialogNode) { - this.dialogNode = query("div.dijitDialogFocused", document.body); + this.dialogNode = query("div.dijitDialogFocused", globalThis.document.body); if (this.dialogNode.length !== 0){ this.dialogNode = this.dialogNode[0]; @@ -490,7 +490,7 @@ define([ } this._cleanChildrenNode(this.boxResultsNode); - this.boxResultsNode = put(document.body, 'div.' + this.suggestionsContainerClass + '.' + this.hiddenClass); + this.boxResultsNode = put(globalThis.document.body, 'div.' + this.suggestionsContainerClass + '.' + this.hiddenClass); var positionNode = domGeom.position(this.domNode); diff --git a/client-app/src/util/widgets/ProgressSlider.js b/client-app/src/util/widgets/ProgressSlider.js index a3a99bab..06c29271 100644 --- a/client-app/src/util/widgets/ProgressSlider.js +++ b/client-app/src/util/widgets/ProgressSlider.js @@ -165,7 +165,7 @@ define([ _createPopupIntermediateValue: function() { - this.popupNode = put(document.body, "div.popupCreate.popupProgressIntermediateValue"); + this.popupNode = put(globalThis.document.body, "div.popupCreate.popupProgressIntermediateValue"); this.spanPopupNode = put(this.popupNode, "span"); this._popupIntermediateValue = true; }, @@ -393,12 +393,12 @@ define([ this._pause(); this.playExecute = playExecute; - document.body.onmouseup = lang.hitch(this, this._eventOnMouseUpDocument); + globalThis.document.body.onmouseup = lang.hitch(this, this._eventOnMouseUpDocument); }, _eventOnMouseUpDocument: function() { - document.body.onmouseup = null; + globalThis.document.body.onmouseup = null; if (this.playExecute) this._play(); }, diff --git a/client-app/src/util/widgets/extensions/_ShowValue.js b/client-app/src/util/widgets/extensions/_ShowValue.js index 66d7ac67..48708d4f 100644 --- a/client-app/src/util/widgets/extensions/_ShowValue.js +++ b/client-app/src/util/widgets/extensions/_ShowValue.js @@ -59,7 +59,7 @@ define([ _createPopupPlay: function() { this.popupPlayCreate = true; - this.popupPlayNode = put(document.body, "div.popupCreate.popupProgressBarPlay"); + this.popupPlayNode = put(globalThis.document.body, "div.popupCreate.popupProgressBarPlay"); this.spanPopupPlayNode = put(this.popupPlayNode, "span"); }, @@ -125,4 +125,4 @@ define([ this.inherited(arguments); } }; -}); \ No newline at end of file +}); diff --git a/client-app/test/_intern-functional.js b/client-app/test/_intern-functional.js index ddf310c4..820bdc67 100644 --- a/client-app/test/_intern-functional.js +++ b/client-app/test/_intern-functional.js @@ -33,13 +33,13 @@ module.exports = function(args) { config.functionalSuites = defaultFunctionalSuites; } - global.credentials = { + globalThis.credentials = { userRole: role, userName: user, userPassword: pass }; - global.reportersOutputPath = args.reportersOutputPath; + globalThis.reportersOutputPath = args.reportersOutputPath; return deepmerge.all([_intern, config], { arrayMerge: function (_destinationArray, sourceArray, _options) { diff --git a/client-app/test/functional/component/components/Keypad/testKeypad.js b/client-app/test/functional/component/components/Keypad/testKeypad.js index b567a186..b1225436 100644 --- a/client-app/test/functional/component/components/Keypad/testKeypad.js +++ b/client-app/test/functional/component/components/Keypad/testKeypad.js @@ -29,7 +29,7 @@ define([ .then(Utils.clickElement(buttonSelector1)) .then(pollUntil(function() { - return window.inputKey; + return globalThis.inputKey; }, timeout)) .then(function(inputKey) { diff --git a/client-app/test/functional/component/components/Keypad/testKeypadScript.js b/client-app/test/functional/component/components/Keypad/testKeypadScript.js index 5b881979..d945a7da 100644 --- a/client-app/test/functional/component/components/Keypad/testKeypadScript.js +++ b/client-app/test/functional/component/components/Keypad/testKeypadScript.js @@ -39,7 +39,7 @@ require([ keypad._once(keypad.getChannel('KEYPAD_INPUT'), function(obj) { - window.inputKey = obj.inputKey; + globalThis.inputKey = obj.inputKey; }); keypad._publish(keypad.getChannel('HIDE_BUTTON'), { diff --git a/client-app/test/sockTest/stomp.js b/client-app/test/sockTest/stomp.js index 45711d9c..3eee74e8 100644 --- a/client-app/test/sockTest/stomp.js +++ b/client-app/test/sockTest/stomp.js @@ -142,7 +142,7 @@ Client.prototype.debug = function(message) { var ref; - return typeof window !== "undefined" && window !== null ? (ref = window.console) != null ? ref.log(message) : void 0 : void 0; + return typeof globalThis !== "undefined" && globalThis !== null ? (ref = globalThis.console) != null ? ref.log(message) : void 0 : void 0; }; now = function() { @@ -492,12 +492,12 @@ if (typeof window !== "undefined" && window !== null) { Stomp.setInterval = function(interval, f) { - return window.setInterval(f, interval); + return globalThis.setInterval(f, interval); }; Stomp.clearInterval = function(id) { - return window.clearInterval(id); + return globalThis.clearInterval(id); }; - window.Stomp = Stomp; + globalThis.Stomp = Stomp; } else if (!exports) { self.Stomp = Stomp; } diff --git a/client-app/test/support/pages/List.js b/client-app/test/support/pages/List.js index e24147e4..b9b663fd 100644 --- a/client-app/test/support/pages/List.js +++ b/client-app/test/support/pages/List.js @@ -16,24 +16,24 @@ define([ constructor: function() { - global.listContainerWithoutLoadingSelector = this._getParentList() + + globalThis.listContainerWithoutLoadingSelector = this._getParentList() + 'div.containerList' + Config.selector.notLoading; - global.listSelector = listContainerWithoutLoadingSelector + ' div.contentList'; - global.listRowCheckboxSelector = 'div.check span'; - global.listRowTitleTextSelector = 'span.title'; - global.listRowSelector = 'div.containerRow'; + globalThis.listSelector = listContainerWithoutLoadingSelector + ' div.contentList'; + globalThis.listRowCheckboxSelector = 'div.check span'; + globalThis.listRowTitleTextSelector = 'span.title'; + globalThis.listRowSelector = 'div.containerRow'; - global.listBottomAreaSelector = listContainerWithoutLoadingSelector + ' div.bottomList'; - global.listSelectionBoxSelector = listBottomAreaSelector + ' > div.containerSelectionBox'; + globalThis.listBottomAreaSelector = listContainerWithoutLoadingSelector + ' div.bottomList'; + globalThis.listSelectionBoxSelector = listBottomAreaSelector + ' > div.containerSelectionBox'; - global.listSelectionBoxInputSelector = listSelectionBoxSelector + ' > div.selectionBox'; - global.listSelectionCountSelector = listSelectionBoxInputSelector + ' > span:nth-child(2)'; + globalThis.listSelectionBoxInputSelector = listSelectionBoxSelector + ' > div.selectionBox'; + globalThis.listSelectionCountSelector = listSelectionBoxInputSelector + ' > span:nth-child(2)'; - global.listModeInputSelector = listSelectionBoxSelector + ' > div.seeSelection'; - global.listModeInputSelectSelector = listModeInputSelector + ' > select'; + globalThis.listModeInputSelector = listSelectionBoxSelector + ' > div.seeSelection'; + globalThis.listModeInputSelectSelector = listModeInputSelector + ' > select'; - global.listOrderSelector = listBottomAreaSelector + ' > div.orderZone > div.containerOrder'; + globalThis.listOrderSelector = listBottomAreaSelector + ' > div.orderZone > div.containerOrder'; }, _getParentList: function() { diff --git a/client-app/test/support/pages/ListHierarchical.js b/client-app/test/support/pages/ListHierarchical.js index 235b9599..0cd66a5d 100644 --- a/client-app/test/support/pages/ListHierarchical.js +++ b/client-app/test/support/pages/ListHierarchical.js @@ -16,10 +16,10 @@ define([ constructor: function() { - global.expandCollapseSelector = 'div.expandCollapse'; - global.expandSelector = expandCollapseSelector + ' span.fa-caret-right'; - global.collapseSelector = expandCollapseSelector + ' span.fa-caret-down'; - global.childrenInParentSelector = 'div.containerBottomRow div.rowsContainer > *'; + globalThis.expandCollapseSelector = 'div.expandCollapse'; + globalThis.expandSelector = expandCollapseSelector + ' span.fa-caret-right'; + globalThis.collapseSelector = expandCollapseSelector + ' span.fa-caret-down'; + globalThis.childrenInParentSelector = 'div.containerBottomRow div.rowsContainer > *'; }, getCountChildrenInParent: function(indexParent) { diff --git a/client-app/test/support/pages/test.html b/client-app/test/support/pages/test.html index b990c166..a56e2550 100644 --- a/client-app/test/support/pages/test.html +++ b/client-app/test/support/pages/test.html @@ -30,7 +30,7 @@ , script ) { - var url = window.location.href, + var url = globalThis.location.href, urlParams = url.substring(url.indexOf('?') + 1), paramsObj = ioQuery.queryToObject(urlParams), scriptUrl = paramsObj.script; diff --git a/client-app/test/unit/component/browser/buttons/testButtons.js b/client-app/test/unit/component/browser/buttons/testButtons.js index eb2b3ada..e28c616c 100644 --- a/client-app/test/unit/component/browser/buttons/testButtons.js +++ b/client-app/test/unit/component/browser/buttons/testButtons.js @@ -78,7 +78,7 @@ define([ buttons = new declare([Buttons, _GroupButtons])(config); node = put('div[style="width:300px;height:300px"]'); - document.children[0].appendChild(node); + globalThis.document.children[0].appendChild(node); item = { id: 1, diff --git a/client-app/test/unit/component/chart/ChartsContainer/testInfoChartsContainerImpl.js b/client-app/test/unit/component/chart/ChartsContainer/testInfoChartsContainerImpl.js index cb9daffe..58be7f0c 100644 --- a/client-app/test/unit/component/chart/ChartsContainer/testInfoChartsContainerImpl.js +++ b/client-app/test/unit/component/chart/ChartsContainer/testInfoChartsContainerImpl.js @@ -49,7 +49,7 @@ define([ }); node = put('div[style="width:300px;height:300px"]'); - document.children[0].appendChild(node); + globalThis.document.children[0].appendChild(node); }, after: function() { @@ -90,7 +90,7 @@ define([ }); node = put('div[style="width:300px;height:300px"]'); - document.children[0].appendChild(node); + globalThis.document.children[0].appendChild(node); Mediator.publish(chartsContainer.getChannel('SHOW'), { node: node diff --git a/client-app/test/unit/component/chart/layer/ChartLayer/testLinearChartImpl.js b/client-app/test/unit/component/chart/layer/ChartLayer/testLinearChartImpl.js index b8450364..6369133d 100644 --- a/client-app/test/unit/component/chart/layer/ChartLayer/testLinearChartImpl.js +++ b/client-app/test/unit/component/chart/layer/ChartLayer/testLinearChartImpl.js @@ -47,7 +47,7 @@ define([ }); node = put('div[style="width:300px;height:300px"]'); - document.children[0].appendChild(node); + globalThis.document.children[0].appendChild(node); Mediator.publish(chartsContainer.getChannel('SHOW'), { node: node diff --git a/client-app/test/unit/component/store/testRestManager.js b/client-app/test/unit/component/store/testRestManager.js index 772bff65..fe0b8596 100644 --- a/client-app/test/unit/component/store/testRestManager.js +++ b/client-app/test/unit/component/store/testRestManager.js @@ -26,12 +26,12 @@ define([ parentChannel: 'app' }); - originalOpenMethod = window.XMLHttpRequest.prototype.open; + originalOpenMethod = globalThis.XMLHttpRequest.prototype.open; }, afterEach: function() { - window.XMLHttpRequest.prototype.open = originalOpenMethod; + globalThis.XMLHttpRequest.prototype.open = originalOpenMethod; }, after: function() { @@ -44,7 +44,7 @@ define([ var dfd = this.async(timeout); - window.XMLHttpRequest.prototype.open = dfd.callback(function(method, url) { + globalThis.XMLHttpRequest.prototype.open = dfd.callback(function(method, url) { var expectedUrl = target + '/' + exampleId; assert.strictEqual(url, expectedUrl, 'La URL de petición no es la esperada'); @@ -157,7 +157,7 @@ define([ var dfd = this.async(timeout); - window.XMLHttpRequest.prototype.open = dfd.callback(function(method, url) { + globalThis.XMLHttpRequest.prototype.open = dfd.callback(function(method, url) { var expectedUrl = target + '/' + exampleAction; assert.strictEqual(url, expectedUrl, 'La URL de petición no es la esperada'); @@ -270,7 +270,7 @@ define([ var dfd = this.async(timeout); - window.XMLHttpRequest.prototype.open = dfd.callback(function(method, url) { + globalThis.XMLHttpRequest.prototype.open = dfd.callback(function(method, url) { var expectedUrl = target + '/' + exampleId; assert.strictEqual(url, expectedUrl, 'La URL de petición no es la esperada'); @@ -385,7 +385,7 @@ define([ var dfd = this.async(timeout); - window.XMLHttpRequest.prototype.open = dfd.callback(function(method, url) { + globalThis.XMLHttpRequest.prototype.open = dfd.callback(function(method, url) { var expectedUrl = target + '/' + exampleId; assert.strictEqual(url, expectedUrl, 'La URL de petición no es la esperada'); diff --git a/client-app/test/unit/util/testCredentials.js b/client-app/test/unit/util/testCredentials.js index 217059ce..7cfdabdc 100644 --- a/client-app/test/unit/util/testCredentials.js +++ b/client-app/test/unit/util/testCredentials.js @@ -30,7 +30,7 @@ define([ "check support of HTML5 storage": function() { var support; try { - support = 'localStorage' in window && window.localStorage !== null; + support = 'localStorage' in globalThis && globalThis.localStorage !== null; } catch (e) { support = false; } diff --git a/client-app/test/unit/util/testRedmicLocalStorage.js b/client-app/test/unit/util/testRedmicLocalStorage.js index fd48e286..78b3c13f 100644 --- a/client-app/test/unit/util/testRedmicLocalStorage.js +++ b/client-app/test/unit/util/testRedmicLocalStorage.js @@ -20,11 +20,11 @@ define([ key1: value1, key2: value2 }; - localStorage.clear(); + globalThis.localStorage.clear(); }, afterEach: function() { - localStorage.clear(); + globalThis.localStorage.clear(); handler && handler.remove(); }, @@ -32,7 +32,7 @@ define([ "check support of HTML5 storage": function() { var support; try { - support = 'localStorage' in window && window.localStorage !== null; + support = 'localStorage' in globalThis && globalThis.localStorage !== null; } catch (e) { support = false; } @@ -42,7 +42,7 @@ define([ "check setItem": function() { // Guardamos con nuestro método y recuperamos con el nativo RedmicLocalStorage.setItem(key1, value1); - assert.strictEqual(value1, localStorage.getItem(prefix + key1), "El valor obtenido no es igual al guardado previamente."); + assert.strictEqual(value1, globalThis.localStorage.getItem(prefix + key1), "El valor obtenido no es igual al guardado previamente."); }, "check getItem": function() { @@ -50,34 +50,34 @@ define([ assert.strictEqual(null, RedmicLocalStorage.getItem(key1), "El valor buscado no existe pero al recuperarlo obtenemos algo válido."); // Guardamos con el método nativo y recuperamos con el nuestro - localStorage.setItem(prefix + key1, value1); + globalThis.localStorage.setItem(prefix + key1, value1); assert.strictEqual(value1, RedmicLocalStorage.getItem(key1), "El valor obtenido no es igual al guardado previamente."); }, "check removeItem": function() { - localStorage.setItem(prefix + key1, value1); + globalThis.localStorage.setItem(prefix + key1, value1); RedmicLocalStorage.removeItem(key1); - assert.strictEqual(null, localStorage.getItem(prefix + key1), "La propiedad se ha borrado pero se sigue encontrando."); + assert.strictEqual(null, globalThis.localStorage.getItem(prefix + key1), "La propiedad se ha borrado pero se sigue encontrando."); }, "check clear": function() { - localStorage.setItem(prefix + key1, value1); - localStorage.setItem(prefix + key2, value2); + globalThis.localStorage.setItem(prefix + key1, value1); + globalThis.localStorage.setItem(prefix + key2, value2); // Propiedad sin nuestro prefijo, ejemplo de propiedad ajena - localStorage.setItem(key1, value1); + globalThis.localStorage.setItem(key1, value1); RedmicLocalStorage.clear(); - assert.strictEqual(null, localStorage.getItem(prefix + key1), "La propiedad se ha borrado pero se sigue encontrando."); - assert.strictEqual(null, localStorage.getItem(prefix + key2), "La propiedad se ha borrado pero se sigue encontrando."); - assert.strictEqual(1, localStorage.length, "La propiedad ajena se ha borrado cuando deberíamos respetarla."); + assert.strictEqual(null, globalThis.localStorage.getItem(prefix + key1), "La propiedad se ha borrado pero se sigue encontrando."); + assert.strictEqual(null, globalThis.localStorage.getItem(prefix + key2), "La propiedad se ha borrado pero se sigue encontrando."); + assert.strictEqual(1, globalThis.localStorage.length, "La propiedad ajena se ha borrado cuando deberíamos respetarla."); }, "check length": function() { // Propiedad sin nuestro prefijo, no cuenta para la longitud - localStorage.setItem(key1, value1); + globalThis.localStorage.setItem(key1, value1); assert.strictEqual(0, RedmicLocalStorage.length(), "No existen propiedades pero se encuentra alguna."); - localStorage.setItem(prefix + key1, value1); + globalThis.localStorage.setItem(prefix + key1, value1); assert.strictEqual(1, RedmicLocalStorage.length(), "Existe una propiedad pero se encuentra un número distinto de ellas."); - localStorage.setItem(prefix + key2, value2); + globalThis.localStorage.setItem(prefix + key2, value2); assert.strictEqual(2, RedmicLocalStorage.length(), "Existen dos propiedades pero se encuentra un número distinto de ellas."); }, @@ -85,7 +85,7 @@ define([ assert.strictEqual(null, RedmicLocalStorage.key(0), "Ya existe un elemento en la posición 0"); - localStorage.setItem(prefix + key1, value1); + globalThis.localStorage.setItem(prefix + key1, value1); assert.strictEqual(key1, RedmicLocalStorage.key(0), "El elemento indexado no tiene la clave esperada"); }, @@ -93,15 +93,15 @@ define([ assert.isEmpty(RedmicLocalStorage.keys(), "Ya existen elementos antes de comenzar"); - localStorage.setItem(prefix + key1, value1); - localStorage.setItem(prefix + key2, value2); + globalThis.localStorage.setItem(prefix + key1, value1); + globalThis.localStorage.setItem(prefix + key2, value2); assert.sameMembers([key1, key2], RedmicLocalStorage.keys(), "Los elementos indexados no tienen las claves esperadas"); }, "check has": function() { assert.notOk(RedmicLocalStorage.has(key1), "La propiedad no existe pero se informa de que sí."); - localStorage.setItem(prefix + key1, value1); + globalThis.localStorage.setItem(prefix + key1, value1); assert.ok(RedmicLocalStorage.has(key1), "La propiedad existe pero se informa de que no es así."); }, @@ -128,7 +128,7 @@ define([ handler = RedmicLocalStorage.on("removed:"+key1, function() { assert.ok(1); }); - localStorage.setItem(key1, value1); + globalThis.localStorage.setItem(key1, value1); RedmicLocalStorage.removeItem(key1); }, @@ -136,7 +136,7 @@ define([ handler = RedmicLocalStorage.on("cleared", function() { assert.ok(1); }); - localStorage.setItem(key1, value1); + globalThis.localStorage.setItem(key1, value1); RedmicLocalStorage.clear(); } } -- GitLab From bdf4801a7b52dce0202b0b3797ffa6aa3ef4fd0a Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Thu, 5 Sep 2024 14:23:58 +0100 Subject: [PATCH 128/249] Simplifica escucha de eventos globales y limpia MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Escucha a nivel global, haciendo uso del objeto globalThis y el método actual para añadir escuchas (la otra alternativa ya era obsoleta en Internet Explorer 11). Limpia comprobaciones de versión destinadas a Internet Explorer y versiones antiguas de Edge. --- client-app/src/app/component/Router.js | 21 ++++--------------- .../mapWithSideContent/main/Tracking.js | 13 ++---------- client-app/src/oldapp/nls/es/translation.js | 5 ----- client-app/src/oldapp/nls/translation.js | 5 ----- 4 files changed, 6 insertions(+), 38 deletions(-) diff --git a/client-app/src/app/component/Router.js b/client-app/src/app/component/Router.js index 58c6fdd0..e4e42dd5 100644 --- a/client-app/src/app/component/Router.js +++ b/client-app/src/app/component/Router.js @@ -92,30 +92,17 @@ define([ // tags: // private - var gCtx = globalThis, - dCtx = gCtx.document, - listenMethod, eventPrefix; - - if (gCtx.addEventListener) { - listenMethod = dCtx.addEventListener; - eventPrefix = ''; - } else { - listenMethod = dCtx.attachEvent; - eventPrefix = 'on'; - } - - listenMethod.call(dCtx, eventPrefix + 'click', lang.hitch(this, this._evaluateClickEvt)); - listenMethod.call(gCtx, eventPrefix + 'popstate', lang.hitch(this, this._evaluatePopStateEvt)); + globalThis.addEventListener.call(globalThis, 'click', lang.hitch(this, this._evaluateClickEvt)); + globalThis.addEventListener.call(globalThis, 'popstate', lang.hitch(this, this._evaluatePopStateEvt)); }, - _evaluateClickEvt: function(evt) { + _evaluateClickEvt: function(event) { // summary: // Recibe eventos de click y, en caso de detectar un enlace de navegación interno, lo captura // tags: // private - var event = evt || globalThis.event, - targets = this._getClickTargets(event); + var targets = this._getClickTargets(event); for (var i = 0; i < targets.length; i++) { var target = targets[i], diff --git a/client-app/src/oldapp/designs/mapWithSideContent/main/Tracking.js b/client-app/src/oldapp/designs/mapWithSideContent/main/Tracking.js index df024da8..545a4d90 100644 --- a/client-app/src/oldapp/designs/mapWithSideContent/main/Tracking.js +++ b/client-app/src/oldapp/designs/mapWithSideContent/main/Tracking.js @@ -1,13 +1,11 @@ define([ - 'alertify/alertify.min' - , "app/designs/base/_Main" + "app/designs/base/_Main" , "app/designs/mapWithSideContent/Controller" , "app/designs/mapWithSideContent/layout/MapAndContentAndTopbar" , 'src/redmicConfig' , 'd3/d3.min' , "dojo/_base/declare" , "dojo/_base/lang" - , "dojo/has" , 'moment/moment.min' , "put-selector/put" , "RWidgets/Utilities" @@ -22,15 +20,13 @@ define([ , "src/component/map/layer/TrackingLayerImpl" , "src/component/mapQuery/QueryOnMap" ], function( - alertify - , _Main + _Main , Controller , Layout , redmicConfig , d3 , declare , lang - , has , moment , put , Utilities @@ -104,11 +100,6 @@ define([ }; lang.mixin(this, this.config, args); - - if (has("edge") || has("trident") || has("ie")) { - alertify.alert(this.i18n.browserPartiallySupported, this.i18n.browserPartiallySupportedMsg1 + ". " + - this.i18n.browserPartiallySupportedMsg2 + ".

" + this.i18n.recommendBrowser + "."); - } }, _setMainConfigurations: function() { diff --git a/client-app/src/oldapp/nls/es/translation.js b/client-app/src/oldapp/nls/es/translation.js index 47503918..b2c58147 100644 --- a/client-app/src/oldapp/nls/es/translation.js +++ b/client-app/src/oldapp/nls/es/translation.js @@ -407,11 +407,6 @@ define({ , "alertRestartAction": "Pulse aquí para deshacer la acción" - , "browserPartiallySupported": "Navegador soportado parcialmente" - , "browserPartiallySupportedMsg1": "Su navegador no soporta todas las características presentes en este módulo" - , "browserPartiallySupportedMsg2": "Puede continuar a pesar de ello, o usar un navegador diferente" - , "recommendBrowser": "Le recomendamos utilizar 'Google Chrome' o 'Mozilla Firefox' para tener un soporte completo" - , "categorizeLayer": "Categorizar capa" , "addLayersCategory": "Añadir categoría de capas" , "editLayersCategory": "Editando categoría de capas" diff --git a/client-app/src/oldapp/nls/translation.js b/client-app/src/oldapp/nls/translation.js index 351f3646..21481890 100644 --- a/client-app/src/oldapp/nls/translation.js +++ b/client-app/src/oldapp/nls/translation.js @@ -407,11 +407,6 @@ define({ , "alertRestartAction": "Click here to undo the action" - , "browserPartiallySupported": "Browser partially supported" - , "browserPartiallySupportedMsg1": "Your browser does not support all the features present in this module" - , "browserPartiallySupportedMsg2": "You can continue despite this, or use a different browser" - , "recommendBrowser": "We recommend using 'Google Chrome' or 'Mozilla Firefox' to get full support" - , "categorizeLayer": "Categorize layer" , "addLayersCategory": "Add layers category" , "editLayersCategory": "Edit layers category" -- GitLab From 46e281ced41d8c92cd221c9ad3b917e45ceed351 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Fri, 6 Sep 2024 08:35:35 +0100 Subject: [PATCH 129/249] Corrige interferencias al pedir datos de actividad --- .../src/detail/activity/ActivityDetailView.js | 32 +++++++++++++++---- .../designs/details/main/_ActivityBase.js | 2 +- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/client-app/src/detail/activity/ActivityDetailView.js b/client-app/src/detail/activity/ActivityDetailView.js index c2f8be20..8dfafc0d 100644 --- a/client-app/src/detail/activity/ActivityDetailView.js +++ b/client-app/src/detail/activity/ActivityDetailView.js @@ -35,7 +35,7 @@ define([ constructor: function(args) { this.config = { - target: redmicConfig.services.activity, + activityTarget: redmicConfig.services.activity, reportService: 'activity', ancestorsTarget: redmicConfig.services.activityAncestors, infoTarget: 'infoWidgetTarget', @@ -47,6 +47,8 @@ define([ _setMainConfigurations: function() { + this.target = [this.activityTarget]; + this.viewPathsWidgets = { organisations: redmicConfig.viewPaths.organisationCatalogDetails, platforms: redmicConfig.viewPaths.platformCatalogDetails, @@ -82,14 +84,28 @@ define([ }); }, + _addTargetToArray: function(target) { + + if (this.target && this.target instanceof Array && !this.target.includes(target)) { + this.target.push(target); + } + }, + + _removeTargetFromArray: function(target) { + + if (this.target && this.target instanceof Array && this.target.includes(target)) { + this.target.splice(this.target.indexOf(target), 1); + } + }, + _itemAvailable: function(res) { - var path = res.data.path, - ancestorsTarget = lang.replace(this.ancestorsTarget, { path: path }); + var path = res.data.path; this._activityData = res.data; - this._originalTarget = this.target; - this.target = ancestorsTarget; + + this._ancestorsTarget = lang.replace(this.ancestorsTarget, { path: path }); + this._addTargetToArray(this._ancestorsTarget); this._emitEvt('INJECT_DATA', { data: this._activityData, @@ -98,7 +114,7 @@ define([ this._emitEvt('REQUEST', { method: 'POST', - target: ancestorsTarget, + target: this._ancestorsTarget, action: '_search', query: { returnFields: ['id', 'path', 'name'] @@ -118,7 +134,7 @@ define([ _dataAvailable: function(res) { - this.target = this._originalTarget; + this._removeTargetFromArray(this._ancestorsTarget); var data = res.data, ancestors = data.data; @@ -163,6 +179,8 @@ define([ _onActivityDetailsHidden: function() { + this.target = [this.activityTarget]; + if (this._lastWktLayer) { var mapInstance = this._getWidgetInstance('spatialExtension'); diff --git a/client-app/src/oldapp/designs/details/main/_ActivityBase.js b/client-app/src/oldapp/designs/details/main/_ActivityBase.js index b28ae052..bd35bd1d 100644 --- a/client-app/src/oldapp/designs/details/main/_ActivityBase.js +++ b/client-app/src/oldapp/designs/details/main/_ActivityBase.js @@ -50,7 +50,7 @@ define([ this._checkPathVariableId(); this._emitEvt('GET', { - target: this.target, + target: this.activityTarget, requesterId: this.ownChannel, id: this.pathVariableId }); -- GitLab From b96895b6ccdc801b48f27cb3a93872ff45c2f7ce Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Fri, 6 Sep 2024 09:06:44 +0100 Subject: [PATCH 130/249] =?UTF-8?q?Actualiza=20subm=C3=B3dulo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client-app/style | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client-app/style b/client-app/style index 281ad85f..2c154fbc 160000 --- a/client-app/style +++ b/client-app/style @@ -1 +1 @@ -Subproject commit 281ad85fdb8c0cd065d5e303fa45f54da71009ac +Subproject commit 2c154fbcaf5866894bb0637f4bc6a855fa801aaf -- GitLab From 811e6acf42bd8d5bcf4d8f1c2747b63f62cb547e Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Fri, 6 Sep 2024 14:45:41 +0100 Subject: [PATCH 131/249] =?UTF-8?q?Permite=20aplicar=20campo=20por=20defec?= =?UTF-8?q?to=20en=20ordenaci=C3=B3n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/component/browser/bars/Order.js | 141 +++++++++--------- 1 file changed, 73 insertions(+), 68 deletions(-) diff --git a/client-app/src/component/browser/bars/Order.js b/client-app/src/component/browser/bars/Order.js index c72ca9ff..4c53eb54 100644 --- a/client-app/src/component/browser/bars/Order.js +++ b/client-app/src/component/browser/bars/Order.js @@ -1,37 +1,35 @@ define([ - "dojo/_base/declare" - , "dojo/_base/lang" - , "dojo/aspect" - , "put-selector/put" - , "src/component/base/_Module" - , "src/component/base/_Show" + 'dojo/_base/declare' + , 'dojo/_base/lang' + , 'put-selector/put' + , 'src/component/base/_Module' + , 'src/component/base/_Show' ], function( declare , lang - , aspect , put , _Module , _Show -){ +) { + return declare([_Module, _Show], { // summary: - // - // description: - // + // Componente que aporta un selector de campo de ordenación y dirección. constructor: function(args) { this.config = { 'class': 'orderZone', - options: null, + hiddenClass: 'hidden', optionDefault: 'default', - directionOrder: "ASC", - directionIconAsc: "fa-sort-amount-asc", - directionIconDesc: "fa-sort-amount-desc", + ascIcon: 'fa-sort-amount-asc', + descIcon: 'fa-sort-amount-desc', + defaultOrderField: 'updated', + defaultOrderDirection: 'DESC', actions: { - ADD_TO_QUERY: "addToQuery", - UPDATE_OPTIONS: "updateOptions" + ADD_TO_QUERY: 'addToQuery', + UPDATE_OPTIONS: 'updateOptions' } }; @@ -41,8 +39,8 @@ define([ _defineSubscriptions: function () { this.subscriptionsConfig.push({ - channel : this.getChannel("UPDATE_OPTIONS"), - callback: "_subUpdateOptions" + channel : this.getChannel('UPDATE_OPTIONS'), + callback: '_subUpdateOptions' }); }, @@ -51,6 +49,10 @@ define([ this.inherited(arguments); this._createOrder(); + + if (this.defaultOrderField !== this.optionDefault) { + this._publishOrder(); + } }, _subUpdateOptions: function(req) { @@ -61,16 +63,16 @@ define([ return; } - this.selectOrderNode && put(this.selectOrderNode, '!'); - this.options = options; + this.selectOrderNode && put(this.selectOrderNode, '!'); + this._createSelectOrderOption(); }, _createOrder: function() { - put(this.domNode, 'span', this.i18n.sort + ":"); + put(this.domNode, 'span', this.i18n.sort + ':'); this.orderNode = put(this.domNode, 'div.containerOrder'); @@ -85,9 +87,11 @@ define([ _createSelectOrderOption: function() { - this.optionSelect = this.optionDefault; + this._currentOrderField = this.defaultOrderField; - this.options.unshift({value: "default"}); + this.options.unshift({ + value: this.optionDefault + }); this.selectOrderNode = put(this.orderNode, 'select.form-control'); @@ -96,14 +100,14 @@ define([ for (var i = 0; i < this.options.length; i++ ) { var item = this.options[i], - selected = ""; + selected = ''; - if (item.value == this.optionDefault) { - selected = "[selected]"; + if (item.value === this.defaultOrderField) { + selected = '[selected]'; } - var optionNode = put(this.selectOrderNode, "option" + - selected + "[value=$]", item.value, item.label || this.i18n[item.value] || item.value); + put(this.selectOrderNode, 'option' + selected + '[value=$]', item.value, + item.label || this.i18n[item.value] || item.value); } this._changeDirectionIcon(); @@ -111,7 +115,9 @@ define([ _createDirectionOrder: function() { - this.directionOrderNode = put(this.orderNode, 'span.hidden'); + this._currentOrderDirection = this.defaultOrderDirection; + + this.directionOrderNode = put(this.orderNode, 'span.' + this.hiddenClass); this.directionOrderNode.onclick = lang.hitch(this, this._eventDirectionClick); this._changeDirectionIcon(); @@ -119,85 +125,84 @@ define([ _changeDirectionIcon: function() { - if (this.directionOrder == "ASC") { - this.directionOrderNode.setAttribute("class", "fa " + this.directionIconAsc); + var directionIconClass = 'fa ' + (this._currentOrderDirection === 'ASC' ? this.ascIcon : this.descIcon); + + this.directionOrderNode.setAttribute('class', directionIconClass); + + if (this._currentOrderField === this.optionDefault) { + this._hideDirectionIcon(); } else { - this.directionOrderNode.setAttribute("class", "fa " + this.directionIconDesc); + this._showDirectionIcon(); } - - this.optionSelect !== "default" ? this._showDirectionIcon() : this._hideDirectionIcon(); }, _hideDirectionIcon: function() { - put(this.directionOrderNode, '.hidden'); + put(this.directionOrderNode, '.' + this.hiddenClass); }, _showDirectionIcon: function() { - put(this.directionOrderNode, '!hidden'); + put(this.directionOrderNode, '!' + this.hiddenClass); }, _eventOrderOptionClick: function(evt) { - var optionSelect = this.selectOrderNode.options[this.selectOrderNode.selectedIndex].value, - optionOrder = null; + var optionSelect = this.selectOrderNode.options[this.selectOrderNode.selectedIndex].value; - if (optionSelect != this.optionSelect) { - this.optionSelect = optionSelect; + if (optionSelect !== this._currentOrderField) { + this._currentOrderField = optionSelect; + this._applyCurrentOrderDirection(); + } + }, - optionOrder = "ASC"; + _eventDirectionClick: function() { - this._eventDirectionClick(optionOrder); - } + this._toggleCurrentOrderDirection(); + this._applyCurrentOrderDirection(); }, - _eventDirectionClick: function(optionOrder) { + _toggleCurrentOrderDirection: function() { - if (typeof optionOrder !== 'string') { - if (this.directionOrder === "ASC") { - this.directionOrder = "DESC"; - } else { - this.directionOrder = "ASC"; - } + if (this._currentOrderDirection === 'ASC') { + this._currentOrderDirection = 'DESC'; } else { - this.directionOrder = optionOrder; + this._currentOrderDirection = 'ASC'; } + }, - this._changeDirectionIcon(); + _applyCurrentOrderDirection: function() { + this._changeDirectionIcon(); this._publishOrder(); }, _publishOrder: function() { - if (this.queryChannel) { - this._publish(this._buildChannel(this.queryChannel, this.actions.ADD_TO_QUERY), { - query: { - sorts: this._createSorts(), - target: this.target - } - }); + if (!this.queryChannel) { + return; } + + this._publish(this._buildChannel(this.queryChannel, this.actions.ADD_TO_QUERY), { + query: { + sorts: this._createSorts(), + target: this.target + } + }); }, _createSorts: function() { var sorts = []; - if (this.optionSelect && this.optionSelect !== this.optionDefault) { + if (this._currentOrderField !== this.optionDefault) { sorts.push({ - "field": this.optionSelect, - "order": this.directionOrder + field: this._currentOrderField, + order: this._currentOrderDirection }); } return sorts; - }, - - _getNodeToShow: function() { - - return this.domNode; } }); }); -- GitLab From 3517124a9489a4c5ad5bfa3713f6908b2c918272 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Fri, 6 Sep 2024 14:53:13 +0100 Subject: [PATCH 132/249] =?UTF-8?q?A=C3=B1ade=20ordenaci=C3=B3n=20por=20de?= =?UTF-8?q?stacada=20a=20inicio?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client-app/src/home/item/SearchResultsWidget.js | 4 +++- client-app/src/oldapp/nls/es/translation.js | 1 + client-app/src/oldapp/nls/translation.js | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/client-app/src/home/item/SearchResultsWidget.js b/client-app/src/home/item/SearchResultsWidget.js index fd4092c0..b6597990 100644 --- a/client-app/src/home/item/SearchResultsWidget.js +++ b/client-app/src/home/item/SearchResultsWidget.js @@ -58,13 +58,15 @@ define([ },{ instance: Order, config: { + defaultOrderField: 'starred', options: [ {value: 'name'}, {value: 'code'}, {value: 'activityType.name', label: this.i18n.activityType}, {value: 'startDate'}, {value: 'endDate'}, - {value: 'updated'} + {value: 'updated'}, + {value: 'starred'} ] } },{ diff --git a/client-app/src/oldapp/nls/es/translation.js b/client-app/src/oldapp/nls/es/translation.js index b2c58147..2503e72c 100644 --- a/client-app/src/oldapp/nls/es/translation.js +++ b/client-app/src/oldapp/nls/es/translation.js @@ -1234,6 +1234,7 @@ define({ , "activityStatusFirstValue": "Sin iniciar" , "activityStatusSecondValue": "En curso" , "activityStatusThirdValue": "Concluida" + , "starred": "Destacada" , "starredActivity": "Destacada" , "activityHasResource": "Con recursos" , "accessibilityFilterInfo": "La accesibilidad de una actividad determina si los datos que contiene son públicos o tienen algún tipo de restricción para su visualización y descarga. Utiliza este filtro para diferenciar actividades con datos libres o con algún tipo de restricción." diff --git a/client-app/src/oldapp/nls/translation.js b/client-app/src/oldapp/nls/translation.js index 21481890..c50722f5 100644 --- a/client-app/src/oldapp/nls/translation.js +++ b/client-app/src/oldapp/nls/translation.js @@ -1238,6 +1238,7 @@ define({ , "activityStatusFirstValue": "Not started" , "activityStatusSecondValue": "In progress" , "activityStatusThirdValue": "Concluded" + , "starred": "Starred" , "starredActivity": "Starred" , "activityHasResource": "Has resources" , "accessibilityFilterInfo": "The accessibility of an activity determines if the contained data is public or has some kind of restriction for viewing and downloading it. Use this filter to differentiate activities with open data or with some kind of restriction." -- GitLab From de6499abf4f6dee88486714d3d8b95a8c8d87536 Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Mon, 9 Sep 2024 08:54:38 +0100 Subject: [PATCH 133/249] Aplica CRS 3857 a mapas y capas Fix #93. --- client-app/src/component/map/LeafletImpl.js | 2 +- .../component/map/StaticLayersDefinition.js | 240 +++++++++--------- client-app/src/util/widgets/Map.js | 4 +- 3 files changed, 127 insertions(+), 119 deletions(-) diff --git a/client-app/src/component/map/LeafletImpl.js b/client-app/src/component/map/LeafletImpl.js index cb0a65e1..0ef62a7a 100644 --- a/client-app/src/component/map/LeafletImpl.js +++ b/client-app/src/component/map/LeafletImpl.js @@ -57,7 +57,7 @@ define([ this.mapNode = put(this.mapParentNode, "div.map"); this.map = L.map(this.mapNode, { - crs: L.CRS.EPSG4326, + //crs: L.CRS.EPSG4326, doubleClickZoom: false, zoomControl: false, minZoom: this.minZoom, diff --git a/client-app/src/component/map/StaticLayersDefinition.js b/client-app/src/component/map/StaticLayersDefinition.js index a6f67d1f..b0b1a14f 100644 --- a/client-app/src/component/map/StaticLayersDefinition.js +++ b/client-app/src/component/map/StaticLayersDefinition.js @@ -1,127 +1,135 @@ -define({ - // summary: - // Definiciones estáticas de capas para el módulo Map. - // description: - // Contiene la definición de las diferentes capas base y superpuestas, en formato compatible con Leaflet. - // Para declarar una capa como base, se debe indicar con la propiedad 'basemap: true'. Soporta ordenación - // mediante la propiedad 'order' (valores enteros >= 1). - // Para declarar una capa como opcional (superpuesta pero cargada automáticamente, permitiendo su - // desactivación), se debe indicar con la propiedad 'optional: true'. +define([ + 'leaflet/leaflet' +], function( + L +) { - 'topografico': { - basemap: true, - protocol: 'WMS-C', - url: 'https://{s}.grafcan.es/ServicioWMS/MTI', - props: { - layers: 'WMS_MTI', - format: 'image/png', - subdomains: ['idecan2', 'idecan3'], - uppercase: true, - attribution: 'GRAFCAN', - minZoom: 5, - maxZoom: 21 - } - }, + return { + // summary: + // Definiciones estáticas de capas para el módulo Map. + // description: + // Contiene la definición de las diferentes capas base y superpuestas, en formato compatible con Leaflet. + // Para declarar una capa como base, se debe indicar con la propiedad 'basemap: true'. Soporta ordenación + // mediante la propiedad 'order' (valores enteros >= 1). + // Para declarar una capa como opcional (superpuesta pero cargada automáticamente, permitiendo su + // desactivación), se debe indicar con la propiedad 'optional: true'. - 'ortofoto': { - basemap: true, - protocol: 'WMS-C', - url: 'https://{s}.grafcan.es/ServicioWMS/OrtoExpress_bat', - props: { - layers: 'WMS_OrtoExpress', - format: 'image/jpeg', - uppercase: true, - subdomains: ['idecan1', 'idecan3'], - attribution: 'GRAFCAN', - minZoom: 5, - maxZoom: 21 - } - }, + 'topografico': { + basemap: true, + protocol: 'WMS-C', + url: 'https://{s}.grafcan.es/ServicioWMS/MTI', + props: { + layers: 'WMS_MTI', + format: 'image/png', + subdomains: ['idecan2', 'idecan3'], + uppercase: true, + attribution: 'GRAFCAN', + minZoom: 5, + maxZoom: 21 + } + }, - 'eoc-map': { - basemap: true, - order: 1, - protocol: 'TMS', - url: 'https://tiles.geoservice.dlr.de/service/tms/1.0.0/{layers}@{crs}@{format}/{z}/{x}/{y}.{format}', - props: { - layers: 'eoc:basemap', - tms: true, - crs: 'EPSG:4326', - format: 'png', - attribution: 'EOC Geoservice', - minZoom: 1, - maxZoom: 15 - } - }, + 'ortofoto': { + basemap: true, + protocol: 'WMS-C', + url: 'https://{s}.grafcan.es/ServicioWMS/OrtoExpress_bat', + props: { + layers: 'WMS_OrtoExpress', + crs: L.CRS.EPSG4326, // TODO por ahora, sólo está soportado este sistema de referencia + format: 'image/jpeg', + uppercase: true, + subdomains: ['idecan1', 'idecan3'], + attribution: 'GRAFCAN', + minZoom: 5, + maxZoom: 21 + } + }, - 'eoc-overlay': { - optional: true, - protocol: 'TMS', - url: 'https://tiles.geoservice.dlr.de/service/tms/1.0.0/{layers}@{crs}@{format}/{z}/{x}/{y}.{format}', - props: { - layers: 'eoc:baseoverlay', - tms: true, - crs: 'EPSG:4326', - format: 'png', - attribution: 'EOC Geoservice', - minZoom: 1, - maxZoom: 15 - } - }, + 'eoc-map': { + basemap: true, + order: 1, + protocol: 'TMS', + url: 'https://tiles.geoservice.dlr.de/service/tms/1.0.0/{layers}@{crs}@{format}/{z}/{x}/{y}.{format}', + props: { + layers: 'eoc:basemap', + tms: true, + crs: 'EPSG:3857', + format: 'png', + attribution: 'EOC Geoservice', + minZoom: 1, + maxZoom: 15 + } + }, - 'grid5000m': { - protocol: 'WMS-C', - url: 'https://atlas.redmic.es/geoserver/gg/wms', - props: { - layers: 'grid5000m', - format: 'image/png', - transparent: true, - tiled: true, - attribution: 'REDMIC', - minZoom: 7, - maxZoom: 12 - } - }, + 'eoc-overlay': { + optional: true, + protocol: 'TMS', + url: 'https://tiles.geoservice.dlr.de/service/tms/1.0.0/{layers}@{crs}@{format}/{z}/{x}/{y}.{format}', + props: { + layers: 'eoc:baseoverlay', + tms: true, + crs: 'EPSG:3857', + format: 'png', + attribution: 'EOC Geoservice', + minZoom: 1, + maxZoom: 15 + } + }, - 'grid1000m': { - protocol: 'WMS-C', - url: 'https://atlas.redmic.es/geoserver/gg/wms', - props: { - layers: 'grid1000m', - format: 'image/png', - transparent: true, - tiled: true, - attribution: 'REDMIC', - minZoom: 10, - maxZoom: 15 - } - }, + 'grid5000m': { + protocol: 'WMS-C', + url: 'https://atlas.redmic.es/geoserver/gg/wms', + props: { + layers: 'grid5000m', + format: 'image/png', + transparent: true, + tiled: true, + attribution: 'REDMIC', + minZoom: 7, + maxZoom: 12 + } + }, - 'grid500m': { - protocol: 'WMS-C', - url: 'https://atlas.redmic.es/geoserver/gg/wms', - props: { - layers: 'grid500m', - format: 'image/png', - transparent: true, - tiled: true, - attribution: 'REDMIC', - minZoom: 11, - maxZoom: 16 - } - }, + 'grid1000m': { + protocol: 'WMS-C', + url: 'https://atlas.redmic.es/geoserver/gg/wms', + props: { + layers: 'grid1000m', + format: 'image/png', + transparent: true, + tiled: true, + attribution: 'REDMIC', + minZoom: 10, + maxZoom: 15 + } + }, + + 'grid500m': { + protocol: 'WMS-C', + url: 'https://atlas.redmic.es/geoserver/gg/wms', + props: { + layers: 'grid500m', + format: 'image/png', + transparent: true, + tiled: true, + attribution: 'REDMIC', + minZoom: 11, + maxZoom: 16 + } + }, - 'grid100m': { - protocol: 'WMS-C', - url: 'https://atlas.redmic.es/geoserver/gg/wms', - props: { - layers: 'grid100m', - format: 'image/png', - transparent: true, - tiled: true, - attribution: 'REDMIC', - minZoom: 14, - maxZoom: 19 + 'grid100m': { + protocol: 'WMS-C', + url: 'https://atlas.redmic.es/geoserver/gg/wms', + props: { + layers: 'grid100m', + format: 'image/png', + transparent: true, + tiled: true, + attribution: 'REDMIC', + minZoom: 14, + maxZoom: 19 + } } } }); diff --git a/client-app/src/util/widgets/Map.js b/client-app/src/util/widgets/Map.js index 424b4876..398c950a 100644 --- a/client-app/src/util/widgets/Map.js +++ b/client-app/src/util/widgets/Map.js @@ -57,7 +57,7 @@ define([ doubleClickZoom: false, attributionControl: false, minZoom: 1, - crs: L.CRS.EPSG4326, + //crs: L.CRS.EPSG4326, maxBounds: L.latLngBounds(L.latLng(-85, -180), L.latLng(85, 180)) }); @@ -171,4 +171,4 @@ define([ this.map.setView([this.latCenter, this.lonCenter], this.zoom); } }); -}); \ No newline at end of file +}); -- GitLab From 4c03cbacd221ebc3021ba735d58bdf1f84d109ca Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Mon, 9 Sep 2024 12:28:39 +0100 Subject: [PATCH 134/249] Mejora maximizado de widgets Fix #97. --- client-app/src/component/base/_Window.js | 32 ++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/client-app/src/component/base/_Window.js b/client-app/src/component/base/_Window.js index 625d5cc9..0a801b35 100644 --- a/client-app/src/component/base/_Window.js +++ b/client-app/src/component/base/_Window.js @@ -49,6 +49,10 @@ define([ minWidthCols: 1, maxWidthCols: 6, + _heightFitContentValue: 'fitContent', + heightByRowsAttr: 'data-rows', + maxHeightRows: 6, + resizableBottomPadding: 15, resizableActionableThreshold: 15, @@ -99,6 +103,7 @@ define([ if (node) { this._originalWidthByCols = domAttr.get(node, this.widthByColsAttr); + this._originalHeightByRows = domAttr.get(node, this.heightByRowsAttr); this._createWindow(node); } @@ -473,13 +478,25 @@ define([ this._updateMaximizeButtonIcon(true); } - domAttr.set(this._windowNode.parentNode, this.widthByColsAttr, this.maxWidthCols); + this._setWindowParentNodeAttrsToMaximize(); + this._unsetWindowParentNodeSize(); this._unsetWindowNodeSize(); this._undoMinimizeModule(); }, + _setWindowParentNodeAttrsToMaximize: function() { + + var node = this._windowNode.parentNode; + + domAttr.set(node, this.widthByColsAttr, this.maxWidthCols); + + if (domAttr.get(node, this.heightByRowsAttr) !== this._heightFitContentValue) { + domAttr.set(node, this.heightByRowsAttr, this.maxHeightRows); + } + }, + _maximizeModuleReturn: function() { this._resizeAfterMaximizeToggle(); @@ -489,11 +506,22 @@ define([ this._updateMaximizeButtonIcon(false); } - domAttr.set(this._windowNode.parentNode, this.widthByColsAttr, this._originalWidthByCols); + this._setWindowParentNodeAttrsToUndoMaximize(); this._undoMinimizeModule(); }, + _setWindowParentNodeAttrsToUndoMaximize: function() { + + var node = this._windowNode.parentNode; + + domAttr.set(node, this.widthByColsAttr, this._originalWidthByCols); + + if (this._originalHeightByRows !== this._heightFitContentValue) { + domAttr.set(node, this.heightByRowsAttr, this._originalHeightByRows); + } + }, + _prepareMaximizeForUndoUserResize: function() { if (!this._maximizeButton) { -- GitLab From 3726d9608aa2b9d0cace2542ae493cd413df003a Mon Sep 17 00:00:00 2001 From: Pedro Trujillo Date: Mon, 9 Sep 2024 14:14:31 +0100 Subject: [PATCH 135/249] Erradica uso de banderas para los idiomas MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Emplea nombres de idiomas en su versión original para representarlos en el selector (tanto interno como externo). Refactoriza vistas externas para aclarar un poco la lógica seguida. Actualiza submódulo. Fix #98. --- .../src/component/user/LanguageSelector.js | 38 ++++--------------- .../src/oldapp/user/views/WhatIsRedmicView.js | 11 ++++++ .../user/views/_ExternalUserBaseView.js | 35 +++++------------ .../views/templates/ExternalUserBase.html | 7 ++-- client-app/style | 2 +- 5 files changed, 33 insertions(+), 60 deletions(-) diff --git a/client-app/src/component/user/LanguageSelector.js b/client-app/src/component/user/LanguageSelector.js index 2387ddb1..e95d581a 100644 --- a/client-app/src/component/user/LanguageSelector.js +++ b/client-app/src/component/user/LanguageSelector.js @@ -1,6 +1,5 @@ define([ - 'src/redmicConfig' - , 'dojo/_base/declare' + 'dojo/_base/declare' , 'dojo/_base/kernel' , 'dojo/_base/lang' , 'put-selector/put' @@ -10,8 +9,7 @@ define([ , 'src/component/base/_ShowOnEvt' , 'src/component/layout/listMenu/ListMenu' ], function( - redmicConfig - , declare + declare , kernel , lang , put @@ -43,13 +41,11 @@ define([ this.listMenuConfig = this._merge([{ parentChannel: this.getChannel(), items: [{ - icon: 'flag-icon-background.flag-icon-es', - label: this.i18n.es, + label: 'Español', callback: '_changeLanguage', value: 'es' },{ - icon: 'flag-icon-background.flag-icon-gb', - label: this.i18n.en, + label: 'English', callback: '_changeLanguage', value: 'en' }] @@ -58,7 +54,9 @@ define([ _initialize: function() { - this.listMenu = new declare([ListMenu, _ShowOnEvt]).extend(_ShowInTooltip)(this.listMenuConfig); + var LanguageTooltipDefinition = declare([ListMenu, _ShowOnEvt]).extend(_ShowInTooltip); + + this.listMenu = new LanguageTooltipDefinition(this.listMenuConfig); }, _defineSubscriptions: function() { @@ -75,7 +73,7 @@ define([ put(this.domNode, '[title=$]', this.i18n.language); - var languageIcon = this._getLanguageIcon(globalThis.lang); + var languageIcon = 'fa.fa-language'; put(this.domNode, 'i.' + languageIcon); this._publish(this.listMenu.getChannel('ADD_EVT'), { @@ -98,26 +96,6 @@ define([ hostnameWithoutLang = hostname.replace(kernel.locale + '.', ''); globalThis.location.href = protocol + '//' + language + '.' + hostnameWithoutLang; - }, - - _getLanguageIcon: function(currentLanguage) { - - var iconClasses; - - if (currentLanguage === 'es') { - iconClasses = 'flag.flag-icon-background.flag-icon-es'; - } else if (currentLanguage === 'en') { - iconClasses = 'flag.flag-icon-background.flag-icon-gb'; - } else { - iconClasses = 'fa.fa-language'; - } - - return iconClasses; - }, - - _getNodeToShow: function() { - - return this.domNode; } }); }); diff --git a/client-app/src/oldapp/user/views/WhatIsRedmicView.js b/client-app/src/oldapp/user/views/WhatIsRedmicView.js index 29637dd3..78765210 100644 --- a/client-app/src/oldapp/user/views/WhatIsRedmicView.js +++ b/client-app/src/oldapp/user/views/WhatIsRedmicView.js @@ -36,6 +36,17 @@ define([ this.inherited(arguments); on(this.domNode, "click", lang.hitch(this, this._onCloseWhatIsRedmic)); + }, + + _onCloseWhatIsRedmic: function(/*event*/ evt) { + // summary: + // Función que cierra la vista que muestra información de redmic. + // tags: + // callback private + + if (globalThis.location.pathname.includes(this.whatIsRedmicPath)) { + globalThis.location.href = this.loginPath; + } } }); }); diff --git a/client-app/src/oldapp/user/views/_ExternalUserBaseView.js b/client-app/src/oldapp/user/views/_ExternalUserBaseView.js index ba64a935..ccc14525 100644 --- a/client-app/src/oldapp/user/views/_ExternalUserBaseView.js +++ b/client-app/src/oldapp/user/views/_ExternalUserBaseView.js @@ -45,14 +45,14 @@ define([ this.config = { baseTemplateProps: { - _onShowWhatIsRedmic: this._onShowWhatIsRedmic, - _onCloseWhatIsRedmic: this._onCloseWhatIsRedmic, + _onShowWhatIsRedmic: lang.hitch(this, this._onShowWhatIsRedmic), _getManagerNode: this._getManagerNode, _changeLang: this._changeLang }, baseClass: '', replaceReg: /\%\[([^\]]+)\]/g, - whatIsRedmicPath: 'what-is-redmic' + whatIsRedmicPath: '/what-is-redmic', + loginPath: '/login' }; lang.mixin(this, this.config, args); @@ -92,35 +92,18 @@ define([ _onShowWhatIsRedmic: function(event) { // summary: // Función que muestra información de redmic. - // *** Se ejecuta en el ámbito del template - // // tags: // callback private - // event.stopPropagation(); - var path = 'what-is-redmic'; - if (globalThis.location.href.indexOf(path) < 0) { - globalThis.location.href = path; - } else { - globalThis.history.back(); - } - }, - _onCloseWhatIsRedmic: function(/*event*/ evt) { - // summary: - // Función que cierra la vista que muestra información de redmic. - // *** Se ejecuta en el ámbito del template - // - // tags: - // callback private - // + var path = this.whatIsRedmicPath; - setTimeout(lang.hitch(this, function() { - if (globalThis.location.href.indexOf(this.whatIsRedmicPath) >= 0) { - globalThis.history.back(); - } - }), 200); + if (globalThis.location.pathname.includes(path)) { + globalThis.location.href = this.loginPath; + } else { + globalThis.location.href = path; + } } }); }); diff --git a/client-app/src/oldapp/user/views/templates/ExternalUserBase.html b/client-app/src/oldapp/user/views/templates/ExternalUserBase.html index e2d7f212..3efb32bc 100644 --- a/client-app/src/oldapp/user/views/templates/ExternalUserBase.html +++ b/client-app/src/oldapp/user/views/templates/ExternalUserBase.html @@ -2,9 +2,10 @@ %[template]