diff --git a/atst/domain/auth.py b/atst/domain/auth.py index 7575ea11..904708d6 100644 --- a/atst/domain/auth.py +++ b/atst/domain/auth.py @@ -8,6 +8,7 @@ UNPROTECTED_ROUTES = [ "dev.login_dev", "atst.login_redirect", "atst.unauthorized", + "atst.helpdocs", "static", ] diff --git a/atst/routes/__init__.py b/atst/routes/__init__.py index c3bc40a6..32995091 100644 --- a/atst/routes/__init__.py +++ b/atst/routes/__init__.py @@ -12,7 +12,12 @@ bp = Blueprint("atst", __name__) @bp.route("/") def root(): - return render_template("root.html") + return render_template("login.html") + + +@bp.route("/help") +def helpdocs(): + return render_template("help/index.html") @bp.route("/home") diff --git a/styles/components/_footer.scss b/styles/components/_footer.scss index 8d77e408..ca43321c 100644 --- a/styles/components/_footer.scss +++ b/styles/components/_footer.scss @@ -4,15 +4,27 @@ display: flex; flex-direction: row; justify-content: space-between; + align-items: center; + padding: $gap * 2; - h5, - .browser-support { - margin: 0; - padding: $gap * 2; + .app-footer__info { + flex-grow: 1; + + .app-footer__info__title { + display: inline-block; + padding: 0; + margin: 0 $gap 0 0; + //margin: ($gap * 2); + } + + .app-footer__info__link { + margin: (-$gap * 2) (-$gap); + } } - .browser-support { + .app-footer__browser-support { color: $color-gray; + margin: 0; text-align: right; dt, dd { @include h5; diff --git a/styles/components/_topbar.scss b/styles/components/_topbar.scss index 24cc24d7..7e91387e 100644 --- a/styles/components/_topbar.scss +++ b/styles/components/_topbar.scss @@ -24,6 +24,14 @@ margin-left: $gap; } + &.topbar__link--home { + padding-left: $gap/2; + + .topbar__link-label { + padding-left: $gap; + } + } + &.topbar__link--shield { width: $icon-bar-width; justify-content: center; @@ -52,7 +60,7 @@ justify-content: flex-end; -ms-flex-pack: start; - .topbar__link { + .topbar__link--workspace { &:first-child { margin-right: auto; } @@ -75,4 +83,34 @@ } } } + + + &.topbar--public { + background-color: $color-primary; + + .topbar__navigation { + justify-content: flex-end; + -ms-flex-pack: justify; + } + + .topbar__link { + color: $color-white; + + .topbar__link-icon { + @include icon-style-inverted; + } + + &.topbar__link--home { + padding-left: $gap; + } + + &:first-child { + margin-right: auto; + } + + &:hover { + background-color: $color-primary-darker; + } + } + } } diff --git a/templates/base_public.html b/templates/base_public.html new file mode 100644 index 00000000..2a5e9c32 --- /dev/null +++ b/templates/base_public.html @@ -0,0 +1,67 @@ +{% from "components/icon.html" import Icon %} + + + + + + + + {% block title %}JEDI Cloud{% endblock %} + {% assets "css" %} + + {% endassets %} + + + + +
+ +
+ +
+ + {% block content %}{% endblock %} + + + +
+ + + + + diff --git a/templates/footer.html b/templates/footer.html index e715749a..f8934fb6 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -1,3 +1,12 @@ +{% from "components/icon.html" import Icon %} + diff --git a/templates/fragments/pending_ccpo_acceptance_alert.html b/templates/fragments/pending_ccpo_acceptance_alert.html index 78ec1707..2e2343f5 100644 --- a/templates/fragments/pending_ccpo_acceptance_alert.html +++ b/templates/fragments/pending_ccpo_acceptance_alert.html @@ -1,3 +1,5 @@ +{% from "components/icon.html" import Icon %} +

We will review and respond to your request in 3 business days. You’ll be notified via email or phone.

@@ -6,6 +8,10 @@ While your request is being reviewed, your next step is to create a Task Order associated with JEDI Cloud. Please contact a Contracting Officer (KO), Contracting Officer Representative (COR), or a Financial Manager to help with this step.

-

- Learn more about the JEDI Cloud Task Order and the Financial Verification process. -

+
+ + {{ Icon('help') }} + Learn more about the JEDI Cloud Task Order and the Financial Verification process. + +
+ diff --git a/templates/fragments/pending_ccpo_approval_modal.html b/templates/fragments/pending_ccpo_approval_modal.html index f414b4ad..a605012e 100644 --- a/templates/fragments/pending_ccpo_approval_modal.html +++ b/templates/fragments/pending_ccpo_approval_modal.html @@ -1,3 +1,5 @@ +{% from "components/icon.html" import Icon %} +

Request submitted. Approval pending.

@@ -30,6 +32,9 @@ Once the Task Order has been created, you will be asked to provide details about the task order in the Financial Verification step.

-

- Learn more about the JEDI Cloud Task Order and the Financial Verification process. -

+
+ + {{ Icon('help') }} + Learn more about the JEDI Cloud Task Order and the Financial Verification process. + +
diff --git a/templates/fragments/pending_financial_verification.html b/templates/fragments/pending_financial_verification.html index 2bbfdf7e..2925f438 100644 --- a/templates/fragments/pending_financial_verification.html +++ b/templates/fragments/pending_financial_verification.html @@ -1,3 +1,5 @@ +{% from "components/icon.html" import Icon %} +

The next step is to create a Task Order associated with JEDI Cloud. Please contact a Contracting Officer (KO), Contracting Officer @@ -7,6 +9,11 @@ Once the Task Order has been created, you will be asked to provide details about the task order in the Financial Verification step.

-

- Learn more about the JEDI Cloud Task Order and the Financial Verification process. -

+ +
+ + {{ Icon('help') }} + Learn more about the JEDI Cloud Task Order and the Financial Verification process. + +
+ diff --git a/templates/help/index.html b/templates/help/index.html new file mode 100644 index 00000000..fa36a346 --- /dev/null +++ b/templates/help/index.html @@ -0,0 +1,57 @@ +{% extends "base_public.html" %} +{% from "components/sidenav_item.html" import SidenavItem %} +{% from "components/alert.html" import Alert %} + +{% block title %}Help | JEDI Cloud{% endblock %} + +{% block content %} +
+
+ +
+ + +
+ {{ Alert('Sample Content', + message='This is a sample help page intended to demonstrate the layout of a JEDI Cloud help documentation page.', + ) }} + +
+
+

+
JEDI Cloud Help Documentation
+ Help Topic +

+
+ +
+

So you see, since we're a small operation, we don't fall into the...uh...jurisdiction of the Empire. So you're part of the mining guild then? No, not actually. Our operation is small enough not to be noticed...which is advantageous for everybody since our customers are anxious to avoid attracting attention to themselves. Aren't you afraid the Empire's going to find out about this little operation and shut you down? That's always been a danger looming like a shadow over everything we've built here. But things have developed that will insure security. I've just made a deal that will keep the Empire out of here forever. We would be honored if you would join us. I had no choice. They arrived right before you did. I'm sorry. I'm sorry, too.

+

Now will you move along, little fella? We're got a lot of work to do. No! No, no! Stay and help you, I will. Find your friend, hmm? I'm not looking for a friend, I'm looking for a Jedi Master. Oohhh. Jedi Master. Yoda. You seek Yoda. You know him? Mmm. Take you to him, I will. Yes, yes. But now, we must eat. Come. Good food. Come. Come, come. Stay here and watch after the camp, Artoo.

+

Well done. Hold them in the security tower - and keep it quiet. Move. What do you think you're doing? We're getting out of here. I knew all along it had to be a mistake. Do you think that after what you did to Han we're going to trust you? I had no choice... What are you doing? Trust him, trust him! Oh, so we understand, don't we, Chewie? He had no choice. I'm just trying to help... We don't need any of your help. H-a-a-a... What? It sounds like Han. There's still a chance to save Han...I mean, at the East Platform... Chewie. I'm terribly sorry about all this. After all, he's only a Wookiee.

+
+
+
+ +
+{% endblock %} diff --git a/templates/root.html b/templates/login.html similarity index 57% rename from templates/root.html rename to templates/login.html index 3470362d..5f6fb468 100644 --- a/templates/root.html +++ b/templates/login.html @@ -1,20 +1,10 @@ {% from "components/alert.html" import Alert %} - - - - - - - {% block title %}JEDI Cloud{% endblock %} - {% assets "css" %} - - {% endassets %} - - - +{% extends "base_public.html" %} -
+{% block title %}Sign in | JEDI Cloud{% endblock %} + +{% block content %}
- - -
- - - +{% endblock %} diff --git a/templates/navigation/topbar.html b/templates/navigation/topbar.html index 35b87473..b5bd8e78 100644 --- a/templates/navigation/topbar.html +++ b/templates/navigation/topbar.html @@ -2,17 +2,25 @@