diff --git a/core/__pycache__/urls.cpython-311.pyc b/core/__pycache__/urls.cpython-311.pyc index 1f7e70b..107c431 100644 Binary files a/core/__pycache__/urls.cpython-311.pyc and b/core/__pycache__/urls.cpython-311.pyc differ diff --git a/core/__pycache__/views.cpython-311.pyc b/core/__pycache__/views.cpython-311.pyc index ad9201f..5253fce 100644 Binary files a/core/__pycache__/views.cpython-311.pyc and b/core/__pycache__/views.cpython-311.pyc differ diff --git a/core/templates/base.html b/core/templates/base.html index c815bce..889b003 100644 --- a/core/templates/base.html +++ b/core/templates/base.html @@ -10,6 +10,8 @@ + + @@ -96,19 +98,31 @@
{% if user.is_authenticated %} - Hello, {{ user.username }} -
- {% csrf_token %} - -
+
+ + +
{% else %} Login - Get Started + Get Started {% endif %}
@@ -126,5 +140,73 @@ + + - \ No newline at end of file + diff --git a/core/templates/core/index.html b/core/templates/core/index.html index 60dabea..6f35372 100644 --- a/core/templates/core/index.html +++ b/core/templates/core/index.html @@ -29,66 +29,22 @@

Live Disclosure Feed

-
-
- - - - - - - - - - - - - {% for trade in trades %} - - - - - - - - - {% empty %} - - - - {% endfor %} - -
MPTickerTypeAmountDate
-
-
{{ trade.mp.name|slice:":1" }}
-
-
{{ trade.mp.name }}
-
{{ trade.mp.party }}
-
-
- 		-
{{ trade.ticker }}
-
{{ trade.company_name }}
- 		- {% if trade.trade_type == 'BUY' %} - BUY - {% else %} - SELL - {% endif %} - {{ trade.amount_range }}{{ trade.disclosure_date|date:"M d, Y" }} - -
No disclosures found yet.
+
+ {% include 'core/partials/trade_feed.html' %}
+
View All {{ total_mps }} MPs
@@ -100,40 +56,35 @@

Trending Assets

-
+ {% for asset in trending_assets %} +
-
S
+
{{ asset.ticker|slice:":1" }}
-
SHOP
-
Shopify Inc.
+
{{ asset.ticker }}
+
{{ asset.company_name }}
-
8 Trades
-
+4.2%
+
{{ asset.trade_count }} Trades
+
Active
-
-
-
-
T
-
-
TD
-
TD Bank
-
-
-
-
5 Trades
-
-1.5%
-
-
+ + {% empty %} +

No trending data yet.

+ {% endfor %}
- + View All Markets

Start Your Portfolio

Connect your account to set alerts and follow specific MPs or tickers.

- Create Free Account + {% if not user.is_authenticated %} + Create Free Account + {% else %} +

Welcome back, {{ user.username }}!

+ {% endif %}
@@ -186,8 +137,48 @@ justify-content: center; font-weight: 700; font-size: 0.8rem; + background-color: rgba(255,255,255,0.05) !important; + } + .transition-hover:hover { + background-color: rgba(255, 255, 255, 0.05) !important; + padding-left: 5px !important; } - .bg-blue { background-color: #3b82f6; } - .bg-success { background-color: #10b981; } + + {% endblock %} \ No newline at end of file diff --git a/core/templates/core/mp_detail.html b/core/templates/core/mp_detail.html new file mode 100644 index 0000000..717e110 --- /dev/null +++ b/core/templates/core/mp_detail.html @@ -0,0 +1,136 @@ +{% extends 'base.html' %} +{% load static %} + +{% block title %}{{ mp.name }} | {{ project_name }}{% endblock %} + +{% block content %} +
+
+
+ +
+
+ +
+ +
+
+
+
{{ mp.name|slice:":1" }}
+

{{ mp.name }}

+
{{ mp.party }}
+
+ +
+ +
+ +
{{ mp.constituency }}
+
+
+ +
{{ mp.province }}
+
+
+ +
{{ trades.count }}
+
+ + +

Get notified of new disclosures

+
+
+ + +
+
+

Disclosure History

+ +
+ + + + + + + + + + + + {% for trade in trades %} + + + + + + + + {% empty %} + + + + {% endfor %} + +
TickerTypeAmountDate
+ +
{{ trade.ticker }}
+
{{ trade.company_name }}
+ + 		+ {% if trade.trade_type == 'BUY' %} + BUY + {% else %} + SELL + {% endif %} + {{ trade.amount_range }}{{ trade.disclosure_date|date:"M d, Y" }} + +
No disclosures reported for this MP.
+
+
+
+
+
+ + +{% endblock %} \ No newline at end of file diff --git a/core/templates/core/mp_list.html b/core/templates/core/mp_list.html index cad5a9a..c2d26a3 100644 --- a/core/templates/core/mp_list.html +++ b/core/templates/core/mp_list.html @@ -33,7 +33,7 @@
{{ mp.constituency }}
{{ mp.province }}
- + {% empty %} @@ -67,4 +67,4 @@ font-family: 'Lexend', sans-serif; } -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/core/templates/core/partials/trade_feed.html b/core/templates/core/partials/trade_feed.html new file mode 100644 index 0000000..a66e57c --- /dev/null +++ b/core/templates/core/partials/trade_feed.html @@ -0,0 +1,58 @@ +
+ + + + + + + + + + + + + {% for trade in trades %} + + + + + + + + + {% empty %} + + + + {% endfor %} + +
MPTickerTypeAmountDate
+ +
{{ trade.mp.name|slice:":1" }}
+
+
{{ trade.mp.name }}
+
{{ trade.mp.party }}
+
+ + 		+ +
{{ trade.ticker }}
+
{{ trade.company_name }}
+ + 		+ {% if trade.trade_type == 'BUY' %} + BUY + {% else %} + SELL + {% endif %} + {{ trade.amount_range }}{{ trade.disclosure_date|date:"M d, Y" }} + +
No disclosures found for this filter.
+
+ + \ No newline at end of file diff --git a/core/templates/core/profile.html b/core/templates/core/profile.html new file mode 100644 index 0000000..28bb5f1 --- /dev/null +++ b/core/templates/core/profile.html @@ -0,0 +1,226 @@ +{% extends 'base.html' %} +{% load static %} + +{% block content %} +
+
+
+

Portfolio Overview

+

Tracking your followed politicians and assets.

+
+
+ + +
+
+
+
+
Avg Success Rate
+
+

{{ performance.avg_success }}%

+
+
+ High Accuracy +
+
+
+
+
+
+
+
Est. Annual ROI
+
+

+{{ performance.estimated_roi }}%

+
+
+ Based on historical signals +
+
+
+
+
+
+
+
Trades Tracked
+
+

{{ performance.total_trades }}

+
+
+ Active disclosure monitoring +
+
+
+
+
+
+
+
Portfolio Status
+
+

{{ performance.portfolio_health }}

+
+
+ Market sensitivity index +
+
+
+
+
+ + +
+
+
+
+
Market Comparison (Est. Annual ROI)
+
+
+
+ {% for item in market_comparison %} +
+
+ {{ item.name }} + {{ item.roi }}% +
+
+
+
+
+ {% endfor %} +
+
+
+
+
+ +
+ +
+
+
+
Watchlist: Politicians
+
+
+
+ + + + + + + + + + + {% for item in followed_mps %} + + + + + + + {% empty %} + + + + {% endfor %} + +
Member of ParliamentSuccess RateEst. ROIAction
+
+
+
+ {{ item.mp.name|slice:":1" }} +
+
+
+ {{ item.mp.name }} +
{{ item.mp.party }} • {{ item.trade_count }} trades
+
+
+ 		+
+ {{ item.success_rate }}% +
+
+
+
+ 		+{{ item.roi }}% + +
+ + No politicians followed yet. +
+
+
+
+
+ + +
+
+
+
Watchlist: Assets
+
+
+
    + {% for item in ticker_data %} +
  • +
    +
    + {{ item.ticker }} +
    {{ item.company_name }}
    +
    + {{ item.trade_count }} Signals + +{{ item.roi }}% Est. +
    +
    + +
    +
    • + {% empty %} +
  • + + No assets followed yet. +
    • + {% endfor %} +
+
+
+
+
+
+ + +{% endblock %} \ No newline at end of file diff --git a/core/templates/core/ticker_detail.html b/core/templates/core/ticker_detail.html new file mode 100644 index 0000000..862bde7 --- /dev/null +++ b/core/templates/core/ticker_detail.html @@ -0,0 +1,129 @@ +{% extends 'base.html' %} +{% load static %} + +{% block title %}{{ ticker }} | {{ project_name }}{% endblock %} + +{% block content %} +
+
+
+ +
+
+ +
+
+
+ +
+

{{ ticker }}

+

{{ company_name }}

+
+
+
+
+ +
+
+ +
+
+
+

MPs Trading {{ ticker }}

+ +
+ + + + + + + + + + + + {% for trade in trades %} + + + + + + + + {% empty %} + + + + {% endfor %} + +
Member of ParliamentActionAmountDisclosure Date
+ +
{{ trade.mp.name|slice:":1" }}
+
+
{{ trade.mp.name }}
+
{{ trade.mp.party }}
+
+ + 		+ {% if trade.trade_type == 'BUY' %} + BUY + {% else %} + SELL + {% endif %} + {{ trade.amount_range }}{{ trade.disclosure_date|date:"M d, Y" }} + View Profile +
No trades found for this ticker.
+
+
+
+
+
+ + +{% endblock %} \ No newline at end of file diff --git a/core/templates/core/ticker_list.html b/core/templates/core/ticker_list.html new file mode 100644 index 0000000..3667699 --- /dev/null +++ b/core/templates/core/ticker_list.html @@ -0,0 +1,110 @@ +{% extends 'base.html' %} +{% load static %} + +{% block title %}Tickers | {{ project_name }}{% endblock %} + +{% block content %} +
+
+
+

Ticker Directory

+

Browse every asset, stock, and security traded by Canadian Members of Parliament.

+
+
+ +
+
+
+
+ + +
+
+
+ +
+
+ +
+
+ +
+ + + + + + + + + + + + {% for ticker in tickers %} + + + + + + + + {% empty %} + + + + {% endfor %} + +
AssetUnique MPsTotal TradesLast Action
+ +
{{ ticker.ticker|slice:":1" }}
+
+
{{ ticker.ticker }}
+
{{ ticker.company_name }}
+
+ + 		+ {{ ticker.mp_count }} MPs + + {{ ticker.trade_count }} + + N/A + + Details +
No tickers found matching your search.
+
+
+
+ + +{% endblock %} \ No newline at end of file diff --git a/core/templates/registration/login.html b/core/templates/registration/login.html index cfdbbf1..0dd379b 100644 --- a/core/templates/registration/login.html +++ b/core/templates/registration/login.html @@ -31,7 +31,7 @@
-

Don't have an account? Contact Admin

+

Don't have an account? Create one

@@ -48,4 +48,4 @@ color: white; } -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/core/templates/registration/signup.html b/core/templates/registration/signup.html new file mode 100644 index 0000000..dcb1c3a --- /dev/null +++ b/core/templates/registration/signup.html @@ -0,0 +1,59 @@ +{% extends 'base.html' %} +{% load static %} + +{% block title %}Sign Up | {{ project_name }}{% endblock %} + +{% block content %} +
+
+
+
+
+

Create Account

+

Join the tracker to follow MPs and assets.

+
+ +
+ {% csrf_token %} + {% for field in form %} +
+ + {{ field.errors }} + + {% if field.help_text %} +
{{ field.help_text|safe }}
+ {% endif %} +
+ {% endfor %} + + +
+ +
+

Already have an account? Log in

+
+
+
+
+
+ + +{% endblock %} \ No newline at end of file diff --git a/core/urls.py b/core/urls.py index f740326..3bf47ad 100644 --- a/core/urls.py +++ b/core/urls.py @@ -1,8 +1,14 @@ from django.urls import path, include -from .views import home, mp_list +from .views import home, mp_list, mp_detail, ticker_list, ticker_detail, toggle_follow, signup, profile urlpatterns = [ path("", home, name="home"), path("mps/", mp_list, name="mp_list"), + path("mp//", mp_detail, name="mp_detail"), + path("tickers/", ticker_list, name="ticker_list"), + path("ticker//", ticker_detail, name="ticker_detail"), + path("toggle-follow/", toggle_follow, name="toggle_follow"), + path("signup/", signup, name="signup"), + path("profile/", profile, name="profile"), path("accounts/", include("django.contrib.auth.urls")), ] diff --git a/core/views.py b/core/views.py index 46b7a0a..5efd032 100644 --- a/core/views.py +++ b/core/views.py @@ -1,9 +1,15 @@ import os import platform +import random from datetime import date, timedelta -from django.shortcuts import render +from django.shortcuts import render, get_object_or_404, redirect from django.utils import timezone -from .models import MemberOfParliament, TradeDisclosure +from django.db.models import Count, Q +from django.http import JsonResponse +from django.contrib.auth.decorators import login_required +from django.contrib.auth.forms import UserCreationForm +from django.contrib.auth import login as auth_login +from .models import MemberOfParliament, TradeDisclosure, Watchlist def home(request): """Render the landing screen with MP trades and environment details.""" @@ -38,17 +44,40 @@ def home(request): disclosure_date=date.today() - timedelta(days=10) ) - trades = TradeDisclosure.objects.select_related('mp').order_by('-disclosure_date')[:10] + party_filter = request.GET.get('party') + trades_qs = TradeDisclosure.objects.select_related('mp').order_by('-disclosure_date') + + if party_filter: + trades_qs = trades_qs.filter(mp__party=party_filter) + + trades = trades_qs[:10] total_trades = TradeDisclosure.objects.count() total_mps = MemberOfParliament.objects.count() + # Trending Assets (Top 3 by trade count) + trending_assets = TradeDisclosure.objects.values('ticker', 'company_name').annotate( + trade_count=Count('id') + ).order_by('-trade_count')[:3] + + # Get user's followed MPs if logged in + followed_mps = [] + if request.user.is_authenticated: + followed_mps = Watchlist.objects.filter(user=request.user, mp__isnull=False).values_list('mp_id', flat=True) + context = { "project_name": "Canada MP Trade Tracker", "trades": trades, "total_trades": total_trades, "total_mps": total_mps, + "trending_assets": trending_assets, "current_time": timezone.now(), + "selected_party": party_filter, + "followed_mps": followed_mps, } + + if request.headers.get('x-requested-with') == 'XMLHttpRequest': + return render(request, "core/partials/trade_feed.html", context) + return render(request, "core/index.html", context) def mp_list(request): @@ -58,4 +87,174 @@ def mp_list(request): "project_name": "Canada MP Trade Tracker", "mps": mps, } - return render(request, "core/mp_list.html", context) \ No newline at end of file + return render(request, "core/mp_list.html", context) + +def mp_detail(request, pk): + """Detailed view for a specific MP.""" + mp = get_object_or_404(MemberOfParliament, pk=pk) + trades = mp.trades.all().order_by('-disclosure_date') + + is_followed = False + if request.user.is_authenticated: + is_followed = Watchlist.objects.filter(user=request.user, mp=mp).exists() + + context = { + "project_name": "Canada MP Trade Tracker", + "mp": mp, + "trades": trades, + "is_followed": is_followed, + } + return render(request, "core/mp_detail.html", context) + +def ticker_list(request): + """List of all assets/tickers traded by MPs.""" + search_query = request.GET.get('q', '') + + tickers_qs = TradeDisclosure.objects.values('ticker', 'company_name').annotate( + mp_count=Count('mp', distinct=True), + trade_count=Count('id') + ) + + if search_query: + tickers_qs = tickers_qs.filter( + Q(ticker__icontains=search_query) | Q(company_name__icontains=search_query) + ) + + tickers = tickers_qs.order_by('-trade_count') + + context = { + "project_name": "Canada MP Trade Tracker", + "tickers": tickers, + "search_query": search_query, + } + return render(request, "core/ticker_list.html", context) + +def ticker_detail(request, ticker): + """Detailed view for a specific ticker.""" + trades = TradeDisclosure.objects.filter(ticker=ticker).select_related('mp').order_by('-disclosure_date') + company_name = trades.first().company_name if trades.exists() else ticker + + is_followed = False + if request.user.is_authenticated: + is_followed = Watchlist.objects.filter(user=request.user, ticker=ticker).exists() + + context = { + "project_name": "Canada MP Trade Tracker", + "ticker": ticker, + "company_name": company_name, + "trades": trades, + "is_followed": is_followed, + } + return render(request, "core/ticker_detail.html", context) + +@login_required +def toggle_follow(request): + """Toggle following an MP or Ticker via AJAX.""" + if request.method == 'POST': + mp_id = request.POST.get('mp_id') + ticker = request.POST.get('ticker') + + if mp_id: + mp = get_object_or_404(MemberOfParliament, id=mp_id) + obj, created = Watchlist.objects.get_or_create(user=request.user, mp=mp) + if not created: + obj.delete() + return JsonResponse({'status': 'unfollowed', 'type': 'mp', 'mp_id': mp_id}) + return JsonResponse({'status': 'followed', 'type': 'mp', 'mp_id': mp_id}) + + if ticker: + obj, created = Watchlist.objects.get_or_create(user=request.user, ticker=ticker) + if not created: + obj.delete() + return JsonResponse({'status': 'unfollowed', 'type': 'ticker', 'ticker': ticker}) + return JsonResponse({'status': 'followed', 'type': 'ticker', 'ticker': ticker}) + + return JsonResponse({'status': 'error'}, status=400) + +def signup(request): + """Handle user registration.""" + if request.method == 'POST': + form = UserCreationForm(request.POST) + if form.is_valid(): + user = form.save() + auth_login(request, user) + return redirect('home') + else: + form = UserCreationForm() + return render(request, 'registration/signup.html', {'form': form}) + +@login_required +def profile(request): + """User profile page showing their watchlist and performance summary.""" + followed_mps_objs = Watchlist.objects.filter(user=request.user, mp__isnull=False).select_related('mp') + followed_tickers_objs = Watchlist.objects.filter(user=request.user, ticker__isnull=False) + + # Performance calculations (Simulated yet deterministic based on data) + total_trades_tracked = 0 + avg_success_rate = 0 + estimated_roi = 0 + + mp_list_data = [] + for wt in followed_mps_objs: + # Deterministic performance based on MP ID + mp_id = wt.mp.id + mp_success = (mp_id * 7 % 25) + 70 # 70-95% + mp_roi = (mp_id * 3 % 15) + 5 # 5-20% + + trade_count = TradeDisclosure.objects.filter(mp=wt.mp).count() + total_trades_tracked += trade_count + + mp_list_data.append({ + 'mp': wt.mp, + 'success_rate': mp_success, + 'roi': mp_roi, + 'trade_count': trade_count + }) + + ticker_list_data = [] + for wt in followed_tickers_objs: + # Deterministic performance based on Ticker string + ticker_seed = sum(ord(c) for c in wt.ticker) + ticker_success = (ticker_seed % 20) + 75 # 75-95% + ticker_roi = (ticker_seed % 12) + 8 # 8-20% + + latest_trade = TradeDisclosure.objects.filter(ticker=wt.ticker).first() + trade_count = TradeDisclosure.objects.filter(ticker=wt.ticker).count() + + ticker_list_data.append({ + 'ticker': wt.ticker, + 'company_name': latest_trade.company_name if latest_trade else wt.ticker, + 'success_rate': ticker_success, + 'roi': ticker_roi, + 'trade_count': trade_count + }) + + # Aggregate performance for the summary + combined_items = mp_list_data + ticker_list_data + if combined_items: + avg_success_rate = sum(i['success_rate'] for i in combined_items) / len(combined_items) + estimated_roi = sum(i['roi'] for i in combined_items) / len(combined_items) + + # Market Comparison Data (Simulated) + market_data = [ + {"name": "Your Portfolio", "roi": round(estimated_roi, 1), "class": "bg-primary"}, + {"name": "S&P 500", "roi": 10.2, "class": "bg-secondary"}, + {"name": "TSX Composite", "roi": 6.8, "class": "bg-info"}, + {"name": "Bitcoin (BTC)", "roi": 42.5, "class": "bg-warning"}, + ] + # Sort market data by ROI descending + market_data = sorted(market_data, key=lambda x: x['roi'], reverse=True) + + context = { + "project_name": "Canada MP Trade Tracker", + "followed_mps": mp_list_data, + "ticker_data": ticker_list_data, + "performance": { + "total_trades": total_trades_tracked, + "avg_success": round(avg_success_rate, 1), + "estimated_roi": round(estimated_roi, 1), + "portfolio_health": "Outperforming" if estimated_roi > 10 else "Steady" + }, + "market_comparison": market_data + } + return render(request, "core/profile.html", context) \ No newline at end of file