Fakultas Ilmu Komputer UI

Commit b2f07c00 authored by Muhammad Fairuzi Teguh's avatar Muhammad Fairuzi Teguh
Browse files

Merge branch 'warmfix-iruz' into 'staging'

Warmfix iruz

See merge request !122
parents 654cbdc6 78a52a2e
Pipeline #50008 passed with stages
in 13 minutes and 4 seconds
from django.contrib import admin from main.admin import InputFilter
from django.conf import settings from donor.models import DaftarDonor, JadwalDonor
from django.utils.translation import gettext_lazy as _
from django.http import HttpResponse from django.http import HttpResponse
from django.conf import settings
from donor.models import JadwalDonor, DaftarDonor from django.db.models import Q
from django.contrib import admin
def download_jadwaldonor(modeladmin, request, queryset): def download_jadwaldonor(modeladmin, request, queryset):
...@@ -73,6 +75,18 @@ class JadwalDonorAdmin(admin.ModelAdmin): ...@@ -73,6 +75,18 @@ class JadwalDonorAdmin(admin.ModelAdmin):
js = [settings.MEDIA_URL+'/js/acara_donor_custom_admin.js', ] js = [settings.MEDIA_URL+'/js/acara_donor_custom_admin.js', ]
class JadwalDonorFilter(InputFilter):
parameter_name = 'lokasi_donor'
title = _('lokasi donor')
def queryset(self, request, queryset):
if self.value() is not None:
lokasi_donor = self.value()
return queryset.filter(
Q(jadwal_donor__location__contains=lokasi_donor)
)
@admin.register(DaftarDonor) @admin.register(DaftarDonor)
class DaftarDonorAdmin(admin.ModelAdmin): class DaftarDonorAdmin(admin.ModelAdmin):
list_display = ('user', 'has_attended', 'get_goldar', 'jadwal_donor') list_display = ('user', 'has_attended', 'get_goldar', 'jadwal_donor')
...@@ -124,7 +138,7 @@ class DaftarDonorAdmin(admin.ModelAdmin): ...@@ -124,7 +138,7 @@ class DaftarDonorAdmin(admin.ModelAdmin):
'menderita_pendarahan', 'menderita_pendarahan',
'seks_dengan_orang_afrika', 'seks_dengan_orang_afrika',
'tinggal_di_afrika') 'tinggal_di_afrika')
list_filter = ('has_attended', 'user__profile__blood_type') list_filter = ('has_attended', JadwalDonorFilter, 'jadwal_donor__time_start', 'user__profile__blood_type')
def get_goldar(self, obj): def get_goldar(self, obj):
return obj.user.profile.blood_type return obj.user.profile.blood_type
......
...@@ -38,6 +38,24 @@ class UserAdmin(DjangoUserAdmin): ...@@ -38,6 +38,24 @@ class UserAdmin(DjangoUserAdmin):
js = [settings.MEDIA_URL+'/js/user_custom_admin.js', ] js = [settings.MEDIA_URL+'/js/user_custom_admin.js', ]
class InputFilter(admin.SimpleListFilter):
template = 'admin/input_filter.html'
def lookups(self, request, model_admin):
# Dummy, required to show the filter.
return ((),)
def choices(self, changelist):
# Grab only the "all" option.
all_choice = next(super().choices(changelist))
all_choice['query_parts'] = (
(k, v)
for k, v in changelist.get_filters_params().items()
if k != self.parameter_name
)
yield all_choice
@admin.register(Profile) @admin.register(Profile)
class ProfileAdmin(admin.ModelAdmin): class ProfileAdmin(admin.ModelAdmin):
list_display = ('user', 'district', 'address', 'age', 'sex', 'blood_type') list_display = ('user', 'district', 'address', 'age', 'sex', 'blood_type')
......
{% load i18n %}
<h3>{% blocktrans with filter_title=title %} By {{ filter_title }} {% endblocktrans %}</h3>
<ul>
<li>
{% with choices.0 as all_choice %}
<form method="GET" action="">
{% for k, v in all_choice.query_parts %}
<input type="hidden" name="{{ k }}" value="{{ v }}" />
{% endfor %}
<input type="text"
value="{{ spec.value|default_if_none:'' }}"
name="{{ spec.parameter_name }}"/>
{% if not all_choice.selected %}
<strong><a href="{{ all_choice.query_string }}">x {% trans 'Remove' %}</a></strong>
{% endif %}
</form>
{% endwith %}
</li>
</ul>
\ No newline at end of file
...@@ -304,6 +304,11 @@ ...@@ -304,6 +304,11 @@
"@babel/types": "^7.8.3" "@babel/types": "^7.8.3"
} }
}, },
"@babel/helper-validator-identifier": {
"version": "7.10.1",
"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz",
"integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw=="
},
"@babel/helper-wrap-function": { "@babel/helper-wrap-function": {
"version": "7.8.3", "version": "7.8.3",
"resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.8.3.tgz", "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.8.3.tgz",
...@@ -854,12 +859,19 @@ ...@@ -854,12 +859,19 @@
} }
}, },
"@babel/polyfill": { "@babel/polyfill": {
"version": "7.8.3", "version": "7.10.1",
"resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.8.3.tgz", "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.10.1.tgz",
"integrity": "sha512-0QEgn2zkCzqGIkSWWAEmvxD7e00Nm9asTtQvi7HdlYvMhjy/J38V/1Y9ode0zEJeIuxAI0uftiAzqc7nVeWUGg==", "integrity": "sha512-TviueJ4PBW5p48ra8IMtLXVkDucrlOZAIZ+EXqS3Ot4eukHbWiqcn7DcqpA1k5PcKtmJ4Xl9xwdv6yQvvcA+3g==",
"requires": { "requires": {
"core-js": "^2.6.5", "core-js": "^2.6.5",
"regenerator-runtime": "^0.13.2" "regenerator-runtime": "^0.13.4"
},
"dependencies": {
"regenerator-runtime": {
"version": "0.13.5",
"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz",
"integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA=="
}
} }
}, },
"@babel/preset-env": { "@babel/preset-env": {
...@@ -1686,15 +1698,14 @@ ...@@ -1686,15 +1698,14 @@
} }
}, },
"@reach/router": { "@reach/router": {
"version": "1.2.1", "version": "1.3.3",
"resolved": "https://registry.npmjs.org/@reach/router/-/router-1.2.1.tgz", "resolved": "https://registry.npmjs.org/@reach/router/-/router-1.3.3.tgz",
"integrity": "sha512-kTaX08X4g27tzIFQGRukaHmNbtMYDS3LEWIS8+l6OayGIw6Oyo1HIF/JzeuR2FoF9z6oV+x/wJSVSq4v8tcUGQ==", "integrity": "sha512-gOIAiFhWdiVGSVjukKeNKkCRBLmnORoTPyBihI/jLunICPgxdP30DroAvPQuf1eVfQbfGJQDJkwhJXsNPMnVWw==",
"requires": { "requires": {
"create-react-context": "^0.2.1", "create-react-context": "0.3.0",
"invariant": "^2.2.3", "invariant": "^2.2.3",
"prop-types": "^15.6.1", "prop-types": "^15.6.1",
"react-lifecycles-compat": "^3.0.4", "react-lifecycles-compat": "^3.0.4"
"warning": "^3.0.0"
} }
}, },
"@restart/context": { "@restart/context": {
...@@ -1978,9 +1989,9 @@ ...@@ -1978,9 +1989,9 @@
} }
}, },
"@types/history": { "@types/history": {
"version": "4.7.4", "version": "4.7.6",
"resolved": "https://registry.npmjs.org/@types/history/-/history-4.7.4.tgz", "resolved": "https://registry.npmjs.org/@types/history/-/history-4.7.6.tgz",
"integrity": "sha512-+o2igcuZA3xtOoFH56s+MCZVidwlJNcJID57DSCyawS2i910yG9vkwehCjJNZ6ImhCR5S9DbvIJKyYHcMyOfMw==" "integrity": "sha512-GRTZLeLJ8ia00ZH8mxMO8t0aC9M1N9bN461Z2eaRurJo6Fpa+utgCwLzI4jQHcrdzuzp5WPN9jRwpsCQ1VhJ5w=="
}, },
"@types/istanbul-lib-coverage": { "@types/istanbul-lib-coverage": {
"version": "2.0.1", "version": "2.0.1",
...@@ -2062,14 +2073,14 @@ ...@@ -2062,14 +2073,14 @@
"integrity": "sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw==" "integrity": "sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw=="
}, },
"@types/q": { "@types/q": {
"version": "1.5.2", "version": "1.5.4",
"resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.2.tgz", "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.4.tgz",
"integrity": "sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw==" "integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug=="
}, },
"@types/reach__router": { "@types/reach__router": {
"version": "1.2.6", "version": "1.3.5",
"resolved": "https://registry.npmjs.org/@types/reach__router/-/reach__router-1.2.6.tgz", "resolved": "https://registry.npmjs.org/@types/reach__router/-/reach__router-1.3.5.tgz",
"integrity": "sha512-Oh5DAVr/L2svBvubw6QEFpXGu295Y406BPs4i9t1n2pp7M+q3pmCmhzb9oZV5wncR41KCD3NHl1Yhi7uKnTPsA==", "integrity": "sha512-h0NbqXN/tJuBY/xggZSej1SKQEstbHO7J/omt1tYoFGmj3YXOodZKbbqD4mNDh7zvEGYd7YFrac1LTtAr3xsYQ==",
"requires": { "requires": {
"@types/history": "*", "@types/history": "*",
"@types/react": "*" "@types/react": "*"
...@@ -2181,6 +2192,12 @@ ...@@ -2181,6 +2192,12 @@
"resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-15.0.0.tgz", "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-15.0.0.tgz",
"integrity": "sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==" "integrity": "sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw=="
}, },
"@types/yoga-layout": {
"version": "1.9.2",
"resolved": "https://registry.npmjs.org/@types/yoga-layout/-/yoga-layout-1.9.2.tgz",
"integrity": "sha512-S9q47ByT2pPvD65IvrWp7qppVMpk9WGMbVq9wbWZOHg6tnXSD4vyhao6nOSBwwfDdV2p3Kx9evA9vI+XWTfDvw==",
"optional": true
},
"@typescript-eslint/eslint-plugin": { "@typescript-eslint/eslint-plugin": {
"version": "2.22.0", "version": "2.22.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.22.0.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.22.0.tgz",
...@@ -2602,9 +2619,9 @@ ...@@ -2602,9 +2619,9 @@
"integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==" "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
}, },
"arch": { "arch": {
"version": "2.1.1", "version": "2.1.2",
"resolved": "https://registry.npmjs.org/arch/-/arch-2.1.1.tgz", "resolved": "https://registry.npmjs.org/arch/-/arch-2.1.2.tgz",
"integrity": "sha512-BLM56aPo9vLLFVa8+/+pJLnrZ7QGGTVHWsCwieAWT9o9K8UeGaQbzZbGoabWLOo2ksBCztoXdqBZBplqLDDCSg==" "integrity": "sha512-NTBIIbAfkJeIletyABbVtdPgeKfDafR+1mZV/AyyfC1UkVkp9iUjV+wwmqtUgphHYajbI86jejBJp5e+jkGTiQ=="
}, },
"argparse": { "argparse": {
"version": "1.0.10", "version": "1.0.10",
...@@ -2714,11 +2731,6 @@ ...@@ -2714,11 +2731,6 @@
"integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==", "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==",
"optional": true "optional": true
}, },
"asap": {
"version": "2.0.6",
"resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
"integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY="
},
"asn1": { "asn1": {
"version": "0.2.4", "version": "0.2.4",
"resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
...@@ -2736,6 +2748,13 @@ ...@@ -2736,6 +2748,13 @@
"bn.js": "^4.0.0", "bn.js": "^4.0.0",
"inherits": "^2.0.1", "inherits": "^2.0.1",
"minimalistic-assert": "^1.0.0" "minimalistic-assert": "^1.0.0"
},
"dependencies": {
"bn.js": {
"version": "4.11.9",
"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
"integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw=="
}
} }
}, },
"assert": { "assert": {
...@@ -2810,34 +2829,45 @@ ...@@ -2810,34 +2829,45 @@
"integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==" "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="
}, },
"auto-bind": { "auto-bind": {
"version": "3.0.0", "version": "4.0.0",
"resolved": "https://registry.npmjs.org/auto-bind/-/auto-bind-3.0.0.tgz", "resolved": "https://registry.npmjs.org/auto-bind/-/auto-bind-4.0.0.tgz",
"integrity": "sha512-v0A231a/lfOo6kxQtmEkdBfTApvC21aJYukA8pkKnoTvVqh3Wmm7/Rwy4GBCHTTHVoLVA5qsBDDvf1XY1nIV2g==", "integrity": "sha512-Hdw8qdNiqdJ8LqT0iK0sVzkFbzg6fhnQqqfWhBDxcHZvU75+B+ayzTy8x+k5Ix0Y92XOhOUlx74ps+bA6BeYMQ==",
"optional": true "optional": true
}, },
"autoprefixer": { "autoprefixer": {
"version": "9.7.4", "version": "9.8.0",
"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.7.4.tgz", "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.0.tgz",
"integrity": "sha512-g0Ya30YrMBAEZk60lp+qfX5YQllG+S5W3GYCFvyHTvhOki0AEQJLPEcIuGRsqVwLi8FvXPVtwTGhfr38hVpm0g==", "integrity": "sha512-D96ZiIHXbDmU02dBaemyAg53ez+6F5yZmapmgKcjm35yEe1uVDYI8hGW3VYoGRaG290ZFf91YxHrR518vC0u/A==",
"requires": { "requires": {
"browserslist": "^4.8.3", "browserslist": "^4.12.0",
"caniuse-lite": "^1.0.30001020", "caniuse-lite": "^1.0.30001061",
"chalk": "^2.4.2", "chalk": "^2.4.2",
"normalize-range": "^0.1.2", "normalize-range": "^0.1.2",
"num2fraction": "^1.2.2", "num2fraction": "^1.2.2",
"postcss": "^7.0.26", "postcss": "^7.0.30",
"postcss-value-parser": "^4.0.2" "postcss-value-parser": "^4.1.0"
}, },
"dependencies": { "dependencies": {
"browserslist": { "browserslist": {
"version": "4.8.5", "version": "4.12.0",
"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.8.5.tgz", "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.12.0.tgz",
"integrity": "sha512-4LMHuicxkabIB+n9874jZX/az1IaZ5a+EUuvD7KFOu9x/Bd5YHyO0DIz2ls/Kl8g0ItS4X/ilEgf4T1Br0lgSg==", "integrity": "sha512-UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg==",
"requires": { "requires": {
"caniuse-lite": "^1.0.30001022", "caniuse-lite": "^1.0.30001043",
"electron-to-chromium": "^1.3.338", "electron-to-chromium": "^1.3.413",
"node-releases": "^1.1.46" "node-releases": "^1.1.53",
"pkg-up": "^2.0.0"
} }
},
"caniuse-lite": {
"version": "1.0.30001077",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001077.tgz",
"integrity": "sha512-AEzsGvjBJL0lby/87W96PyEvwN0GsYvk5LHsglLg9tW37K4BqvAvoSCdWIE13OZQ8afupqZ73+oL/1LkedN8hA=="
},
"node-releases": {
"version": "1.1.58",
"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.58.tgz",
"integrity": "sha512-NxBudgVKiRh/2aPWMgPR7bPTX0VPmGx5QBwCtdHitnqFE5/O8DeBXuIMH1nwNnw/aMo6AjOrpsHzfY3UbUJ7yg=="
} }
} }
}, },
...@@ -3012,52 +3042,6 @@ ...@@ -3012,52 +3042,6 @@
"mkdirp": "^0.5.3", "mkdirp": "^0.5.3",
"pify": "^4.0.1", "pify": "^4.0.1",
"schema-utils": "^2.6.5" "schema-utils": "^2.6.5"
},
"dependencies": {
"ajv": {
"version": "6.12.1",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.1.tgz",
"integrity": "sha512-AUh2mDlJDAnzSRaKkMHopTD1GKwC1ApUq8oCzdjAOM5tavncgqWU+JoRu5Y3iYY0Q/euiU+1LWp0/O/QY8CcHw==",
"requires": {
"fast-deep-equal": "^3.1.1",
"fast-json-stable-stringify": "^2.0.0",
"json-schema-traverse": "^0.4.1",
"opencollective-postinstall": "^2.0.2",
"uri-js": "^4.2.2"
}
},
"emojis-list": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
"integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q=="
},
"json5": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
"integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
"requires": {
"minimist": "^1.2.0"
}
},
"loader-utils": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
"integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^1.0.1"
}
},
"schema-utils": {
"version": "2.6.6",
"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.6.tgz",
"integrity": "sha512-wHutF/WPSbIi9x6ctjGGk2Hvl0VOz5l3EKEuKbjPlB30mKZUzb9A5k9yEXRX3pwyqVLPvpfZZEllaFq/M718hA==",
"requires": {
"ajv": "^6.12.0",
"ajv-keywords": "^3.4.1"
}
}
} }
}, },
"babel-plugin-add-module-exports": { "babel-plugin-add-module-exports": {
...@@ -3137,9 +3121,9 @@ ...@@ -3137,9 +3121,9 @@
} }
}, },
"babel-plugin-remove-graphql-queries": { "babel-plugin-remove-graphql-queries": {
"version": "2.7.22", "version": "2.9.3",
"resolved": "https://registry.npmjs.org/babel-plugin-remove-graphql-queries/-/babel-plugin-remove-graphql-queries-2.7.22.tgz", "resolved": "https://registry.npmjs.org/babel-plugin-remove-graphql-queries/-/babel-plugin-remove-graphql-queries-2.9.3.tgz",
"integrity": "sha512-gb4bKZvePZME/VRBMiIZfnli1BIO0K8cm1Pj9HPm85PqElPHzdjeUZ9p3ybOCGe+BBpIlqKx7mx9V/RsjlH+SA==" "integrity": "sha512-EfMoizTX4/aUVN/cbWCU+uythWT5Xjh29npZnyTwBL2b16JH7WM9vbVMJQoCi+26HfRpKJS6SJfDcUT12wc3Mg=="
}, },
"babel-plugin-syntax-object-rest-spread": { "babel-plugin-syntax-object-rest-spread": {
"version": "6.13.0", "version": "6.13.0",
...@@ -3379,9 +3363,9 @@ ...@@ -3379,9 +3363,9 @@
"integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="
}, },
"bn.js": { "bn.js": {
"version": "4.11.8", "version": "5.1.2",
"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.2.tgz",
"integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==" "integrity": "sha512-40rZaf3bUNKTVYu9sIeeEGOg7g14Yvnj9kH7b50EiwX0Q7A6umbvfI5tvHaOERH0XigqKkfLkFQxzb4e6CIXnA=="
}, },
"body-parser": { "body-parser": {
"version": "1.19.0", "version": "1.19.0",
...@@ -3654,20 +3638,46 @@ ...@@ -3654,20 +3638,46 @@
"requires": { "requires": {
"bn.js": "^4.1.0", "bn.js": "^4.1.0",
"randombytes": "^2.0.1" "randombytes": "^2.0.1"
},
"dependencies": {
"bn.js": {
"version": "4.11.9",
"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
"integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw=="
}
} }
}, },
"browserify-sign": { "browserify-sign": {
"version": "4.0.4", "version": "4.2.0",
"resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz", "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.0.tgz",
"integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=", "integrity": "sha512-hEZC1KEeYuoHRqhGhTy6gWrpJA3ZDjFWv0DE61643ZnOXAKJb3u7yWcrU0mMc9SwAqK1n7myPGndkp0dFG7NFA==",
"requires": { "requires": {
"bn.js": "^4.1.1", "bn.js": "^5.1.1",
"browserify-rsa": "^4.0.0", "browserify-rsa": "^4.0.1",
"create-hash": "^1.1.0", "create-hash": "^1.2.0",
"create-hmac": "^1.1.2", "create-hmac": "^1.1.7",
"elliptic": "^6.0.0", "elliptic": "^6.5.2",
"inherits": "^2.0.1", "inherits": "^2.0.4",
"parse-asn1": "^5.0.0" "parse-asn1": "^5.1.5",
"readable-stream": "^3.6.0",
"safe-buffer": "^5.2.0"
},
"dependencies": {
"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==",
"requires": {
"inherits": "^2.0.3",
"string_decoder": "^1.1.1",
"util-deprecate": "^1.0.1"
}
},
"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=="
}
} }
}, },
"browserify-zlib": { "browserify-zlib": {
...@@ -3817,11 +3827,12 @@ ...@@ -3817,11 +3827,12 @@
} }
}, },
"cache-manager": { "cache-manager": {
"version": "2.10.1", "version": "2.11.1",
"resolved": "https://registry.npmjs.org/cache-manager/-/cache-manager-2.10.1.tgz", "resolved": "https://registry.npmjs.org/cache-manager/-/cache-manager-2.11.1.tgz",
"integrity": "sha512-bk17v9IkLqNcbCzggEh82LEJhjHp+COnL57L7a0ESbM/cOuXIIBatdVjD/ps7vOsofI48++zAC14Ye+8v50flg==", "integrity": "sha512-XhUuc9eYwkzpK89iNewFwtvcDYMUsvtwzHeyEOPJna/WsVsXcrzsA1ft2M0QqPNunEzLhNCYPo05tEfG+YuNow==",
"requires": { "requires": {
"async": "1.5.2", "async": "1.5.2",
"lodash.clonedeep": "4.5.0",
"lru-cache": "4.0.0" "lru-cache": "4.0.0"
} }
}, },
...@@ -3918,14 +3929,27 @@ ...@@ -3918,14 +3929,27 @@
}, },
"dependencies": { "dependencies": {
"browserslist": { "browserslist": {
"version": "4.8.5", "version": "4.12.0",
"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.8.5.tgz", "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.12.0.tgz",
"integrity": "sha512-4LMHuicxkabIB+n9874jZX/az1IaZ5a+EUuvD7KFOu9x/Bd5YHyO0DIz2ls/Kl8g0ItS4X/ilEgf4T1Br0lgSg==", "integrity": "sha512-UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg==",
"requires": { "requires": {
"caniuse-lite": "^1.0.30001022", "caniuse-lite": "^1.0.30001043",
"electron-to-chromium": "^1.3.338", "electron-to-chromium": "^1.3.413",
"node-releases": "^1.1.46" "node-releases": "^1.1.53",
"pkg-up": "^2.0.0"
},
"dependencies": {
"caniuse-lite": {
"version": "1.0.30001077",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001077.tgz",
"integrity": "sha512-AEzsGvjBJL0lby/87W96PyEvwN0GsYvk5LHsglLg9tW37K4BqvAvoSCdWIE13OZQ8afupqZ73+oL/1LkedN8hA=="
}
} }
},
"node-releases": {
"version": "1.1.58",
"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.58.tgz",
"integrity": "sha512-NxBudgVKiRh/2aPWMgPR7bPTX0VPmGx5QBwCtdHitnqFE5/O8DeBXuIMH1nwNnw/aMo6AjOrpsHzfY3UbUJ7yg=="
} }
} }
}, },
...@@ -4278,12 +4302,13 @@ ...@@ -4278,12 +4302,13 @@
"integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=" "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk="
}, },
"clipboardy": { "clipboardy": {
"version": "2.1.0", "version": "2.3.0",
"resolved": "https://registry.npmjs.org/clipboardy/-/clipboardy-2.1.0.tgz", "resolved": "https://registry.npmjs.org/clipboardy/-/clipboardy-2.3.0.tgz",
"integrity": "sha512-2pzOUxWcLlXWtn+Jd6js3o12TysNOOVes/aQfg+MT/35vrxWzedHlLwyoJpXjsFKWm95BTNEcMGD9+a7mKzZkQ==", "integrity": "sha512-mKhiIL2DrQIsuXMgBgnfEHOZOryC7kY7YO//TN6c63wlEm3NG5tz+YgY5rVi29KCmq/QQjKYvM7a19+MDOTHOQ==",
"requires": { "requires": {
"arch": "^2.1.1", "arch": "^2.1.1",
"execa": "^1.0.0" "execa": "^1.0.0",
"is-wsl": "^2.1.1"
}, },
"dependencies": { "dependencies": {
"execa": { "execa": {
...@@ -4433,9 +4458,9 @@ ...@@ -4433,9 +4458,9 @@
} }
}, },
"command-exists": { "command-exists": {
"version": "1.2.8", "version": "1.2.9",
"resolved": "https://registry.npmjs.org/command-exists/-/command-exists-1.2.8.tgz", "resolved": "https://registry.npmjs.org/command-exists/-/command-exists-1.2.9.tgz",
"integrity": "sha512-PM54PkseWbiiD/mMsbvW351/u+dafwTJ0ye2qB60G1aGQP9j3xK2gmMDc+R34L3nDtx4qMCitXT75mkbkGJDLw==" "integrity": "sha512-LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w=="
}, },
"commander": { "commander": {
"version": "2.20.3", "version": "2.20.3",
...@@ -4646,16 +4671,23 @@ ...@@ -4646,16 +4671,23 @@
} }
}, },
"copyfiles": { "copyfiles": {
"version": "2.2.0", "version": "2.3.0",
"resolved": "https://registry.npmjs.org/copyfiles/-/copyfiles-2.2.0.tgz", "resolved": "https://registry.npmjs.org/copyfiles/-/copyfiles-2.3.0.tgz",
"integrity": "sha512-iJbHJI+8OKqsq+4JF0rqgRkZzo++jqO6Wf4FUU1JM41cJF6JcY5968XyF4tm3Kkm7ZOMrqlljdm8N9oyY5raGw==", "integrity": "sha512-73v7KFuDFJ/ofkQjZBMjMBFWGgkS76DzXvBMUh7djsMOE5EELWtAO/hRB6Wr5Vj5Zg+YozvoHemv0vnXpqxmOQ==",
"requires": { "requires": {
"glob": "^7.0.5", "glob": "^7.0.5",
"minimatch": "^3.0.3",