diff --git a/GameServerSupervisor/settings.py b/GameServerSupervisor/settings.py index cb09b1e..178bae8 100644 --- a/GameServerSupervisor/settings.py +++ b/GameServerSupervisor/settings.py @@ -121,4 +121,4 @@ STATIC_URL = "static/" # Default primary key field type # https://docs.djangoproject.com/en/5.1/ref/settings/#default-auto-field -DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField" +DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField" \ No newline at end of file diff --git a/game_thumbnails/4210332-unreal-tournament-2004-linux-front-cover.jpg b/game_thumbnails/4210332-unreal-tournament-2004-linux-front-cover.jpg new file mode 100644 index 0000000..5088337 Binary files /dev/null and b/game_thumbnails/4210332-unreal-tournament-2004-linux-front-cover.jpg differ diff --git a/game_thumbnails/7647786-quake-ii-windows-front-cover.jpg b/game_thumbnails/7647786-quake-ii-windows-front-cover.jpg new file mode 100644 index 0000000..7b92ff4 Binary files /dev/null and b/game_thumbnails/7647786-quake-ii-windows-front-cover.jpg differ diff --git a/game_thumbnails/Unreal_Tournament_box.JPG b/game_thumbnails/Unreal_Tournament_box.JPG new file mode 100644 index 0000000..c2d7794 Binary files /dev/null and b/game_thumbnails/Unreal_Tournament_box.JPG differ diff --git a/game_thumbnails/th-3810891248.jpeg b/game_thumbnails/th-3810891248.jpeg new file mode 100644 index 0000000..f183a85 Binary files /dev/null and b/game_thumbnails/th-3810891248.jpeg differ diff --git a/game_thumbnails/th-4252175577.jpeg b/game_thumbnails/th-4252175577.jpeg new file mode 100644 index 0000000..ab3ca4b Binary files /dev/null and b/game_thumbnails/th-4252175577.jpeg differ diff --git a/webpanel/admin.py b/webpanel/admin.py index be0085f..c3a7d71 100644 --- a/webpanel/admin.py +++ b/webpanel/admin.py @@ -5,7 +5,7 @@ import podman @admin.register(Game) class GameAdmin(admin.ModelAdmin): - list_display = ('name', 'genre') + list_display = ('name', 'genre', 'thumbnail') search_fields = ('name', 'genre') ordering = ('name',) diff --git a/webpanel/migrations/0007_game_thumbnail.py b/webpanel/migrations/0007_game_thumbnail.py new file mode 100644 index 0000000..ccd1aa4 --- /dev/null +++ b/webpanel/migrations/0007_game_thumbnail.py @@ -0,0 +1,20 @@ +# Generated by Django 5.1.5 on 2025-02-11 01:27 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("webpanel", "0006_rename_docker_image_server_image_and_more"), + ] + + operations = [ + migrations.AddField( + model_name="game", + name="thumbnail", + field=models.ImageField( + blank=True, null=True, upload_to="game_thumbnails/" + ), + ), + ] diff --git a/webpanel/models.py b/webpanel/models.py index 9a18890..93a3c05 100644 --- a/webpanel/models.py +++ b/webpanel/models.py @@ -4,6 +4,8 @@ import podman class Game(models.Model): name = models.CharField(max_length=100) genre = models.CharField(max_length=50, blank=True, null=True) + thumbnail = models.ImageField(upload_to='game_thumbnails/', null=True, blank=True) + def __str__(self): return self.name 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..4b3e3c0 --- /dev/null +++ b/webpanel/templates/webpanel/base.html @@ -0,0 +1,212 @@ + + + + + + + {% block title %}Game Server Supervisor{% endblock %} + + + + +
+
+ 
+┬   ┌┬┐ ┬─┐ ┌─┐ ┬─┐ ┐─┐ ┬─┐
+│    │  │─│ │   │─┤ └─┐ │─┤
+┘─┘ └┴┘ │─┘ └─┘ ┘ │ ──┘ ┘ │
+
+
+ Home + Games + Mods +
+ +
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 index d2ed9b1..8754947 100644 --- a/webpanel/templates/webpanel/game_detail.html +++ b/webpanel/templates/webpanel/game_detail.html @@ -1,15 +1,31 @@ - - -{{ game.name }} - -

{{ game.name }}

-

{{ game.description }}

-

Servers

- - Back to Games - - +{% extends 'webpanel/base.html' %} + +{% block title %}{{ game.name }} - Game Details{% endblock %} + +{% block content %} +

{{ game.name }}

+ + + +
+
+ {{ game.name }} +
+
+

Pull data from some open API to populate information about the game and render it.

+ +
+
+{% endblock %} 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..faf3fff --- /dev/null +++ b/webpanel/templates/webpanel/games.html @@ -0,0 +1,20 @@ +{% extends 'webpanel/base.html' %} + +{% block title %}Games - Game Servers{% endblock %} + +{% block content %} +

Public Game Servers

+ +
+ {% for game in games %} +
+ + {{ game.name }} +

{{ game.name }}

+ +
+ {% empty %} +

No games available.

+ {% endfor %} +
+{% endblock %} diff --git a/webpanel/templates/webpanel/home.html b/webpanel/templates/webpanel/home.html index 35ce3e8..36f6bdb 100644 --- a/webpanel/templates/webpanel/home.html +++ b/webpanel/templates/webpanel/home.html @@ -1,53 +1,74 @@ - - - - - - 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 %} \ No newline at end of file diff --git a/webpanel/urls.py b/webpanel/urls.py index 42bbbdd..1b70220 100644 --- a/webpanel/urls.py +++ b/webpanel/urls.py @@ -1,9 +1,16 @@ +from django.conf import settings +from django.conf.urls.static import static 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'), -] \ No newline at end of file + path('', views.home, name='home'), + path('games/', views.games, name='games'), + path('games//', 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'), +] + +if settings.DEBUG: # Only serve media files in development + urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) \ No newline at end of file diff --git a/webpanel/views.py b/webpanel/views.py index a2ce261..df5b32a 100644 --- a/webpanel/views.py +++ b/webpanel/views.py @@ -1,41 +1,15 @@ 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) +def game_detail(request, game_name): + game = get_object_or_404(Game, id=game_name) 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() - - # Fetch only servers with status 'online' - active_servers = Server.objects.filter(status='online') - - 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) - - # 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') - - return render(request, 'webpanel/game_servers.html', {'game': game, 'servers': active_servers}) \ No newline at end of file