diff --git a/routes.py b/routes.py index 215a29b..3bb5a34 100644 --- a/routes.py +++ b/routes.py @@ -9,7 +9,12 @@ blueprint = Blueprint('main', __name__) @blueprint.route('/') def index(): # put application's code here users = User.query.order_by(User.time_registered.desc()).limit(10).all() - return render_template('layouts/index.html', new_users=users) + stats = { + 'total_users': User.query.count(), + 'total_comments': Comment.query.count(), + 'total_posts': Post.query.count() + } + return render_template('layouts/index.html', new_users=users, stats=stats) @blueprint.route('/about') diff --git a/static/styles.css b/static/styles.css index 68fa7cb..af2812a 100644 --- a/static/styles.css +++ b/static/styles.css @@ -275,4 +275,19 @@ form button { text-decoration: none; } +.new-users > div, .statistics > div { + border: 1px solid grey; + padding: 0.2em; + width: fit-content; + padding-right: 1.2em; +} +.new-users > div a, .statistics > div a { + text-decoration: none; +} + +.statistics > div { + min-height: 235px; + margin: 1em; +} + /*# sourceMappingURL=styles.css.map */ diff --git a/static/styles.css.map b/static/styles.css.map index 53d5bbb..94b2dbf 100644 --- a/static/styles.css.map +++ b/static/styles.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","sources":["styles.scss"],"names":[],"mappings":"AAAA;EACE;EACA;;AAGF;EACE;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;;AAEA;EAOE;;AALA;EAEE;;;AAON;EACE;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;;;AAKN;EACE;EACA;EACA;EACA;;AAEA;EACE;;;AAIJ;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAIA;EACE;EACA;;AAEA;EACE;;AAEA;EACE;;;AAMR;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;;;AAGF;EACE;;;AAIA;EACE;EACA;;;AAIJ;EACE;EACA;;;AAGF;EACE;EACA;;AAEA;EACE;EACA;;AAGF;EACE;;AAEA;EACE;;AAIJ;EACE;EACA;EACA;;;AAIJ;EACE;EACA;EACA;;AAEA;EACE;EACA;;AAGF;EACE;EACA;;;AAIJ;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;EACA;;AAEA;EACE;EACA;;AAGF;EACE;EACA;EACA;EACA;;;AAIJ;EACE;;;AAGF;EACE;EACA;;AAEA;EACE;EACA;EACA;;;AAMF;EACE;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAGF;EACE;;AAGF;EACE;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EAGA;EACA;EACA;EACA;;AAKF;EACE;EACA;EACA;EACA;;;AAMR;EACE;EACA;;AAEA;EACE;EACA;EACA;;AAGF;EACE;EACA;;AAGF;EACE;;;AAIJ;EACE;EACA;EACA;EACA;EACE;;AAEF;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;;AAIJ;EACE;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;;AAEA;EACE;;AACA;EACE;EACA;;AAIJ;EAEE;EACA;EACA","file":"styles.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["styles.scss"],"names":[],"mappings":"AAAA;EACE;EACA;;AAGF;EACE;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;;AAEA;EAOE;;AALA;EAEE;;;AAON;EACE;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;;;AAKN;EACE;EACA;EACA;EACA;;AAEA;EACE;;;AAIJ;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAIA;EACE;EACA;;AAEA;EACE;;AAEA;EACE;;;AAMR;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;;;AAGF;EACE;;;AAIA;EACE;EACA;;;AAIJ;EACE;EACA;;;AAGF;EACE;EACA;;AAEA;EACE;EACA;;AAGF;EACE;;AAEA;EACE;;AAIJ;EACE;EACA;EACA;;;AAIJ;EACE;EACA;EACA;;AAEA;EACE;EACA;;AAGF;EACE;EACA;;;AAIJ;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;EACA;;AAEA;EACE;EACA;;AAGF;EACE;EACA;EACA;EACA;;;AAIJ;EACE;;;AAGF;EACE;EACA;;AAEA;EACE;EACA;EACA;;;AAMF;EACE;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAGF;EACE;;AAGF;EACE;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EAGA;EACA;EACA;EACA;;AAKF;EACE;EACA;EACA;EACA;;;AAMR;EACE;EACA;;AAEA;EACE;EACA;EACA;;AAGF;EACE;EACA;;AAGF;EACE;;;AAIJ;EACE;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;;AAIJ;EACE;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAEA;EACE;EACA;;AAIJ;EAEE;EACA;EACA;;;AAON;EACE;EACF;EACA;EACA;;AACE;EACE;;;AAKN;EACE;EACA","file":"styles.css"} \ No newline at end of file diff --git a/static/styles.scss b/static/styles.scss index 2a5861f..3298000 100644 --- a/static/styles.scss +++ b/static/styles.scss @@ -278,7 +278,7 @@ form { border-radius: 3px; padding: 1.5em; padding-bottom: 0.8em; - margin: 0.45em; + margin: 0.45em; .post-author { margin-top: 1em; @@ -305,6 +305,7 @@ form { &.add-comment { border: 0; + button { margin-left: 0.8em; width: fit-content; @@ -320,3 +321,20 @@ form { } } } + +.new-users, .statistics { + > div { + border: 1px solid grey; + padding: 0.2em; + width: fit-content; + padding-right: 1.2em; + a { + text-decoration: none; + } + } +} + +.statistics > div { + min-height: 235px; + margin: 1em; +} diff --git a/templates/layouts/index.html b/templates/layouts/index.html index 1caff4d..9a89e41 100644 --- a/templates/layouts/index.html +++ b/templates/layouts/index.html @@ -1,12 +1,28 @@ {% extends 'layouts/base.html' %} {% block content %} -

New Users

-
- +
+
+

New Users

+
+
    + {% for new_user in new_users %} +
  • {{ new_user.username }} as + of {{ new_user.get_registration_delta() }} ago +
  • + {% endfor %} +
+
+
+
+

runnerspace Statistics

+
+
+ {{ stats['total_comments'] }} comments across {{ stats['total_posts'] }} posts
+ {{ stats['total_users'] }} users +
+
+ +
{% endblock %}