remove dead code from dashboard

app/templates/views/dashboard/_inbox.html

@@ -1,17 +0,0 @@
-<div class="ajax-block">
-  {% if current_service.inbound_sms_summary != None %}
-    <a id="total-received" class="usa-link banner-dashboard" class="banner-dashboard" href="{{ url_for('.inbox', service_id=current_service.id) }}">
-      <span class="banner-dashboard-count">
-        {{ current_service.inbound_sms_summary.count|format_thousands }}
-      </span>
-      <span class="banner-dashboard-count-label">
-        {{ current_service.inbound_sms_summary.count|message_count_label('sms', suffix='received') }}
-      </span>
-      {% if current_service.inbound_sms_summary.most_recent %}
-        <span class="banner-dashboard-meta">
-          latest message {{ current_service.inbound_sms_summary.most_recent | format_delta }}
-        </span>
-      {% endif %}
-    </a>
-  {% endif %}
-</div>

app/templates/views/dashboard/_inbox_messages.html

@@ -1,38 +0,0 @@
-{% from "components/table.html" import list_table, field, hidden_field_heading, right_aligned_field_heading, row_heading %}
-{% from "components/previous-next-navigation.html" import previous_next_navigation %}
-
-<div class="ajax-block-container">
-  {% if messages %}
-    <p class="bottom-gutter-2-3 top-gutter-1-2">
-      <a href="{{ url_for('.inbox_download', service_id=current_service.id) }}" download class="usa-link bold">Download these messages</a>
-    </p>
-  {% endif %}
-  {% call(item, row_number) list_table(
-    messages,
-    caption="Inbox",
-    caption_visible=False,
-    empty_message='When users text your service’s phone number ({}) you’ll see the messages here'.format(inbound_number),
-    field_headings=[
-      'From',
-      'First two lines of message'
-    ],
-    field_headings_visible=False
-  ) %}
-    {% call field() %}
-      <a
-        class="usa-link file-list-filename"
-        href="{{ url_for('.conversation', service_id=current_service.id, notification_id=item.id) }}#n{{ item.id }}"
-      >
-        {{ item.user_number | format_phone_number_human_readable }}
-      </a>
-      <span class="file-list-hint">{{ item.content }}</span>
-    {% endcall %}
-    {% call field(align='right') %}
-      <span class="align-with-message-body">
-        {{ item.created_at | format_delta }}
-      </span>
-    {% endcall %}
-  {% endcall %}
-
-  {{ previous_next_navigation(prev_page, next_page) }}
-</div>

app/templates/views/dashboard/_totals.html

@@ -1,25 +0,0 @@
-<div class="ajax-block-container">
-  <div class="grid-row grid-gap">
-    <div id="total-sms" class="grid-col-12 margin-top-2">
-      <span class="big-number-with-status display-block margin-bottom-2">
-        <p>
-          <span class="big-number-smaller">
-            <span class="big-number-number">
-              {% if statistics['sms']['requested'] is number %}
-              {{ "{:,}".format(statistics['sms']['requested']) }}
-              {% else %}
-              {{ statistics['sms']['requested'] }}
-              {% endif %}
-            </span>
-            <span class="big-number-label">{{ statistics['sms']['requested']|message_count_label('sms', suffix='sent') }} in the last seven days</span>
-          </span>
-        </p>
-        <a class="usa-button usa-button--outline" href="{{ url_for('.view_notifications', service_id=service_id, message_type='sms', status='sending,delivered,failed') }}">
-         Details
-        </a>
-        {# Removing the failures area for now, as the user can click on the above link to see all the details.
-        In the future state of the dashboard, the all statuses will be more apparent with data visualizations #}
-      </span>
-      </div>
-    </div>
-</div>

app/templates/views/dashboard/dashboard.html

@@ -19,13 +19,14 @@
 {% if current_user.has_permissions('manage_templates') and not current_service.all_templates %}
     {% include 'views/dashboard/write-first-messages.html' %}
 {% endif %}
+<!-- this could use some kind of update once the messages are sent and no more scheduled jobs but not every second call or anything  -->
 
-{{ ajax_block(partials, updates_url, 'upcoming') }}
+<!-- {{ ajax_block(partials, updates_url, 'upcoming') }} -->
+
+{% include 'views/dashboard/_upcoming.html' %}
 
 <h2 class="font-body-2xl line-height-sans-2 margin-top-0">{{ current_service.name }} Dashboard</h2>
 
-{{ ajax_block(partials, updates_url, 'inbox') }}
-
 <div id="totalMessageChartContainer" data-messages-sent="{{ messages_sent }}" data-messages-remaining="{{ messages_remaining }}">
     <h2 id="chartTitle">Total messages</h2>
     <svg id="totalMessageChart"></svg>
@@ -37,7 +38,10 @@
 
 {% if current_user.has_permissions('manage_service') %}{% endif %}
 
-{{ ajax_block(partials, updates_url, 'template-statistics') }}
+<!-- do we actually need this pulling every minute? -->
+<!-- {{ ajax_block(partials, updates_url, 'template-statistics') }} -->
+{% include 'views/dashboard/most-used-templates.html'   %}
+
 </div>
 
 {% endblock %}

app/templates/views/dashboard/inbox.html

@@ -1,25 +0,0 @@
-{% extends "withnav_template.html" %}
-{% from "components/ajax-block.html" import ajax_block %}
-{% from "components/page-header.html" import page_header %}
-{% from "components/components/back-link/macro.njk" import usaBackLink %}
-
-{% block service_page_title %}
-  Received text messages
-{% endblock %}
-
-
-{% block backLink %}
-  {{ usaBackLink({ "href": url_for('main.service_dashboard', service_id=current_service.id) }) }}
-{% endblock %}
-
-{% block maincolumn_content %}
-
-  {{ page_header('Received text messages') }}
-
-  {{ ajax_block(
-    partials,
-    updates_url,
-    'messages',
-  ) }}
-
-{% endblock %}

app/templates/views/dashboard/most-used-templates.html

@@ -26,6 +26,7 @@
           </tr>
         </thead>
         <tbody>
+          {{template_statistics}}
           {% for item in template_statistics[:8] %}
             <tr class="table-row">
               <td>
@@ -34,12 +35,13 @@
               <td><p>{{ item.template_folder }}</p></td>
               <td><p>{{ item.last_used|format_datetime_table}}</p></td>
               <td><p>{{ item.created_by }}</p></td>
-              <td><p>{{ item.count }}</p></td>
+              <td><p>{{ '{:,.0f}'.format(item.count) }}</p></td>
             </tr>
           {% endfor %}
         </tbody>
       </table>
-        <a href="/services/78409625-0c0a-485e-b82c-b19c8f4b1bdb/template-usage" class="usa-link show-more-no-border"><span>See templates by month</span></a>
+      <a
+      href="{{ url_for('.template_usage', service_id=current_service.id) }}" class="usa-link show-more-no-border"><span>See templates by month</span></a>
     </div>
   {% endif %}
 </div>