From 21d0581f4e7b4311a7f056cfed295d88a5f39328 Mon Sep 17 00:00:00 2001 From: Luis Cielak Date: Mon, 23 Jul 2018 10:05:29 -0400 Subject: [PATCH 01/34] Update requests table and add temp nav link --- scss/elements/_inputs.scss | 7 ++ scss/elements/_panels.scss | 9 ++ scss/elements/_tables.scss | 7 +- .../navigation/global_navigation.html.to | 1 + templates/requests.html.to | 88 +++++++++++-------- 5 files changed, 73 insertions(+), 39 deletions(-) diff --git a/scss/elements/_inputs.scss b/scss/elements/_inputs.scss index bcff6c79..00823f4e 100644 --- a/scss/elements/_inputs.scss +++ b/scss/elements/_inputs.scss @@ -28,3 +28,10 @@ select { padding-bottom: 0.5rem; } } + +.usa-search { + // width: 45%; + // float: left; + // padding: $gap * 2; + margin-right: $gap; +} \ No newline at end of file diff --git a/scss/elements/_panels.scss b/scss/elements/_panels.scss index 5b0c1220..d5ecbfae 100644 --- a/scss/elements/_panels.scss +++ b/scss/elements/_panels.scss @@ -44,3 +44,12 @@ } } } + +.panel__actions { + display: flex; + padding: $gap; + + // &__search { + // float: left; + // } +} \ No newline at end of file diff --git a/scss/elements/_tables.scss b/scss/elements/_tables.scss index 678770d6..a7fabfc5 100644 --- a/scss/elements/_tables.scss +++ b/scss/elements/_tables.scss @@ -4,7 +4,7 @@ * @source https://github.com/uswds/uswds/blob/develop/src/stylesheets/elements/_table.scss */ -table { + table { @include panel-margin; min-width: 100%; @@ -16,6 +16,11 @@ table { th { @include block-list-header; + + &:first-child { + padding: $gap * 2 !important; // This overrides USWDS's no padding + } + } td { diff --git a/templates/navigation/global_navigation.html.to b/templates/navigation/global_navigation.html.to index 17e8bf01..f5acc5a3 100644 --- a/templates/navigation/global_navigation.html.to +++ b/templates/navigation/global_navigation.html.to @@ -5,6 +5,7 @@ {% end %} {% module SidenavItem("Requests", href="/requests", icon="document", active=matchesPath('/requests')) %} + {% module SidenavItem("+ New Request", href="/requests/new", icon="", active=matchesPath('/requests/new')) %} {% module SidenavItem("Workspaces", href="/workspaces", icon="cloud", active=matchesPath('/workspaces')) %} diff --git a/templates/requests.html.to b/templates/requests.html.to index 653c01b3..b8a52553 100644 --- a/templates/requests.html.to +++ b/templates/requests.html.to @@ -3,50 +3,62 @@ {% block content %} - -
- -
- -
-

Requests New Request

+
+
+
+ + + +
+
+
+
- - - - - - - - - - - - - - {% for r in requests %} - - - {% end %} - - - - - - - {% end %} - -
Order IDRequest DateRequesterTotal AppsStatusActions
{{ r['order_id'] }} - {% if r['is_new'] %}New - {{ r['date'] }}{{ r['full_name'] }}{{ r['app_count'] }}{{ r['status'] }}Download
- - -
+ + + +
+ + + + + + + + + + + + + + {% for r in requests %} + + + {% end %} + + + + + + + {% end %} + +
Order IDRequest DateRequesterTotal AppsStatusActions
{{ r['order_id'] }} + {% if r['is_new'] %}New + {{ r['date'] }}{{ r['full_name'] }}{{ r['app_count'] }}{{ r['status'] }}Download
+
{% end %} From 3bc5c984c1eced7bcd61b7c9a0a5dd9109768cd0 Mon Sep 17 00:00:00 2001 From: Luis Cielak Date: Mon, 23 Jul 2018 10:05:29 -0400 Subject: [PATCH 02/34] Update requests table and add temp nav link --- scss/elements/_inputs.scss | 7 ++ scss/elements/_panels.scss | 9 ++ scss/elements/_tables.scss | 7 +- .../navigation/global_navigation.html.to | 1 + templates/requests.html.to | 88 +++++++++++-------- 5 files changed, 73 insertions(+), 39 deletions(-) diff --git a/scss/elements/_inputs.scss b/scss/elements/_inputs.scss index bcff6c79..00823f4e 100644 --- a/scss/elements/_inputs.scss +++ b/scss/elements/_inputs.scss @@ -28,3 +28,10 @@ select { padding-bottom: 0.5rem; } } + +.usa-search { + // width: 45%; + // float: left; + // padding: $gap * 2; + margin-right: $gap; +} \ No newline at end of file diff --git a/scss/elements/_panels.scss b/scss/elements/_panels.scss index 5b0c1220..d5ecbfae 100644 --- a/scss/elements/_panels.scss +++ b/scss/elements/_panels.scss @@ -44,3 +44,12 @@ } } } + +.panel__actions { + display: flex; + padding: $gap; + + // &__search { + // float: left; + // } +} \ No newline at end of file diff --git a/scss/elements/_tables.scss b/scss/elements/_tables.scss index 678770d6..a7fabfc5 100644 --- a/scss/elements/_tables.scss +++ b/scss/elements/_tables.scss @@ -4,7 +4,7 @@ * @source https://github.com/uswds/uswds/blob/develop/src/stylesheets/elements/_table.scss */ -table { + table { @include panel-margin; min-width: 100%; @@ -16,6 +16,11 @@ table { th { @include block-list-header; + + &:first-child { + padding: $gap * 2 !important; // This overrides USWDS's no padding + } + } td { diff --git a/templates/navigation/global_navigation.html.to b/templates/navigation/global_navigation.html.to index 17e8bf01..f5acc5a3 100644 --- a/templates/navigation/global_navigation.html.to +++ b/templates/navigation/global_navigation.html.to @@ -5,6 +5,7 @@ {% end %} {% module SidenavItem("Requests", href="/requests", icon="document", active=matchesPath('/requests')) %} + {% module SidenavItem("+ New Request", href="/requests/new", icon="", active=matchesPath('/requests/new')) %} {% module SidenavItem("Workspaces", href="/workspaces", icon="cloud", active=matchesPath('/workspaces')) %}
diff --git a/templates/requests.html.to b/templates/requests.html.to index 653c01b3..b8a52553 100644 --- a/templates/requests.html.to +++ b/templates/requests.html.to @@ -3,50 +3,62 @@ {% block content %} - -
- -
- -
-

Requests New Request

+
+
+
+ + + +
+
+
+
- - - - - - - - - - - - - - {% for r in requests %} - - - {% end %} - - - - - - - {% end %} - -
Order IDRequest DateRequesterTotal AppsStatusActions
{{ r['order_id'] }} - {% if r['is_new'] %}New - {{ r['date'] }}{{ r['full_name'] }}{{ r['app_count'] }}{{ r['status'] }}Download
- - -
+ + + +
+ + + + + + + + + + + + + + {% for r in requests %} + + + {% end %} + + + + + + + {% end %} + +
Order IDRequest DateRequesterTotal AppsStatusActions
{{ r['order_id'] }} + {% if r['is_new'] %}New + {{ r['date'] }}{{ r['full_name'] }}{{ r['app_count'] }}{{ r['status'] }}Download
+
{% end %} From d5e6fae7ba151aedd21129a33be1e719b9273764 Mon Sep 17 00:00:00 2001 From: Luis Cielak Date: Mon, 23 Jul 2018 10:23:59 -0400 Subject: [PATCH 03/34] Add panel actions styleguide --- scss/atat.scss | 1 + scss/elements/_inputs.scss | 9 +-------- scss/elements/_panel_actions.scss | 20 ++++++++++++++++++++ scss/elements/_panels.scss | 9 --------- 4 files changed, 22 insertions(+), 17 deletions(-) create mode 100644 scss/elements/_panel_actions.scss diff --git a/scss/atat.scss b/scss/atat.scss index 082fbab2..1589b971 100644 --- a/scss/atat.scss +++ b/scss/atat.scss @@ -8,6 +8,7 @@ @import 'elements/inputs'; @import 'elements/buttons'; @import 'elements/panels'; +@import 'elements/panel_actions'; @import 'elements/block_lists'; @import 'elements/tables'; @import 'elements/icons'; diff --git a/scss/elements/_inputs.scss b/scss/elements/_inputs.scss index 00823f4e..8d47dfe8 100644 --- a/scss/elements/_inputs.scss +++ b/scss/elements/_inputs.scss @@ -4,7 +4,7 @@ * @source https://github.com/uswds/uswds/blob/develop/src/stylesheets/elements/_inputs.scss */ -from { + from { margin-bottom: 3rem; } @@ -27,11 +27,4 @@ select { label:first-child { padding-bottom: 0.5rem; } -} - -.usa-search { - // width: 45%; - // float: left; - // padding: $gap * 2; - margin-right: $gap; } \ No newline at end of file diff --git a/scss/elements/_panel_actions.scss b/scss/elements/_panel_actions.scss new file mode 100644 index 00000000..bf797a06 --- /dev/null +++ b/scss/elements/_panel_actions.scss @@ -0,0 +1,20 @@ +// Panels Actions +// Form inputs and other actions for panels + +.panel__actions { + display: flex; + padding: $gap; + + .usa-search { + padding-top: 2px; + input[type=search] { + height: 4.4rem; + font-size: 14px; + color: $color-black; + + } + button { + min-height: 4.4rem; + } + } +} \ No newline at end of file diff --git a/scss/elements/_panels.scss b/scss/elements/_panels.scss index d5ecbfae..e45ee1ec 100644 --- a/scss/elements/_panels.scss +++ b/scss/elements/_panels.scss @@ -43,13 +43,4 @@ padding: 0 ($gap * 4); } } -} - -.panel__actions { - display: flex; - padding: $gap; - - // &__search { - // float: left; - // } } \ No newline at end of file From 342eefa45e2f173b766fe4377b8e4ca30fff14ba Mon Sep 17 00:00:00 2001 From: richard-dds Date: Mon, 23 Jul 2018 10:25:29 -0400 Subject: [PATCH 04/34] Display user's name in header --- templates/navigation/topbar.html.to | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/navigation/topbar.html.to b/templates/navigation/topbar.html.to index 9c6ef28c..856075ec 100644 --- a/templates/navigation/topbar.html.to +++ b/templates/navigation/topbar.html.to @@ -11,7 +11,7 @@ - Sam Seeceepio + {{ current_user["first_name"] + " " + current_user["last_name"] }} {% module Icon('avatar', classes='topbar__link-icon') %}
From ca112667bd421ec672a8f1836e99b0c546722e78 Mon Sep 17 00:00:00 2001 From: richard-dds Date: Mon, 23 Jul 2018 10:28:29 -0400 Subject: [PATCH 05/34] Change spelling of Sam's last name --- atst/handlers/dev.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atst/handlers/dev.py b/atst/handlers/dev.py index 86c4e419..878aca11 100644 --- a/atst/handlers/dev.py +++ b/atst/handlers/dev.py @@ -6,7 +6,7 @@ _DEV_USERS = { "sam": { "id": "164497f6-c1ea-4f42-a5ef-101da278c012", "first_name": "Sam", - "last_name": "CCPO", + "last_name": "Seeceepio", "atat_role": "ccpo" }, From cfd99f1de470ac6da7bed65913abf90ea875731d Mon Sep 17 00:00:00 2001 From: richard-dds Date: Mon, 23 Jul 2018 10:38:08 -0400 Subject: [PATCH 06/34] Add users details to README --- README.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/README.md b/README.md index 311965be..6d1cddf2 100644 --- a/README.md +++ b/README.md @@ -58,6 +58,19 @@ To start the app locally in the foreground and watch for changes: script/dev_server +### Users + +There are currently six mock users for development: + +- Sam (a CCPO) +- Amanda +- Brandon +- Christina +- Dominick +- Erica + +To log in as one of them, navigate to `/login-dev?username=`. For example `/login-dev?username=amanda`. + ## Testing To run lint, static analysis, and unit tests: From e578005a14950516131c412821e9d0dc6b33ec95 Mon Sep 17 00:00:00 2001 From: Luis Cielak Date: Mon, 23 Jul 2018 10:40:23 -0400 Subject: [PATCH 07/34] Adjust size for serach bar and filter dropdown --- scss/elements/_panel_actions.scss | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/scss/elements/_panel_actions.scss b/scss/elements/_panel_actions.scss index bf797a06..bc42274c 100644 --- a/scss/elements/_panel_actions.scss +++ b/scss/elements/_panel_actions.scss @@ -1,20 +1,31 @@ -// Panels Actions -// Form inputs and other actions for panels +/* + * Panels Actions + * Form inputs and other actions for panels + */ -.panel__actions { + .panel__actions { display: flex; padding: $gap; + &--filter { + width: 50%; + } + + &--search { + width: 50%; + } + .usa-search { padding-top: 2px; + margin-right: 2rem; + input[type=search] { height: 4.4rem; - font-size: 14px; - color: $color-black; - } + button { min-height: 4.4rem; } + } } \ No newline at end of file From 313d7f6fd1cf1729fd71ef2d2134fc974827a0a3 Mon Sep 17 00:00:00 2001 From: Luis Cielak Date: Mon, 23 Jul 2018 10:45:06 -0400 Subject: [PATCH 08/34] Add alert module for information --- templates/requests.html.to | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/templates/requests.html.to b/templates/requests.html.to index b8a52553..85b2097c 100644 --- a/templates/requests.html.to +++ b/templates/requests.html.to @@ -3,6 +3,10 @@ {% block content %} +{% module Alert('Pending Financial Verification', + message="

Your next step is to create a Task Order (T.O.) associated with JEDI Cloud. Please consult a COntracting Officer (KO) or Contracting Officer Representative (COR) to help with this step.

" +) %} +
From a1efbb27a1e650cbc97af65319d3db16388f885f Mon Sep 17 00:00:00 2001 From: Luis Cielak Date: Mon, 23 Jul 2018 12:02:30 -0400 Subject: [PATCH 09/34] Increase search bar font size --- scss/elements/_panel_actions.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scss/elements/_panel_actions.scss b/scss/elements/_panel_actions.scss index bc42274c..702c5cc1 100644 --- a/scss/elements/_panel_actions.scss +++ b/scss/elements/_panel_actions.scss @@ -21,6 +21,8 @@ input[type=search] { height: 4.4rem; + font-size: 1.7rem; + color: $color-black; } button { From a9e3cb5d8e859cbe76e6f21c05a31d50aca87646 Mon Sep 17 00:00:00 2001 From: Luis Cielak Date: Mon, 23 Jul 2018 12:52:17 -0400 Subject: [PATCH 10/34] Fix typo --- templates/requests.html.to | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/requests.html.to b/templates/requests.html.to index 85b2097c..52ab1ea6 100644 --- a/templates/requests.html.to +++ b/templates/requests.html.to @@ -4,7 +4,7 @@ {% module Alert('Pending Financial Verification', - message="

Your next step is to create a Task Order (T.O.) associated with JEDI Cloud. Please consult a COntracting Officer (KO) or Contracting Officer Representative (COR) to help with this step.

" + message="

Your next step is to create a Task Order (T.O.) associated with JEDI Cloud. Please consult a Contracting Officer (KO) or Contracting Officer Representative (COR) to help with this step.

" ) %}
From 1916461d6e2ad6aaa0eabdf43bc27854d6adc77c Mon Sep 17 00:00:00 2001 From: Luis Cielak Date: Mon, 23 Jul 2018 10:05:29 -0400 Subject: [PATCH 11/34] Update requests table and add temp nav link --- scss/elements/_inputs.scss | 7 ++ scss/elements/_panels.scss | 9 ++ scss/elements/_tables.scss | 7 +- .../navigation/global_navigation.html.to | 1 + templates/requests.html.to | 88 +++++++++++-------- 5 files changed, 73 insertions(+), 39 deletions(-) diff --git a/scss/elements/_inputs.scss b/scss/elements/_inputs.scss index bcff6c79..00823f4e 100644 --- a/scss/elements/_inputs.scss +++ b/scss/elements/_inputs.scss @@ -28,3 +28,10 @@ select { padding-bottom: 0.5rem; } } + +.usa-search { + // width: 45%; + // float: left; + // padding: $gap * 2; + margin-right: $gap; +} \ No newline at end of file diff --git a/scss/elements/_panels.scss b/scss/elements/_panels.scss index 5b0c1220..d5ecbfae 100644 --- a/scss/elements/_panels.scss +++ b/scss/elements/_panels.scss @@ -44,3 +44,12 @@ } } } + +.panel__actions { + display: flex; + padding: $gap; + + // &__search { + // float: left; + // } +} \ No newline at end of file diff --git a/scss/elements/_tables.scss b/scss/elements/_tables.scss index 678770d6..a7fabfc5 100644 --- a/scss/elements/_tables.scss +++ b/scss/elements/_tables.scss @@ -4,7 +4,7 @@ * @source https://github.com/uswds/uswds/blob/develop/src/stylesheets/elements/_table.scss */ -table { + table { @include panel-margin; min-width: 100%; @@ -16,6 +16,11 @@ table { th { @include block-list-header; + + &:first-child { + padding: $gap * 2 !important; // This overrides USWDS's no padding + } + } td { diff --git a/templates/navigation/global_navigation.html.to b/templates/navigation/global_navigation.html.to index 17e8bf01..f5acc5a3 100644 --- a/templates/navigation/global_navigation.html.to +++ b/templates/navigation/global_navigation.html.to @@ -5,6 +5,7 @@ {% end %} {% module SidenavItem("Requests", href="/requests", icon="document", active=matchesPath('/requests')) %} + {% module SidenavItem("+ New Request", href="/requests/new", icon="", active=matchesPath('/requests/new')) %} {% module SidenavItem("Workspaces", href="/workspaces", icon="cloud", active=matchesPath('/workspaces')) %}
diff --git a/templates/requests.html.to b/templates/requests.html.to index 653c01b3..b8a52553 100644 --- a/templates/requests.html.to +++ b/templates/requests.html.to @@ -3,50 +3,62 @@ {% block content %} - -
- -
- -
-

Requests New Request

+
+
+
+ + + +
+
+
+
- - - - - - - - - - - - - - {% for r in requests %} - - - {% end %} - - - - - - - {% end %} - -
Order IDRequest DateRequesterTotal AppsStatusActions
{{ r['order_id'] }} - {% if r['is_new'] %}New - {{ r['date'] }}{{ r['full_name'] }}{{ r['app_count'] }}{{ r['status'] }}Download
- - -
+ + + +
+ + + + + + + + + + + + + + {% for r in requests %} + + + {% end %} + + + + + + + {% end %} + +
Order IDRequest DateRequesterTotal AppsStatusActions
{{ r['order_id'] }} + {% if r['is_new'] %}New + {{ r['date'] }}{{ r['full_name'] }}{{ r['app_count'] }}{{ r['status'] }}Download
+
{% end %} From 9464e36fb6a276b57de1632b1fdb784ab16ae8e4 Mon Sep 17 00:00:00 2001 From: Luis Cielak Date: Mon, 23 Jul 2018 10:23:59 -0400 Subject: [PATCH 12/34] Add panel actions styleguide --- scss/atat.scss | 1 + scss/elements/_inputs.scss | 9 +-------- scss/elements/_panel_actions.scss | 20 ++++++++++++++++++++ scss/elements/_panels.scss | 9 --------- 4 files changed, 22 insertions(+), 17 deletions(-) create mode 100644 scss/elements/_panel_actions.scss diff --git a/scss/atat.scss b/scss/atat.scss index 082fbab2..1589b971 100644 --- a/scss/atat.scss +++ b/scss/atat.scss @@ -8,6 +8,7 @@ @import 'elements/inputs'; @import 'elements/buttons'; @import 'elements/panels'; +@import 'elements/panel_actions'; @import 'elements/block_lists'; @import 'elements/tables'; @import 'elements/icons'; diff --git a/scss/elements/_inputs.scss b/scss/elements/_inputs.scss index 00823f4e..8d47dfe8 100644 --- a/scss/elements/_inputs.scss +++ b/scss/elements/_inputs.scss @@ -4,7 +4,7 @@ * @source https://github.com/uswds/uswds/blob/develop/src/stylesheets/elements/_inputs.scss */ -from { + from { margin-bottom: 3rem; } @@ -27,11 +27,4 @@ select { label:first-child { padding-bottom: 0.5rem; } -} - -.usa-search { - // width: 45%; - // float: left; - // padding: $gap * 2; - margin-right: $gap; } \ No newline at end of file diff --git a/scss/elements/_panel_actions.scss b/scss/elements/_panel_actions.scss new file mode 100644 index 00000000..bf797a06 --- /dev/null +++ b/scss/elements/_panel_actions.scss @@ -0,0 +1,20 @@ +// Panels Actions +// Form inputs and other actions for panels + +.panel__actions { + display: flex; + padding: $gap; + + .usa-search { + padding-top: 2px; + input[type=search] { + height: 4.4rem; + font-size: 14px; + color: $color-black; + + } + button { + min-height: 4.4rem; + } + } +} \ No newline at end of file diff --git a/scss/elements/_panels.scss b/scss/elements/_panels.scss index d5ecbfae..e45ee1ec 100644 --- a/scss/elements/_panels.scss +++ b/scss/elements/_panels.scss @@ -43,13 +43,4 @@ padding: 0 ($gap * 4); } } -} - -.panel__actions { - display: flex; - padding: $gap; - - // &__search { - // float: left; - // } } \ No newline at end of file From c5f41fb369d41cb31c11656139d3468ad1a3a6e6 Mon Sep 17 00:00:00 2001 From: Luis Cielak Date: Mon, 23 Jul 2018 10:40:23 -0400 Subject: [PATCH 13/34] Adjust size for serach bar and filter dropdown --- scss/elements/_panel_actions.scss | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/scss/elements/_panel_actions.scss b/scss/elements/_panel_actions.scss index bf797a06..bc42274c 100644 --- a/scss/elements/_panel_actions.scss +++ b/scss/elements/_panel_actions.scss @@ -1,20 +1,31 @@ -// Panels Actions -// Form inputs and other actions for panels +/* + * Panels Actions + * Form inputs and other actions for panels + */ -.panel__actions { + .panel__actions { display: flex; padding: $gap; + &--filter { + width: 50%; + } + + &--search { + width: 50%; + } + .usa-search { padding-top: 2px; + margin-right: 2rem; + input[type=search] { height: 4.4rem; - font-size: 14px; - color: $color-black; - } + button { min-height: 4.4rem; } + } } \ No newline at end of file From f533c79cff16014a5c4b0f7c51d3aa6327620e6f Mon Sep 17 00:00:00 2001 From: Luis Cielak Date: Mon, 23 Jul 2018 10:45:06 -0400 Subject: [PATCH 14/34] Add alert module for information --- templates/requests.html.to | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/templates/requests.html.to b/templates/requests.html.to index b8a52553..85b2097c 100644 --- a/templates/requests.html.to +++ b/templates/requests.html.to @@ -3,6 +3,10 @@ {% block content %} +{% module Alert('Pending Financial Verification', + message="

Your next step is to create a Task Order (T.O.) associated with JEDI Cloud. Please consult a COntracting Officer (KO) or Contracting Officer Representative (COR) to help with this step.

" +) %} +
From f22ee3b7b2ccdbfb653fb5c6e27de62bd9f8ad8f Mon Sep 17 00:00:00 2001 From: Luis Cielak Date: Mon, 23 Jul 2018 12:02:30 -0400 Subject: [PATCH 15/34] Increase search bar font size --- scss/elements/_panel_actions.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scss/elements/_panel_actions.scss b/scss/elements/_panel_actions.scss index bc42274c..702c5cc1 100644 --- a/scss/elements/_panel_actions.scss +++ b/scss/elements/_panel_actions.scss @@ -21,6 +21,8 @@ input[type=search] { height: 4.4rem; + font-size: 1.7rem; + color: $color-black; } button { From 16b58e9aa19316061b747b779d212ea06ccdf286 Mon Sep 17 00:00:00 2001 From: Luis Cielak Date: Mon, 23 Jul 2018 12:52:17 -0400 Subject: [PATCH 16/34] Fix typo --- templates/requests.html.to | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/requests.html.to b/templates/requests.html.to index 85b2097c..52ab1ea6 100644 --- a/templates/requests.html.to +++ b/templates/requests.html.to @@ -4,7 +4,7 @@ {% module Alert('Pending Financial Verification', - message="

Your next step is to create a Task Order (T.O.) associated with JEDI Cloud. Please consult a COntracting Officer (KO) or Contracting Officer Representative (COR) to help with this step.

" + message="

Your next step is to create a Task Order (T.O.) associated with JEDI Cloud. Please consult a Contracting Officer (KO) or Contracting Officer Representative (COR) to help with this step.

" ) %}
From 21f972a3ec7d277276ff336179c218e8fdac198b Mon Sep 17 00:00:00 2001 From: Luis Cielak Date: Mon, 23 Jul 2018 13:32:56 -0400 Subject: [PATCH 17/34] Fix typo --- scss/elements/_inputs.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scss/elements/_inputs.scss b/scss/elements/_inputs.scss index 8d47dfe8..39312b2b 100644 --- a/scss/elements/_inputs.scss +++ b/scss/elements/_inputs.scss @@ -4,7 +4,7 @@ * @source https://github.com/uswds/uswds/blob/develop/src/stylesheets/elements/_inputs.scss */ - from { + form { margin-bottom: 3rem; } From 245b6a5f27e689cfbbb4d08942f3273344b10fdd Mon Sep 17 00:00:00 2001 From: Luis Cielak Date: Mon, 23 Jul 2018 13:38:10 -0400 Subject: [PATCH 18/34] Remove margin --- scss/elements/_inputs.scss | 4 ---- 1 file changed, 4 deletions(-) diff --git a/scss/elements/_inputs.scss b/scss/elements/_inputs.scss index 39312b2b..073b264e 100644 --- a/scss/elements/_inputs.scss +++ b/scss/elements/_inputs.scss @@ -4,10 +4,6 @@ * @source https://github.com/uswds/uswds/blob/develop/src/stylesheets/elements/_inputs.scss */ - form { - margin-bottom: 3rem; -} - select { border-radius: 0; -webkit-appearance: none; From 963ffc612a9f64c23444beae3ad8b3329c03a488 Mon Sep 17 00:00:00 2001 From: Andrew Croce Date: Mon, 23 Jul 2018 14:23:39 -0400 Subject: [PATCH 19/34] modal block and body classnames --- templates/base.html.to | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/templates/base.html.to b/templates/base.html.to index f3412da9..fd4fa3a8 100644 --- a/templates/base.html.to +++ b/templates/base.html.to @@ -13,7 +13,7 @@ {% end %} - + {% include 'navigation/topbar.html.to' %}
@@ -29,6 +29,8 @@
{% include 'footer.html.to' %} + + {% block modal %}{% end %} From 19f71c33e019810da185f7b429830fee4a3ab1ac Mon Sep 17 00:00:00 2001 From: Andrew Croce Date: Mon, 23 Jul 2018 14:23:51 -0400 Subject: [PATCH 20/34] modal template --- templates/components/modal.html.to | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 templates/components/modal.html.to diff --git a/templates/components/modal.html.to b/templates/components/modal.html.to new file mode 100644 index 00000000..4330adbd --- /dev/null +++ b/templates/components/modal.html.to @@ -0,0 +1,7 @@ +
+ +
From a13727107a5a08cf92ace3521c5d666dccfb8870 Mon Sep 17 00:00:00 2001 From: Andrew Croce Date: Mon, 23 Jul 2018 14:24:16 -0400 Subject: [PATCH 21/34] Add modal sample and link to styleguide Add action-group sample --- templates/styleguide.html.to | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/templates/styleguide.html.to b/templates/styleguide.html.to index 38c042b2..473d745b 100644 --- a/templates/styleguide.html.to +++ b/templates/styleguide.html.to @@ -1,5 +1,22 @@ {% extends "base.html.to" %} +{% block modal %} + {% if modalOpen() %} + {% apply modal %} +

A modal dialog

+ +

We count thirty Rebel ships, Lord Vader. But they're so small they're evading our turbo-lasers! We'll have to destroy them ship to ship. Get the crews to their fighters. Luke, let me know when you're going in. I'm on my way in now... Watch yourself! There's a lot of fire coming from the right side of that deflection tower. I'm on it. Squad leaders, we've picked up a new group of signals. Enemy fighters coming your way.

+

I hope the old man got that tractor beam out if commission, or this is going to be a real short trip. Okay, hit it! We're coming up on the sentry ships. Hold 'em off! Angle the deflector shields while I charge up the main guns! I can't believe he's gone. There wasn't anything you could have done. Come on, buddy, we're not out of this yet! You in, kid? Okay, stay sharp!

+ +
+ Close + This also closes the modal +
+ {% end %} + {% end %} +{% end %} + + {% block content %} {% module Alert('A Warning Alert', @@ -7,7 +24,7 @@

This is a message. It is a very important message. Please note, proper semantic markup is required here, such as paragraph tags. Don't omit paragraph tags!

\

Also note the same for actions below. You'll need to include the full link markup.

\ ", - actions="Do something", + actions="Open a Modal Dialog", level='warning' ) %} @@ -191,5 +208,10 @@ + +
+ Action Group Button + Action group link +
{% end %} From 270de201a6479700aff5eaeba701458088605a0c Mon Sep 17 00:00:00 2001 From: Andrew Croce Date: Mon, 23 Jul 2018 14:24:49 -0400 Subject: [PATCH 22/34] UI methods for rendering a modal, and dummy function to check if a modal is open --- atst/ui_methods.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/atst/ui_methods.py b/atst/ui_methods.py index e335b941..0d652fbb 100644 --- a/atst/ui_methods.py +++ b/atst/ui_methods.py @@ -5,3 +5,12 @@ def dev(self): def matchesPath(self, href): return self.request.uri.startswith(href) + +def modal(self, body): + return self.render_string( + "components/modal.html.to", + body=body) + +def modalOpen(self): + # For now, just check a dummy URL param + return self.get_argument("modal", False) From 0dd90f7cc7d5892d09332052648a6f23aa0f783f Mon Sep 17 00:00:00 2001 From: Andrew Croce Date: Mon, 23 Jul 2018 14:25:02 -0400 Subject: [PATCH 23/34] modal styled --- scss/components/_modal.scss | 47 +++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 scss/components/_modal.scss diff --git a/scss/components/_modal.scss b/scss/components/_modal.scss new file mode 100644 index 00000000..868476b9 --- /dev/null +++ b/scss/components/_modal.scss @@ -0,0 +1,47 @@ +.modal { + position: fixed; + z-index: 3; + left: 0; + right: 0; + top: 0; + bottom: 0; + background-color: $color-overlay; + + .modal__dialog { + padding: $gap; + height: 100vh; + display: flex; + justify-content: center; + align-items: center; + flex-direction: column; + + @include media($medium-screen) { + padding: $gap * 2; + } + + @include media($large-screen) { + padding: $gap * 4; + } + + .modal__body { + background-color: $color-white; + padding: $gap * 2; + flex-grow: 1; + overflow-y: auto; + max-width: 80rem; + + @include media($medium-screen) { + padding: $gap * 4; + flex-grow: 0; + } + + h1, h2 { + @include h3; + } + + :first-child { + margin-top: 0; + } + } + } +} From 900544bffd506f3601a0916176105a450854ac06 Mon Sep 17 00:00:00 2001 From: Andrew Croce Date: Mon, 23 Jul 2018 14:25:21 -0400 Subject: [PATCH 24/34] Add action-group element --- scss/atat.scss | 1 + scss/elements/_action_group.scss | 14 ++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 scss/elements/_action_group.scss diff --git a/scss/atat.scss b/scss/atat.scss index 082fbab2..08130614 100644 --- a/scss/atat.scss +++ b/scss/atat.scss @@ -12,6 +12,7 @@ @import 'elements/tables'; @import 'elements/icons'; @import 'elements/sidenav'; +@import 'elements/action_group'; @import 'components/layout'; @import 'components/topbar'; diff --git a/scss/elements/_action_group.scss b/scss/elements/_action_group.scss new file mode 100644 index 00000000..dfc47776 --- /dev/null +++ b/scss/elements/_action_group.scss @@ -0,0 +1,14 @@ +.action-group { + display: flex; + flex-direction: row-reverse; + align-items: center; + margin-top: $gap * 4; + + .action-group__action { + margin: 0 0 0 ($gap * 2); + } + + &:last-child { + margin-bottom: $gap * 3; + } +} From 9f13737e8f467ee3b1241e7e4b07629f1a0aaa5f Mon Sep 17 00:00:00 2001 From: Andrew Croce Date: Mon, 23 Jul 2018 14:25:38 -0400 Subject: [PATCH 25/34] some typography fixes --- scss/components/_alerts.scss | 1 + scss/elements/_typography.scss | 21 ++++++--------------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/scss/components/_alerts.scss b/scss/components/_alerts.scss index a0030547..f48042b9 100644 --- a/scss/components/_alerts.scss +++ b/scss/components/_alerts.scss @@ -44,6 +44,7 @@ .alert__title { @include h3; + margin-top: 0; } .alert__content { diff --git a/scss/elements/_typography.scss b/scss/elements/_typography.scss index e720402c..facba32b 100644 --- a/scss/elements/_typography.scss +++ b/scss/elements/_typography.scss @@ -9,23 +9,14 @@ -moz-osx-font-smoothing: grayscale; } +p { + margin: 0 0 ($gap * 2) 0; + max-width: 45em; +} + h1, h2, h3, h4, h5, h6 { font-family: $font-sans; - - .usa-button { - position: relative; - bottom: 0.5rem; - left: 1rem; - } - -} - -h1 { - margin-top: 0.5em; -} - -h2 { - margin-top: 0; + margin: ($gap * 2) 0; } a, From 35156f196c234afa432f50944f32c693f93ed87c Mon Sep 17 00:00:00 2001 From: Andrew Croce Date: Mon, 23 Jul 2018 14:25:51 -0400 Subject: [PATCH 26/34] hide y overflow when a modal is open --- scss/components/_layout.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scss/components/_layout.scss b/scss/components/_layout.scss index ee8308af..19c6be9f 100644 --- a/scss/components/_layout.scss +++ b/scss/components/_layout.scss @@ -8,6 +8,10 @@ body { > footer { margin-top: auto; } + + &.modalOpen { + overflow-y: hidden; + } } .global-layout { From 22655dbd298caf1e4ae1ac2c4b2e8722e870e74e Mon Sep 17 00:00:00 2001 From: Andrew Croce Date: Mon, 23 Jul 2018 14:26:01 -0400 Subject: [PATCH 27/34] overlay background color --- scss/core/_variables.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/scss/core/_variables.scss b/scss/core/_variables.scss index 4380ac69..7bc7d759 100644 --- a/scss/core/_variables.scss +++ b/scss/core/_variables.scss @@ -106,6 +106,7 @@ $color-base: $color-black-light; $color-focus: $color-gray-light; $color-visited: $color-purple; +$color-overlay: rgba(#000, 0.5); $color-shadow: rgba(#000, 0.3); $color-transparent: rgba(#000, 0); From 788753f2db0cdf9b23f90988c8530dd7a5070afb Mon Sep 17 00:00:00 2001 From: Andrew Croce Date: Mon, 23 Jul 2018 14:26:12 -0400 Subject: [PATCH 28/34] import modal sass --- scss/atat.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/scss/atat.scss b/scss/atat.scss index 08130614..2810db63 100644 --- a/scss/atat.scss +++ b/scss/atat.scss @@ -20,6 +20,7 @@ @import 'components/site_action'; @import 'components/empty_state'; @import 'components/alerts'; +@import 'components/modal'; @import 'sections/footer'; @import 'sections/login'; From 56d6077f487b6ddf6dd5177070e98a9864913667 Mon Sep 17 00:00:00 2001 From: Luis Cielak Date: Mon, 23 Jul 2018 15:45:46 -0400 Subject: [PATCH 29/34] Use block-list instead of panel --- scss/elements/_inputs.scss | 16 +++++++++++ scss/elements/_panel_actions.scss | 33 ---------------------- scss/elements/_tables.scss | 5 ---- templates/requests.html.to | 47 ++++++++++++++++--------------- 4 files changed, 40 insertions(+), 61 deletions(-) delete mode 100644 scss/elements/_panel_actions.scss diff --git a/scss/elements/_inputs.scss b/scss/elements/_inputs.scss index 073b264e..b3151653 100644 --- a/scss/elements/_inputs.scss +++ b/scss/elements/_inputs.scss @@ -23,4 +23,20 @@ select { label:first-child { padding-bottom: 0.5rem; } +} + +.usa-search { + padding-top: 2px; + margin-right: 2rem; + + input[type=search] { + height: 4.4rem; + font-size: 1.7rem; + color: $color-black; + } + + button { + min-height: 4.4rem; + } + } \ No newline at end of file diff --git a/scss/elements/_panel_actions.scss b/scss/elements/_panel_actions.scss deleted file mode 100644 index 702c5cc1..00000000 --- a/scss/elements/_panel_actions.scss +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Panels Actions - * Form inputs and other actions for panels - */ - - .panel__actions { - display: flex; - padding: $gap; - - &--filter { - width: 50%; - } - - &--search { - width: 50%; - } - - .usa-search { - padding-top: 2px; - margin-right: 2rem; - - input[type=search] { - height: 4.4rem; - font-size: 1.7rem; - color: $color-black; - } - - button { - min-height: 4.4rem; - } - - } -} \ No newline at end of file diff --git a/scss/elements/_tables.scss b/scss/elements/_tables.scss index a7fabfc5..9c917286 100644 --- a/scss/elements/_tables.scss +++ b/scss/elements/_tables.scss @@ -16,11 +16,6 @@ th { @include block-list-header; - - &:first-child { - padding: $gap * 2 !important; // This overrides USWDS's no padding - } - } td { diff --git a/templates/requests.html.to b/templates/requests.html.to index 52ab1ea6..5c223568 100644 --- a/templates/requests.html.to +++ b/templates/requests.html.to @@ -9,33 +9,34 @@
-
-
-
-
- - - -
-
-
- -
-
-
- +
+
    +
  • + +
    + + + +
    +     + + + +
    • +
+
- +
From 648aaa23a0ab4b486308417412631c93e607c1ba Mon Sep 17 00:00:00 2001 From: Andrew Croce Date: Mon, 23 Jul 2018 16:49:36 -0400 Subject: [PATCH 30/34] Add subnav behavior to SidenavItem module --- atst/ui_modules.py | 5 +++-- scss/elements/_sidenav.scss | 15 ++++++++++++++- static/icons/plus.svg | 1 + templates/navigation/_sidenav_item.html.to | 15 +++++++++++++++ .../navigation/global_navigation.html.to | 19 ++++++++++++++++--- 5 files changed, 49 insertions(+), 6 deletions(-) create mode 100644 static/icons/plus.svg diff --git a/atst/ui_modules.py b/atst/ui_modules.py index 78f9e5ca..0ced7fad 100644 --- a/atst/ui_modules.py +++ b/atst/ui_modules.py @@ -16,10 +16,11 @@ class Icon(UIModule): "components/icon.html.to", svg=svg.read(), name=name, classes=classes) class SidenavItem(UIModule): - def render(self, label, href, active=False, icon=None): + def render(self, label, href, active=False, icon=None, subnav=None): return self.render_string( "navigation/_sidenav_item.html.to", label=label, href=href, active=active, - icon=icon) + icon=icon, + subnav=subnav) diff --git a/scss/elements/_sidenav.scss b/scss/elements/_sidenav.scss index 6f94f6ca..d4c67366 100644 --- a/scss/elements/_sidenav.scss +++ b/scss/elements/_sidenav.scss @@ -44,6 +44,7 @@ &--active { @include h5; color: $color-primary; + box-shadow: none; } } } @@ -55,9 +56,21 @@ li { .sidenav__link { @include h5; - padding: ($gap * .75) ($gap * 3); + padding: $gap * .75; + padding-left: 4.5rem; border: 0; font-weight: normal; + + .sidenav__link-icon { + @include icon-size(12); + flex-shrink: 0; + margin-right: 1.5rem; + margin-left: -3rem + } + + .sidenav__link-label { + padding-left: 0; + } } } } diff --git a/static/icons/plus.svg b/static/icons/plus.svg new file mode 100644 index 00000000..c43ad77a --- /dev/null +++ b/static/icons/plus.svg @@ -0,0 +1 @@ + diff --git a/templates/navigation/_sidenav_item.html.to b/templates/navigation/_sidenav_item.html.to index a41b7726..888245bc 100644 --- a/templates/navigation/_sidenav_item.html.to +++ b/templates/navigation/_sidenav_item.html.to @@ -6,4 +6,19 @@ {{label}} + + {% if subnav and active %} + + {% end %} diff --git a/templates/navigation/global_navigation.html.to b/templates/navigation/global_navigation.html.to index f5acc5a3..60991d47 100644 --- a/templates/navigation/global_navigation.html.to +++ b/templates/navigation/global_navigation.html.to @@ -1,11 +1,24 @@
    {% if dev() %} - {% module SidenavItem("Styleguide", href="/styleguide", icon="visible", active=matchesPath('/styleguide')) %} + {% module SidenavItem("Styleguide", + href="/styleguide", + icon="visible", + active=matchesPath('/styleguide'), + subnav=[ + {"label":"Subnav 1", "href":"/styleguide?subnav1", "icon": "plus", "active": matchesPath('/styleguide?subnav1')}, + {"label":"Subnav 2", "href":"/styleguide?subnav2", "active": matchesPath('/styleguide?subnav2')}, + ]) %} {% end %} - {% module SidenavItem("Requests", href="/requests", icon="document", active=matchesPath('/requests')) %} - {% module SidenavItem("+ New Request", href="/requests/new", icon="", active=matchesPath('/requests/new')) %} + {% module SidenavItem("Requests", + href="/requests", + icon="document", + active=matchesPath('/requests'), + subnav=[ + {"label":"New Request", "href":"/requests/new", "icon": "plus", "active": matchesPath('/requests/new')}, + ] + ) %} {% module SidenavItem("Workspaces", href="/workspaces", icon="cloud", active=matchesPath('/workspaces')) %}
From cd29712001651ca05517eefacf96a33d3080f1b3 Mon Sep 17 00:00:00 2001 From: Andrew Croce Date: Mon, 23 Jul 2018 16:49:53 -0400 Subject: [PATCH 31/34] Remove unused import --- scss/atat.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/scss/atat.scss b/scss/atat.scss index 1589b971..082fbab2 100644 --- a/scss/atat.scss +++ b/scss/atat.scss @@ -8,7 +8,6 @@ @import 'elements/inputs'; @import 'elements/buttons'; @import 'elements/panels'; -@import 'elements/panel_actions'; @import 'elements/block_lists'; @import 'elements/tables'; @import 'elements/icons'; From 9a9ed1f10edd1c402696101af182a41e042992d8 Mon Sep 17 00:00:00 2001 From: Andrew Croce Date: Mon, 23 Jul 2018 16:58:26 -0400 Subject: [PATCH 32/34] Add filters/search with basic rows and cols --- templates/requests.html.to | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/templates/requests.html.to b/templates/requests.html.to index 5c223568..f95610bc 100644 --- a/templates/requests.html.to +++ b/templates/requests.html.to @@ -9,6 +9,28 @@
+
+
+
+
+ + + + +
+
+ +
+
+
+
    From cbd3eb2f9bcf8cf7fb3983eaaf74fb4f13592436 Mon Sep 17 00:00:00 2001 From: Luis Cielak Date: Mon, 23 Jul 2018 17:32:08 -0400 Subject: [PATCH 33/34] Remove unused actions --- templates/requests.html.to | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/templates/requests.html.to b/templates/requests.html.to index f95610bc..1d107967 100644 --- a/templates/requests.html.to +++ b/templates/requests.html.to @@ -31,31 +31,6 @@
- -
-
    -
  • - -
    - - - - -     - - - -
    • -
-
-
Order ID
From 96930251fc2885e958314b91d535f414a376c413 Mon Sep 17 00:00:00 2001 From: dandds Date: Tue, 24 Jul 2018 10:32:26 -0400 Subject: [PATCH 34/34] update readme with http basic auth info --- README.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/README.md b/README.md index 6d1cddf2..6089986f 100644 --- a/README.md +++ b/README.md @@ -99,3 +99,17 @@ To render an icon use `{% module Icon('name') %}` in a template, where `name` is All icons used should be from the Noun Project, specifically [this collection](https://thenounproject.com/monstercritic/collection/tinicons-a-set-of-tiny-icons-perfect-for-ui-elemen/) if possible. SVG markup should be cleaned an minified, [Svgsus](http://www.svgs.us/) works well. + +## Deployment + +The `/login-dev` endpoint is protected by HTTP basic auth when deployed. This can be configured for NGINX following the instructions [here](https://docs.nginx.com/nginx/admin-guide/security-controls/configuring-http-basic-authentication/). The following config should added within the main server block for the site: + +``` +location /login-dev { + auth_basic "Developer Access"; + auth_basic_user_file /etc/apache2/.htpasswd; + [proxy information should follow this] +} +``` + +The location block will require the same proxy pass configuration as other location blocks for the app.