Merge pull request #140 from fleizean/mpa

Default profile, online status.

README.MD

@@ -80,7 +80,7 @@ of the project.</b>
           <li>✅ Users can select a  unique display name to play the tournaments. </li>
           <li>✅ Users can update their  information. </li>
           <li>✅ Users can upload an   avatar, with a default option if none is provided. </li>
-          <li>⌛ Users can add others as friends   and view their online status. </li>
+          <li>✅ Users can add others as friends   and view their online status. </li>
           <li>✅ User profiles display stats,  such as wins and losses. </li>
           <li>✅ Each user has a <b>Match  History</b> including 1v1 games, dates, and relevant
           details, accessible to logged-in users.</li>

indianpong/pong/admin.py

@@ -19,7 +19,7 @@ class UserProfileAdmin(admin.ModelAdmin):
     list_display = ('username', 'email', 'displayname', 'avatar_thumbnail')
     search_fields = ('username', 'email', 'displayname')
     fieldsets = (
-    ('User Information', {'fields': ('username', 'password', 'displayname', 'email', 'avatar', 'friends', 'elo_point', 'indian_wallet')}),
+    ('User Information', {'fields': ('username', 'password', 'displayname', 'email', 'avatar', 'friends', 'elo_point', 'indian_wallet', 'is_online', 'is_playing')}),
     ('Dates', {'fields': ('date_joined', 'last_login')}),
     ('Roles', {'fields': ('is_staff', 'is_active', 'is_superuser', 'is_verified', 'is_42student', 'is_indianai')}),
     ('Permissions', {'fields': ('groups', 'user_permissions')}),

indianpong/pong/apps.py

@@ -1,6 +1,21 @@
 from django.apps import AppConfig
+from django.contrib.auth.signals import user_logged_in, user_logged_out
+from django.dispatch import receiver
 
 
 class PongConfig(AppConfig):
     default_auto_field = 'django.db.models.BigAutoField'
     name = 'pong'
+
+    def ready(self):
+
+        @receiver(user_logged_in)
+        def user_logged_in_handler(sender, request, **kwargs):
+            request.user.is_online = True
+            request.user.save()
+
+        @receiver(user_logged_out)
+        def user_logged_out_handler(sender, request, **kwargs):
+            request.user.is_online = False
+            request.user.save()
+

indianpong/pong/context_processors.py

@@ -9,5 +9,5 @@ def userinfo(request):
         return {}
      """
     profile = get_object_or_404(UserProfile, username=request.user.username)
-    profile_avatar = profile.avatar.url if profile.avatar else "/static/assets/profile/profilephoto.jpeg"
-    return {'username': profile.username, 'avatar': profile_avatar}
+    #profile_avatar = profile.avatar.url if profile.avatar else "/static/assets/profile/profilephoto.jpeg"
+    return {'username': profile.username, 'avatar': profile.avatar.url}

indianpong/pong/management/commands/initdata.py

@@ -3,6 +3,7 @@
 from django.core.files import File
 from os import environ
 import json
+import shutil
 
 class Command(BaseCommand):
 	def handle(self, *args, **options):
@@ -38,3 +39,10 @@ def handle(self, *args, **options):
 			StoreItem.objects.create(**item_data)
 
 		self.stdout.write(self.style.SUCCESS('Store data loaded successfully.'))
+
+		# Load default avatar to media directory
+		source_path = 'static/assets/profile/c4.jpg'
+		destination_path = 'media/c4.jpg'
+		shutil.copyfile(source_path, destination_path)
+
+

indianpong/pong/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 5.0 on 2024-02-21 15:52
+# Generated by Django 5.0 on 2024-02-27 22:14
 
 import datetime
 import django.contrib.auth.models
@@ -74,13 +74,15 @@ class Migration(migrations.Migration):
                 ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')),
                 ('displayname', models.CharField(blank=True, max_length=100, null=True)),
                 ('email', models.EmailField(max_length=254, unique=True)),
-                ('avatar', models.ImageField(blank=True, null=True, upload_to=pong.utils.get_upload_to)),
+                ('avatar', models.ImageField(blank=True, default='c4.jpg', null=True, upload_to=pong.utils.get_upload_to)),
                 ('is_verified', models.BooleanField(default=False)),
                 ('is_42student', models.BooleanField(default=False)),
                 ('is_indianai', models.BooleanField(default=False)),
                 ('preffered_lang', models.CharField(blank=True, max_length=100, null=True)),
                 ('indian_wallet', models.IntegerField(blank=True, default=0, null=True, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(9999)])),
                 ('elo_point', models.IntegerField(blank=True, default=0, null=True, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(99999)])),
+                ('is_online', models.BooleanField(default=False)),
+                ('is_playing', models.BooleanField(default=False)),
                 ('friends', models.ManyToManyField(blank=True, to=settings.AUTH_USER_MODEL)),
                 ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.group', verbose_name='groups')),
                 ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.permission', verbose_name='user permissions')),

indianpong/pong/models.py

@@ -2,7 +2,9 @@
 import os
 from django.db import models
 from django.contrib.auth.models import AbstractUser
+from django.contrib.auth.signals import user_logged_in, user_logged_out
 from django.core.validators import MinValueValidator, MaxValueValidator
+from django.dispatch import receiver
 from django.utils.html import mark_safe
 from django.core.mail import send_mail
 from django.template.loader import render_to_string
@@ -32,7 +34,7 @@ class UserProfile(AbstractUser):
     #id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
     displayname = models.CharField(max_length=100, blank=True, null=True)
     email = models.EmailField(unique=True, max_length=254)
-    avatar = models.ImageField(upload_to=get_upload_to, null=True, blank=True)
+    avatar = models.ImageField(upload_to=get_upload_to, null=True, blank=True, default="c4.jpg")
     friends = models.ManyToManyField('self', symmetrical=False, blank=True)
     social = models.OneToOneField('Social', on_delete=models.SET_NULL, null=True, blank=True)
     #channel_name = models.CharField(max_length=100, blank=True, null=True)
@@ -44,65 +46,55 @@ class UserProfile(AbstractUser):
     game_stats = models.OneToOneField('UserGameStat', on_delete=models.SET_NULL, null=True, blank=True)
     indian_wallet = models.IntegerField(blank=True, null=True, default=0, validators=[MinValueValidator(0), MaxValueValidator(9999)])
     elo_point = models.IntegerField(blank=True, null=True, default=0, validators=[MinValueValidator(0), MaxValueValidator(99999)])
-
+    is_online = models.BooleanField(default=False)
+    is_playing = models.BooleanField(default=False)
 
     def __str__(self) -> str:
         return f"{self.username}"
 
     @property
     def thumbnail(self):
-        if self.avatar:
+        return mark_safe('<img src="%s" width="50" height="50" />' % (self.avatar.url))
+    """         if self.avatar:
             return mark_safe('<img src="%s" width="50" height="50" />' % (self.avatar.url))
         else:
-            return mark_safe('<img src="/static/assets/profile/profilephoto.jpeg" width="50" height="50" />')
+            return mark_safe('<img src="/static/assets/profile/profilephoto.jpeg" width="50" height="50" />') """
 
     def get_rank_image(self):
-        if 1 <= self.elo_point <= 150:
-            return "iron.webp"
-        elif 150 < self.elo_point <= 200:
-            return "bronze.webp"
-        elif 200 < self.elo_point <= 250:
-            return "silver.webp"
-        elif 250 < self.elo_point <= 310:
-            return "gold.webp"
-        elif 310 < self.elo_point <= 360:
-            return "platinum.webp"
-        elif 360 < self.elo_point <= 420:
-            return "emerlad.webp"
-        elif 420 < self.elo_point <= 500:
-            return "diamond.webp"
-        elif 500 < self.elo_point <= 550:
-            return "master.webp"
-        elif 550 < self.elo_point <= 600:
-            return "grandmaster.webp"
-        elif 600 < self.elo_point:
-            return "challenger.webp"
-        else:
-            return "unranked.webp"
-
+        ranks = {
+            (1, 150): "iron.webp",
+            (150, 200): "bronze.webp",
+            (200, 250): "silver.webp",
+            (250, 310): "gold.webp",
+            (310, 360): "platinum.webp",
+            (360, 420): "emerlad.webp",
+            (420, 500): "diamond.webp",
+            (500, 550): "master.webp",
+            (550, 600): "grandmaster.webp",
+            (600, float('inf')): "challenger.webp"
+        }
+        for rank_range, rank_image in ranks.items():
+            if rank_range[0] <= self.elo_point <= rank_range[1]:
+                return rank_image
+        return "unranked.webp"
+
     def get_rank_name(self):
-        if 1 <= self.elo_point <= 150:
-            return "Iron"
-        elif 150 < self.elo_point <= 200:
-            return "Bronze"
-        elif 200 < self.elo_point <= 250:
-            return "Silver"
-        elif 250 < self.elo_point <= 310:
-            return "Gold"
-        elif 310 < self.elo_point <= 360:
-            return "Platinum"
-        elif 360 < self.elo_point <= 420:
-            return "Emerald"
-        elif 420 < self.elo_point <= 500:
-            return "Diamond"
-        elif 500 < self.elo_point <= 550:
-            return "Master"
-        elif 550 < self.elo_point <= 600:
-            return "Grandmaster"
-        elif 600 < self.elo_point:
-            return "Challenger"
-        else:
-            return "Unranked"
+        ranks = {
+            (1, 150): "Iron",
+            (150, 200): "Bronze",
+            (200, 250): "Silver",
+            (250, 310): "Gold",
+            (310, 360): "Platinum",
+            (360, 420): "Emerald",
+            (420, 500): "Diamond",
+            (500, 550): "Master",
+            (550, 600): "Grandmaster",
+            (600, float('inf')): "Challenger"
+        }
+        for rank_range, rank_name in ranks.items():
+            if rank_range[0] <= self.elo_point <= rank_range[1]:
+                return rank_name
+        return "Unranked"
 
 
 class UserItem(models.Model):

indianpong/pong/templates/_nav.html

@@ -54,4 +54,13 @@
       </li>
     </ul>
     <div class="burger-menu">&#9776;</div>
-  </nav>
+  </nav>
+<script>
+  window.addEventListener("beforeunload", function(e) {
+    // Sayfa kapatılmadan önce bir istek gönder
+    var xhr = new XMLHttpRequest();
+    xhr.open("GET", "/logout", false);  // Sunucuya logout işlemi için bir istek gönder
+    xhr.send();
+});
+</script>
+  <script src="{% static "js/index.js" %}"></script>

indianpong/pong/templates/base.html

@@ -48,7 +48,6 @@
     </div>
     <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.min.js"></script>
     {% comment %} <script src="{% static "js/bootstrap.min.js" %}"></script> {% endcomment %}
-    <script src="{% static "js/index.js" %}"></script>
 
 
 </body>

indianpong/pong/templates/chat.html

@@ -56,7 +56,7 @@
                   {% for user in users %}
                       <li>
                         <a href="{% url 'start_chat' user %}" data-link>
-                          <img class="content-message-image" src="{% if user.avatar %}{{ user.avatar.url }}{% else %}/static/assets/profile/profilephoto.jpeg{% endif %}" alt="" />
+                          <img class="content-message-image" src="{{ user.avatar.url }}" alt="" />
 
                           <span class="content-message-info">
                             <span class="content-message-name">{{ user }}</span>

indianpong/pong/templates/friends.html

@@ -12,16 +12,11 @@
     <div class="search-card">
         <div class="card-container-wrapper">
         <!-- Arama sonuçları -->
-        {% if friends %}
             {% for friend in friends %}
               <div class="card-containers">
                 <div class="profile-card">
                     <div class="image">
-                        {% if friend.avatar %}
-                            <a href="/profile/{{friend.username}}"><img src="{{friend.avatar.url}}" alt="" class="profile-img" /></a>
-                        {% else %}
-                            <a href="/profile/{{friend.username}}"><img src="/static/assets/profile/profilephoto.jpeg" alt="" class="profile-img" /></a>
-                        {% endif %}
+                        <a href="/profile/{{friend.username}}"><img src="{{friend.avatar.url}}" alt="" class="profile-img" {% if friend.is_online and not friend.is_playing %} style="border: 3px solid #4CAF4F" {% elif friend.is_playing %} style="border: 3px solid #ffa600" {% else %} style="border: 3px solid #ff0000" {% endif %} /></a>
                     </div>
                     <div class="text-data">
                       <span class="name">{{friend.username}}</span>
@@ -53,23 +48,22 @@
                       <div class="analytics">
                         <div class="data">
                           <i class="bi bi-dice-1-fill" style="color: #FF5733;"></i>
-                          <span class="number">50</span>
+                          <span class="number">{% if friend.game_stats.total_games_pong %} {{friend.game_stats.total_games_pong}} {% else %} 0 {% endif %}</span>
                         </div>
                         <div class="data">
                           <i class="bi bi-trophy-fill" style="color: #FFD601;"></i>
-                          <span class="number">50</span>
+                          <span class="number">{% if friend.game_stats.total_win_pong %} {{friend.game_stats.total_win_pong}} {% else %} 0 {% endif %}</span>
                         </div>
                         <div class="data">
                           <i class="bi bi-award-fill" style="color: #4CAF4F;"></i>
-                          <span class="number">100%</span>
+                          <span class="number">{% if friend.game_stats.formatted_win_rate %} {{friend.game_stats.formatted_win_rate}} {% else %} 0% {% endif %}</span>
                         </div>
                       </div>
                 </div>
               </div>
+              {% empty %}
+              <p style="color:orange; font-weight:bold; text-align: center;">No friends found.</p>
               {% endfor %}
-              {% else %}
-                <p style="color:orange; font-weight:bold; text-align: center;">No friends found.</p>
-              {% endif %}
             </div>
             <nav aria-label="Page navigation example " class="mt-4">
               <ul class="pagination justify-content-center">

indianpong/pong/templates/gamewithchat.html

@@ -289,6 +289,24 @@
             chatPopup.style.display = "none";
         }
     });
+
+    var canvas = document.getElementById("myCanvas");
+
+function setCanvasSize() {
+    if (canvas) {
+        var maxWidth = window.innerWidth - 370;
+        var maxHeight = window.innerHeight - 100;
+        console.log("width" + maxWidth)
+        console.log("height" + maxHeight)
+        // Canvas'ın genişliğini ve yüksekliğini belirle
+        canvas.width = maxWidth;
+        canvas.height = maxHeight;
+    }
+}
+
+document.addEventListener("DOMContentLoaded", setCanvasSize);
+window.addEventListener("resize", setCanvasSize);
+
 </script>
 </html>
 

indianpong/pong/templates/login.html

@@ -83,7 +83,7 @@
     {% endif %}
   </div>
 </div>
-<script src="{% static "js/index.js" %}"></script>
+<script src="{% static "js/login-register.js" %}"></script>
 
 {% endblock %}