From 2725e6fb050c46474c5ec5b31a1f15a5b8a8d3c2 Mon Sep 17 00:00:00 2001 From: Pratyush Desai Date: Fri, 7 Feb 2025 11:13:17 +0530 Subject: [PATCH] Home and Games V1 views Added an Image for the Grid Thumbnail There is plenty to fix but that's trivial shall polish it at the end of v1 Signed-off-by: Pratyush Desai --- webpanel/migrations/0006_game_image_url.py | 18 ++ webpanel/models.py | 1 + .../templates/webpanel/active_servers.html | 46 ---- webpanel/templates/webpanel/base.html | 205 ++++++++++++++++++ webpanel/templates/webpanel/game_detail.html | 15 -- webpanel/templates/webpanel/game_servers.html | 49 ----- webpanel/templates/webpanel/games.html | 26 +++ webpanel/templates/webpanel/home.html | 135 +++++++----- webpanel/urls.py | 9 +- webpanel/views.py | 52 ++--- 10 files changed, 364 insertions(+), 192 deletions(-) create mode 100644 webpanel/migrations/0006_game_image_url.py delete mode 100644 webpanel/templates/webpanel/active_servers.html create mode 100644 webpanel/templates/webpanel/base.html delete mode 100644 webpanel/templates/webpanel/game_detail.html delete mode 100644 webpanel/templates/webpanel/game_servers.html create mode 100644 webpanel/templates/webpanel/games.html diff --git a/webpanel/migrations/0006_game_image_url.py b/webpanel/migrations/0006_game_image_url.py new file mode 100644 index 0000000..79b39c0 --- /dev/null +++ b/webpanel/migrations/0006_game_image_url.py @@ -0,0 +1,18 @@ +# Generated by Django 5.1.5 on 2025-02-07 05:14 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("webpanel", "0005_server_command_args_server_docker_run_command"), + ] + + operations = [ + migrations.AddField( + model_name="game", + name="image_url", + field=models.URLField(blank=True, null=True), + ), + ] diff --git a/webpanel/models.py b/webpanel/models.py index 4ddc928..5556b00 100644 --- a/webpanel/models.py +++ b/webpanel/models.py @@ -3,6 +3,7 @@ import podman class Game(models.Model): name = models.CharField(max_length=100) + image_url = models.URLField(blank=True, null=True) genre = models.CharField(max_length=50, blank=True, null=True) def __str__(self): diff --git a/webpanel/templates/webpanel/active_servers.html b/webpanel/templates/webpanel/active_servers.html deleted file mode 100644 index e21bbed..0000000 --- a/webpanel/templates/webpanel/active_servers.html +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - Active Servers - - - -

Active Servers

- {% if servers %} - {% for server in servers %} -
- Server: {{ server.game.name }} -
-

Genre: {{ server.game.genre }}

-

IP Address: {{ server.ip_address }}

-

Port: {{ server.port }}

-

Status: Online

-
-
- {% endfor %} - {% else %} -

No active servers found.

- {% endif %} - - diff --git a/webpanel/templates/webpanel/base.html b/webpanel/templates/webpanel/base.html new file mode 100644 index 0000000..3964615 --- /dev/null +++ b/webpanel/templates/webpanel/base.html @@ -0,0 +1,205 @@ + + + + + + + {% block title %}Game Server Supervisor{% endblock %} + + + + +
+
+ Home + Games + Mods +
+
+
+ +
+ Auth / Settings +
Dp
+
+
+ +
+ {% block content %}{% endblock %} +
+ + + + + \ No newline at end of file diff --git a/webpanel/templates/webpanel/game_detail.html b/webpanel/templates/webpanel/game_detail.html deleted file mode 100644 index d2ed9b1..0000000 --- a/webpanel/templates/webpanel/game_detail.html +++ /dev/null @@ -1,15 +0,0 @@ - - -{{ game.name }} - -

{{ game.name }}

-

{{ game.description }}

-

Servers

- - Back to Games - - diff --git a/webpanel/templates/webpanel/game_servers.html b/webpanel/templates/webpanel/game_servers.html deleted file mode 100644 index 185438c..0000000 --- a/webpanel/templates/webpanel/game_servers.html +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - Active Servers for {{ game.name }} - - - -

Active Servers for {{ game.name }}

-

Genre: {{ game.genre }}

- {% if servers %} - {% for server in servers %} -
- Server: {{ game.name }} -
-

IP Address: {{ server.ip_address }}

-

Port: {{ server.port }}

-

Status: Online

-
-
- {% endfor %} - {% else %} -

No active servers found for this game.

- {% endif %} - - diff --git a/webpanel/templates/webpanel/games.html b/webpanel/templates/webpanel/games.html new file mode 100644 index 0000000..24fd67f --- /dev/null +++ b/webpanel/templates/webpanel/games.html @@ -0,0 +1,26 @@ +{% extends 'webpanel/base.html' %} + +{% block title %}Games - Game Servers{% endblock %} + +{% block content %} +

Public Game Servers

+ + + +
+
+
Quake II
+
Unreal Tournament
+
Quake III Arena
+
+
+
+{% endblock %} diff --git a/webpanel/templates/webpanel/home.html b/webpanel/templates/webpanel/home.html index 35ce3e8..b9fe7d0 100644 --- a/webpanel/templates/webpanel/home.html +++ b/webpanel/templates/webpanel/home.html @@ -1,53 +1,84 @@ - - - - - - GibCasa GSM - - - -

Game Hosting Panel

-

Quick Links

- -

Games

- - - +{% extends 'webpanel/base.html' %} - +{% block title %}Home - Game Servers{% endblock %} + + +{% block content %} +

Public Game Servers

+ + + +
+
+

Concise yet extreme 3D RGB features and services list

+
+
+

Upcoming shit

+
+
+
    +
  1. Server Uptime & reliability
    2. +
  2. Craziest Player Stats
    3. +
  3. ??
    4. +
+
+
+{% endblock %} diff --git a/webpanel/urls.py b/webpanel/urls.py index 42bbbdd..5defa6f 100644 --- a/webpanel/urls.py +++ b/webpanel/urls.py @@ -2,8 +2,9 @@ from django.urls import path from . import views urlpatterns = [ - path('', views.home_view, name='home'), - path('/', views.game_detail, name='game_detail'), - path('active-servers/', views.active_servers_view, name='active-servers'), - path('games//', views.game_servers_view, name='game-servers'), + path('', views.home, name='home'), + path('games/', views.games, name='games') + # path('/', views.game_detail, name='game_detail'), + # path('active-servers/', views.active_servers_view, name='active-servers'), + # path('games//', views.game_servers_view, name='game-servers'), ] \ No newline at end of file diff --git a/webpanel/views.py b/webpanel/views.py index a2ce261..6d8ec05 100644 --- a/webpanel/views.py +++ b/webpanel/views.py @@ -1,41 +1,41 @@ from django.shortcuts import render, get_object_or_404 from .models import Game, Server -def home_view(request): +def home(request): """Display the home page with links to other views.""" games = Game.objects.all() # Fetch all games return render(request, 'webpanel/home.html', {'games': games}) -# def game_list(request): -# games = Game.objects.all() -# return render(request, 'webpanel/game_list.html', {'games': games}) +def games(request): + games = Game.objects.all() + return render(request, 'webpanel/games.html', {'games': games}) -def game_detail(request, pk): - game = get_object_or_404(Game, pk=pk) - return render(request, 'webpanel/game_detail.html', {'game': game}) +# def game_detail(request, pk): +# game = get_object_or_404(Game, pk=pk) +# return render(request, 'webpanel/game_detail.html', {'game': game}) -def active_servers_view(request): - """Fetch and display all active servers.""" - # Sync server status before fetching - servers = Server.objects.all() - for server in servers: - server.sync_status() +# def active_servers_view(request): +# """Fetch and display all active servers.""" +# # Sync server status before fetching +# servers = Server.objects.all() +# for server in servers: +# server.sync_status() - # Fetch only servers with status 'online' - active_servers = Server.objects.filter(status='online') +# # Fetch only servers with status 'online' +# active_servers = Server.objects.filter(status='online') - return render(request, 'webpanel/active_servers.html', {'servers': active_servers}) +# return render(request, 'webpanel/active_servers.html', {'servers': active_servers}) -def game_servers_view(request, game_name): - """Fetch and display active servers for a specific game.""" - game = get_object_or_404(Game, name=game_name) +# def game_servers_view(request, game_name): +# """Fetch and display active servers for a specific game.""" +# game = get_object_or_404(Game, name=game_name) - # Sync server status before fetching - servers = Server.objects.filter(game=game) - for server in servers: - server.sync_status() +# # Sync server status before fetching +# servers = Server.objects.filter(game=game) +# for server in servers: +# server.sync_status() - # Fetch only active servers for the game - active_servers = servers.filter(status='online') +# # Fetch only active servers for the game +# active_servers = servers.filter(status='online') - return render(request, 'webpanel/game_servers.html', {'game': game, 'servers': active_servers}) \ No newline at end of file +# return render(request, 'webpanel/game_servers.html', {'game': game, 'servers': active_servers}) \ No newline at end of file