add 2 weeks mention on global stats

This commit is contained in:
Son Nguyen Kim 2021-07-14 17:15:46 +02:00
parent ba6b6e2fdd
commit 25f0a71ea5
3 changed files with 72 additions and 31 deletions

View File

@ -26,39 +26,69 @@
{% block default_content %}
<!-- Global Stats -->
<div class="row">
<div class="col-6 col-sm-3">
<div class="col-12 col-md-6 col-lg-3">
<div class="card">
<div class="card-body p-3 text-center">
<div class="card-body">
<div class="d-flex align-items-center">
<div class="subheader">
Aliases
</div>
<div class="text-muted" style="order: 2; margin-left: auto; font-size: .8rem">
All time
</div>
</div>
<div class="h1 m-0">{{ stats.nb_alias }}</div>
<div class="text-muted">Aliases</div>
</div>
</div>
</div>
<div class="col-6 col-sm-3">
<div class="card">
<div class="card-body p-3 text-center">
<div class="h1 m-0">{{ stats.nb_forward }}</div>
<div class="text-muted">Forwards</div>
</div>
</div>
</div>
<div class="col-6 col-sm-3">
<div class="card">
<div class="card-body p-3 text-center">
<div class="h1 m-0">{{ stats.nb_reply }}</div>
<div class="text-muted">Replies</div>
</div>
</div>
</div>
<div class="col-6 col-sm-3">
<div class="card">
<div class="card-body p-3 text-center">
<div class="h1 m-0">{{ stats.nb_block }}</div>
<div class="text-muted">Blocks</div>
</div>
</div>
</div>
<div class="col-12 col-md-6 col-lg-3">
<div class="card">
<div class="card-body">
<div class="d-flex align-items-center">
<div class="subheader">
Forwards
</div>
<div class="text-muted" style="order: 2; margin-left: auto; font-size: .8rem">
Last 14 days
</div>
</div>
<div class="h1 m-0">{{ stats.nb_forward }}</div>
</div>
</div>
</div>
<div class="col-12 col-md-6 col-lg-3">
<div class="card">
<div class="card-body">
<div class="d-flex align-items-center">
<div class="subheader">
Replies/Sent
</div>
<div class="text-muted" style="order: 2; margin-left: auto; font-size: .8rem">
Last 14 days
</div>
</div>
<div class="h1 m-0">{{ stats.nb_reply }}</div>
</div>
</div>
</div>
<div class="col-12 col-md-6 col-lg-3">
<div class="card">
<div class="card-body">
<div class="d-flex align-items-center">
<div class="subheader">
Blocks
</div>
<div class="text-muted" style="order: 2; margin-left: auto; font-size: .8rem">
Last 14 days
</div>
</div>
<div class="h1 m-0">{{ stats.nb_block }}</div>
</div>
</div>
</div>
</div>
<!-- END Global Stats -->

View File

@ -28,17 +28,17 @@ class Stats:
def get_stats(user: User) -> Stats:
nb_alias = Alias.query.filter_by(user_id=user.id).count()
nb_forward = (
db.session.query(EmailLog.id)
db.session.query(EmailLog)
.filter_by(user_id=user.id, is_reply=False, blocked=False, bounced=False)
.count()
)
nb_reply = (
db.session.query(EmailLog.id)
db.session.query(EmailLog)
.filter_by(user_id=user.id, is_reply=True, blocked=False, bounced=False)
.count()
)
nb_block = (
db.session.query(EmailLog.id)
db.session.query(EmailLog)
.filter_by(user_id=user.id, is_reply=False, blocked=True, bounced=False)
.count()
)

13
static/style.css vendored
View File

@ -113,4 +113,15 @@ em {
.footer-list-group {
list-style: none;
padding-left: 0;
}
}
.subheader{
font-size: .625rem;
font-weight: 600;
text-transform: uppercase;
letter-spacing: .04em;
line-height: 1.6;
color: #656d77;
}