diff --git a/atst/app.py b/atst/app.py index 6b2a8cc4..519ac1a2 100644 --- a/atst/app.py +++ b/atst/app.py @@ -1,6 +1,7 @@ import tornado.web from atst.handlers.main import MainHandler from atst.handlers.request import Request +from atst.handlers.request_new import RequestNew from atst.home import home from tornado.web import url @@ -8,9 +9,10 @@ def make_app(**kwargs): app = tornado.web.Application([ url( r"/", MainHandler, {'page': 'login'}, name='login' ), url( r"/home", MainHandler, {'page': 'home'}, name='home' ), + url( r"/workspaces", MainHandler, {'page': 'workspaces'}, name='workspaces' ), url( r"/requests", Request, {'page': 'requests'}, name='requests' ), - url( r"/accounts", MainHandler, {'page': 'accounts'}, name='accounts' ), - url( r"/requests/([0-9])", Request, {'page': 'requests'}, name='request_form' ), + url( r"/requests/new", RequestNew, {'page': 'requests_new'}, name='request_new' ), + url( r"/requests/new/([0-9])", RequestNew, {'page': 'requests_new'}, name='request_form' ), url( r"/users", MainHandler, {'page': 'users'}, name='users' ), url( r"/reports", MainHandler, {'page': 'reports'}, name='reports' ), url( r"/calculator", MainHandler, {'page': 'calculator'}, name='calculator' ), diff --git a/atst/handler.py b/atst/handler.py index dd151c4c..baa6f0ef 100644 --- a/atst/handler.py +++ b/atst/handler.py @@ -11,7 +11,8 @@ assets = Environment( css = Bundle( 'atat.scss', filters = 'scss', - output = '../static/assets/out.css') + output = '../static/assets/out.css', + depends = ('**/*.scss')) assets.register( 'css', css ) helpers = { diff --git a/atst/handlers/request.py b/atst/handlers/request.py index 6f8bfc1d..b3a99f14 100644 --- a/atst/handlers/request.py +++ b/atst/handlers/request.py @@ -1,31 +1,8 @@ from atst.handler import BaseHandler class Request(BaseHandler): - screens = [ - { 'title' : 'Details of Use', - 'subitems' : [ - {'title' : 'Application Details', - 'id' : 'application-details'}, - {'title' : 'Computation', - 'id' : 'computation' }, - {'title' : 'Storage', - 'id' : 'storage' }, - {'title' : 'Usage', - 'id' : 'usage' }, - ]}, - { 'title' : 'Organizational Info', }, - { 'title' : 'Funding/Contracting', }, - { 'title' : 'Readiness Survey', }, - { 'title' : 'Review & Submit', } - ] - def initialize(self, page): self.page = page - def get(self, screen = 1): - self.render( 'requests/screen-%d.html.to' % int(screen), - page = self.page, - screens = self.screens, - current = int(screen), - next_screen = int(screen) + 1 ) - + def get(self): + self.render('requests.html.to', page = self.page) \ No newline at end of file diff --git a/atst/handlers/request_new.py b/atst/handlers/request_new.py new file mode 100644 index 00000000..aa405e3a --- /dev/null +++ b/atst/handlers/request_new.py @@ -0,0 +1,31 @@ +from atst.handler import BaseHandler + +class RequestNew(BaseHandler): + screens = [ + { 'title' : 'Details of Use', + 'subitems' : [ + {'title' : 'Application Details', + 'id' : 'application-details'}, + {'title' : 'Computation', + 'id' : 'computation' }, + {'title' : 'Storage', + 'id' : 'storage' }, + {'title' : 'Usage', + 'id' : 'usage' }, + ]}, + { 'title' : 'Organizational Info', }, + { 'title' : 'Funding/Contracting', }, + { 'title' : 'Readiness Survey', }, + { 'title' : 'Review & Submit', } + ] + + def initialize(self, page): + self.page = page + + def get(self, screen = 1): + self.render( 'requests/screen-%d.html.to' % int(screen), + page = self.page, + screens = self.screens, + current = int(screen), + next_screen = int(screen) + 1 ) + diff --git a/scss/atat.scss b/scss/atat.scss index afe397c1..85d20bd8 100644 --- a/scss/atat.scss +++ b/scss/atat.scss @@ -1,5 +1,5 @@ +@import 'base/variables'; @import '../node_modules/uswds/src/stylesheets/uswds'; -@import 'variables'; @import 'base/typography'; @import 'base/forms'; diff --git a/scss/base/_typography.scss b/scss/base/_typography.scss index 80f7501d..53184bac 100644 --- a/scss/base/_typography.scss +++ b/scss/base/_typography.scss @@ -1,3 +1,10 @@ h1, h2, h3, h4, h5, h6 { font-family: $font-sans; -} + + .usa-button { + position: relative; + bottom: 0.5rem; + left: 1rem; + } + +} \ No newline at end of file diff --git a/scss/variables.scss b/scss/base/_variables.scss similarity index 100% rename from scss/variables.scss rename to scss/base/_variables.scss diff --git a/scss/sections/_layout.scss b/scss/sections/_layout.scss index ee58f0d6..17fbbed7 100644 --- a/scss/sections/_layout.scss +++ b/scss/sections/_layout.scss @@ -11,5 +11,7 @@ section { } footer { - + position: fixed; + bottom: 0; + width: 100%; } \ No newline at end of file diff --git a/static/img/alerts/error.png b/static/img/alerts/error.png new file mode 100755 index 00000000..0d434975 Binary files /dev/null and b/static/img/alerts/error.png differ diff --git a/static/img/alerts/error.svg b/static/img/alerts/error.svg new file mode 100755 index 00000000..20b8057a --- /dev/null +++ b/static/img/alerts/error.svg @@ -0,0 +1,17 @@ + + + + + + diff --git a/static/img/alerts/info.png b/static/img/alerts/info.png new file mode 100755 index 00000000..e666e97b Binary files /dev/null and b/static/img/alerts/info.png differ diff --git a/static/img/alerts/info.svg b/static/img/alerts/info.svg new file mode 100755 index 00000000..89bf03a7 --- /dev/null +++ b/static/img/alerts/info.svg @@ -0,0 +1,18 @@ + + + + + + diff --git a/static/img/alerts/success.png b/static/img/alerts/success.png new file mode 100755 index 00000000..66abc096 Binary files /dev/null and b/static/img/alerts/success.png differ diff --git a/static/img/alerts/success.svg b/static/img/alerts/success.svg new file mode 100755 index 00000000..29c7eb61 --- /dev/null +++ b/static/img/alerts/success.svg @@ -0,0 +1,12 @@ + + + diff --git a/static/img/alerts/warning.png b/static/img/alerts/warning.png new file mode 100755 index 00000000..909518d8 Binary files /dev/null and b/static/img/alerts/warning.png differ diff --git a/static/img/alerts/warning.svg b/static/img/alerts/warning.svg new file mode 100755 index 00000000..ad4533a2 --- /dev/null +++ b/static/img/alerts/warning.svg @@ -0,0 +1,16 @@ + + + + + + diff --git a/static/img/angle-arrow-down-hover.png b/static/img/angle-arrow-down-hover.png new file mode 100644 index 00000000..e611376d Binary files /dev/null and b/static/img/angle-arrow-down-hover.png differ diff --git a/static/img/angle-arrow-down-hover.svg b/static/img/angle-arrow-down-hover.svg new file mode 100644 index 00000000..63b09db8 --- /dev/null +++ b/static/img/angle-arrow-down-hover.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/img/angle-arrow-down-primary-hover.png b/static/img/angle-arrow-down-primary-hover.png new file mode 100644 index 00000000..2ea69897 Binary files /dev/null and b/static/img/angle-arrow-down-primary-hover.png differ diff --git a/static/img/angle-arrow-down-primary-hover.svg b/static/img/angle-arrow-down-primary-hover.svg new file mode 100644 index 00000000..0777e09f --- /dev/null +++ b/static/img/angle-arrow-down-primary-hover.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/img/angle-arrow-down-primary.png b/static/img/angle-arrow-down-primary.png new file mode 100644 index 00000000..ee7b9ed6 Binary files /dev/null and b/static/img/angle-arrow-down-primary.png differ diff --git a/static/img/angle-arrow-down-primary.svg b/static/img/angle-arrow-down-primary.svg new file mode 100644 index 00000000..f522e715 --- /dev/null +++ b/static/img/angle-arrow-down-primary.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/img/angle-arrow-down.png b/static/img/angle-arrow-down.png new file mode 100644 index 00000000..31a81906 Binary files /dev/null and b/static/img/angle-arrow-down.png differ diff --git a/static/img/angle-arrow-down.svg b/static/img/angle-arrow-down.svg new file mode 100644 index 00000000..87cfc3a0 --- /dev/null +++ b/static/img/angle-arrow-down.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/img/angle-arrow-up-primary-hover.png b/static/img/angle-arrow-up-primary-hover.png new file mode 100644 index 00000000..a8af5709 Binary files /dev/null and b/static/img/angle-arrow-up-primary-hover.png differ diff --git a/static/img/angle-arrow-up-primary-hover.svg b/static/img/angle-arrow-up-primary-hover.svg new file mode 100644 index 00000000..05a4c041 --- /dev/null +++ b/static/img/angle-arrow-up-primary-hover.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/img/angle-arrow-up-primary.png b/static/img/angle-arrow-up-primary.png new file mode 100644 index 00000000..20fdf18e Binary files /dev/null and b/static/img/angle-arrow-up-primary.png differ diff --git a/static/img/angle-arrow-up-primary.svg b/static/img/angle-arrow-up-primary.svg new file mode 100644 index 00000000..7b3ec391 --- /dev/null +++ b/static/img/angle-arrow-up-primary.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/img/arrow-both.png b/static/img/arrow-both.png new file mode 100644 index 00000000..075ffa97 Binary files /dev/null and b/static/img/arrow-both.png differ diff --git a/static/img/arrow-both.svg b/static/img/arrow-both.svg new file mode 100644 index 00000000..4c7af72a --- /dev/null +++ b/static/img/arrow-both.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/img/arrow-down.png b/static/img/arrow-down.png new file mode 100644 index 00000000..d6fc7100 Binary files /dev/null and b/static/img/arrow-down.png differ diff --git a/static/img/arrow-down.svg b/static/img/arrow-down.svg new file mode 100644 index 00000000..79e1c6ae --- /dev/null +++ b/static/img/arrow-down.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/img/arrow-right.png b/static/img/arrow-right.png new file mode 100644 index 00000000..5765f1b6 Binary files /dev/null and b/static/img/arrow-right.png differ diff --git a/static/img/arrow-right.svg b/static/img/arrow-right.svg new file mode 100644 index 00000000..5d29cdde --- /dev/null +++ b/static/img/arrow-right.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/img/circle-124.png b/static/img/circle-124.png new file mode 100644 index 00000000..7d1e17d9 Binary files /dev/null and b/static/img/circle-124.png differ diff --git a/static/img/close-primary.png b/static/img/close-primary.png new file mode 100644 index 00000000..11260c53 Binary files /dev/null and b/static/img/close-primary.png differ diff --git a/static/img/close-primary.svg b/static/img/close-primary.svg new file mode 100644 index 00000000..8b0eca41 --- /dev/null +++ b/static/img/close-primary.svg @@ -0,0 +1,16 @@ + + + + UI element / Icons / Close + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/static/img/close.png b/static/img/close.png new file mode 100644 index 00000000..677ac8f4 Binary files /dev/null and b/static/img/close.png differ diff --git a/static/img/close.svg b/static/img/close.svg new file mode 100644 index 00000000..25f10873 --- /dev/null +++ b/static/img/close.svg @@ -0,0 +1,12 @@ + + + + Fill 15 Copy + Created with Sketch. + + + + + + + \ No newline at end of file diff --git a/static/img/correct8.png b/static/img/correct8.png new file mode 100755 index 00000000..4b76107e Binary files /dev/null and b/static/img/correct8.png differ diff --git a/static/img/correct8.svg b/static/img/correct8.svg new file mode 100755 index 00000000..bd7b38b2 --- /dev/null +++ b/static/img/correct8.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/img/correct9.png b/static/img/correct9.png new file mode 100644 index 00000000..a83160a0 Binary files /dev/null and b/static/img/correct9.png differ diff --git a/static/img/correct9.svg b/static/img/correct9.svg new file mode 100755 index 00000000..485f42e5 --- /dev/null +++ b/static/img/correct9.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/img/external-link-alt-hover.png b/static/img/external-link-alt-hover.png new file mode 100644 index 00000000..bf0242ce Binary files /dev/null and b/static/img/external-link-alt-hover.png differ diff --git a/static/img/external-link-alt-hover.svg b/static/img/external-link-alt-hover.svg new file mode 100644 index 00000000..2958691b --- /dev/null +++ b/static/img/external-link-alt-hover.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/img/external-link-alt.png b/static/img/external-link-alt.png new file mode 100644 index 00000000..7761c284 Binary files /dev/null and b/static/img/external-link-alt.png differ diff --git a/static/img/external-link-alt.svg b/static/img/external-link-alt.svg new file mode 100644 index 00000000..2c4edd7e --- /dev/null +++ b/static/img/external-link-alt.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/img/external-link-hover.png b/static/img/external-link-hover.png new file mode 100644 index 00000000..9df376d4 Binary files /dev/null and b/static/img/external-link-hover.png differ diff --git a/static/img/external-link-hover.svg b/static/img/external-link-hover.svg new file mode 100644 index 00000000..98942ea9 --- /dev/null +++ b/static/img/external-link-hover.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/img/external-link.png b/static/img/external-link.png new file mode 100644 index 00000000..b98fd998 Binary files /dev/null and b/static/img/external-link.png differ diff --git a/static/img/external-link.svg b/static/img/external-link.svg new file mode 100644 index 00000000..51b6cf20 --- /dev/null +++ b/static/img/external-link.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/img/favicons/favicon-114.png b/static/img/favicons/favicon-114.png new file mode 100755 index 00000000..cc1969e9 Binary files /dev/null and b/static/img/favicons/favicon-114.png differ diff --git a/static/img/favicons/favicon-144.png b/static/img/favicons/favicon-144.png new file mode 100755 index 00000000..fe9df4a5 Binary files /dev/null and b/static/img/favicons/favicon-144.png differ diff --git a/static/img/favicons/favicon-16.png b/static/img/favicons/favicon-16.png new file mode 100755 index 00000000..ca6c38f5 Binary files /dev/null and b/static/img/favicons/favicon-16.png differ diff --git a/static/img/favicons/favicon-192.png b/static/img/favicons/favicon-192.png new file mode 100755 index 00000000..51f99f2f Binary files /dev/null and b/static/img/favicons/favicon-192.png differ diff --git a/static/img/favicons/favicon-40.png b/static/img/favicons/favicon-40.png new file mode 100755 index 00000000..875fcf73 Binary files /dev/null and b/static/img/favicons/favicon-40.png differ diff --git a/static/img/favicons/favicon-57.png b/static/img/favicons/favicon-57.png new file mode 100755 index 00000000..33de9b45 Binary files /dev/null and b/static/img/favicons/favicon-57.png differ diff --git a/static/img/favicons/favicon-72.png b/static/img/favicons/favicon-72.png new file mode 100755 index 00000000..79697ddd Binary files /dev/null and b/static/img/favicons/favicon-72.png differ diff --git a/static/img/favicons/favicon.ico b/static/img/favicons/favicon.ico new file mode 100755 index 00000000..c8c9f1c0 Binary files /dev/null and b/static/img/favicons/favicon.ico differ diff --git a/static/img/favicons/favicon.png b/static/img/favicons/favicon.png new file mode 100755 index 00000000..0d0077a7 Binary files /dev/null and b/static/img/favicons/favicon.png differ diff --git a/static/img/hero.png b/static/img/hero.png new file mode 100644 index 00000000..6197b334 Binary files /dev/null and b/static/img/hero.png differ diff --git a/static/img/icon-dot-gov.svg b/static/img/icon-dot-gov.svg new file mode 100644 index 00000000..641cbb8e --- /dev/null +++ b/static/img/icon-dot-gov.svg @@ -0,0 +1 @@ +dot gov icon \ No newline at end of file diff --git a/static/img/icon-https.svg b/static/img/icon-https.svg new file mode 100644 index 00000000..45163236 --- /dev/null +++ b/static/img/icon-https.svg @@ -0,0 +1 @@ +https icon \ No newline at end of file diff --git a/static/img/logo-img.png b/static/img/logo-img.png new file mode 100644 index 00000000..82ab23ec Binary files /dev/null and b/static/img/logo-img.png differ diff --git a/static/img/minus-alt.png b/static/img/minus-alt.png new file mode 100644 index 00000000..aaa386d9 Binary files /dev/null and b/static/img/minus-alt.png differ diff --git a/static/img/minus-alt.svg b/static/img/minus-alt.svg new file mode 100644 index 00000000..177eedd2 --- /dev/null +++ b/static/img/minus-alt.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/img/minus.png b/static/img/minus.png new file mode 100644 index 00000000..70a2ea68 Binary files /dev/null and b/static/img/minus.png differ diff --git a/static/img/minus.svg b/static/img/minus.svg new file mode 100644 index 00000000..73faba57 --- /dev/null +++ b/static/img/minus.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/img/plus-alt.png b/static/img/plus-alt.png new file mode 100644 index 00000000..746aaa1e Binary files /dev/null and b/static/img/plus-alt.png differ diff --git a/static/img/plus-alt.svg b/static/img/plus-alt.svg new file mode 100644 index 00000000..b97d4bfd --- /dev/null +++ b/static/img/plus-alt.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/img/plus.png b/static/img/plus.png new file mode 100644 index 00000000..d9199707 Binary files /dev/null and b/static/img/plus.png differ diff --git a/static/img/plus.svg b/static/img/plus.svg new file mode 100644 index 00000000..55bdf51f --- /dev/null +++ b/static/img/plus.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/img/search-alt.png b/static/img/search-alt.png new file mode 100755 index 00000000..32927c61 Binary files /dev/null and b/static/img/search-alt.png differ diff --git a/static/img/search-alt.svg b/static/img/search-alt.svg new file mode 100755 index 00000000..98170b99 --- /dev/null +++ b/static/img/search-alt.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/img/search-primary.png b/static/img/search-primary.png new file mode 100644 index 00000000..f8b4aa45 Binary files /dev/null and b/static/img/search-primary.png differ diff --git a/static/img/search-primary.svg b/static/img/search-primary.svg new file mode 100644 index 00000000..e68a017c --- /dev/null +++ b/static/img/search-primary.svg @@ -0,0 +1,12 @@ + + + + Fill 200 Copy + Created with Sketch. + + + + + + + \ No newline at end of file diff --git a/static/img/search.png b/static/img/search.png new file mode 100755 index 00000000..781d5b58 Binary files /dev/null and b/static/img/search.png differ diff --git a/static/img/search.svg b/static/img/search.svg new file mode 100755 index 00000000..a50fa62f --- /dev/null +++ b/static/img/search.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/img/social-icons/png/facebook25.png b/static/img/social-icons/png/facebook25.png new file mode 100644 index 00000000..98d55698 Binary files /dev/null and b/static/img/social-icons/png/facebook25.png differ diff --git a/static/img/social-icons/png/rss25.png b/static/img/social-icons/png/rss25.png new file mode 100644 index 00000000..b0102b3d Binary files /dev/null and b/static/img/social-icons/png/rss25.png differ diff --git a/static/img/social-icons/png/twitter16.png b/static/img/social-icons/png/twitter16.png new file mode 100644 index 00000000..f169313e Binary files /dev/null and b/static/img/social-icons/png/twitter16.png differ diff --git a/static/img/social-icons/png/youtube15.png b/static/img/social-icons/png/youtube15.png new file mode 100644 index 00000000..f3cf18bd Binary files /dev/null and b/static/img/social-icons/png/youtube15.png differ diff --git a/static/img/social-icons/svg/facebook25.svg b/static/img/social-icons/svg/facebook25.svg new file mode 100755 index 00000000..2a136e15 --- /dev/null +++ b/static/img/social-icons/svg/facebook25.svg @@ -0,0 +1 @@ + diff --git a/static/img/social-icons/svg/rss25.svg b/static/img/social-icons/svg/rss25.svg new file mode 100755 index 00000000..b95e0b22 --- /dev/null +++ b/static/img/social-icons/svg/rss25.svg @@ -0,0 +1 @@ + diff --git a/static/img/social-icons/svg/twitter16.svg b/static/img/social-icons/svg/twitter16.svg new file mode 100755 index 00000000..de129d6f --- /dev/null +++ b/static/img/social-icons/svg/twitter16.svg @@ -0,0 +1 @@ + diff --git a/static/img/social-icons/svg/youtube15.svg b/static/img/social-icons/svg/youtube15.svg new file mode 100755 index 00000000..92175295 --- /dev/null +++ b/static/img/social-icons/svg/youtube15.svg @@ -0,0 +1 @@ + diff --git a/static/img/us_flag_small.png b/static/img/us_flag_small.png new file mode 100644 index 00000000..34b927b4 Binary files /dev/null and b/static/img/us_flag_small.png differ diff --git a/templates/accounts.html.to b/templates/accounts.html.to deleted file mode 100644 index 472481f4..00000000 --- a/templates/accounts.html.to +++ /dev/null @@ -1,35 +0,0 @@ -{% extends "base.html.to" %} - -{% block content %} - -
- -

Accounts

- - - - - - - - - - - - - - - - - -
Account NameAccount InfoActions
- Unclassified IaaS and PaaS for Defense Digital Service (DDS)
- Task Order: #123456 - 		- 23
Users -
- -
- -{% end %} - diff --git a/templates/header.html.to b/templates/header.html.to index 74931843..517eb8df 100644 --- a/templates/header.html.to +++ b/templates/header.html.to @@ -12,7 +12,7 @@