Merge pull request #11 from dod-ccpo/jedi_accounts

Jedi Accounts
This commit is contained in:
luisgov 2018-05-30 09:59:47 -04:00 committed by GitHub
commit f6fa44b065
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 57 additions and 14 deletions

View File

@ -9,6 +9,7 @@ def make_app(**kwargs):
url( r"/", MainHandler, {'page': 'login'}, name='login' ),
url( r"/home", MainHandler, {'page': 'home'}, name='home' ),
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"/users", MainHandler, {'page': 'users'}, name='users' ),
url( r"/reports", MainHandler, {'page': 'reports'}, name='reports' ),

View File

@ -0,0 +1,35 @@
{% extends "base.html.to" %}
{% block content %}
<main class="usa-section usa-content usa-width-one-whole" id="main-content">
<h1>Accounts</h1>
<table class="usa-table-borderless" width="100%">
<!-- <caption>Borderless table: A borderless table can be useful when you want the information to feel more a part of the text it accompanies and extends.</caption> -->
<thead>
<tr>
<th scope="col" width="50%">Account Name</th>
<th scope="col" width="30%">Account Info</th>
<th scope="col" width="20%">Actions</th>
</tr>
</thead>
<tbody>
<tr>
<th scope="row">
<a href="">Unclassified IaaS and PaaS for Defense Digital Service (DDS)</a><br>
Task Order: #123456
</th>
<td>
<span class="usa-label">23</span><br>Users
</td>
<td><button class="usa-button-secondary">Go to CSP</button></td>
</tr>
</tbody>
</table>
</main>
{% end %}

View File

@ -2,9 +2,9 @@
{% block content %}
<main class="usa-grid usa-section usa-content usa-layout-docs" id="main-content">
<main class="usa-section usa-content" id="main-content">
calculator
<h1>Calculator</h1>
</main>

View File

@ -7,7 +7,13 @@
<nav class="usa-footer-nav usa-width-two-thirds">
<ul class="usa-unstyled-list">
<li class="usa-width-one-fourth usa-footer-primary-content">
<a class="usa-footer-primary-link" href="javascript:void(0);">JEDI Requests</a>
<a class="usa-footer-primary-link" href="javascript:void(0);">Home</a>
</li>
<li class="usa-width-one-fourth usa-footer-primary-content">
<a class="usa-footer-primary-link" href="javascript:void(0);">Accounts</a>
</li>
<li class="usa-width-one-fourth usa-footer-primary-content">
<a class="usa-footer-primary-link" href="javascript:void(0);">Requests</a>
</li>
<li class="usa-width-one-fourth usa-footer-primary-content">
<a class="usa-footer-primary-link" href="javascript:void(0);">Users</a>

View File

@ -3,7 +3,7 @@
<div class="usa-navbar">
<div class="usa-logo" id="basic-logo">
<em class="usa-logo-text">
<a href="/" title="Home" aria-label="Home">AT-AT</a>
<a href="/" title="Home" aria-label="Home">JEDI</a>
</em>
</div>
</div>
@ -12,7 +12,8 @@
<ul class="usa-nav-primary usa-accordion">
{% for item in [
['home', 'Home'],
['requests', 'JEDI Requests'],
['accounts', 'Accounts'],
['requests', 'Requests'],
['users', 'Users' ],
['reports', 'Reports' ],
['calculator','Usage Calculator'],

View File

@ -2,9 +2,9 @@
{% block content %}
<main class="usa-grid usa-section usa-content usa-layout-docs" id="main-content">
<main class="usa-section usa-content" id="main-content">
home
<h1>Home</h1>
</main>

View File

@ -15,7 +15,7 @@
<img class="logo-img" src="/static/img/logo-alt.png" alt="Defense Digital Service Logo">
<h1 class="usa-display">AT-AT</h1>
<h1 class="usa-display">JEDI</h1>
<a class="usa-button" href='{{ reverse_url('home') }}'><span>Sign In with CAC</span></a>
<button class="usa-button" disabled>Sign In via MFA</button>

View File

@ -2,9 +2,9 @@
{% block content %}
<main class="usa-grid usa-section usa-content usa-layout-docs" id="main-content">
<main class="usa-section usa-content" id="main-content">
reports
<h1>Reports</h1>
</main>

View File

@ -2,9 +2,9 @@
{% block content %}
<main class="usa-grid usa-section usa-content usa-layout-docs" id="main-content">
<main class="usa-section usa-content" id="main-content">
<h1>JEDI Requests</h1>
<h1>Requests</h1>
<aside class="usa-width-one-fourth usa-layout-docs-sidenav">
{% include 'requests/sidebar.html.to' %}
</aside>

View File

@ -2,9 +2,9 @@
{% block content %}
<main class="usa-grid usa-section usa-content usa-layout-docs" id="main-content">
<main class="usa-section usa-content" id="main-content">
users
<h1>Users</h1>
</main>