From e6dffa6baa42d44d81ed68549ad7acd591016fe1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 2 Nov 2019 19:01:11 +0000 Subject: [PATCH 1/7] Bump mixin-deep from 1.3.0 to 1.3.2 Bumps [mixin-deep](https://github.com/jonschlinkert/mixin-deep) from 1.3.0 to 1.3.2. - [Release notes](https://github.com/jonschlinkert/mixin-deep/releases) - [Commits](https://github.com/jonschlinkert/mixin-deep/compare/1.3.0...1.3.2) Signed-off-by: dependabot[bot] --- yarn.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yarn.lock b/yarn.lock index affee8289..d951d6b3f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4276,8 +4276,8 @@ mississippi@^1.3.0: through2 "^2.0.0" mixin-deep@^1.2.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.0.tgz#47a8732ba97799457c8c1eca28f95132d7e8150a" + version "1.3.2" + resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566" dependencies: for-in "^1.0.2" is-extendable "^1.0.1" From ac4343c970d79303eb26dab712e9d77d69b3666e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 30 Apr 2020 01:57:27 +0000 Subject: [PATCH 2/7] Bump jquery from 3.2.1 to 3.5.0 Bumps [jquery](https://github.com/jquery/jquery) from 3.2.1 to 3.5.0. - [Release notes](https://github.com/jquery/jquery/releases) - [Commits](https://github.com/jquery/jquery/compare/3.2.1...3.5.0) Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) mode change 100755 => 100644 package.json diff --git a/package.json b/package.json old mode 100755 new mode 100644 index 7ceac0ea2..15f652a13 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "axios": "^0.17", "bootstrap-sass": "^3.3.7", "cross-env": "^5.1", - "jquery": "^3.2", + "jquery": "^3.5", "laravel-mix": "^1.0", "lodash": "^4.17.4", "vue": "^2.5.7" diff --git a/yarn.lock b/yarn.lock index affee8289..82cdcf643 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3604,9 +3604,9 @@ isstream@~0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" -jquery@^3.2: - version "3.2.1" - resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.2.1.tgz#5c4d9de652af6cd0a770154a631bba12b015c787" +jquery@^3.5: + version "3.5.0" + resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.0.tgz#9980b97d9e4194611c36530e7dc46a58d7340fc9" js-base64@^2.1.8, js-base64@^2.1.9: version "2.4.0" From 17dd7ca5cf9ba35ab37e31f300ac79e31621445a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 6 Jun 2020 14:11:41 +0000 Subject: [PATCH 3/7] Bump websocket-extensions from 0.1.3 to 0.1.4 Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-node) from 0.1.3 to 0.1.4. - [Release notes](https://github.com/faye/websocket-extensions-node/releases) - [Changelog](https://github.com/faye/websocket-extensions-node/blob/master/CHANGELOG.md) - [Commits](https://github.com/faye/websocket-extensions-node/compare/0.1.3...0.1.4) Signed-off-by: dependabot[bot] --- yarn.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yarn.lock b/yarn.lock index affee8289..f6a78ae3c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6892,8 +6892,8 @@ websocket-driver@>=0.5.1: websocket-extensions ">=0.1.1" websocket-extensions@>=0.1.1: - version "0.1.3" - resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29" + version "0.1.4" + resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42" whet.extend@~0.9.9: version "0.9.9" From c4d98e3507a2c9fb5beeb47db32e2c9ee02c4239 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 30 Jul 2020 13:26:42 +0000 Subject: [PATCH 4/7] Bump elliptic from 6.4.0 to 6.5.3 Bumps [elliptic](https://github.com/indutny/elliptic) from 6.4.0 to 6.5.3. - [Release notes](https://github.com/indutny/elliptic/releases) - [Commits](https://github.com/indutny/elliptic/compare/v6.4.0...v6.5.3) Signed-off-by: dependabot[bot] --- yarn.lock | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/yarn.lock b/yarn.lock index affee8289..e48e006c3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -902,8 +902,8 @@ bluebird@^3.1.1, bluebird@^3.5.0: resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9" bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0: - version "4.11.8" - resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f" + version "4.11.9" + resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz#26d556829458f9d1e81fc48952493d0ba3507828" body-parser@1.18.2: version "1.18.2" @@ -2021,8 +2021,8 @@ electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.30: electron-releases "^2.1.0" elliptic@^6.0.0: - version "6.4.0" - resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.0.tgz#cac9af8762c85836187003c8dfe193e5e2eae5df" + version "6.5.3" + resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz#cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6" dependencies: bn.js "^4.4.0" brorand "^1.0.1" @@ -2986,11 +2986,11 @@ hash-sum@^1.0.2: resolved "https://registry.yarnpkg.com/hash-sum/-/hash-sum-1.0.2.tgz#33b40777754c6432573c120cc3808bbd10d47f04" hash.js@^1.0.0, hash.js@^1.0.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.3.tgz#340dedbe6290187151c1ea1d777a3448935df846" + version "1.1.7" + resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42" dependencies: inherits "^2.0.3" - minimalistic-assert "^1.0.0" + minimalistic-assert "^1.0.1" hawk@3.1.3, hawk@~3.1.3: version "3.1.3" @@ -3233,14 +3233,18 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" +inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3: + version "2.0.4" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" inherits@2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1" +inherits@2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" + ini@~1.3.0: version "1.3.5" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" @@ -4238,9 +4242,9 @@ mimic-fn@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18" -minimalistic-assert@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz#702be2dda6b37f4836bcb3f5db56641b64a1d3d3" +minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1: version "1.0.1" From e7cd0587c187db5f19be021c9f9b5d50812ae20b Mon Sep 17 00:00:00 2001 From: Eddie Ridwan Date: Wed, 11 Nov 2020 15:12:23 +1100 Subject: [PATCH 5/7] gitignore Vagrantfile --- .gitignore | 3 ++- Vagrantfile | 2 +- .../Dashboard/DashboardAnggaranRealisasiController.php | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4e9b9028a..8fb8a6432 100755 --- a/.gitignore +++ b/.gitignore @@ -12,4 +12,5 @@ yarn-error.log .env composer.lock composer.log -/storage/installed \ No newline at end of file +/storage/installed +Vagrantfile.* \ No newline at end of file diff --git a/Vagrantfile b/Vagrantfile index 3a0784b2f..4e159eda9 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -5,7 +5,7 @@ Vagrant.configure("2") do |config| config.vm.box = "scotch/box-pro" config.vm.hostname = "scotchbox" - config.vm.network "forwarded_port", guest: 80, host: 8080 + config.vm.network "forwarded_port", guest: 80, host: 8099 config.vm.network "private_network", ip: "192.168.33.30" config.vm.synced_folder ".", "/var/www", :mount_options => ["dmode=777", "fmode=666"] config.vm.synced_folder "storage/app/public", "/var/www/storage/app/public", owner: "www-data", group: "www-data" diff --git a/app/Http/Controllers/Dashboard/DashboardAnggaranRealisasiController.php b/app/Http/Controllers/Dashboard/DashboardAnggaranRealisasiController.php index ebb99cd5b..7c241c541 100755 --- a/app/Http/Controllers/Dashboard/DashboardAnggaranRealisasiController.php +++ b/app/Http/Controllers/Dashboard/DashboardAnggaranRealisasiController.php @@ -54,7 +54,7 @@ public function getChartAnggaranRealisasi() $res = $query_result->first(); - if (count($res) > 0) { + if (! empty($res) ) { $total_anggaran = $res->total_anggaran; $total_belanja = $res->total_belanja; $belanja_pegawai = $res->belanja_pegawai; From cdd0cc0bfe982ef3b9f6539bbe26277b5b8a2469 Mon Sep 17 00:00:00 2001 From: Eddie Ridwan Date: Wed, 11 Nov 2020 15:15:34 +1100 Subject: [PATCH 6/7] Hapus Vagrantfile --- .gitignore | 3 ++- Vagrantfile | 14 -------------- 2 files changed, 2 insertions(+), 15 deletions(-) delete mode 100644 Vagrantfile diff --git a/.gitignore b/.gitignore index 8fb8a6432..f34529596 100755 --- a/.gitignore +++ b/.gitignore @@ -13,4 +13,5 @@ yarn-error.log composer.lock composer.log /storage/installed -Vagrantfile.* \ No newline at end of file +Vagrantfile.* +Vagrantfile \ No newline at end of file diff --git a/Vagrantfile b/Vagrantfile deleted file mode 100644 index 4e159eda9..000000000 --- a/Vagrantfile +++ /dev/null @@ -1,14 +0,0 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : - -Vagrant.configure("2") do |config| - - config.vm.box = "scotch/box-pro" - config.vm.hostname = "scotchbox" - config.vm.network "forwarded_port", guest: 80, host: 8099 - config.vm.network "private_network", ip: "192.168.33.30" - config.vm.synced_folder ".", "/var/www", :mount_options => ["dmode=777", "fmode=666"] - config.vm.synced_folder "storage/app/public", "/var/www/storage/app/public", owner: "www-data", group: "www-data" - # Optional NFS. Make sure to remove other synced_folder line too - #config.vm.synced_folder ".", "/var/www", :nfs => { :mount_options => ["dmode=777","fmode=666"] } -end From 9d1ad35aed90f0dc9e600bf6ce248c673a87c31d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 Nov 2020 04:30:06 +0000 Subject: [PATCH 7/7] Bump lodash from 4.17.4 to 4.17.19 Bumps [lodash](https://github.com/lodash/lodash) from 4.17.4 to 4.17.19. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/compare/4.17.4...4.17.19) Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 15f652a13..c8f568336 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "cross-env": "^5.1", "jquery": "^3.5", "laravel-mix": "^1.0", - "lodash": "^4.17.4", + "lodash": "^4.17.19", "vue": "^2.5.7" } } diff --git a/yarn.lock b/yarn.lock index c22ed3bdb..c5b6a7fdc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4014,9 +4014,9 @@ lodash.uniq@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" -lodash@^4.0.0, lodash@^4.14.0, lodash@^4.17.2, lodash@^4.17.4, lodash@~4.17.4: - version "4.17.4" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae" +lodash@^4.0.0, lodash@^4.14.0, lodash@^4.17.19, lodash@^4.17.2, lodash@^4.17.4, lodash@~4.17.4: + version "4.17.19" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b" logalot@^2.0.0: version "2.1.0"