Skip to content

Commit 1742cb4

Browse files
tdunn891tdunn891
committed
Clean up comments
1 parent e17e7cc commit 1742cb4

File tree

3 files changed

+98
-77
lines changed

3 files changed

+98
-77
lines changed

‎accounts/templates/index.html‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ <h2 class="display-5">Issue and Feature tracking done right</h2>
3232
<br>
3333
<p>Logged in as: <b>{{ user.username }}</b></p>
3434
<p><a href="{% url 'profile' %}">My Account</a></p>
35+
{% if user.is_authenticated and not user.profile.is_pro_user %}
36+
<p><a href="{% url 'checkout' %}" class="btn btn-sm btn-primary">Go PRO</a></p>
37+
{% endif %}
3538
{% endif %}
3639
</div>
3740
</div>
@@ -93,7 +96,8 @@ <h5>Nice</h5>
9396
<div class="row">
9497
<div class="col-12">
9598
<br>
96-
<h4 class="text-right"><i class="material-icons align-bottom">verified_user</i> See Our Customers</h4>
99+
<h4 class="text-right"><i class="material-icons align-bottom">verified_user</i> See Our
100+
Customers</h4>
97101
<br>
98102
</div>
99103
<div class="col-12 col-md-3">

‎accounts/templates/profile.html‎

Lines changed: 11 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
{% extends 'base.html' %}
2-
{% block title %}{{ user }}'s Profile{% endblock %}
3-
{% block page_heading %} <i class="material-icons">account_circle</i> My Account{% endblock %}
2+
{% block title %}TrackIt | Account{% endblock %}
3+
{% block page_heading %}<i class="material-icons">account_circle</i> Account
4+
<hr>
5+
{% endblock %}
6+
{% block container-class %}profile-container{% endblock %}
47
{% block content %}
58
<div class="row">
69
<div class="col-sm-2">
7-
<p><i class="material-icons">account_circle</i></p>
810
<p><a href="#">Add Avatar</a></p>
911
</div>
1012
<div class="col-sm-10">
@@ -25,7 +27,10 @@
2527
</tr>
2628
<tr>
2729
<th>Email</th>
28-
<td>{{ user.email }} <a href="#" class="float-right">Update</a></td>
30+
<!-- * Triggers Modal on click, user enters new email, backend checks if email is valid and not already taken, -->
31+
<td>{{ user.email }}
32+
<!-- <a href="#" class="float-right">Update</a> -->
33+
</td>
2934
</tr>
3035
<tr>
3136
<th>Member Since</th>
@@ -40,45 +45,12 @@
4045
{% if user.profile.is_pro_user %}
4146
<td><span class="badge badge-primary">PRO</span></td>
4247
{% else %}
43-
<td>Basic</td>
48+
<td>Basic <a href="{% url 'checkout' %}" class="btn btn-sm btn-primary"><b>Go PRO</b></a>
49+
</td>
4450
{% endif %}
4551
</tr>
4652
</tbody>
4753
</table>
4854
</div>
4955
</div>
50-
<div class="row">
51-
<div class="col-sm-12 text-center">
52-
<h3>Plans</h3>
53-
<br>
54-
</div>
55-
</div>
56-
<div class="row">
57-
<div class="col-sm-6 text-center">
58-
<div class="jumbotron">
59-
{% if user.profile.is_pro_user %}
60-
<h5>BASIC</h5>
61-
<p>Max Tickets/Month: 10/month</p>
62-
{% else %}
63-
<h5>BASIC <span class="badge badge-secondary">Current</span></h5>
64-
<p>Max Tickets/Month: 10/month</p>
65-
<p>Tickets Remaining This Month: placeholder</p>
66-
{% endif %}
67-
</div>
68-
</div>
69-
<div class="col-sm-6 text-center">
70-
<div class="jumbotron">
71-
{% if user.profile.is_pro_user %}
72-
<h5>PRO <span class="badge badge-primary align-top">Current Plan</span></h5>
73-
<p>Max Tickets/Month: Unlimited</p>
74-
<p>Kanban View: Available</p>
75-
{% else %}
76-
<h5>PRO</h5>
77-
Unlock <a href="#">Kanban View</a></p>
78-
<p>9.90 EUR / month</p>
79-
<p><a href="{% url 'checkout' %}" class="btn btn-primary">Go PRO</a></p>
80-
{% endif %}
81-
</div>
82-
</div>
83-
</div>
8456
{% endblock %}

‎accounts/templates/user_list.html‎

Lines changed: 82 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,95 @@
11
{% extends 'base.html' %}
2-
{% block title %}User List{% endblock %}
3-
{% block page_heading %}<i class="material-icons">people</i> User List{% endblock %}
2+
{% block title %}Trackit | Team{% endblock %}
3+
{% block page_heading %}<i class="material-icons">people</i> Users ({{ users.count }})
4+
<hr>
5+
{% endblock %}
46
{% block head %}
5-
<!-- <link rel="stylesheet" href="//cdn.datatables.net/1.10.20/css/jquery.dataTables.min.css"> -->
67
<link rel="stylesheet" type="text/css"
78
href="https://cdn.datatables.net/v/bs4/jszip-2.5.0/dt-1.10.20/b-1.6.1/b-html5-1.6.1/cr-1.5.2/r-2.2.3/sp-1.0.1/sl-1.3.1/datatables.min.css" />
89
{% endblock %}
10+
{% block container-class %}user-list-container{% endblock %}
911
{% block content %}
10-
<div class="row">
11-
<div class="col col-12">
12-
<table id="user-table" class="table display">
13-
<thead>
14-
<tr>
15-
<th>ID</th>
16-
<th>User</th>
17-
<th>First Name</th>
18-
<th>Last Name</th>
19-
<th>Role</th>
20-
<th>SuperUser</th>
21-
<th>Email</th>
22-
</tr>
23-
</thead>
24-
<tbody>
25-
{% for user in users %}
26-
<tr>
27-
<td>{{ user.id }}</td>
28-
<td>{{ user.username }}</td>
29-
<td>{{ user.first_name }}</td>
30-
<td>{{ user.last_name }}</td>
31-
<td>placeholder</td>
32-
<td>{{ user.is_superuser }}</td>
33-
<td>{{ user.email }}</td>
34-
</tr>
35-
{% endfor %}
36-
</tbody>
37-
</table>
12+
<!-- Internal Panes Nav Items -->
13+
<nav>
14+
<div class="nav nav-tabs" id="nav-tab" role="tablist">
15+
<a class="nav-item nav-link active" id="nav-submitters-tab" data-toggle="tab" href="#nav-submitters" role="tab"
16+
aria-controls="nav-submitters" aria-selected="true">Submitters ({{ submitters.count }})</a>
17+
<a class="nav-item nav-link" id="nav-assignees-tab" data-toggle="tab" href="#nav-assignees" role="tab"
18+
aria-controls="nav-assignees" aria-selected="false">Assignees ({{ staff.count }})</a>
19+
</div>
20+
</nav>
21+
22+
<!-- Internal Panes -->
23+
<div class="tab-content" id="nav-tabContent">
24+
<!-- Submitters Pane Here -->
25+
<div class="tab-pane fade show active" id="nav-submitters" role="tabpanel" aria-labelledby="nav-submitters-tab">
26+
<br>
27+
<div class="row">
28+
<div class="col col-12">
29+
<table id="submitters-table" class="table display">
30+
<thead>
31+
<tr>
32+
<th>ID</th>
33+
<th>User</th>
34+
<th>First Name</th>
35+
<th>Last Name</th>
36+
<th>Email</th>
37+
</tr>
38+
</thead>
39+
<tbody>
40+
{% for submitter in submitters %}
41+
<tr>
42+
<td>{{ submitter.id }}</td>
43+
<td>{{ submitter.username }}</td>
44+
<td>{{ submitter.first_name }}</td>
45+
<td>{{ submitter.last_name }}</td>
46+
<td><a href="mailto:{{ submitter.email }}" data-toggle="tooltip" title="Mail to:"
47+
data-placement="left">
48+
{{ submitter.email }}</td>
49+
</tr>
50+
{% endfor %}
51+
</tbody>
52+
</table>
53+
</div>
54+
</div>
55+
</div>
56+
<!-- Assignees Pane -->
57+
<div class="tab-pane fade" id="nav-assignees" role="tabpanel" aria-labelledby="nav-assignees-tab">
58+
<!-- Table -->
59+
<br>
60+
<div class="row">
61+
<div class="col col-12">
62+
<table id="assignees-table" class="table display">
63+
<thead>
64+
<tr>
65+
<th>ID</th>
66+
<th>User</th>
67+
<th>First Name</th>
68+
<th>Last Name</th>
69+
<th>Email</th>
70+
</tr>
71+
</thead>
72+
<tbody>
73+
{% for staff_member in staff %}
74+
<tr>
75+
<td>{{ staff_member.id }}</td>
76+
<td>{{ staff_member.username }}</td>
77+
<td>{{ staff_member.first_name }}</td>
78+
<td>{{ staff_member.last_name }}</td>
79+
<td><a href="mailto:{{ staff_member.email }}" data-toggle="tooltip" title="Mail to:"
80+
data-placement="left">
81+
{{ staff_member.email }}</td>
82+
</tr>
83+
{% endfor %}
84+
</tbody>
85+
</table>
86+
</div>
87+
</div>
3888
</div>
3989
</div>
4090
{% endblock %}
4191
{% block scripts %}
42-
<script src="https://cdn.datatables.net/1.10.20/js/jquery.dataTables.min.js"></script>
92+
<!-- DataTables.js -->
4393
<script type="text/javascript"
4494
src="https://cdn.datatables.net/v/bs4/jszip-2.5.0/dt-1.10.20/b-1.6.1/b-html5-1.6.1/cr-1.5.2/r-2.2.3/sp-1.0.1/sl-1.3.1/datatables.min.js"></script>
45-
<script>
46-
$(document).ready(() => {
47-
$('#user-table').DataTable();
48-
});
49-
</script>
5095
{% endblock %}

0 commit comments

Comments
 (0)