From ab2060c711696ea96f35e6b66ef5926798ee083a Mon Sep 17 00:00:00 2001 From: Lilfade Date: Thu, 10 Jul 2025 02:52:55 -0500 Subject: [PATCH] was working, changes to displays --- app/templates/core/base.html | 7 ++- celerybeat-schedule | Bin 0 -> 16384 bytes plugins/admin/routes.py | 58 ++++++++++++------ .../templates/admin/invitations/list.html | 40 ++++++++++++ plugins/admin/templates/admin/users/form.html | 9 +++ plugins/admin/templates/admin/users/list.html | 26 ++++++-- 6 files changed, 116 insertions(+), 24 deletions(-) create mode 100644 celerybeat-schedule create mode 100644 plugins/admin/templates/admin/invitations/list.html diff --git a/app/templates/core/base.html b/app/templates/core/base.html index e8a5628..caaa8d1 100644 --- a/app/templates/core/base.html +++ b/app/templates/core/base.html @@ -1,3 +1,4 @@ + @@ -119,11 +120,15 @@ Orphaned Media +
  • + + Invitations + +
    • {% endif %} -
    ?>miv+GTNy9o2-~bMm0O|mB zfI7fFfDS+hpaakW=m2y8IshH`&vanM?P|8zSa!=f&(Aw6*G>oi+$fWssK=XW2yxm>9@Sewvi zoF~sXK|dV}aQHnA;nA06Ayu)_>@T0fthR9eIo)BuT32sh@2sdHV>cU~_C5P=)GPa+ zr=lEtBg5_awxuk+i6tKrz&=2nD-45Li+$KEskWB$n{sup{V zj9%Cm{WJ^)MI{COibW=hLmr7x8GY_voQQsvi959Np*c3!l9s+Y$g15`mb{+GRaowo zyq+H9#UKe~X>_L_DxuPSig@N8o6ULulRxjTTJl5WyfG-G6<>m%xQ`=AmPrP{8a$dq=lf literal 0 HcmV?d00001 diff --git a/plugins/admin/routes.py b/plugins/admin/routes.py index b42b060..56f53f2 100644 --- a/plugins/admin/routes.py +++ b/plugins/admin/routes.py @@ -10,7 +10,7 @@ from sqlalchemy import func, desc from datetime import datetime, timedelta from app import db -from plugins.auth.models import User +from plugins.auth.models import User, Invitation from plugins.plant.growlog.models import GrowLog from plugins.plant.models import Plant from plugins.media.models import Media @@ -26,9 +26,9 @@ def dashboard(): if current_user.role != 'admin': return "Access denied", 403 - now = datetime.utcnow() - week_ago = now - timedelta(days=7) - month_ago= now - timedelta(days=30) + now = datetime.utcnow() + week_ago = now - timedelta(days=7) + month_ago = now - timedelta(days=30) # ─── Overview metrics ────────────────────────────────────────────── # @@ -51,7 +51,7 @@ def dashboard(): # Sign‐ups last 30 days signup_dates = [(month_ago + timedelta(days=i)).date() for i in range(31)] signup_counts = [ - User.query.filter(func.date(User.created_at)==d).count() + User.query.filter(func.date(User.created_at) == d).count() for d in signup_dates ] chart_dates = [d.strftime('%Y-%m-%d') for d in signup_dates] @@ -64,7 +64,7 @@ def dashboard(): # ─── Analytics aggregates ─────────────────────────────────────────── # - ev_q = AnalyticsEvent.query.filter(AnalyticsEvent.timestamp >= week_ago) + ev_q = AnalyticsEvent.query.filter(AnalyticsEvent.timestamp >= week_ago) total_ev = ev_q.count() or 1 error_ev = ev_q.filter(AnalyticsEvent.status_code >= 500).count() error_pct = round(error_ev / total_ev * 100, 1) @@ -96,10 +96,14 @@ def dashboard(): ) for ua, cnt in ua_counts: b = 'Other' - if 'Chrome' in ua: b = 'Chrome' - elif 'Firefox' in ua: b = 'Firefox' - elif 'Safari' in ua and 'Chrome' not in ua: b = 'Safari' - elif 'Edge' in ua: b = 'Edge' + if 'Chrome' in ua: + b = 'Chrome' + elif 'Firefox' in ua: + b = 'Firefox' + elif 'Safari' in ua and 'Chrome' not in ua: + b = 'Safari' + elif 'Edge' in ua: + b = 'Edge' browsers[b] = browsers.get(b, 0) + cnt referrers = dict( @@ -116,16 +120,14 @@ def dashboard(): # ─── Stats metrics ────────────────────────────────────────────────── # - # Plant totals - total_plants = Plant.query.count() + total_plants = Plant.query.count() total_images = Media.query.count() - active_plants = Plant.query.filter_by(is_active=True).count() + active_plants = Plant.query.filter_by(is_active=True).count() - # Top 5 popular plant types popular_plants = db.session.query( Plant.plant_type, func.count(Plant.id).label('count') - ).filter(Plant.is_active==True) \ + ).filter(Plant.is_active == True) \ .group_by(Plant.plant_type) \ .order_by(desc('count')) \ .limit(5) \ @@ -340,7 +342,27 @@ def undelete_user(user_id): @bp.route('/orphaned-media') @login_required def orphaned_media_list(): - if not current_user.role == 'admin': - abort(403) + if current_user.role != 'admin': + return "Access denied", 403 items = Media.query.filter_by(status='orphaned').order_by(Media.orphaned_at.desc()).all() - return render_template('admin/orphaned_media_list.html', items=items) \ No newline at end of file + return render_template('admin/orphaned_media_list.html', items=items) + + +# ─── Invitation Management ──────────────────────────────────────────────── # + +@bp.route('/invitations') +@login_required +def list_invitations(): + if current_user.role != 'admin': + return "Access denied", 403 + + user_id = request.args.get('user_id', type=int) + query = Invitation.query + if user_id: + query = query.filter(Invitation.created_by == user_id) + invitations = query.order_by(Invitation.created_at.desc()).all() + + return render_template( + 'admin/invitations/list.html', + invitations=invitations + ) diff --git a/plugins/admin/templates/admin/invitations/list.html b/plugins/admin/templates/admin/invitations/list.html new file mode 100644 index 0000000..5d67da3 --- /dev/null +++ b/plugins/admin/templates/admin/invitations/list.html @@ -0,0 +1,40 @@ +{% extends 'core/base.html' %} +{% block title %}Invitations – Admin – Nature In Pots{% endblock %} + +{% block content %} +

    Invitations

    + +

    + + Create Invitation + +

    + + + + + + + + + + + + + + + {% for inv in invitations %} + + + + + + + + + + {% endfor %} + +
    CodeRecipient EmailCreated ByCreated AtUsed ByUsed AtActive
    {{ inv.code }}{{ inv.recipient_email }}{{ inv.creator.email }}{{ inv.created_at.strftime('%Y-%m-%d %H:%M') }}{{ inv.user.email if inv.user else '' }}{{ inv.used_at.strftime('%Y-%m-%d %H:%M') if inv.used_at else '' }}{{ 'Yes' if inv.is_active else 'No' }}
    +{% endblock %} diff --git a/plugins/admin/templates/admin/users/form.html b/plugins/admin/templates/admin/users/form.html index 0ba1bd5..4a8e669 100644 --- a/plugins/admin/templates/admin/users/form.html +++ b/plugins/admin/templates/admin/users/form.html @@ -1,3 +1,4 @@ +{# File: plugins/admin/templates/admin/users/form.html #} {% extends 'core/base.html' %} {% block title %}{{ action }} User – Admin – Nature In Pots{% endblock %} @@ -37,6 +38,14 @@ {{ form.excluded_from_analytics.label(class="form-check-label") }}
    +
    + {{ form.invites_remaining.label(class="form-label") }} + {{ form.invites_remaining(class="form-control") }} + + How many invitations this user may still send. + +
    +
    diff --git a/plugins/admin/templates/admin/users/list.html b/plugins/admin/templates/admin/users/list.html index 6e2b3b8..50647a1 100644 --- a/plugins/admin/templates/admin/users/list.html +++ b/plugins/admin/templates/admin/users/list.html @@ -1,3 +1,4 @@ +{# File: plugins/admin/templates/admin/users/list.html #} {% extends 'core/base.html' %} {% block title %}Users – Admin – Nature In Pots{% endblock %} {% block content %} @@ -36,9 +37,15 @@ - - - + + + + + + + + + @@ -61,6 +68,7 @@ {% endif %} + `); }); - // hide pagination when searching paginationNav.style.display = q ? 'none' : ''; }); }
    IDEmailRoleVerifiedExcludedStatusJoinedActionsIDEmailRoleVerifiedExcludedStatusJoinedInvites RemainingActions
    {{ u.created_at.strftime('%Y-%m-%d') }}{{ u.invites_remaining }} Edit + + Adjust Invites + + Invitations + {% if u.is_deleted %}
    Edit + Adjust Invites + Invitations ${actionForms}