From 090768972b8962bce88f2d259205682549cc2279 Mon Sep 17 00:00:00 2001 From: luis cielak Date: Thu, 9 Aug 2018 13:49:17 -0400 Subject: [PATCH 01/34] Add example tooltips --- js/index.js | 4 ++ styles/atat.scss | 1 + styles/elements/_tooltip.scss | 109 ++++++++++++++++++++++++++++++ templates/components/tooltip.html | 0 templates/styleguide.html | 5 ++ 5 files changed, 119 insertions(+) create mode 100644 styles/elements/_tooltip.scss create mode 100644 templates/components/tooltip.html diff --git a/js/index.js b/js/index.js index 59883c65..76c3d81e 100644 --- a/js/index.js +++ b/js/index.js @@ -1,8 +1,12 @@ import classes from '../styles/atat.scss' import Vue from 'vue/dist/vue' +import VTooltip from 'v-tooltip' import textinput from './components/text_input' +Vue.use(VTooltip) + + const app = new Vue({ el: '#app-root', components: { diff --git a/styles/atat.scss b/styles/atat.scss index ad650bbd..70d9d4b9 100644 --- a/styles/atat.scss +++ b/styles/atat.scss @@ -16,6 +16,7 @@ @import 'elements/action_group'; @import 'elements/labels'; @import 'elements/diff'; +@import 'elements/tooltip'; @import 'components/topbar'; @import 'components/global_layout'; diff --git a/styles/elements/_tooltip.scss b/styles/elements/_tooltip.scss new file mode 100644 index 00000000..91e0e7cf --- /dev/null +++ b/styles/elements/_tooltip.scss @@ -0,0 +1,109 @@ +.tooltip { + display: block; + z-index: 10000; + + .tooltip-inner { + background: $color-black; + color: $color-white; + border-radius: $border-radius; + padding: 5px 10px 4px; + } + + .tooltip-arrow { + width: 0; + height: 0; + border-style: solid; + position: absolute; + margin: 5px; + border-color: black; + z-index: 1; + } + + &[x-placement^="top"] { + margin-bottom: 5px; + + .tooltip-arrow { + border-width: 5px 5px 0 5px; + border-left-color: transparent; + border-right-color: transparent; + border-bottom-color: transparent; + bottom: -5px; + left: calc(50% - 5px); + margin-top: 0; + margin-bottom: 0; + } + } + + &[x-placement^="bottom"] { + margin-top: 5px; + + .tooltip-arrow { + border-width: 0 5px 5px 5px; + border-left-color: transparent; + border-right-color: transparent; + border-top-color: transparent; + top: -5px; + left: calc(50% - 5px); + margin-top: 0; + margin-bottom: 0; + } + } + + &[x-placement^="right"] { + margin-left: 5px; + + .tooltip-arrow { + border-width: 5px 5px 5px 0; + border-left-color: transparent; + border-top-color: transparent; + border-bottom-color: transparent; + left: -5px; + top: calc(50% - 5px); + margin-left: 0; + margin-right: 0; + } + } + + &[x-placement^="left"] { + margin-right: 5px; + + .tooltip-arrow { + border-width: 5px 0 5px 5px; + border-top-color: transparent; + border-right-color: transparent; + border-bottom-color: transparent; + right: -5px; + top: calc(50% - 5px); + margin-left: 0; + margin-right: 0; + } + } + + &.popover { + $color: #f9f9f9; + + .popover-inner { + background: $color; + color: black; + padding: 24px; + border-radius: 5px; + box-shadow: 0 5px 30px rgba(black, .1); + } + + .popover-arrow { + border-color: $color; + } + } + + &[aria-hidden='true'] { + visibility: hidden; + opacity: 0; + transition: opacity .15s, visibility .15s; + } + + &[aria-hidden='false'] { + visibility: visible; + opacity: 1; + transition: opacity .15s; + } +} \ No newline at end of file diff --git a/templates/components/tooltip.html b/templates/components/tooltip.html new file mode 100644 index 00000000..e69de29b diff --git a/templates/styleguide.html b/templates/styleguide.html index a65069c4..753e2d94 100644 --- a/templates/styleguide.html +++ b/templates/styleguide.html @@ -128,6 +128,11 @@
col 12
+
Tooltips
+ {{ Icon('help') }}top
+ {{ Icon('help') }}top-start
+ {{ Icon('help') }}right
+ {{ Icon('help') }}bottom
From fcbb16afc6c5eee52c3be9aa69f2af9df21a07d8 Mon Sep 17 00:00:00 2001 From: luis cielak Date: Thu, 9 Aug 2018 13:51:02 -0400 Subject: [PATCH 02/34] Organize styleguide --- templates/styleguide.html | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/templates/styleguide.html b/templates/styleguide.html index 753e2d94..f5b32657 100644 --- a/templates/styleguide.html +++ b/templates/styleguide.html @@ -128,12 +128,6 @@
col 12
-
Tooltips
- {{ Icon('help') }}top
- {{ Icon('help') }}top-start
- {{ Icon('help') }}right
- {{ Icon('help') }}bottom
-
@@ -288,6 +282,14 @@
+ +
+
Tooltips
+ {{ Icon('help') }}top
+ {{ Icon('help') }}top-start
+ {{ Icon('help') }}right
+ {{ Icon('help') }}bottom
+ From 30a84c3ac6075e116015047882abaf9747143e39 Mon Sep 17 00:00:00 2001 From: luis cielak Date: Thu, 9 Aug 2018 14:06:29 -0400 Subject: [PATCH 03/34] Make tooltip module and update example --- templates/components/tooltip.html | 9 +++++++++ templates/styleguide.html | 6 ++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/templates/components/tooltip.html b/templates/components/tooltip.html index e69de29b..465d57e4 100644 --- a/templates/components/tooltip.html +++ b/templates/components/tooltip.html @@ -0,0 +1,9 @@ +{% from "components/icon.html" import Icon %} + +{% macro Tooltip(message) -%} + + + {{ Icon('help') }} + + +{%- endmacro %} diff --git a/templates/styleguide.html b/templates/styleguide.html index f5b32657..80d72fae 100644 --- a/templates/styleguide.html +++ b/templates/styleguide.html @@ -3,6 +3,7 @@ {% from "components/icon.html" import Icon %} {% from "components/modal.html" import Modal %} {% from "components/alert.html" import Alert %} +{% from "components/tooltip.html" import Tooltip %} {% block content %} @@ -283,13 +284,14 @@ -
Tooltips
- {{ Icon('help') }}top
+ {{ Tooltip('this is a tooltip text') }}example
{{ Icon('help') }}top-start
{{ Icon('help') }}right
{{ Icon('help') }}bottom
+ + From a29e7895bf2cef11fff50ac4c640128810eb01cb Mon Sep 17 00:00:00 2001 From: luis cielak Date: Wed, 8 Aug 2018 13:46:48 -0400 Subject: [PATCH 04/34] Style form labels for inputs correctly --- styles/elements/_inputs.scss | 22 +++++++++++++--------- templates/components/text_input.html | 2 -- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/styles/elements/_inputs.scss b/styles/elements/_inputs.scss index 459e907d..7ce1c714 100644 --- a/styles/elements/_inputs.scss +++ b/styles/elements/_inputs.scss @@ -65,20 +65,12 @@ } label { - padding: 0 0 $gap 0; + padding: 0; margin: 0; @include h4; @include line-max; position: relative; - .usa-input__help { - display: block; - @include h5; - font-weight: normal; - padding-top: $gap / 2; - @include line-max; - } - .icon { position: absolute; left: 100%; @@ -88,6 +80,14 @@ } } + .usa-input__help { + display: block; + @include h4; + font-weight: normal; + padding: $gap/2 0; + @include line-max; + } + input, textarea, select { @@ -103,6 +103,10 @@ .icon { vertical-align: middle; } + + .usa-input__help { + font-weight: $font-bold; + } } ul { diff --git a/templates/components/text_input.html b/templates/components/text_input.html index 0f50ca89..8145c366 100644 --- a/templates/components/text_input.html +++ b/templates/components/text_input.html @@ -1,6 +1,5 @@ {% macro TextInput(field, placeholder='') -%}
- {{ field(placeholder=placeholder) | safe }} From bf66a31392082c3ee943d050d359633bd7da81dd Mon Sep 17 00:00:00 2001 From: luis cielak Date: Wed, 8 Aug 2018 13:47:31 -0400 Subject: [PATCH 05/34] Add subtitle style --- styles/elements/_typography.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/styles/elements/_typography.scss b/styles/elements/_typography.scss index fcdc97d9..b1af1be1 100644 --- a/styles/elements/_typography.scss +++ b/styles/elements/_typography.scss @@ -20,6 +20,7 @@ h1, h2, h3, h4, h5, h6 { + .subtitle * { margin-top: 0; + color: $color-gray; } } From 4e587c67a41dbf51a4a98eb1cfb1e1c7d56a56c5 Mon Sep 17 00:00:00 2001 From: luis cielak Date: Wed, 8 Aug 2018 13:50:48 -0400 Subject: [PATCH 06/34] Increase some padding --- styles/elements/_inputs.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/styles/elements/_inputs.scss b/styles/elements/_inputs.scss index 7ce1c714..69750caf 100644 --- a/styles/elements/_inputs.scss +++ b/styles/elements/_inputs.scss @@ -65,7 +65,7 @@ } label { - padding: 0; + padding: 0 0 $gap/2 0; margin: 0; @include h4; @include line-max; From bd58da642b714ac1bc26ec7e6724d8a9ec6e3db4 Mon Sep 17 00:00:00 2001 From: luis cielak Date: Wed, 8 Aug 2018 13:54:10 -0400 Subject: [PATCH 07/34] Make sure the label style for input text and radios match --- atst/forms/request.py | 2 +- styles/elements/_inputs.scss | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/atst/forms/request.py b/atst/forms/request.py index f15e9140..fb179587 100644 --- a/atst/forms/request.py +++ b/atst/forms/request.py @@ -62,7 +62,7 @@ class RequestForm(ValidatedForm): ) engineering_assessment = RadioField( - description="Have you completed an engineering assessment of your software systems for cloud readiness?", + "Have you completed an engineering assessment of your software systems for cloud readiness?", choices=[("yes", "Yes"), ("no", "No"), ("in_progress", "In Progress")], ) diff --git a/styles/elements/_inputs.scss b/styles/elements/_inputs.scss index 69750caf..e0cab5be 100644 --- a/styles/elements/_inputs.scss +++ b/styles/elements/_inputs.scss @@ -100,6 +100,10 @@ padding: 0 0 $gap 0; @include h4; + label { + font-weight: $font-bold; + } + .icon { vertical-align: middle; } From f365b18acd4c2cfcf6edde6f1d45774e4e80e092 Mon Sep 17 00:00:00 2001 From: luis cielak Date: Wed, 8 Aug 2018 17:39:03 -0400 Subject: [PATCH 08/34] Render error validation message with proper color --- templates/components/options_input.html | 2 +- templates/components/text_input.html | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/templates/components/options_input.html b/templates/components/options_input.html index ff0d8814..06f4c3db 100644 --- a/templates/components/options_input.html +++ b/templates/components/options_input.html @@ -1,7 +1,7 @@ {% from "components/icon.html" import Icon %} {% macro OptionsInput(field, inline=False) -%} -
+
diff --git a/templates/components/text_input.html b/templates/components/text_input.html index 8145c366..0f50ca89 100644 --- a/templates/components/text_input.html +++ b/templates/components/text_input.html @@ -1,5 +1,6 @@ {% macro TextInput(field, placeholder='') -%}
+ {{ field(placeholder=placeholder) | safe }} From cb2b9faa4224ff47a86a2fb37a2a4c5e5dba460c Mon Sep 17 00:00:00 2001 From: luis cielak Date: Wed, 8 Aug 2018 17:44:37 -0400 Subject: [PATCH 09/34] Render error message with proper color for input text --- templates/components/text_input.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/components/text_input.html b/templates/components/text_input.html index 0f50ca89..1f272934 100644 --- a/templates/components/text_input.html +++ b/templates/components/text_input.html @@ -1,5 +1,5 @@ {% macro TextInput(field, placeholder='') -%} -
+
+ + + {%- endmacro %} From d83ee6daf3f6d33812447bfbd73063b8cb9b99bd Mon Sep 17 00:00:00 2001 From: Patrick Smith Date: Thu, 9 Aug 2018 10:11:44 -0400 Subject: [PATCH 12/34] Fix financial verification form submission --- atst/routes/requests/financial_verification.py | 2 +- ...ubmitted.html.to => financial_verification_submitted.html} | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename templates/requests/{financial_verification_submitted.html.to => financial_verification_submitted.html} (84%) diff --git a/atst/routes/requests/financial_verification.py b/atst/routes/requests/financial_verification.py index 38420287..ce70eaee 100644 --- a/atst/routes/requests/financial_verification.py +++ b/atst/routes/requests/financial_verification.py @@ -41,4 +41,4 @@ def update_financial_verification(request_id): @requests_bp.route("/requests/financial_verification_submitted") def financial_verification_submitted(): - pass + return render_template("requests/financial_verification_submitted.html") diff --git a/templates/requests/financial_verification_submitted.html.to b/templates/requests/financial_verification_submitted.html similarity index 84% rename from templates/requests/financial_verification_submitted.html.to rename to templates/requests/financial_verification_submitted.html index 21088724..01d6ef89 100644 --- a/templates/requests/financial_verification_submitted.html.to +++ b/templates/requests/financial_verification_submitted.html @@ -1,4 +1,4 @@ -{% extends "../base.html.to" %} +{% extends "base.html" %} {% block content %} @@ -15,4 +15,4 @@
-{% end %} +{% endblock %} From 087b8707183404951a03a34af289abc30816e316 Mon Sep 17 00:00:00 2001 From: Patrick Smith Date: Thu, 9 Aug 2018 10:26:58 -0400 Subject: [PATCH 13/34] Fix NewlineListField displaying too many newlines --- atst/forms/fields.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/atst/forms/fields.py b/atst/forms/fields.py index bc542bf5..00e53529 100644 --- a/atst/forms/fields.py +++ b/atst/forms/fields.py @@ -29,8 +29,10 @@ class NewlineListField(Field): widget = TextArea() def _value(self): - if self.data: - return "\n".join(self.data) + if isinstance(self.data, list): + return '\n'.join(self.data) + elif self.data: + return self.data else: return "" From 3fa4adb4dee4700816edfc6cf6e7a8c01d5f9da3 Mon Sep 17 00:00:00 2001 From: Patrick Smith Date: Thu, 9 Aug 2018 10:51:04 -0400 Subject: [PATCH 14/34] Require PE id to be defined in financial verification form --- atst/forms/financial.py | 2 +- atst/routes/requests/financial_verification.py | 2 +- tests/routes/test_financial_verification.py | 11 +++++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/atst/forms/financial.py b/atst/forms/financial.py index 68196837..674eace4 100644 --- a/atst/forms/financial.py +++ b/atst/forms/financial.py @@ -70,7 +70,7 @@ class FinancialForm(ValidatedForm): "Unique Item Identifier (UII)s related to your application(s) if you already have them." ) - pe_id = StringField("Program Element (PE) Number related to your request") + pe_id = StringField("Program Element (PE) Number related to your request", validators=[Required()]) treasury_code = StringField("Program Treasury Code") diff --git a/atst/routes/requests/financial_verification.py b/atst/routes/requests/financial_verification.py index ce70eaee..f6b8cfda 100644 --- a/atst/routes/requests/financial_verification.py +++ b/atst/routes/requests/financial_verification.py @@ -25,10 +25,10 @@ def update_financial_verification(request_id): if form.validate(): request_data = {"financial_verification": post_data} - Requests.update(request_id, request_data) valid = form.perform_extra_validation( existing_request.body.get("financial_verification") ) + Requests.update(request_id, request_data) if valid: return redirect(url_for("requests.financial_verification_submitted")) else: diff --git a/tests/routes/test_financial_verification.py b/tests/routes/test_financial_verification.py index e15638df..8e62cc48 100644 --- a/tests/routes/test_financial_verification.py +++ b/tests/routes/test_financial_verification.py @@ -72,3 +72,14 @@ class TestPENumberInForm: assert response.status_code == 302 assert "/requests/financial_verification_submitted" in response.headers.get("Location") + + def test_submit_request_form_with_missing_pe_id(self, monkeypatch, client): + self._set_monkeypatches(monkeypatch) + + data = dict(self.required_data) + data['pe_id'] = '' + + response = self.submit_data(client, data) + + assert "There were some errors, see below" in response.data.decode() + assert response.status_code == 200 From c98e57f17c532493f091df123af66593d7a28413 Mon Sep 17 00:00:00 2001 From: dandds Date: Thu, 9 Aug 2018 11:48:33 -0400 Subject: [PATCH 15/34] log errors in error handlers --- atst/domain/exceptions.py | 4 +++- atst/routes/errors.py | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/atst/domain/exceptions.py b/atst/domain/exceptions.py index b92e64c1..ec574232 100644 --- a/atst/domain/exceptions.py +++ b/atst/domain/exceptions.py @@ -27,4 +27,6 @@ class UnauthorizedError(Exception): class UnauthenticatedError(Exception): - pass + @property + def message(self): + return str(self) diff --git a/atst/routes/errors.py b/atst/routes/errors.py index 0d0211b8..e9dcafcf 100644 --- a/atst/routes/errors.py +++ b/atst/routes/errors.py @@ -8,12 +8,14 @@ def make_error_pages(app): @app.errorhandler(exceptions.UnauthorizedError) # pylint: disable=unused-variable def not_found(e): + app.logger.error(e.message) return render_template("not_found.html"), 404 @app.errorhandler(exceptions.UnauthenticatedError) # pylint: disable=unused-variable def unauthorized(e): + app.logger.error(e.message) return render_template('unauthorized.html'), 401 return app From 3860bc40a68ca5bca9532314a0dc93997323e12c Mon Sep 17 00:00:00 2001 From: dandds Date: Thu, 9 Aug 2018 11:57:37 -0400 Subject: [PATCH 16/34] better name, text for unauthenticated page --- atst/routes/errors.py | 2 +- templates/{unauthorized.html => unauthenticated.html} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename templates/{unauthorized.html => unauthenticated.html} (83%) diff --git a/atst/routes/errors.py b/atst/routes/errors.py index e9dcafcf..5fdac3d1 100644 --- a/atst/routes/errors.py +++ b/atst/routes/errors.py @@ -16,6 +16,6 @@ def make_error_pages(app): # pylint: disable=unused-variable def unauthorized(e): app.logger.error(e.message) - return render_template('unauthorized.html'), 401 + return render_template('unauthenticated.html'), 401 return app diff --git a/templates/unauthorized.html b/templates/unauthenticated.html similarity index 83% rename from templates/unauthorized.html rename to templates/unauthenticated.html index efaa3b95..8fabbdf9 100644 --- a/templates/unauthorized.html +++ b/templates/unauthenticated.html @@ -4,7 +4,7 @@
-

Unauthorized

+

Log in Failed

From 659edcd183bae2604b6877d0272b15d8e4836f26 Mon Sep 17 00:00:00 2001 From: luis cielak Date: Thu, 9 Aug 2018 14:25:34 -0400 Subject: [PATCH 17/34] Begin adding tooltip to text input module --- styles/elements/_tooltip.scss | 4 ++++ templates/components/tooltip.html | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/styles/elements/_tooltip.scss b/styles/elements/_tooltip.scss index 91e0e7cf..4bbeecd9 100644 --- a/styles/elements/_tooltip.scss +++ b/styles/elements/_tooltip.scss @@ -106,4 +106,8 @@ opacity: 1; transition: opacity .15s; } +} + +.tooltip-wrapper { + } \ No newline at end of file diff --git a/templates/components/tooltip.html b/templates/components/tooltip.html index 465d57e4..e6535c6e 100644 --- a/templates/components/tooltip.html +++ b/templates/components/tooltip.html @@ -2,7 +2,7 @@ {% macro Tooltip(message) -%} - + {{ Icon('help') }} From a9be4665ceafe70d7ee4726f7e99e879f696139a Mon Sep 17 00:00:00 2001 From: luis cielak Date: Thu, 9 Aug 2018 14:57:45 -0400 Subject: [PATCH 18/34] Begin adding tooltips to req form fields --- atst/forms/request.py | 3 --- styles/elements/_inputs.scss | 2 +- styles/elements/_tooltip.scss | 2 +- templates/components/options_input.html | 2 +- templates/components/text_input.html | 7 ++++--- templates/components/tooltip.html | 2 +- templates/requests/screen-1.html | 2 +- 7 files changed, 9 insertions(+), 11 deletions(-) diff --git a/atst/forms/request.py b/atst/forms/request.py index fb179587..3b6e5904 100644 --- a/atst/forms/request.py +++ b/atst/forms/request.py @@ -26,9 +26,6 @@ class RequestForm(ValidatedForm): jedi_usage = TextAreaField( "JEDI Usage", description="Briefly describe how you are expecting to use the JEDI Cloud", - render_kw={ - "placeholder": "e.g. We are migrating XYZ application to the cloud so that..." - }, ) # Details of Use: Cloud Readiness diff --git a/styles/elements/_inputs.scss b/styles/elements/_inputs.scss index eff35e34..89261689 100644 --- a/styles/elements/_inputs.scss +++ b/styles/elements/_inputs.scss @@ -71,7 +71,7 @@ @include line-max; position: relative; - .icon { + .icon-validation { position: absolute; left: 100%; top: 100%; diff --git a/styles/elements/_tooltip.scss b/styles/elements/_tooltip.scss index 4bbeecd9..afc4f625 100644 --- a/styles/elements/_tooltip.scss +++ b/styles/elements/_tooltip.scss @@ -109,5 +109,5 @@ } .tooltip-wrapper { - + // display: none; } \ No newline at end of file diff --git a/templates/components/options_input.html b/templates/components/options_input.html index dbd01947..5cdf0351 100644 --- a/templates/components/options_input.html +++ b/templates/components/options_input.html @@ -12,7 +12,7 @@ {% endif %} {% if field.errors %} - {{ Icon('alert') }} + {{ Icon('alert') }} {% endif %} diff --git a/templates/components/text_input.html b/templates/components/text_input.html index 80c24ec2..9160f498 100644 --- a/templates/components/text_input.html +++ b/templates/components/text_input.html @@ -1,15 +1,16 @@ {% from "components/icon.html" import Icon %} +{% from "components/tooltip.html" import Tooltip %} -{% macro TextInput(field, placeholder='') -%} +{% macro TextInput(field, tooltip='', placeholder='') -%}
{{ field(placeholder=placeholder) | safe }} diff --git a/templates/components/tooltip.html b/templates/components/tooltip.html index e6535c6e..7e27d397 100644 --- a/templates/components/tooltip.html +++ b/templates/components/tooltip.html @@ -2,7 +2,7 @@ {% macro Tooltip(message) -%} - + {{ Icon('help') }} diff --git a/templates/requests/screen-1.html b/templates/requests/screen-1.html index 7dbfb367..a285ba10 100644 --- a/templates/requests/screen-1.html +++ b/templates/requests/screen-1.html @@ -23,7 +23,7 @@

General

{{ TextInput(f.dod_component) }} -{{ TextInput(f.jedi_usage,placeholder="e.g. We are migrating XYZ application to the cloud so that...") }} +{{ TextInput(f.jedi_usage,placeholder="e.g. We are migrating XYZ application to the cloud so that...",tooltip="Your answer will help us provide tangible examples to DoD leadership how and why commercial cloud resources are accelerating the Departments missions.
Please tell us more about what the systems / applications you are working with and why the cloud is a good place to host these applications.") }}

Cloud Readiness

{{ TextInput(f.num_software_systems,placeholder="Number of systems") }} From 0cefe76334618ae49a7f28f94fb2cf2209912fb1 Mon Sep 17 00:00:00 2001 From: luis cielak Date: Thu, 9 Aug 2018 15:54:02 -0400 Subject: [PATCH 19/34] Restrict the with of the tooltip for longer text --- styles/elements/_tooltip.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/styles/elements/_tooltip.scss b/styles/elements/_tooltip.scss index afc4f625..4cca7963 100644 --- a/styles/elements/_tooltip.scss +++ b/styles/elements/_tooltip.scss @@ -1,6 +1,7 @@ .tooltip { display: block; z-index: 10000; + max-width: $text-max-width; .tooltip-inner { background: $color-black; From a3489d50e4e0e59ad241b905fab6346fe3a114a5 Mon Sep 17 00:00:00 2001 From: luis cielak Date: Fri, 10 Aug 2018 13:27:40 -0400 Subject: [PATCH 20/34] Adding some tooltips --- templates/components/options_input.html | 5 ++++- templates/requests/screen-1.html | 10 +++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/templates/components/options_input.html b/templates/components/options_input.html index 5cdf0351..49e98943 100644 --- a/templates/components/options_input.html +++ b/templates/components/options_input.html @@ -1,12 +1,15 @@ {% from "components/icon.html" import Icon %} +{% from "components/tooltip.html" import Tooltip %} -{% macro OptionsInput(field, inline=False) -%} +{% macro OptionsInput(field, tooltip, inline=False) -%}
{{ field.label | striptags}} + {% if tooltip %}{{ Tooltip(tooltip) }}{% endif %} + {% if field.description %} {{ field.description | safe }} {% endif %} diff --git a/templates/requests/screen-1.html b/templates/requests/screen-1.html index a285ba10..bcb9276d 100644 --- a/templates/requests/screen-1.html +++ b/templates/requests/screen-1.html @@ -26,15 +26,15 @@ {{ TextInput(f.jedi_usage,placeholder="e.g. We are migrating XYZ application to the cloud so that...",tooltip="Your answer will help us provide tangible examples to DoD leadership how and why commercial cloud resources are accelerating the Departments missions.
Please tell us more about what the systems / applications you are working with and why the cloud is a good place to host these applications.") }}

Cloud Readiness

-{{ TextInput(f.num_software_systems,placeholder="Number of systems") }} -{{ OptionsInput(f.jedi_migration) }} -{{ OptionsInput(f.rationalization_software_systems) }} +{{ TextInput(f.num_software_systems,placeholder="Number of systems",tooltip="A software system can be any code that you plan to host on cloud infrastructure. For example, it could be a custom-developed web application, or a large ERP system.") }} +{{ OptionsInput(f.jedi_migration, tooltip="Cloud migration is the process of moving data, applications or other business elements from an organization\\'s onsite computers/data centers to the cloud, or moving them from one cloud environment to another.") }} +{{ OptionsInput(f.rationalization_software_systems, tooltip="Rationalization is the DoD process to determine whether the application should move to the cloud.") }} {{ OptionsInput(f.technical_support_team) }} {{ OptionsInput(f.organization_providing_assistance) }} -{{ OptionsInput(f.engineering_assessment) }} +{{ OptionsInput(f.engineering_assessment, tooltip="An engineering assessment is an evaluation to convert your application architecture from on-premises to using the commercial cloud") }} {{ TextInput(f.data_transfers) }} {{ TextInput(f.expected_completion_date) }} -{{ OptionsInput(f.cloud_native) }} +{{ OptionsInput(f.cloud_native, tooltip="Cloud native is architecting and designing your application to use all the benefits of the commercial cloud. Specifically, designing applications so that they are decoupled from a physical resource.") }}

Financial Usage

{{ TextInput(f.estimated_monthly_spend) }} From 1bc44b8882055bba63874adf780fbcaa3d4a8bf0 Mon Sep 17 00:00:00 2001 From: luis cielak Date: Fri, 10 Aug 2018 13:38:14 -0400 Subject: [PATCH 21/34] Add moaaar tooltips --- atst/forms/request.py | 6 ++++++ templates/requests/screen-1.html | 5 +++-- templates/requests/screen-4.html | 7 ++++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/atst/forms/request.py b/atst/forms/request.py index 3b6e5904..6b670650 100644 --- a/atst/forms/request.py +++ b/atst/forms/request.py @@ -112,6 +112,12 @@ class RequestForm(ValidatedForm): ) average_daily_traffic = IntegerField( + "Average Daily Traffic (Number of Requests)", + description="What is the average daily traffic you expect the systems under this cloud contract to use?" + ) + + average_daily_traffic_gb = IntegerField( + "Average Daily Traffic (GB)", description="What is the average daily traffic you expect the systems under this cloud contract to use?" ) diff --git a/templates/requests/screen-1.html b/templates/requests/screen-1.html index bcb9276d..51011f2c 100644 --- a/templates/requests/screen-1.html +++ b/templates/requests/screen-1.html @@ -37,11 +37,12 @@ {{ OptionsInput(f.cloud_native, tooltip="Cloud native is architecting and designing your application to use all the benefits of the commercial cloud. Specifically, designing applications so that they are decoupled from a physical resource.") }}

Financial Usage

-{{ TextInput(f.estimated_monthly_spend) }} +{{ TextInput(f.estimated_monthly_spend, tooltip="Refer to financial verification step help docs") }}

So this means you are spending approximately $X annually

{{ TextInput(f.dollar_value) }} {{ TextInput(f.number_user_sessions) }} -{{ TextInput(f.average_daily_traffic) }} +{{ TextInput(f.average_daily_traffic, tooltip="Requests are the client-to-server network traffic that is being transferred to your systems") }} +{{ TextInput(f.average_daily_traffic_gb, tooltip="GB uploaded is the gigabyte amount of data traffic that is being transferred to your systems") }} {{ TextInput(f.start_date) }} diff --git a/templates/requests/screen-4.html b/templates/requests/screen-4.html index 2e940e57..add689ff 100644 --- a/templates/requests/screen-4.html +++ b/templates/requests/screen-4.html @@ -98,10 +98,15 @@
-
Average Daily Traffic
+
Average Daily Traffic (Number of Requests)
{{data['details_of_use']['average_daily_traffic']}}
+
+
Average Daily Traffic (GB)
+
{{data['details_of_use']['average_daily_traffic_gb']}}
+
+
Start Date
{{data['details_of_use']['start_date']}}
From 51185d16f0e8a9918d3810ee57912cf8a1c5ac03 Mon Sep 17 00:00:00 2001 From: luis cielak Date: Fri, 10 Aug 2018 13:50:34 -0400 Subject: [PATCH 22/34] Strip out html from label --- templates/components/text_input.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/components/text_input.html b/templates/components/text_input.html index 9160f498..8703e2db 100644 --- a/templates/components/text_input.html +++ b/templates/components/text_input.html @@ -4,7 +4,7 @@ {% macro TextInput(field, tooltip='', placeholder='') -%}
+
+
+
+
Tooltips
{{ Tooltip('this is a tooltip text') }}default
{{ Icon('help') }}top-start
{{ Icon('help') }}right
{{ Icon('help') }}bottom
+
+
- - +
+
+
Labels
+ Label + Label Info + Label Warning + Label Error + Label Success
From 65207a480dee09febf6e10d479f729e92e39e03a Mon Sep 17 00:00:00 2001 From: luis cielak Date: Mon, 13 Aug 2018 13:10:18 -0400 Subject: [PATCH 27/34] Set label text displayed block with the tooltip --- styles/elements/_inputs.scss | 1 - templates/components/options_input.html | 9 +++++---- templates/components/text_input.html | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/styles/elements/_inputs.scss b/styles/elements/_inputs.scss index 7da283af..88589f29 100644 --- a/styles/elements/_inputs.scss +++ b/styles/elements/_inputs.scss @@ -81,7 +81,6 @@ } .usa-input__help { - display: block; @include h4; font-weight: normal; padding: $gap/2 0; diff --git a/templates/components/options_input.html b/templates/components/options_input.html index 49e98943..6009cd51 100644 --- a/templates/components/options_input.html +++ b/templates/components/options_input.html @@ -6,16 +6,17 @@
- {{ field.label | striptags}} - - {% if tooltip %}{{ Tooltip(tooltip) }}{% endif %} +
+ {{ field.label | striptags}} + {% if tooltip %}{{ Tooltip(tooltip) }}{% endif %} +
{% if field.description %} {{ field.description | safe }} {% endif %} {% if field.errors %} - {{ Icon('alert') }} + {{ Icon('alert') }} {% endif %} diff --git a/templates/components/text_input.html b/templates/components/text_input.html index 8703e2db..f14ffe87 100644 --- a/templates/components/text_input.html +++ b/templates/components/text_input.html @@ -4,7 +4,7 @@ {% macro TextInput(field, tooltip='', placeholder='') -%}
{{ field(placeholder=placeholder) | safe }} From 8f50fd265151dedaff759035bdc74d9499b73281 Mon Sep 17 00:00:00 2001 From: luis cielak Date: Mon, 13 Aug 2018 13:22:32 -0400 Subject: [PATCH 29/34] Update text on some fields --- atst/forms/request.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/atst/forms/request.py b/atst/forms/request.py index 0b424e31..c6b7c8c5 100644 --- a/atst/forms/request.py +++ b/atst/forms/request.py @@ -36,6 +36,7 @@ class RequestForm(ValidatedForm): ) jedi_migration = RadioField( + "JEDI Migration", description="Are you using the JEDI Cloud to migrate existing systems?", choices=[("yes", "Yes"), ("no", "No")], ) @@ -94,7 +95,7 @@ class RequestForm(ValidatedForm): ) cloud_native = RadioField( - "Are your software systems being developed cloud native?", + description="Are your software systems being developed cloud native?", choices=[("yes", "Yes"), ("no", "No")], ) From 88092a7892c04dcfc4bdfec64d9fb8e235134307 Mon Sep 17 00:00:00 2001 From: luis cielak Date: Mon, 13 Aug 2018 14:13:47 -0400 Subject: [PATCH 30/34] Adjust tooltips for accessibility --- styles/elements/_inputs.scss | 26 ++++++++++++------------- styles/elements/_tooltip.scss | 11 ++++++++--- templates/base.html | 5 +++-- templates/components/options_input.html | 2 +- templates/components/text_input.html | 2 +- templates/components/tooltip.html | 4 ++-- 6 files changed, 27 insertions(+), 23 deletions(-) diff --git a/styles/elements/_inputs.scss b/styles/elements/_inputs.scss index 7b22f2d7..93ee7917 100644 --- a/styles/elements/_inputs.scss +++ b/styles/elements/_inputs.scss @@ -80,6 +80,17 @@ } } + .usa-input__title { + display: flex; + align-items: center; + + .icon-tooltip { + padding: 0 $gap/2; + cursor: default; + margin-left: $gap/2; + } + } + .usa-input__help { @include h4; font-weight: normal; @@ -87,16 +98,7 @@ @include line-max; .icon-link { - padding: $gap/2; - } - } - - .icon-tooltip .icon { - @include icon-color($color-blue); - - &:hover { - @include icon-color($color-aqua); - cursor: pointer; + padding: 0 $gap/2; } } @@ -116,10 +118,6 @@ font-weight: $font-bold; } - .icon { - vertical-align: middle; - } - } ul { diff --git a/styles/elements/_tooltip.scss b/styles/elements/_tooltip.scss index 4cca7963..57995336 100644 --- a/styles/elements/_tooltip.scss +++ b/styles/elements/_tooltip.scss @@ -7,7 +7,7 @@ background: $color-black; color: $color-white; border-radius: $border-radius; - padding: 5px 10px 4px; + padding: $gap*2; } .tooltip-arrow { @@ -109,6 +109,11 @@ } } -.tooltip-wrapper { - // display: none; + +.icon-tooltip { + @include icon-link; + + .icon { + @include icon-size(16); + } } \ No newline at end of file diff --git a/templates/base.html b/templates/base.html index 8416032f..515caec0 100644 --- a/templates/base.html +++ b/templates/base.html @@ -3,11 +3,12 @@ {% set context=g.navigationContext %} - + - {% block title %}JEDI{% endblock %} + + {% block title %}JEDI Cloud{% endblock %} {% assets "css" %} {% endassets %} diff --git a/templates/components/options_input.html b/templates/components/options_input.html index 4685f050..af2dfd81 100644 --- a/templates/components/options_input.html +++ b/templates/components/options_input.html @@ -6,7 +6,7 @@
-
+
{{ field.label | striptags}} {% if tooltip %}{{ Tooltip(tooltip) }}{% endif %}
diff --git a/templates/components/text_input.html b/templates/components/text_input.html index 933d1f07..c8fcbfa6 100644 --- a/templates/components/text_input.html +++ b/templates/components/text_input.html @@ -4,7 +4,7 @@ {% macro TextInput(field, tooltip='', placeholder='') -%}
diff --git a/templates/requests/screen-1.html b/templates/requests/screen-1.html index ea17827f..e88498a7 100644 --- a/templates/requests/screen-1.html +++ b/templates/requests/screen-1.html @@ -21,7 +21,7 @@

All fields are required, unless specified optional.

General

-{{ TextInput(f.dod_component) }} +{{ OptionsInput(f.dod_component) }} {{ TextInput(f.jedi_usage,placeholder="Briefly describe how you are expecting to use the JEDI Cloud. \n e.g. We are migrating XYZ application to the cloud so that...",tooltip="Your answer will help us provide tangible examples to DoD leadership how and why commercial cloud resources are accelerating the Department\\'s missions.") }}

Cloud Readiness

@@ -31,8 +31,8 @@ {{ OptionsInput(f.technical_support_team) }} {{ OptionsInput(f.organization_providing_assistance) }} {{ OptionsInput(f.engineering_assessment, tooltip="An engineering assessment is an evaluation to convert your application architecture from on-premises to using the commercial cloud") }} -{{ TextInput(f.data_transfers) }} -{{ TextInput(f.expected_completion_date) }} +{{ OptionsInput(f.data_transfers) }} +{{ OptionsInput(f.expected_completion_date) }} {{ OptionsInput(f.cloud_native, tooltip="Cloud native is architecting and designing your application to use all the benefits of the commercial cloud. Specifically, designing applications so that they are decoupled from a physical resource.") }}

Financial Usage

From 1231edee412491490a770521091223b6e6b196cc Mon Sep 17 00:00:00 2001 From: luis cielak Date: Mon, 13 Aug 2018 15:28:20 -0400 Subject: [PATCH 33/34] Fix icon error --- templates/components/options_input.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/components/options_input.html b/templates/components/options_input.html index 1277b3b5..34c9a0da 100644 --- a/templates/components/options_input.html +++ b/templates/components/options_input.html @@ -17,7 +17,7 @@ {% endif %} {% if field.errors %} - {{ Icon('alert',classes="icon-validation")) }} + {{ Icon('alert',classes="icon-validation") }} {% endif %} From 3a5f8694baf7f55b8e762df85c0166e7c06d2c33 Mon Sep 17 00:00:00 2001 From: luis cielak Date: Mon, 13 Aug 2018 15:47:29 -0400 Subject: [PATCH 34/34] Add vue tooltip dep --- package.json | 1 + yarn.lock | 81 +++++++++++++++++++--------------------------------- 2 files changed, 30 insertions(+), 52 deletions(-) diff --git a/package.json b/package.json index b52327bf..5918bf60 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "parcel": "^1.9.7", "text-mask-addons": "^3.8.0", "uswds": "^1.6.3", + "v-tooltip": "^2.0.0-rc.33", "vue": "^2.5.17", "vue-text-mask": "^6.1.2" }, diff --git a/yarn.lock b/yarn.lock index ab510b61..d0665a54 100644 --- a/yarn.lock +++ b/yarn.lock @@ -127,14 +127,10 @@ anymatch@^2.0.0: micromatch "^3.1.4" normalize-path "^2.1.1" -aproba@^1.0.3, aproba@^1.1.1, aproba@^1.1.2, aproba@~1.2.0: +aproba@^1.0.3, aproba@^1.1.1, aproba@^1.1.2, "aproba@^1.1.2 || 2", aproba@~1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" -"aproba@^1.1.2 || 2": - version "2.0.0" - resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc" - archy@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40" @@ -1355,14 +1351,10 @@ color-convert@^1.3.0, color-convert@^1.9.0, color-convert@^1.9.1: dependencies: color-name "1.1.1" -color-name@1.1.1: +color-name@1.1.1, color-name@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.1.tgz#4b1415304cf50028ea81643643bd82ea05803689" -color-name@^1.0.0: - version "1.1.3" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" - color-string@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/color-string/-/color-string-0.3.0.tgz#27d46fb67025c5c2fa25993bfbf579e47841b991" @@ -2148,18 +2140,7 @@ 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" -escodegen@^1.8.1: - version "1.11.0" - resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.11.0.tgz#b27a9389481d5bfd5bec76f7bb1eb3f8f4556589" - dependencies: - esprima "^3.1.3" - estraverse "^4.2.0" - esutils "^2.0.2" - optionator "^0.8.1" - optionalDependencies: - source-map "~0.6.1" - -escodegen@~1.9.0: +escodegen@^1.8.1, escodegen@~1.9.0: version "1.9.1" resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.9.1.tgz#dbae17ef96c8e4bedb1356f4504fa4cc2f7cb7e2" dependencies: @@ -2259,14 +2240,10 @@ extglob@^2.0.4: snapdragon "^0.8.1" to-regex "^3.0.1" -extsprintf@1.3.0: +extsprintf@1.3.0, extsprintf@^1.2.0: version "1.3.0" resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" -extsprintf@^1.2.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" - falafel@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/falafel/-/falafel-2.1.0.tgz#96bb17761daba94f46d001738b3cedf3a67fe06c" @@ -3214,11 +3191,7 @@ js-beautify@^1.7.5: mkdirp "~0.5.0" nopt "~3.0.1" -"js-tokens@^3.0.0 || ^4.0.0": - version "4.0.0" - resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" - -js-tokens@^3.0.2: +"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" @@ -3482,6 +3455,10 @@ lodash.memoize@~3.0.3: version "3.0.4" resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-3.0.4.tgz#2dcbd2c287cbc0a55cc42328bd0c736150d53e3f" +lodash.merge@^4.6.0: + version "4.6.1" + resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.1.tgz#adc25d9cb99b9391c59624f379fbba60d7111d54" + lodash.mergewith@^4.6.0: version "4.6.1" resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927" @@ -3802,14 +3779,10 @@ move-concurrently@^1.0.1: rimraf "^2.5.4" run-queue "^1.0.3" -ms@2.0.0: +ms@2.0.0, ms@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" -ms@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" - mute-stream@~0.0.4: version "0.0.7" resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" @@ -4556,14 +4529,10 @@ pascalcase@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" -path-browserify@0.0.0: +path-browserify@0.0.0, path-browserify@~0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a" -path-browserify@~0.0.0: - version "0.0.1" - resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.1.tgz#e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a" - path-dirname@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0" @@ -4652,6 +4621,10 @@ pinkie@^2.0.0: version "2.0.4" resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" +popper.js@^1.12.9: + version "1.14.4" + resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.14.4.tgz#8eec1d8ff02a5a3a152dd43414a15c7b79fd69b6" + posix-character-classes@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" @@ -6084,11 +6057,7 @@ static-module@^2.2.0: static-eval "^2.0.0" through2 "~2.0.3" -"statuses@>= 1.4.0 < 2": - version "1.5.0" - resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" - -statuses@~1.4.0: +"statuses@>= 1.4.0 < 2", statuses@~1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087" @@ -6430,14 +6399,10 @@ trim-right@^1.0.1: dependencies: glob "^6.0.4" -tty-browserify@0.0.0: +tty-browserify@0.0.0, tty-browserify@~0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6" -tty-browserify@~0.0.0: - version "0.0.1" - resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.1.tgz#3f05251ee17904dfd0677546670db9651682b811" - tunnel-agent@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" @@ -6640,6 +6605,14 @@ uuid@^3.0.0, uuid@^3.1.0, uuid@^3.3.2: version "3.3.2" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131" +v-tooltip@^2.0.0-rc.33: + version "2.0.0-rc.33" + resolved "https://registry.yarnpkg.com/v-tooltip/-/v-tooltip-2.0.0-rc.33.tgz#78f7d8e9c34265622be65ba9dc78c67f1dc02b73" + dependencies: + lodash.merge "^4.6.0" + popper.js "^1.12.9" + vue-resize "^0.4.3" + v8-compile-cache@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.0.tgz#526492e35fc616864284700b7043e01baee09f0a" @@ -6679,6 +6652,10 @@ vm-browserify@0.0.4, vm-browserify@~0.0.1: dependencies: indexof "0.0.1" +vue-resize@^0.4.3: + version "0.4.4" + resolved "https://registry.yarnpkg.com/vue-resize/-/vue-resize-0.4.4.tgz#dee9b8dd1b189e7e3f6ec47f86c60694a241bb17" + vue-text-mask@^6.1.2: version "6.1.2" resolved "https://registry.yarnpkg.com/vue-text-mask/-/vue-text-mask-6.1.2.tgz#2cc18a1ca04ea66798518a9373929a12256d14b9"