pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/monolith' into vue

Browse Source
This commit is contained in:
Patrick Smith
2018-08-02 16:36:22 -04:00
parent 07d2f3a124 32cc6cb520
commit 165a5bf374
41 changed files with 478 additions and 510 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/calculator.html.to → templates/calculator.html
View File

@@ -1,4 +1,4 @@
{% extends "base.html.to" %}
{% extends "base.html" %}
{% block content %}
@@ -8,5 +8,5 @@
</main>
{% end %}
{% endblock %}

73
templates/member_edit.html.to
View File

@@ -16,40 +16,39 @@
level="info"
) %}
<div class='panel member-card'>
<div class='member-card__header'>
<h1 class='member-card__heading'>{{ member_name }}</h1>
<dl><dt>Workspace Role</dt> <dd><span class='label label--info'>{{member_workspace_role}}</span></dd></dl>
</div>
<div class='member-card__details'>
<dl>
<div>
<dt>DOD ID:</dt>
<dd>{{ member_id }}</dd>
</div>
<div>
<dt>Email:</dt>
<dd>{{ member_email }}</dd>
</div>
</dl>
<a href='#' class='icon-link'>edit account details</a>
<div class='panel'>
<div class='panel__heading'>
<h1 class='h2'>
{% if is_new_member %}
Add new member
{% else %}
{{ member_name }}
{% end %}
</h1>
<div>Workspace Role</span> <span class="label">{{member_workspace_role}}</div>
</div>
</div>
<form class='search-bar'>
<div class='usa-input search-input'>
<label for='project-search'>Search by project name</label>
<input type='search' id='project-search' name='project-search' placeholder="Search by project name"/>
<button type="submit">
<span class="hide">Search</span>
</button>
<div class='panel panel__actions'>
<div class='row'>
<div class='col col--grow'>
<form class="usa-search usa-search-small">
<label class="usa-sr-only" for="search-field-small">Search small</label>
<input id="search-field-small" type="search" name="search" placeholder="Search by project name">
<button type="submit">
<span class="usa-sr-only">Search</span>
</button>
</form>
</div>
</div>
</form>
</div>
<div class='block-list project-list-item'>
<header class='block-list__header'>
<h2 class='block-list__title'>{% module Icon('arrow-down') %} Code.mil</h2>
<span><a href="#" class="icon-link icon-link--danger">revoke all access</a></span>
<h2 class='block-list__title'>Code.mil</h2>
<a class="block-list__header__link icon-link icon-link--danger">revoke all access</a>
</header>
<ul>
<li class='block-list__item project-list-item__environment'>
@@ -57,15 +56,7 @@
Development
</span>
<div class='project-list-item__environment__actions'>
<span class="label">no access </span><a href="#" class="icon-link">set role</a>
</div>
</li>
<li class='block-list__item project-list-item__environment'>
<span class='project-list-item__environment'>
Sandbox
</span>
<div class='project-list-item__environment__actions'>
<span class="label">no access</span><a href="#" class="icon-link">set role</a>
<span>no access</span><a href="#" class="icon-link">set role</a>
</div>
</li>
<li class='block-list__item project-list-item__environment'>
@@ -73,17 +64,11 @@
Production
</span>
<div class='project-list-item__environment__actions'>
<span class="label label--success">Billing</span><a href="#" class="icon-link">set role</a>
<span>Billing</span><a href="#" class="icon-link">set role</a>
</div>
</li>
</ul>
</div>
<div class='block-list project-list-item'>
<header class='block-list__header'>
<h2 class='block-list__title'>{% module Icon('arrow-right') %} Digital Dojo</h2>
<span class="label">no access</span>
</header>
</ul>
</div>
<div class='action-group'>

32
templates/navigation/workspace_navigation.html.to
View File

@@ -1,44 +1,42 @@
{% from "components.html" import SidenavItem %}
<nav class='sidenav workspace-navigation'>
<ul>
{{ SidenavItem(
{% module SidenavItem(
"Projects",
href=url_for("workspaces.workspace_projects", workspace_id="123456"),
active=g.matchesPath('\/workspaces\/[A-Za-z0-9]*\/projects'),
href=reverse_url('workspace_projects', '123456'),
active=matchesPath('\/workspaces\/[A-Za-z0-9]*\/projects'),
subnav=[
{
"label": "Add New Project",
"href":"/",
"active": g.matchesPath('workspaces/projects/new'),
"active": matchesPath('workspaces/projects/new'),
"icon": "plus"
}
]
)}}
)%}
{{ SidenavItem(
{% module SidenavItem(
"Members",
href="/workspaces/{}/members".format('123456'),
active=g.matchesPath('\/workspaces\/[A-Za-z0-9]*\/members'),
href=reverse_url('workspace_members', '123456'),
active=matchesPath('\/workspaces\/[A-Za-z0-9]*\/members'),
subnav=[
{
"label": "Add New Member",
"href": "",
"active": g.matchesPath('/workspaces/members/new'),
"active": matchesPath('/workspaces/members/new'),
"icon": "plus"
},
{
"label": "Editing Member",
"href": "",
"active": g.matchesPath('/workspaces/123456/members/789/edit')
"active": matchesPath('/workspaces/123456/members/789/edit')
}
]
)}}
)%}
{{ SidenavItem(
{% module SidenavItem(
"Funding & Reports",
href=url_for("workspaces.workspace_projects", workspace_id="123456"),
active=g.matchesPath('\/workspaces\/[A-Za-z0-9]*\/reports')
)}}
href=reverse_url('workspace_projects', '123456'),
active=matchesPath('\/workspaces\/[A-Za-z0-9]*\/reports')
)%}
</ul>
</nav>

4
templates/reports.html.to → templates/reports.html
View File

@@ -1,4 +1,4 @@
{% extends "base.html.to" %}
{% extends "base.html" %}
{% block content %}
@@ -8,5 +8,5 @@
</main>
{% end %}
{% endblock %}

14
templates/root.html.to → templates/root.html
View File

@@ -3,10 +3,10 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>{% block title %}JEDI{% end %}</title>
{% for url in assets['css'].urls() %}
<link rel="stylesheet" href="{{ url }}" type="text/css">
{% end %}
<title>{% block title %}JEDI{% endblock %}</title>
{% assets "css" %}
<link rel="stylesheet" href="{{ ASSET_URL }}" type="text/css">
{% endassets %}
<link rel="icon" type="image/x-icon" href="/static/img/favicon.ico">
</head>
<body>
@@ -17,11 +17,11 @@
<h1 class="usa-display">JEDI</h1>
<a class="usa-button" href='{{ config['default'].get('cac_url','https://cac.atat.codes') }}'><span>Sign In with CAC</span></a>
<a class="usa-button" href='{{ config.get('cac_url','https://cac.atat.codes') }}'><span>Sign In with CAC</span></a>
<button class="usa-button" disabled>Sign In via MFA</button>
{% if dev() %}
{% if g.dev %}
<a class="usa-button usa-button-secondary" href='/login-dev'><span>DEV Login</span></a>
{% end %}
{% endif %}
</main>

4
templates/users.html.to → templates/users.html
View File

@@ -1,4 +1,4 @@
{% extends "base.html.to" %}
{% extends "base.html" %}
{% block content %}
@@ -8,5 +8,5 @@
</main>
{% end %}
{% endblock %}

16
templates/workspace_members.html
View File

@@ -1,17 +1,15 @@
{% from "components.html" import EmptyState %}
{% extends "base_workspace.html" %}
{% extends "base_workspace.html.to" %}
{% block workspace_content %}
{% if not members %}
{{ EmptyState(
{% module EmptyState(
'There are currently no members in this Workspace.',
actionLabel='Invite a new Member',
actionHref='/members/new',
icon='avatar'
)}}
)%}
{% else %}
@@ -61,17 +59,17 @@
{% for m in members %}
<tr>
<td><a href="/workspaces/123456/members/789/edit" class="icon-link icon-link--large">{{ m['first_name'] }} {{ m['last_name'] }}</a></td>
<td class='table-cell--shrink'>{% if m['num_projects'] == '0' %} <span class="label label--info">No Project Access</span> {% endif %}</td>
<td class='table-cell--shrink'>{% if m['num_projects'] == '0' %} <span class="label label--info">No Project Access</span> {% end %}</td>
<td>{{ m['status'] }}</a></td>
<td>{{ m['workspace_role'] }}</a></td>
</tr>
{% endfor %}
{% end %}
</tbody>
</table>
</div>
{% endif %}
{% end %}
{% endblock %}
{% end %}