Skip to content

Commit

Permalink
Added: time diffs as strings (#39)
Browse files Browse the repository at this point in the history
  • Loading branch information
signebedi committed Jun 2, 2023
1 parent f900cd1 commit 0b9b57a
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 14 deletions.
7 changes: 4 additions & 3 deletions app.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import os
import yaml
import datetime
from num2words import num2words

def prettify_time_diff(dt, anchor=datetime.datetime.now()):

Expand All @@ -14,13 +15,13 @@ def prettify_time_diff(dt, anchor=datetime.datetime.now()):
return 'just now'
elif delta < datetime.timedelta(hours=1):
minutes = delta.seconds // 60
return f'{minutes} minute{"s" if minutes != 1 else ""} ago'
return f'{num2words(minutes)} minute{"s" if minutes != 1 else ""} ago'
elif delta < datetime.timedelta(days=1):
hours = delta.seconds // 3600
return f'{hours} hour{"s" if hours != 1 else ""} ago'
return f'{num2words(hours)} hour{"s" if hours != 1 else ""} ago'
else:
days = delta.days
return f'{days} day{"s" if days != 1 else ""} ago'
return f'{num2words(days)} day{"s" if days != 1 else ""} ago'

# Satisfies
def flask_route_macros():
Expand Down
6 changes: 6 additions & 0 deletions static/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,9 @@
.search-dropdown-item:hover {
background-color: rgba(0, 0, 0, 0.5);
}


.tooltip .tooltip-inner {
color: #fff;
background-color: #343A40; /* or any dark color of your choice */
}
14 changes: 6 additions & 8 deletions templates/base.html.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -118,14 +118,10 @@
</div>
</div>


<!-- Optional JavaScript; choose one of the two! -->
{% block scripts %}{% endblock %}
<!-- Bootstrap Bundle with Popper -->
<script src="{{ url_for('static', filename='bootstrap.bundle.min.js') }}"></script>

<script>
document.getElementById('search').addEventListener('keyup', function() {
var input = this.value;
if(input.length > 2){
Expand Down Expand Up @@ -156,8 +152,10 @@
});
</script>
<!-- Option 1: Bootstrap Bundle with Popper -->
<script src="{{ url_for('static', filename='bootstrap.bundle.min.js') }}"></script>

<!-- Optional JavaScript -->
{% block scripts %}{% endblock %}

</body>

</html>
Expand Down
19 changes: 16 additions & 3 deletions templates/page.html.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,21 @@ View - {{ page.title|e }}

{% block content %}
<div style="padding-bottom: 10px;">
<h4>{{ page.title|e }}</h4> <small>Created {{ prettify_time_diff(page.created_at) }} (Last edited on <span data-bs-toggle="tooltip" data-bs-placement="top" data-bs-original-title="Tooltip on top">{{ prettify_time_diff(page.last_edited) }}</span>)</small>
<h4>{{ page.title|e }}</h4>
<small>
Created
<a href="#" class="text-decoration-none" onclick="event.preventDefault();" data-bs-toggle="tooltip" data-bs-placement="top" title="{{ page.created_at }}">
{{ prettify_time_diff(page.created_at) }}
</a>
(last edited
<a href="#" class="text-decoration-none" onclick="event.preventDefault();" data-bs-toggle="tooltip" data-bs-placement="top" title="{{ page.last_edited }}">
{{ prettify_time_diff(page.last_edited) }}
</a>)
</small>
</div>



<div class="card p-3">
<div class="card-body">
<p>{{ page.content|safe }}</p>
Expand All @@ -41,14 +53,15 @@ View - {{ page.title|e }}
</a>

{% endblock %}
{%block scripts%}


{%block scripts%}
<script>
document.addEventListener("DOMContentLoaded", function(){
var tooltipTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]'))
var tooltipList = tooltipTriggerList.map(function (tooltipTriggerEl) {
return new bootstrap.Tooltip(tooltipTriggerEl)
})
});
</script>
{%endblock%}

0 comments on commit 0b9b57a

Please sign in to comment.