diff --git a/app/app/urls.py b/app/app/urls.py index b5e442dfcfa..05bb53eef01 100644 --- a/app/app/urls.py +++ b/app/app/urls.py @@ -136,7 +136,6 @@ ), url(r'^api/v0.1/profile/(?P.*)', dashboard.views.profile_details, name='profile_details'), url(r'^api/v0.1/banners', dashboard.views.load_banners, name='load_banners'), - url(r'^api/v0.1/status_wallpapers', townsquare.views.load_wallpapers, name='load_wallpapers'), url( r'^api/v0.1/get_suggested_contributors', dashboard.views.get_suggested_contributors, diff --git a/app/assets/status_backgrounds/burst-blue-icon.png b/app/assets/status_backgrounds/burst-blue-icon.png deleted file mode 100644 index 35c6d91c386..00000000000 Binary files a/app/assets/status_backgrounds/burst-blue-icon.png and /dev/null differ diff --git a/app/assets/status_backgrounds/burst-blue.png b/app/assets/status_backgrounds/burst-blue.png deleted file mode 100644 index f17f439b567..00000000000 Binary files a/app/assets/status_backgrounds/burst-blue.png and /dev/null differ diff --git a/app/assets/status_backgrounds/burst-pink-icon.png b/app/assets/status_backgrounds/burst-pink-icon.png deleted file mode 100644 index 4ceecb1a9da..00000000000 Binary files a/app/assets/status_backgrounds/burst-pink-icon.png and /dev/null differ diff --git a/app/assets/status_backgrounds/burst-pink.png b/app/assets/status_backgrounds/burst-pink.png deleted file mode 100644 index 7d82dbd48ff..00000000000 Binary files a/app/assets/status_backgrounds/burst-pink.png and /dev/null differ diff --git a/app/assets/status_backgrounds/burst-yellow-icon.png b/app/assets/status_backgrounds/burst-yellow-icon.png deleted file mode 100644 index 569755d00f0..00000000000 Binary files a/app/assets/status_backgrounds/burst-yellow-icon.png and /dev/null differ diff --git a/app/assets/status_backgrounds/burst-yellow.png b/app/assets/status_backgrounds/burst-yellow.png deleted file mode 100644 index f5fe211506d..00000000000 Binary files a/app/assets/status_backgrounds/burst-yellow.png and /dev/null differ diff --git a/app/assets/status_backgrounds/cannon-blue-yellow-icon.png b/app/assets/status_backgrounds/cannon-blue-yellow-icon.png deleted file mode 100644 index 2083d66cedd..00000000000 Binary files a/app/assets/status_backgrounds/cannon-blue-yellow-icon.png and /dev/null differ diff --git a/app/assets/status_backgrounds/cannon-blue-yellow.png b/app/assets/status_backgrounds/cannon-blue-yellow.png deleted file mode 100644 index e87e923c621..00000000000 Binary files a/app/assets/status_backgrounds/cannon-blue-yellow.png and /dev/null differ diff --git a/app/assets/status_backgrounds/cannon-green-blue-icon.png b/app/assets/status_backgrounds/cannon-green-blue-icon.png deleted file mode 100644 index 8e4e4f06d1f..00000000000 Binary files a/app/assets/status_backgrounds/cannon-green-blue-icon.png and /dev/null differ diff --git a/app/assets/status_backgrounds/cannon-green-blue.png b/app/assets/status_backgrounds/cannon-green-blue.png deleted file mode 100644 index 1627c048208..00000000000 Binary files a/app/assets/status_backgrounds/cannon-green-blue.png and /dev/null differ diff --git a/app/assets/status_backgrounds/cannon-yellow-pink-icon.png b/app/assets/status_backgrounds/cannon-yellow-pink-icon.png deleted file mode 100644 index d2684b02a04..00000000000 Binary files a/app/assets/status_backgrounds/cannon-yellow-pink-icon.png and /dev/null differ diff --git a/app/assets/status_backgrounds/cannon-yellow-pink.png b/app/assets/status_backgrounds/cannon-yellow-pink.png deleted file mode 100644 index a617caa980b..00000000000 Binary files a/app/assets/status_backgrounds/cannon-yellow-pink.png and /dev/null differ diff --git a/app/assets/status_backgrounds/dvdptr-blue-green-icon.png b/app/assets/status_backgrounds/dvdptr-blue-green-icon.png deleted file mode 100644 index cd3ee755723..00000000000 Binary files a/app/assets/status_backgrounds/dvdptr-blue-green-icon.png and /dev/null differ diff --git a/app/assets/status_backgrounds/dvdptr-blue-green.png b/app/assets/status_backgrounds/dvdptr-blue-green.png deleted file mode 100644 index 9693fa84114..00000000000 Binary files a/app/assets/status_backgrounds/dvdptr-blue-green.png and /dev/null differ diff --git a/app/assets/status_backgrounds/dvdptr-blue-yellow-icon.png b/app/assets/status_backgrounds/dvdptr-blue-yellow-icon.png deleted file mode 100644 index 0554832bab9..00000000000 Binary files a/app/assets/status_backgrounds/dvdptr-blue-yellow-icon.png and /dev/null differ diff --git a/app/assets/status_backgrounds/dvdptr-blue-yellow.png b/app/assets/status_backgrounds/dvdptr-blue-yellow.png deleted file mode 100644 index beef2aa333e..00000000000 Binary files a/app/assets/status_backgrounds/dvdptr-blue-yellow.png and /dev/null differ diff --git a/app/assets/status_backgrounds/eletric_design-icon.png b/app/assets/status_backgrounds/eletric_design-icon.png deleted file mode 100644 index d9a582b08cb..00000000000 Binary files a/app/assets/status_backgrounds/eletric_design-icon.png and /dev/null differ diff --git a/app/assets/status_backgrounds/eletric_design.png b/app/assets/status_backgrounds/eletric_design.png deleted file mode 100644 index 3030f81f393..00000000000 Binary files a/app/assets/status_backgrounds/eletric_design.png and /dev/null differ diff --git a/app/assets/status_backgrounds/h2-icon.png b/app/assets/status_backgrounds/h2-icon.png deleted file mode 100644 index ddbe1e982a1..00000000000 Binary files a/app/assets/status_backgrounds/h2-icon.png and /dev/null differ diff --git a/app/assets/status_backgrounds/h2-v2-icon.png b/app/assets/status_backgrounds/h2-v2-icon.png deleted file mode 100644 index 739c9709faf..00000000000 Binary files a/app/assets/status_backgrounds/h2-v2-icon.png and /dev/null differ diff --git a/app/assets/status_backgrounds/h2-v2.png b/app/assets/status_backgrounds/h2-v2.png deleted file mode 100644 index c88e8cedde4..00000000000 Binary files a/app/assets/status_backgrounds/h2-v2.png and /dev/null differ diff --git a/app/assets/status_backgrounds/h2-v3-icon.png b/app/assets/status_backgrounds/h2-v3-icon.png deleted file mode 100644 index fecc0efe8fd..00000000000 Binary files a/app/assets/status_backgrounds/h2-v3-icon.png and /dev/null differ diff --git a/app/assets/status_backgrounds/h2-v3.png b/app/assets/status_backgrounds/h2-v3.png deleted file mode 100644 index ef969e32301..00000000000 Binary files a/app/assets/status_backgrounds/h2-v3.png and /dev/null differ diff --git a/app/assets/status_backgrounds/h2.png b/app/assets/status_backgrounds/h2.png deleted file mode 100644 index a84ff61c5a3..00000000000 Binary files a/app/assets/status_backgrounds/h2.png and /dev/null differ diff --git a/app/assets/status_backgrounds/h4-icon.png b/app/assets/status_backgrounds/h4-icon.png deleted file mode 100644 index c8e4aa0f747..00000000000 Binary files a/app/assets/status_backgrounds/h4-icon.png and /dev/null differ diff --git a/app/assets/status_backgrounds/h4.png b/app/assets/status_backgrounds/h4.png deleted file mode 100644 index c219edcc8ea..00000000000 Binary files a/app/assets/status_backgrounds/h4.png and /dev/null differ diff --git a/app/assets/status_backgrounds/network-blue-icon.png b/app/assets/status_backgrounds/network-blue-icon.png deleted file mode 100644 index c491d67ff2d..00000000000 Binary files a/app/assets/status_backgrounds/network-blue-icon.png and /dev/null differ diff --git a/app/assets/status_backgrounds/network-blue.png b/app/assets/status_backgrounds/network-blue.png deleted file mode 100644 index 95e97a3dc5c..00000000000 Binary files a/app/assets/status_backgrounds/network-blue.png and /dev/null differ diff --git a/app/assets/status_backgrounds/network-pink-icon.png b/app/assets/status_backgrounds/network-pink-icon.png deleted file mode 100644 index c3c11b7de92..00000000000 Binary files a/app/assets/status_backgrounds/network-pink-icon.png and /dev/null differ diff --git a/app/assets/status_backgrounds/network-pink.png b/app/assets/status_backgrounds/network-pink.png deleted file mode 100644 index 27cafd8458f..00000000000 Binary files a/app/assets/status_backgrounds/network-pink.png and /dev/null differ diff --git a/app/assets/status_backgrounds/network-yellow-icon.png b/app/assets/status_backgrounds/network-yellow-icon.png deleted file mode 100644 index bfa6125378e..00000000000 Binary files a/app/assets/status_backgrounds/network-yellow-icon.png and /dev/null differ diff --git a/app/assets/status_backgrounds/network-yellow.png b/app/assets/status_backgrounds/network-yellow.png deleted file mode 100644 index 25b57e6372a..00000000000 Binary files a/app/assets/status_backgrounds/network-yellow.png and /dev/null differ diff --git a/app/assets/v2/css/activity_stream.css b/app/assets/v2/css/activity_stream.css index 1c1cdc7f979..80fa298bd19 100644 --- a/app/assets/v2/css/activity_stream.css +++ b/app/assets/v2/css/activity_stream.css @@ -52,59 +52,6 @@ text-align: left; } -#bg-selector { - height: 4em; - width: 100%; - padding: 0.5em; - overflow: auto; - white-space: nowrap; -} - -.bg-thumbnail { - display: inline-block; - height: 2.35em; - width: 2em; - margin-left:0.2em; - margin-right: 0.2em; -} - -.bg-icon { - width:100%; - cursor: pointer; -} - -.status_background { - width:100%; -} - -.status_background_container { - margin-top: 1em; - position: relative; -} - -.image-text-container { - padding:1.5em; - text-align: center; - width: 100%; - text-overflow: wrap; - color: white; - position: absolute; - top: 50%; - left: 50%; - transform: translate(-50%, -50%); - font-size: 18pt; - font-weight: bold; -} - - -.selector-bar { - background-color: #3E00FF; - height: 0.15em; - width: 100%; - margin-top: 0.2em; - border-radius: 0.075em; -} - .action { padding: 3px; border-radius: 5px; @@ -125,6 +72,7 @@ a .sup { .tip_activity, .action:hover { + background-color: #fafafa; cursor: pointer; } @@ -205,7 +153,7 @@ a .sup { } -.tip_activity { +.tip_activity{ color: black; } diff --git a/app/assets/v2/js/status.js b/app/assets/v2/js/status.js index f83442d2e00..6571bfe8a05 100644 --- a/app/assets/v2/js/status.js +++ b/app/assets/v2/js/status.js @@ -4,45 +4,11 @@ const youtube_re = /(?:https?:\/\/|\/\/)?(?:www\.|m\.)?(?:youtu\.be\/|youtube\.c const giphy_re = /(?:https?:\/\/)?(?:media0\.)?(?:giphy\.com\/media\/)/; $(document).ready(function() { - var embedded_resource = ''; const GIPHY_API_KEY = document.contxt.giphy_key; let button = document.querySelector('#btn_post'); - // populates background selector on load - let bgs = [ - 'cannon-green-blue', - 'h2-v2', - 'burst-yellow', - 'burst-pink', - 'burst-blue', - 'eletric_design', - 'dvdptr-blue-green', - 'cannon-yellow-pink', - 'network-yellow', - 'h4', - 'network-blue', - 'network-pink', - 'h2', - 'cannon-blue-yellow', - 'dvdptr-blue-yellow' - ]; - - let selector = $('#bg-selector'); - - for (var i = 0; i < bgs.length; i++) { - selector.append('
'); - } - - function closeBackgroundDropdown(e) { - e.preventDefault(); - $('#bg-selector').attr('data-selected', null); - $('#bg-selector').addClass('hide'); - embedded_resource = ''; - $('#bg-selector').children('div').children('div').addClass('hide'); - } - function selectGif(e) { embedded_resource = $(e.target).data('src'); $('#preview-img').attr('src', embedded_resource); @@ -50,19 +16,6 @@ $(document).ready(function() { $('#thumbnail').hide(); } - function deselectGif(e) { - embedded_resource = ''; - $('#preview-img').attr('src', ''); - $('#preview').hide(); - $('#thumbnail').hide(); - $('#btn_gif').removeClass('selected'); - $('.gif-inject-target').removeClass('show'); - } - - function deselectVideo(e) { - $('#video-button').removeClass('selected'); - $('#video_container').remove(); - } function injectGiphy(query) { const endpoint = 'https://api.giphy.com/v1/gifs/search?limit=13&api_key=' + GIPHY_API_KEY + '&offset=0&rating=G&lang=en&q=' + query; @@ -202,9 +155,7 @@ $(document).ready(function() { } else { $('#thumbnail-desc').text(''); if (no_lb) { - if (embedded_resource != $('#bg-selector').attr('data-selected')) { - embedded_resource = ''; - } + embedded_resource = ''; $('#thumbnail').hide(); } } @@ -267,69 +218,22 @@ $(document).ready(function() { $('#textarea').focus(); } - $('#btn_gif').click(function(e) { - e.preventDefault(); - closeBackgroundDropdown(e); - deselectVideo(e); - - $('#poll-button').removeClass('selected'); - $('#poll_container').remove(); - }); - - var selectedElement = null; - // handle background selection - $('.bg-thumbnail').click(function(e) { - e.preventDefault(); - - $('#bg-selector').find('.selector-bar').addClass('d-none'); - $(this).children('div').removeClass('d-none'); - - selectedElement = $(this); - $('#bg-selector').attr('data-selected', $(this).attr('data-bg-name')); - embedded_resource = $(this).attr('data-bg-name'); - }); - - // handle add background button push - $('body').on('click', '#background-button', function(e) { - e.preventDefault(); - $('#bg-selector').toggleClass('d-none'); - if ($('#bg-selector').hasClass('d-none')) { - closeBackgroundDropdown(e); - } - - $('#poll-button').removeClass('selected'); - $('#poll_container').remove(); - deselectVideo(e); - deselectGif(e); - }); - - - document.is_shift = false; - // handle shift button - $('body').on('keyup', '#textarea', function(e) { - if (e.keyCode == 16) { - document.is_shift = false; - } - }); - // handle shift button + // handle poll button $('body').on('click', '#poll-button', function(e) { e.preventDefault(); - deselectGif(e); - closeBackgroundDropdown(e); - deselectVideo(e); $(this).toggleClass('selected'); var is_selected = $(this).hasClass('selected'); if (is_selected) { let html = ` -
- - - - -
- `; +
+ + + + +
+ `; $(html).insertAfter('#status'); $('#poll_container input[name=option1]').focus(); @@ -344,11 +248,6 @@ $(document).ready(function() { // handle video button $('body').on('click', '#video-button', function(e) { e.preventDefault(); - closeBackgroundDropdown(e); - deselectGif(e); - $('#poll-button').removeClass('selected'); - $('#poll_container').remove(); - $(this).toggleClass('selected'); var is_selected = $(this).hasClass('selected'); @@ -357,10 +256,10 @@ $(document).ready(function() { const item = $(this).data('gfx') ? $(this).data('gfx') : items[Math.floor(Math.random() * items.length)]; let html = ` -
+
-
- `; +
+ `; $(html).insertAfter('#status'); } else { @@ -416,7 +315,6 @@ $(document).ready(function() { if ($('#btn_post').is(':disabled')) { return; } - const data = new FormData(); const message = $('#textarea'); const the_message = message.val().trim(); @@ -444,7 +342,6 @@ $(document).ready(function() { const description = $('#thumbnail-desc').text(); const image = $('#thumbnail-img').attr('src'); const youtube = embedded_resource.match(youtube_re); - const background = $('#bg-selector').attr('data-selected'); if (embedded_resource.match(giphy_re)) { data.append('resource', 'gif'); @@ -457,10 +354,6 @@ $(document).ready(function() { data.append('title', title); data.append('description', description); data.append('image', image); - } else if (background != null) { - data.append('resource', 'background'); - data.append('resourceProvider', 'gitcoin'); - data.append('resourceId', background); } else { data.append('resource', 'content'); data.append('resourceProvider', link); @@ -470,9 +363,7 @@ $(document).ready(function() { data.append('image', image); } } - $('#bg-selector').attr('data-selected', null); - $('#bg-selector').addClass('d-none'); - $('#bg-selector').children('div').children('div').addClass('d-none'); + var fail_callback = function() { message.val(the_message); localStorage.setItem(lskey, the_message); diff --git a/app/dashboard/templates/profiles/status_box.html b/app/dashboard/templates/profiles/status_box.html index aac1f58efce..004afb30fec 100644 --- a/app/dashboard/templates/profiles/status_box.html +++ b/app/dashboard/templates/profiles/status_box.html @@ -6,14 +6,13 @@ id="textarea" class="form__input p-2 font-body status-textarea" placeholder="{% if placeholder %}{{placeholder}}{%else%}What are you thinking?{%endif%}" - style="resize: none; height: 7em;" data-maxlen={% if max_length %}{{max_length}}{%else%}280{%endif%} + style="height: 70px;" >
- {% if is_alpha_tester %} {% endif %} @@ -34,8 +33,6 @@
-
-
{% if tags %} diff --git a/app/retail/templates/shared/activity.html b/app/retail/templates/shared/activity.html index 184009dda7e..d33748f2bd1 100644 --- a/app/retail/templates/shared/activity.html +++ b/app/retail/templates/shared/activity.html @@ -194,21 +194,18 @@ {{ row.metadata.title }} {% elif row.activity_type == 'status_update' or row.activity_type == 'silent_status_update' %} - {% if row.metadata.resource.type != 'background' %} - {{ row.metadata.title }} {% if row.metadata.ask != 'undefined' %}{{ row.metadata.ask }}{%endif%} + {{ row.metadata.title }} {% if row.metadata.ask != 'undefined' %}{{ row.metadata.ask }}{%endif%} - {% if row.metadata.video and row.metadata.gfx != 'undefined' %} -
- -

-

- • -

- {{row.video_participants_count}} users on call + {% if row.metadata.video and row.metadata.gfx != 'undefined' %} +
+

+

+ •

- - {% endif %} + {{row.video_participants_count}} users on call +

{% endif %} + {% elif row.activity_type == 'wall_post' %} > {% if row.grant %} @@ -295,36 +292,59 @@ -
- - Copy Link - - - Report - - {% if row.profile.handle|lower == github_handle|lower %} - - Delete - - {% endif %} -
- {% if row.show_token_info %} - {% if row.value_in_token_disp or row.metadata.value_in_eth or row.metadata.value_in_token and row.metadata.token_name or row.bounty %} -
+ +
+ + Copy Link + + + {% if row.metadata.favorite %} + + {% else %} + + {%endif%} Favorite + + + Report + + {% if row.metadata.fund_able and not row.bounty %} + + Fund Issue + + {% endif %} + {% if row.profile.handle|lower == github_handle|lower %} + + Delete + + {% endif %} +
+ + {% if row.show_token_info %} + {% if row.value_in_token_disp or row.metadata.value_in_eth or row.metadata.value_in_token and row.metadata.token_name or row.bounty %} +
+

+ {% if row.bounty %} + {{ row.bounty.value_true | floatformat:2 }} {{row.bounty.token_name}} + {% elif row.value_in_token_disp %} + {{ row.value_in_token_disp | floatformat:2 }} {{row.token_name}} + {% elif row.metadata.value_in_eth %} + {{ row.metadata.value_in_eth | floatformat:2 }} ETH + {% elif row.metadata.value_in_token and row.metadata.token_name %} + {{row.metadata.value_in_token | floatformat:2}} {{row.metadata.token_name}} + {% endif %} +

+
+ {% endif %} + {% if row.value_in_usdt_now %} +

- {% if row.bounty %} - {{ row.bounty.value_true | floatformat:2 }} {{row.bounty.token_name}} - {% elif row.value_in_token_disp %} - {{ row.value_in_token_disp | floatformat:2 }} {{row.token_name}} - {% elif row.metadata.value_in_eth %} - {{ row.metadata.value_in_eth | floatformat:2 }} ETH - {% elif row.metadata.value_in_token and row.metadata.token_name %} - {{row.metadata.value_in_token | floatformat:2}} {{row.metadata.token_name}} - {% endif %} + {{ row.value_in_usdt_now }} USD

{% endif %} @@ -340,9 +360,10 @@ {% endif %} +
-
+
{% if not hide_date %} {{ row.created_human_time }} @@ -364,16 +385,6 @@ {% endif %}
- {% if row.metadata.resource.type == 'background' %} -
- -
-

- {{row.metadata.title}} -

-
-
- {% endif %}
{% if row.metadata.poll_choices %}
diff --git a/app/townsquare/templates/townsquare/shared/shareactivity.html b/app/townsquare/templates/townsquare/shared/shareactivity.html index 28305a17d2a..eb482944521 100644 --- a/app/townsquare/templates/townsquare/shared/shareactivity.html +++ b/app/townsquare/templates/townsquare/shared/shareactivity.html @@ -21,7 +21,6 @@
- {% if is_alpha_tester %} {% endif %} diff --git a/app/townsquare/views.py b/app/townsquare/views.py index 480efe36011..dff319fa8e3 100644 --- a/app/townsquare/views.py +++ b/app/townsquare/views.py @@ -24,7 +24,6 @@ ) from .tasks import increment_offer_view_counts from .utils import is_user_townsquare_enabled -from dashboard.helpers import load_files_in_directory tags = [ ['#announce','bullhorn','search-announce'], @@ -38,16 +37,6 @@ ] -def load_wallpapers(request): - """Load profile banners""" - images_with_icons = load_files_in_directory('status_backgrounds') - images = [image.split('.')[0] for image in images_with_icons if 'icon' not in image] - response = { - 'status': 200, - 'wallpapers': images - } - return JsonResponse(response, safe=False) - def get_next_time_available(key): d = timezone.now() next_offer = Offer.objects.filter(key=key, valid_from__gt=d).order_by('valid_from') diff --git a/package-lock.json b/package-lock.json index 2ad74b66e34..4b65fe51f2e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -265,12 +265,6 @@ "integrity": "sha512-02tIL+QIi/RW4E5xILdoAMjeJ9kYq5t5S2vciUdFPXv/ikFTb0zK8q9vXkg4+WAJuYXGiVT1H28AkD2C+IkXVw==", "dev": true }, - "@types/sizzle": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.2.tgz", - "integrity": "sha512-7EJYyKTL7tFR8+gDbB6Wwz/arpGa0Mywk1TJbNzKzHtzbwVmY4HR9WqS5VV7dsBUKQmPNr192jHr/VpBluj/hg==", - "dev": true - }, "@types/unist": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.3.tgz", @@ -305,9 +299,9 @@ "dev": true }, "acorn-jsx": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.2.0.tgz", - "integrity": "sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.0.2.tgz", + "integrity": "sha512-tiNTrP1MP0QrChmD2DdupCr6HWSFeKVw5d/dHTu4Y7rkAkRhU/Dt7dphAfIUyxtHpl/eBVip5uTNSpQJHylpAw==", "dev": true }, "ajv": { @@ -478,9 +472,9 @@ "dev": true }, "aws4": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz", - "integrity": "sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==", + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz", + "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==", "dev": true }, "bail": { @@ -934,9 +928,9 @@ }, "dependencies": { "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==", + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "dev": true, "requires": { "core-util-is": "~1.0.0", @@ -1034,14 +1028,13 @@ } }, "cypress": { - "version": "3.8.3", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-3.8.3.tgz", - "integrity": "sha512-I9L/d+ilTPPA4vq3NC1OPKmw7jJIpMKNdyfR8t1EXYzYCjyqbc59migOm1YSse/VRbISLJ+QGb5k4Y3bz2lkYw==", + "version": "3.4.1", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-3.4.1.tgz", + "integrity": "sha512-1HBS7t9XXzkt6QHbwfirWYty8vzxNMawGj1yI+Fu6C3/VZJ8UtUngMW6layqwYZzLTZV8tiDpdCNBypn78V4Dg==", "dev": true, "requires": { "@cypress/listr-verbose-renderer": "0.4.1", "@cypress/xvfb": "1.2.4", - "@types/sizzle": "2.3.2", "arch": "2.1.1", "bluebird": "3.5.0", "cachedir": "1.3.0", @@ -1050,7 +1043,6 @@ "commander": "2.15.1", "common-tags": "1.8.0", "debug": "3.2.6", - "eventemitter2": "4.1.2", "execa": "0.10.0", "executable": "4.1.1", "extract-zip": "1.6.7", @@ -1069,7 +1061,6 @@ "request-progress": "3.0.0", "supports-color": "5.5.0", "tmp": "0.1.0", - "untildify": "3.0.3", "url": "0.11.0", "yauzl": "2.10.0" }, @@ -1381,12 +1372,12 @@ } }, "eslint-utils": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz", - "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==", + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.2.tgz", + "integrity": "sha512-eAZS2sEUMlIeCjBeubdj45dmBHQwPHWyBcT1VSYB7o9x9WRRqKxyUoiXlRjyAwzN7YEzHJlYg0NmzDRWx6GP4Q==", "dev": true, "requires": { - "eslint-visitor-keys": "^1.1.0" + "eslint-visitor-keys": "^1.0.0" } }, "eslint-visitor-keys": { @@ -1413,9 +1404,9 @@ "dev": true }, "esquery": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.1.0.tgz", - "integrity": "sha512-MxYW9xKmROWF672KqjO75sszsA8Mxhw06YFeS5VHlB98KDHbOSurm3ArsjO60Eaf3QmGMCP1yn+0JQkNLo/97Q==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz", + "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==", "dev": true, "requires": { "estraverse": "^4.0.0" @@ -1442,12 +1433,6 @@ "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", "dev": true }, - "eventemitter2": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-4.1.2.tgz", - "integrity": "sha1-DhqEd6+CGm7zmVsxG/dMI6UkfxU=", - "dev": true - }, "execa": { "version": "0.10.0", "resolved": "https://registry.npmjs.org/execa/-/execa-0.10.0.tgz", @@ -2140,9 +2125,9 @@ "dev": true }, "import-fresh": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz", - "integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.1.0.tgz", + "integrity": "sha512-PpuksHKGt8rXfWEr9m9EHIpgyyaltBy8+eF6GJM0QCAxMgxCfucMF3mjecK2QsJr0amJW7gTqh5/wht0z2UhEQ==", "dev": true, "requires": { "parent-module": "^1.0.0", @@ -2266,9 +2251,9 @@ } }, "rxjs": { - "version": "6.5.4", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz", - "integrity": "sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==", + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.2.tgz", + "integrity": "sha512-HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg==", "dev": true, "requires": { "tslib": "^1.9.0" @@ -2441,10 +2426,13 @@ "dev": true }, "is-finite": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz", - "integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==", - "dev": true + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz", + "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", + "dev": true, + "requires": { + "number-is-nan": "^1.0.0" + } }, "is-fullwidth-code-point": { "version": "2.0.0", @@ -3071,18 +3059,18 @@ } }, "mime-db": { - "version": "1.43.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz", - "integrity": "sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ==", + "version": "1.40.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz", + "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==", "dev": true }, "mime-types": { - "version": "2.1.26", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz", - "integrity": "sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==", + "version": "2.1.24", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz", + "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==", "dev": true, "requires": { - "mime-db": "1.43.0" + "mime-db": "1.40.0" } }, "mimic-fn": { @@ -3326,17 +3314,17 @@ "dev": true }, "optionator": { - "version": "0.8.3", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", - "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz", + "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=", "dev": true, "requires": { "deep-is": "~0.1.3", - "fast-levenshtein": "~2.0.6", + "fast-levenshtein": "~2.0.4", "levn": "~0.3.0", "prelude-ls": "~1.1.2", "type-check": "~0.3.2", - "word-wrap": "~1.2.3" + "wordwrap": "~1.0.0" } }, "ora": { @@ -3695,9 +3683,9 @@ "dev": true }, "psl": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/psl/-/psl-1.7.0.tgz", - "integrity": "sha512-5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/psl/-/psl-1.3.0.tgz", + "integrity": "sha512-avHdspHO+9rQTLbv1RO+MPYeP/SzsCoxofjVnHanETfQhTJrmB0HlDoW+EiN/R+C0BZ+gERab9NY0lPN2TxNag==", "dev": true }, "punycode": { @@ -3955,9 +3943,9 @@ } }, "run-async": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.0.tgz", - "integrity": "sha512-xJTbh/d7Lm7SBhc1tNvTpeCHaEzoyxPrqNlvSdMfBTYwaY++UJFyXUOxAtsRUXjlqOfj8luNaR9vjCh4KeV+pg==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz", + "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=", "dev": true, "requires": { "is-promise": "^2.1.0" @@ -4696,9 +4684,9 @@ "dev": true }, "tslib": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz", - "integrity": "sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==", + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz", + "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==", "dev": true }, "tunnel-agent": { @@ -4869,12 +4857,6 @@ } } }, - "untildify": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/untildify/-/untildify-3.0.3.tgz", - "integrity": "sha512-iSk/J8efr8uPT/Z4eSUywnqyrQU7DSdMfdqK4iWEaUVVmcP5JcnpRqmVMwcwcnmI1ATFNgC5V90u09tBynNFKA==", - "dev": true - }, "uri-js": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", @@ -4921,9 +4903,9 @@ "dev": true }, "uuid": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", - "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz", + "integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==", "dev": true }, "validate-npm-package-license": { @@ -4991,10 +4973,10 @@ "isexe": "^2.0.0" } }, - "word-wrap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", + "wordwrap": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", + "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", "dev": true }, "wrappy": {