From 046d97af33122dfdfc30bed96f499246360fd778 Mon Sep 17 00:00:00 2001 From: Pablo Bonilla Date: Sun, 11 Jul 2021 01:17:12 -0600 Subject: [PATCH] Add jQuery and fix modal close on register survey --- angular.json | 7 +- package-lock.json | 79 + package.json | 3 + .../encuesta/list/encuesta.component.html | 2 +- .../encuesta/list/encuesta.component.spec.ts | 48 - .../encuesta/list/encuesta.component.ts | 9 +- .../update/encuesta-update.component.ts | 3 + .../webapp/content/scss/bootstrap.min.css | 8254 +++++++++++++++++ 8 files changed, 8349 insertions(+), 56 deletions(-) delete mode 100644 src/main/webapp/app/entities/encuesta/list/encuesta.component.spec.ts create mode 100644 src/main/webapp/content/scss/bootstrap.min.css diff --git a/angular.json b/angular.json index eb5232d..8bf54fc 100644 --- a/angular.json +++ b/angular.json @@ -45,7 +45,7 @@ ], "styles": ["src/main/webapp/content/scss/paper-dashboard.scss", "./node_modules/swiper/swiper-bundle.min.css"], "scripts": [ - "src/main/webapp/content/js/jquery-3.1.1.min.js", + "./node_modules/jquery/dist/jquery.min.js", "src/main/webapp/content/js/jquery.bootstrap.wizard.min.js", "src/main/webapp/content/js/jquery.datatables.js", "src/main/webapp/content/js/jquery.easypiechart.min.js", @@ -53,7 +53,6 @@ "src/main/webapp/content/js/jquery-jvectormap.js", "src/main/webapp/content/js/jquery-ui.min.js", "src/main/webapp/content/js/bootstrap.bundle.min.js", - "src/main/webapp/content/js/bootstrap.min.js", "src/main/webapp/content/js/moment.min.js", "src/main/webapp/content/js/bootstrap-datetimepicker.js", "src/main/webapp/content/js/bootstrap-notify.js", @@ -64,10 +63,10 @@ "src/main/webapp/content/js/es6-promise-auto.min.js", "src/main/webapp/content/js/fullcalendar.min.js", "src/main/webapp/content/js/nouislider.min.js", - "src/main/webapp/content/js/paper-dashboard.js", "src/main/webapp/content/js/perfect-scrollbar.min.js", "src/main/webapp/content/js/sweetalert2.js", - "./node_modules/swiper/swiper-bundle.min.js" + "./node_modules/swiper/swiper-bundle.min.js", + "src/main/webapp/content/js/paper-dashboard.js" ] }, "configurations": { diff --git a/package-lock.json b/package-lock.json index 250092c..cae69cb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -25,6 +25,7 @@ "@ngx-translate/http-loader": "6.0.0", "bootstrap": "4.6.0", "dayjs": "1.10.5", + "jquery": "^3.6.0", "ngx-infinite-scroll": "10.0.1", "ngx-webstorage": "8.0.0", "rxjs": "6.6.7", @@ -42,7 +43,9 @@ "@angular/cli": "12.0.4", "@angular/compiler-cli": "12.0.5", "@angular/service-worker": "12.0.5", + "@types/bootstrap": "^5.0.17", "@types/jest": "26.0.23", + "@types/jquery": "^3.5.6", "@types/node": "15.12.2", "@types/sockjs-client": "1.5.0", "@typescript-eslint/eslint-plugin": "4.27.0", @@ -3981,6 +3984,16 @@ "integrity": "sha512-15spi3V28QdevleWBNXE4pIls3nFZmBbUGrW9IVPwiQczuSb9n76TCB4bsk8TSel+I1OkHEdPhu5QKMfY6rQHA==", "dev": true }, + "node_modules/@popperjs/core": { + "version": "2.9.2", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.9.2.tgz", + "integrity": "sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q==", + "dev": true, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/popperjs" + } + }, "node_modules/@scarf/scarf": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/@scarf/scarf/-/scarf-1.1.1.tgz", @@ -4177,6 +4190,16 @@ "@babel/types": "^7.3.0" } }, + "node_modules/@types/bootstrap": { + "version": "5.0.17", + "resolved": "https://registry.npmjs.org/@types/bootstrap/-/bootstrap-5.0.17.tgz", + "integrity": "sha512-uQQQ3p+zw10VjZLvtCuKWI6QgVCYEnK/yHnno3gyEhikfQdiZexS2XPxjWRboGmX135o470GkmCta9eAgQMVLQ==", + "dev": true, + "dependencies": { + "@popperjs/core": "^2.9.2", + "@types/jquery": "*" + } + }, "node_modules/@types/concat-stream": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/@types/concat-stream/-/concat-stream-1.6.0.tgz", @@ -4280,6 +4303,15 @@ "pretty-format": "^26.0.0" } }, + "node_modules/@types/jquery": { + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz", + "integrity": "sha512-SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg==", + "dev": true, + "dependencies": { + "@types/sizzle": "*" + } + }, "node_modules/@types/json-schema": { "version": "7.0.7", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.7.tgz", @@ -4328,6 +4360,12 @@ "integrity": "sha512-0/HnwIfW4ki2D8L8c9GVcG5I72s9jP5GSLVF0VIXDW00kmIpA6O33G7a8n59Tmh7Nz0WUC3rSb7PTY/sdW2JzA==", "dev": true }, + "node_modules/@types/sizzle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==", + "dev": true + }, "node_modules/@types/sockjs-client": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/@types/sockjs-client/-/sockjs-client-1.5.0.tgz", @@ -15464,6 +15502,11 @@ "@sideway/pinpoint": "^2.0.0" } }, + "node_modules/jquery": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -30101,6 +30144,12 @@ "integrity": "sha512-15spi3V28QdevleWBNXE4pIls3nFZmBbUGrW9IVPwiQczuSb9n76TCB4bsk8TSel+I1OkHEdPhu5QKMfY6rQHA==", "dev": true }, + "@popperjs/core": { + "version": "2.9.2", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.9.2.tgz", + "integrity": "sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q==", + "dev": true + }, "@scarf/scarf": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/@scarf/scarf/-/scarf-1.1.1.tgz", @@ -30270,6 +30319,16 @@ "@babel/types": "^7.3.0" } }, + "@types/bootstrap": { + "version": "5.0.17", + "resolved": "https://registry.npmjs.org/@types/bootstrap/-/bootstrap-5.0.17.tgz", + "integrity": "sha512-uQQQ3p+zw10VjZLvtCuKWI6QgVCYEnK/yHnno3gyEhikfQdiZexS2XPxjWRboGmX135o470GkmCta9eAgQMVLQ==", + "dev": true, + "requires": { + "@popperjs/core": "^2.9.2", + "@types/jquery": "*" + } + }, "@types/concat-stream": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/@types/concat-stream/-/concat-stream-1.6.0.tgz", @@ -30373,6 +30432,15 @@ "pretty-format": "^26.0.0" } }, + "@types/jquery": { + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz", + "integrity": "sha512-SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg==", + "dev": true, + "requires": { + "@types/sizzle": "*" + } + }, "@types/json-schema": { "version": "7.0.7", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.7.tgz", @@ -30421,6 +30489,12 @@ "integrity": "sha512-0/HnwIfW4ki2D8L8c9GVcG5I72s9jP5GSLVF0VIXDW00kmIpA6O33G7a8n59Tmh7Nz0WUC3rSb7PTY/sdW2JzA==", "dev": true }, + "@types/sizzle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==", + "dev": true + }, "@types/sockjs-client": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/@types/sockjs-client/-/sockjs-client-1.5.0.tgz", @@ -39006,6 +39080,11 @@ "@sideway/pinpoint": "^2.0.0" } }, + "jquery": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", diff --git a/package.json b/package.json index 8cb4b47..f15f14c 100644 --- a/package.json +++ b/package.json @@ -82,6 +82,7 @@ "@ngx-translate/http-loader": "6.0.0", "bootstrap": "4.6.0", "dayjs": "1.10.5", + "jquery": "^3.6.0", "ngx-infinite-scroll": "10.0.1", "ngx-webstorage": "8.0.0", "rxjs": "6.6.7", @@ -99,7 +100,9 @@ "@angular/cli": "12.0.4", "@angular/compiler-cli": "12.0.5", "@angular/service-worker": "12.0.5", + "@types/bootstrap": "^5.0.17", "@types/jest": "26.0.23", + "@types/jquery": "^3.5.6", "@types/node": "15.12.2", "@types/sockjs-client": "1.5.0", "@typescript-eslint/eslint-plugin": "4.27.0", diff --git a/src/main/webapp/app/entities/encuesta/list/encuesta.component.html b/src/main/webapp/app/entities/encuesta/list/encuesta.component.html index 5e2099d..3587a63 100644 --- a/src/main/webapp/app/entities/encuesta/list/encuesta.component.html +++ b/src/main/webapp/app/entities/encuesta/list/encuesta.component.html @@ -216,7 +216,7 @@