From 9d32b12b05f96f108518ed49fccc4a2c72dd7f24 Mon Sep 17 00:00:00 2001
From: Conrad <grosserconrad@gmail.com>
Date: Sun, 19 Jan 2020 11:14:34 +0100
Subject: [PATCH] Profile and Settings Work

- Added logout button + url
- Added redirect urls
- Fixed bug where the steam name wouldn't show in template
- Added tradeurl to model
- Added simple profile
- Added ability to change own trade url
---
 src/asiimov/settings.py                       | 11 +++--
 src/asiimov/urls.py                           |  4 +-
 src/common/static_files/css/profile.css       |  3 ++
 src/common/templates/master.html              |  3 +-
 src/core/forms.py                             |  9 ++++
 src/core/migrations/0002_gamer_tradeurl.py    | 18 +++++++
 src/core/migrations/0003_gamer_offer_count.py | 18 +++++++
 src/core/models.py                            |  3 ++
 src/core/steam_api.py                         |  2 +-
 src/core/templates/core/signup.html           |  1 -
 src/core/templates/profile/profile.html       | 43 ++++++++++++++++
 src/core/templates/profile/settings.html      | 21 ++++++++
 src/core/urls.py                              |  1 +
 src/core/views.py                             | 49 ++++++++++++++-----
 14 files changed, 167 insertions(+), 19 deletions(-)
 create mode 100644 src/common/static_files/css/profile.css
 create mode 100644 src/core/forms.py
 create mode 100644 src/core/migrations/0002_gamer_tradeurl.py
 create mode 100644 src/core/migrations/0003_gamer_offer_count.py
 delete mode 100644 src/core/templates/core/signup.html
 create mode 100644 src/core/templates/profile/profile.html
 create mode 100644 src/core/templates/profile/settings.html

diff --git a/src/asiimov/settings.py b/src/asiimov/settings.py
index 89e282e..772dab6 100644
--- a/src/asiimov/settings.py
+++ b/src/asiimov/settings.py
@@ -27,7 +27,6 @@ ALLOWED_HOSTS = []
 
 
 # Application definition
-
 INSTALLED_APPS = [
     'core',
     'django.contrib.admin',
@@ -71,7 +70,6 @@ WSGI_APPLICATION = 'asiimov.wsgi.application'
 
 # Database
 # https://docs.djangoproject.com/en/3.0/ref/settings/#databases
-
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3',
@@ -82,7 +80,6 @@ DATABASES = {
 
 # Password validation
 # https://docs.djangoproject.com/en/3.0/ref/settings/#auth-password-validators
-
 AUTH_PASSWORD_VALIDATORS = [
     {
         'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
@@ -101,7 +98,6 @@ AUTH_PASSWORD_VALIDATORS = [
 
 # Internationalization
 # https://docs.djangoproject.com/en/3.0/topics/i18n/
-
 LANGUAGE_CODE = 'en-us'
 TIME_ZONE = 'UTC'
 USE_I18N = True
@@ -119,3 +115,10 @@ STATICFILES_DIRS = [
 
 # Steam API variables
 STEAM_API_KEY = os.environ['STEAM_API_KEY']
+
+# Redirect for users to login
+LOGIN_URL = 'signup'
+# Redirect after login
+LOGIN_REDIRECT_URL = 'me'
+# Redirect after logout
+LOGOUT_REDIRECT_URL = 'home'
diff --git a/src/asiimov/urls.py b/src/asiimov/urls.py
index 82b67d9..734ea78 100644
--- a/src/asiimov/urls.py
+++ b/src/asiimov/urls.py
@@ -15,8 +15,10 @@ Including another URLconf
 """
 from django.contrib import admin
 from django.urls import path, include
+from django.contrib.auth.views import LogoutView
 
 urlpatterns = [
     path('', include('core.urls')),
-    path('admin/', admin.site.urls)
+    path('admin/', admin.site.urls),
+    path('logout/', LogoutView.as_view(template_name='logout.html'), name='logout')
 ]
diff --git a/src/common/static_files/css/profile.css b/src/common/static_files/css/profile.css
new file mode 100644
index 0000000..01d40ba
--- /dev/null
+++ b/src/common/static_files/css/profile.css
@@ -0,0 +1,3 @@
+.content_block{
+  text-align: center;
+}
diff --git a/src/common/templates/master.html b/src/common/templates/master.html
index 0125f90..66ca612 100644
--- a/src/common/templates/master.html
+++ b/src/common/templates/master.html
@@ -13,6 +13,7 @@
   	<link rel="stylesheet" href="{% static 'css/master.css' %}">
   	<!-- JQuery for easier HTML manipulation -->
   	<script type="text/javascript" src="https://code.jquery.com/jquery-3.4.1.min.js"></script>
+    {% block header %}{% endblock %}
   </head>
 
   <body>
@@ -22,7 +23,7 @@
       </div>
       <div id="right_nav" class="nav_box">
         {% if user.is_authenticated %}
-          <a href="{% url 'offer_create' %}">Add Offer</a> | <a href="{% url 'me_settings' %}">settings</a> | Welcome, <a href="{% url 'me' %}">{{ user.gamer.display_name }}</a>
+          <a href="{% url 'offer_create' %}">Add Offer</a> | <a href="{% url 'me_settings' %}">Settings</a> | Welcome, <a href="{% url 'me' %}">{{ user.gamer.personaname }} <a href="{% url 'logout' %}">(Logout)</a></a>
         {% else %}
           <a href="{% url 'signup' %}"><img src="{% static 'pic/steam_sign_in.png' %}" /></a>
         {% endif %}
diff --git a/src/core/forms.py b/src/core/forms.py
new file mode 100644
index 0000000..c24ea8b
--- /dev/null
+++ b/src/core/forms.py
@@ -0,0 +1,9 @@
+# Import forms for creating custom template forms
+from django import forms
+from .models import Gamer
+
+
+class ChangeTradeUrl(forms.ModelForm):
+    class Meta:
+        model = Gamer
+        fields = ('tradeurl',)
diff --git a/src/core/migrations/0002_gamer_tradeurl.py b/src/core/migrations/0002_gamer_tradeurl.py
new file mode 100644
index 0000000..02308da
--- /dev/null
+++ b/src/core/migrations/0002_gamer_tradeurl.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.0.2 on 2020-01-19 09:15
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='gamer',
+            name='tradeurl',
+            field=models.URLField(max_length=256, null=True),
+        ),
+    ]
diff --git a/src/core/migrations/0003_gamer_offer_count.py b/src/core/migrations/0003_gamer_offer_count.py
new file mode 100644
index 0000000..198c783
--- /dev/null
+++ b/src/core/migrations/0003_gamer_offer_count.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.0.2 on 2020-01-19 09:34
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0002_gamer_tradeurl'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='gamer',
+            name='offer_count',
+            field=models.IntegerField(default=0),
+        ),
+    ]
diff --git a/src/core/models.py b/src/core/models.py
index 3315964..abe0575 100644
--- a/src/core/models.py
+++ b/src/core/models.py
@@ -91,11 +91,14 @@ class Gamer(models.Model):
     timecreated = models.IntegerField(null=True)  # Only visible if user has profile visibility
     loccountrycode = models.CharField(max_length=2, null=True)  # 2 char ISO country code
 
+    tradeurl = models.URLField(max_length=256, null=True)
+
     # Asiimov specific information
     inventory = models.ManyToManyField(ItemInstance)  # Temporary storage of items for improving site performance
     API_KEY = models.CharField(max_length=32, null=True)  # Optionally use the API KEY of the user
     badges = models.ManyToManyField(Badge)
     system_user = models.OneToOneField(User, on_delete=models.CASCADE)
+    offer_count = models.IntegerField(default=0)
 
 
 class Offer(models.Model):
diff --git a/src/core/steam_api.py b/src/core/steam_api.py
index 419832d..1a9f088 100644
--- a/src/core/steam_api.py
+++ b/src/core/steam_api.py
@@ -15,7 +15,7 @@ FLOAT_SERVER = 'https://api.csgofloat.com/?url='
 def getUserInfo(steamID, API_KEY=settings.STEAM_API_KEY):
     QUERY = STEAM_SERVER + USER_METHOD + '/?key=' + str(API_KEY) + '&format=json&steamids=' + str(steamID)
     player_object = json.load(urllib.request.urlopen(QUERY))
-    return player_object
+    return player_object['response']['players'][0]
 
 
 # Get the CS:GO inventory of a gamer
diff --git a/src/core/templates/core/signup.html b/src/core/templates/core/signup.html
deleted file mode 100644
index d4b29a2..0000000
--- a/src/core/templates/core/signup.html
+++ /dev/null
@@ -1 +0,0 @@
-{{ url }}
diff --git a/src/core/templates/profile/profile.html b/src/core/templates/profile/profile.html
new file mode 100644
index 0000000..733fdd3
--- /dev/null
+++ b/src/core/templates/profile/profile.html
@@ -0,0 +1,43 @@
+{% extends 'master.html' %}
+{% load static %}
+
+{% block header %}
+<!-- Adding custom style sheet for profile-->
+<link rel="stylesheet" href="{% static 'css/profile.css' %}">
+{% endblock %}
+
+{% block content %}
+<div class="content_block">
+  <p><img src="{{ gamer.avatar }}" /></p>
+  <h2>{{ gamer.personaname }} {% if request.user.gamer == gamer %}(Your Profile){% endif %}</h2>
+
+  <h3>Links</h3>
+  <ul>
+    <a href="{{ gamer.profileurl }}" target="_blank"><li>Steam</li></a>
+    <a href="http://csgo.exchange/id/{{ gamer.steamid }}"><li>csgo.exchange</li></a>
+    {% if gamer.tradeurl %}<a href="{{ gamer.tradeurl }}" target="_blank"><li>Trade</li></a>{% endif %}
+  </ul>
+
+  <h3>Info</h3>
+  <p>Steam ID: {{ gamer.steamid }}</p>
+  <p>Profile: {% if gamer.profilestate %}Public Profile{% else %}Private Profile{% endif %}</p>
+  <p>Comments: {% if gamer.commentpermission %}Allowed{% else %}Denied{% endif %}</p>
+  <p>Locale: {% if gamer.loccountrycode %}{{ gamer.loccountrycode }}{% else %}Not provided{% endif %}</p>
+  {% if gamer.API_KEY %}<p style="color: red">This is an API Key Sponsor!</p>{% endif %}
+
+  <h3>Badges</h3>
+  <p>
+  {% for badge in gamer.badges.all %}
+    <img src="{{ badge.icon }}" placeholder="{{ badge.name }}">
+  {% empty %}
+    No badges earned yet.
+  {% endfor %}
+  </p>
+
+  <h3>Statistics</h3>
+  <p>Offers created: {{ gamer.offer_count }}</p>
+  <p>Live Offers: {{ live_offers }}</p>
+  <p>Member since: {{ gamer.system_user.date_joined }}</p>
+  <p>Last Login: {{ gamer.system_user.last_login }}</p>
+</div>
+{% endblock %}
diff --git a/src/core/templates/profile/settings.html b/src/core/templates/profile/settings.html
new file mode 100644
index 0000000..b223b91
--- /dev/null
+++ b/src/core/templates/profile/settings.html
@@ -0,0 +1,21 @@
+{% extends 'master.html' %}
+{% load static %}
+
+{% block header %}
+<!-- Adding custom style sheet for profile-->
+<link rel="stylesheet" href="{% static 'css/profile.css' %}">
+{% endblock %}
+
+{% block content %}
+<div class="content_block">
+  <h2>Settings</h2>
+  <a href="http://steamcommunity.com/id/me/tradeoffers/privacy#trade_offer_access_url" target="_blank">Find your trade URL!</a>
+  {% if gamer.API_KEY %}<a href="{% url 'profile_update' gamer.steamid %}">Synchronize profile from Steam</a>{% endif %}
+
+  <form role="from" method="post" action="{% url 'me_settings' %}">
+    {% csrf_token %}
+    {{ form.as_p }}
+    <button type="submit">Set Trade URL</button>
+  </form>
+</div>
+{% endblock %}
diff --git a/src/core/urls.py b/src/core/urls.py
index 51cb86e..dbc4761 100644
--- a/src/core/urls.py
+++ b/src/core/urls.py
@@ -11,6 +11,7 @@ urlpatterns = [
     path('offers/create', views.offer_create, name='offer_create'),
     path('search/<str:filter>', views.search, name='search'),
     path('profile/<int:steamID>', views.profile, name='profile'),
+    path('profile/<int:steamID>/update', views.profile_update, name='profile_update'),
     path('profile/me', views.me, name='me'),
     path('profile/settings', views.me_settings, name='me_settings'),
 
diff --git a/src/core/views.py b/src/core/views.py
index 801f3cc..5b8e318 100644
--- a/src/core/views.py
+++ b/src/core/views.py
@@ -17,6 +17,8 @@ from .steam_api import getUserInfo
 # Import for manually logging in user after creation
 from django.contrib.auth import login
 
+from .forms import ChangeTradeUrl
+
 
 # HELPER
 def validate_steam_login(params):
@@ -92,14 +94,14 @@ def signup_confirm(request):
             Gamer.objects.create(
                 steamid=claimed_id,
                 system_user=new_user,
-                communityvisibilitystate=(True if info['response']['players'][0]['communityvisibilitystate'] == 3 else False),
-                profilestate=info['response']['players'][0]['profilestate'],
-                personaname=info['response']['players'][0]['personaname'],
-                profileurl=info['response']['players'][0]['profileurl'],
-                avatar=info['response']['players'][0]['avatar'],
-                commentpermission=info['response']['players'][0]['commentpermission'],
-                timecreated=info['response']['players'][0]['timecreated'] or None,
-                loccountrycode=info['response']['players'][0]['loccountrycode'] or None
+                communityvisibilitystate=(True if info['communityvisibilitystate'] == 3 else False),
+                profilestate=info['profilestate'],
+                personaname=info['personaname'],
+                profileurl=info['profileurl'],
+                avatar=info['avatar'],
+                commentpermission=info['commentpermission'],
+                timecreated=info['timecreated'] or None,
+                loccountrycode=info['loccountrycode'] or None
             )
         login(request, new_user)
         return redirect(me)
@@ -132,16 +134,41 @@ def offer_create(request):
 @login_required
 def profile(request, steamID):
     dude = get_object_or_404(Gamer, steamid=steamID)
-    return render(request, 'core/profile.html', {'gamer': dude})
+    return render(request, 'profile/profile.html', {'gamer': dude, 'live_offers': Offer.objects.filter(offeror=dude).count()})
 
 
+@login_required
+def profile_update(request, steamID):
+    if (request.user.steamid == steamID and request.user.gamer.API_KEY) or request.user.is_staff:
+        the_gamer = get_object_or_404(Gamer, steamid=steamID)
+        info = getUserInfo(steamID, API_KEY=request.user.gamer.API_KEY or None)
+        the_gamer.communityvisibilitystate = (True if info['communityvisibilitystate'] == 3 else False)
+        the_gamer.profilestate = info['profilestate']
+        the_gamer.personaname = info['personaname']
+        the_gamer.profileurl = info['profileurl']
+        the_gamer.avatar = info['avatar']
+        the_gamer.commentpermission = info['commentpermission']
+        if 'timecreated' in info:
+            the_gamer.timecreated = info['timecreated']
+        if 'loccountrycode' in info:
+            the_gamer.loccountrycode = info['loccountrycode']
+        the_gamer.save()
+        return redirect(profile, steamID=steamID)
+    else:
+        return HttpResponseForbidden()
+
 # PRIVATE AREA
 @login_required
 def me(request):
-    return render(request, 'core/profile.html', {'gamer': Gamer.objects.get(system_user=request.user)})
+    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()})
 
 
 @login_required
 def me_settings(request):
     dude = get_object_or_404(Gamer, system_user=request.user)
-    return render(request, 'core/settings.html', {'gamer': dude})
+    trade_form = ChangeTradeUrl(request.POST or None, instance=dude)
+    if trade_form.is_valid() and request.method == 'POST':
+        dude.tradeurl = trade_form.cleaned_data['trade_url']
+        dude.save()
+    return render(request, 'profile/settings.html', {'gamer': dude, 'form': trade_form})