From 3640feb612e83bf3bf440273cb34a6f2661ff171 Mon Sep 17 00:00:00 2001 From: Conrad Date: Sun, 19 Jan 2020 17:49:44 +0100 Subject: [PATCH] Added Functionality To Get Player Inventory --- src/common/templates/master.html | 2 +- .../migrations/0004_auto_20200119_1201.py | 23 ++++++ .../migrations/0005_auto_20200119_1205.py | 23 ++++++ .../migrations/0006_auto_20200119_1240.py | 36 +++++++++ src/core/models.py | 14 ++-- src/core/steam_api.py | 73 +++++++++++++++++-- src/core/templates/profile/inventory.html | 24 ++++++ src/core/templates/profile/profile.html | 7 +- src/core/urls.py | 7 +- src/core/views.py | 22 +++++- 10 files changed, 207 insertions(+), 24 deletions(-) create mode 100644 src/core/migrations/0004_auto_20200119_1201.py create mode 100644 src/core/migrations/0005_auto_20200119_1205.py create mode 100644 src/core/migrations/0006_auto_20200119_1240.py create mode 100644 src/core/templates/profile/inventory.html diff --git a/src/common/templates/master.html b/src/common/templates/master.html index 66ca612..6dd5620 100644 --- a/src/common/templates/master.html +++ b/src/common/templates/master.html @@ -23,7 +23,7 @@ {% endblock %} diff --git a/src/core/urls.py b/src/core/urls.py index dbc4761..eb72e17 100644 --- a/src/core/urls.py +++ b/src/core/urls.py @@ -12,8 +12,11 @@ urlpatterns = [ path('search/', views.search, name='search'), path('profile/', views.profile, name='profile'), path('profile//update', views.profile_update, name='profile_update'), - path('profile/me', views.me, name='me'), - path('profile/settings', views.me_settings, name='me_settings'), + path('profile//inventory', views.profile_inventory, name='profile_inventory'), + path('profile//inventory/update', views.profile_inventory_update, name='profile_inventory_update'), + path('me', views.me, name='me'), + path('me/settings', views.me_settings, name='me_settings'), + path('me/inventory', views.me_inventory, name='me_inventory'), path('help', views.help, name='help'), path('imprint', views.imprint, name='imprint'), diff --git a/src/core/views.py b/src/core/views.py index 5b8e318..4dcb785 100644 --- a/src/core/views.py +++ b/src/core/views.py @@ -13,7 +13,7 @@ import requests # For manually creating system users from django.contrib.auth.models import User # For getting the API interaction methods -from .steam_api import getUserInfo +from .steam_api import getUserInfo, updateInventory # Import for manually logging in user after creation from django.contrib.auth import login @@ -137,6 +137,12 @@ def profile(request, steamID): return render(request, 'profile/profile.html', {'gamer': dude, 'live_offers': Offer.objects.filter(offeror=dude).count()}) +@login_required +def profile_inventory(request, steamID): + dude = get_object_or_404(Gamer, steamid=steamID) + return render(request, 'profile/inventory.html', {'gamer': dude}) + + @login_required def profile_update(request, steamID): if (request.user.steamid == steamID and request.user.gamer.API_KEY) or request.user.is_staff: @@ -160,8 +166,18 @@ def profile_update(request, steamID): # PRIVATE AREA @login_required def me(request): - dude = get_object_or_404(Gamer, steamid=request.user.gamer.steamid) - return render(request, 'profile/profile.html', {'gamer': dude, 'live_offers': Offer.objects.filter(offeror=dude).count()}) + return redirect(profile, steamID=request.user.gamer.steamid) + + +@login_required +def me_inventory(request): + return redirect(profile_inventory, steamID=request.user.gamer.steamid) + + +@login_required +def profile_inventory_update(request, steamID): + updateInventory(steamID) + return redirect(profile_inventory, steamID=steamID) @login_required