feat(#19 ): добавить ссылку на игру в карточку батча

- SessionBatchDto: добавлено поле JoinLink - SessionViewItem: добавлено поле JoinLink - SessionBatchViewBuilder: прокидывание JoinLink из DTO в ViewModel - CreateSessionHandler, SessionService: обновлены все вызовы конструктора - TelegramSessionBatchRenderer (Bot + Web): рендеринг ссылки в карточке - Добавлены тесты на наличие ссылки в рендере - Все 7 SQL-запросов, загружающих SessionBatchDto, обновлены с join_link AS JoinLink - Бамп версии до 1.11.0 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
Merge pull request #50 : fix(ui): prevent NavMenu logo from overlapping hamburger on mobile
2026-05-10 18:13:55 +03:00 · 2026-05-08 13:57:04 +03:00 · 2026-05-08 13:41:48 +03:00 · 2026-05-08 13:24:02 +03:00 · 2026-05-08 13:16:16 +03:00 · 2026-05-08 13:15:53 +03:00
26 changed files with 74 additions and 41 deletions
@@ -6,7 +6,7 @@ on:
      - main 

 env:
-  VERSION: 1.10.4
+  VERSION: 1.11.0

 jobs:
  # ЧАСТЬ 1: Собираем образы и кладем в Gitea (чтобы делиться с ребятами)
@@ -1,6 +1,6 @@
 <Project>
  <PropertyGroup>
-    <Version>1.10.4</Version>
+    <Version>1.11.0</Version>
    <TargetFramework>net10.0</TargetFramework>
    <LangVersion>preview</LangVersion>
    <Nullable>enable</Nullable>
@@ -17,7 +17,7 @@ services:
      retries: 10

  bot:
-    image: git.codeanddice.ru/toutsu/gmrelay-bot:1.10.4
+    image: git.codeanddice.ru/toutsu/gmrelay-bot:1.11.0
    restart: always
    depends_on:
      db:
@@ -30,7 +30,7 @@ services:
      - gmrelay

  web:
-    image: git.codeanddice.ru/toutsu/gmrelay-web:1.10.4
+    image: git.codeanddice.ru/toutsu/gmrelay-web:1.11.0
    restart: always
    depends_on:
      db:
@@ -69,7 +69,7 @@ public sealed class CancelSessionHandler(

        // 3. Загружаем весь батч для перерисовки
        var batchSessions = await connection.QueryAsync<SessionBatchDto>(
-            @"SELECT id as SessionId, scheduled_at as ScheduledAt, status as Status, max_players as MaxPlayers
+            @"SELECT id as SessionId, scheduled_at as ScheduledAt, status as Status, max_players as MaxPlayers, join_link as JoinLink
              FROM sessions
              WHERE batch_id = @BatchId
              ORDER BY scheduled_at",
@@ -178,7 +178,7 @@ public sealed class CreateSessionHandler(
                    },
                    transaction);

-                sessions.Add(new SessionBatchDto(sessionId, scheduledAt.UtcDateTime, SessionStatus.Planned, parseResult.MaxPlayers));
+                sessions.Add(new SessionBatchDto(sessionId, scheduledAt.UtcDateTime, SessionStatus.Planned, parseResult.MaxPlayers, link));
            }

            await transaction.CommitAsync(cancellationToken);
@@ -115,7 +115,7 @@ public sealed class JoinSessionHandler(

            // Загружаем весь батч для перерисовки
            var batchSessions = await connection.QueryAsync<SessionBatchDto>(
-                @"SELECT id as SessionId, scheduled_at as ScheduledAt, status as Status, max_players as MaxPlayers
+                @"SELECT id as SessionId, scheduled_at as ScheduledAt, status as Status, max_players as MaxPlayers, join_link as JoinLink
                  FROM sessions
                  WHERE batch_id = @BatchId
                  ORDER BY scheduled_at",
@@ -157,7 +157,8 @@ public sealed class LeaveSessionHandler(
                SELECT id AS SessionId,
                       scheduled_at AS ScheduledAt,
                       status AS Status,
-                       max_players AS MaxPlayers
+                       max_players AS MaxPlayers,
+                       join_link AS JoinLink
                FROM sessions
                WHERE batch_id = @BatchId
                ORDER BY scheduled_at
@@ -137,7 +137,8 @@ public sealed class PromoteWaitlistedPlayerHandler(
                SELECT id AS SessionId,
                       scheduled_at AS ScheduledAt,
                       status AS Status,
-                       max_players AS MaxPlayers
+                       max_players AS MaxPlayers,
+                       join_link AS JoinLink
                FROM sessions
                WHERE batch_id = @BatchId
                ORDER BY scheduled_at
@@ -357,7 +357,7 @@ public sealed class HandleRescheduleTimeInputHandler(
            await using var conn = await dataSource.OpenConnectionAsync(ct);

            var batchSessions = (await conn.QueryAsync<SessionBatchDto>(
-                "SELECT id AS SessionId, scheduled_at AS ScheduledAt, status AS Status, max_players AS MaxPlayers FROM sessions WHERE batch_id = @BatchId ORDER BY scheduled_at",
+                "SELECT id AS SessionId, scheduled_at AS ScheduledAt, status AS Status, max_players AS MaxPlayers, join_link AS JoinLink FROM sessions WHERE batch_id = @BatchId ORDER BY scheduled_at",
                new { proposal.BatchId })).ToList();

            var batchParticipants = (await conn.QueryAsync<ParticipantBatchDto>(
@@ -286,7 +286,7 @@ public sealed class RescheduleVotingDeadlineService(
            await using var connection = await dataSource.OpenConnectionAsync(ct);

            var batchSessions = (await connection.QueryAsync<SessionBatchDto>(
-                "SELECT id AS SessionId, scheduled_at AS ScheduledAt, status AS Status, max_players AS MaxPlayers FROM sessions WHERE batch_id = @BatchId ORDER BY scheduled_at",
+                "SELECT id AS SessionId, scheduled_at AS ScheduledAt, status AS Status, max_players AS MaxPlayers, join_link AS JoinLink FROM sessions WHERE batch_id = @BatchId ORDER BY scheduled_at",
                new { proposal.BatchId })).ToList();

            var batchParticipants = (await connection.QueryAsync<ParticipantBatchDto>(
@@ -21,6 +21,11 @@ public static class TelegramSessionBatchRenderer
                ? $"👥 Места: {session.ActivePlayerCount}/{session.MaxPlayers.Value}\n"
                : $"👥 Игроки ({session.ActivePlayerCount}):\n";

+            if (!string.IsNullOrEmpty(session.JoinLink))
+            {
+                messageText += $"🔗 <a href=\"{System.Net.WebUtility.HtmlEncode(session.JoinLink)}\">Ссылка на игру</a>\n";
+            }
+
            if (session.ActivePlayers.Count > 0)
            {
                messageText += string.Join("\n", session.ActivePlayers.Select(p =>
@@ -1,4 +1,4 @@
 namespace GmRelay.Shared.Rendering;

-public sealed record SessionBatchDto(Guid SessionId, DateTime ScheduledAt, string Status, int? MaxPlayers);
+public sealed record SessionBatchDto(Guid SessionId, DateTime ScheduledAt, string Status, int? MaxPlayers, string JoinLink);
 public sealed record ParticipantBatchDto(Guid SessionId, string DisplayName, string? TelegramUsername, string RegistrationStatus);
@@ -38,6 +38,7 @@ public static class SessionBatchViewBuilder
                session.ScheduledAt,
                session.Status,
                session.MaxPlayers,
+                session.JoinLink,
                activePlayers.Count,
                activePlayers,
                waitlistedPlayers,
@@ -11,6 +11,7 @@ public sealed record SessionViewItem(
    DateTime ScheduledAt,
    string Status,
    int? MaxPlayers,
+    string JoinLink,
    int ActivePlayerCount,
    IReadOnlyList<PlayerViewItem> ActivePlayers,
    IReadOnlyList<PlayerViewItem> WaitlistedPlayers,
@@ -2,7 +2,7 @@

 <div class="nav-header">
    <a class="nav-brand" href="">
-        <span class="nav-brand-icon">🐢</span>
+        <img src="logo.png" alt="GM-Relay" class="nav-brand-icon" />
        <span class="nav-brand-text">GM-Relay</span>
    </a>
    <button class="nav-toggle" @onclick="ToggleMenu" aria-label="Переключить меню">
@@ -56,7 +56,7 @@
                    </button>
                </form>

-                <div class="nav-version">v1.10.4</div>
+                <div class="nav-version">v1.11.0</div>
            </div>
        </Authorized>
        <NotAuthorized>
@@ -16,10 +16,10 @@
 }

 .nav-brand-icon {
-    font-size: 1.5rem;
-    line-height: 1;
-    vertical-align: middle;
-    margin-top: -2px;
+    width: 1.5rem;
+    height: 1.5rem;
+    object-fit: contain;
+    display: block;
 }

 .nav-brand-text {
@@ -198,6 +198,7 @@
    }

    .nav-header {
+        padding-left: 3.75rem;
        padding-right: 0.75rem;
    }
 }
@@ -8,7 +8,7 @@

 <div class="login-page">
    <div class="login-card">
-        <div class="login-logo">🎲</div>
+        <img src="logo.png" alt="GM-Relay" class="login-logo" />
        <h1 class="login-title">GM-Relay</h1>
        <p class="login-subtitle">Войдите через Telegram для управления игровыми сессиями</p>

@@ -8,7 +8,7 @@

 <div class="mini-app-page">
    <div class="mini-app-auth-card" data-auth-status="@miniAppAuthStatus">
-        <div class="mini-app-logo">🎲</div>
+        <img src="logo.png" alt="GM-Relay" class="mini-app-logo" />
        <h1>GM-Relay</h1>
        <p>@statusMessage</p>

@@ -938,7 +938,7 @@ public sealed class SessionService(
                },
                transaction);

-            renderedSessions.Add(new SessionBatchDto(sessionId, scheduledAt, SessionStatus.Planned, sourceSession.MaxPlayers));
+            renderedSessions.Add(new SessionBatchDto(sessionId, scheduledAt, SessionStatus.Planned, sourceSession.MaxPlayers, batchJoinLink));
        }

        await transaction.CommitAsync();
@@ -1147,7 +1147,7 @@ public sealed class SessionService(
                },
                transaction);

-            renderedSessions.Add(new SessionBatchDto(sessionId, scheduledAt, SessionStatus.Planned, template.MaxPlayers));
+            renderedSessions.Add(new SessionBatchDto(sessionId, scheduledAt, SessionStatus.Planned, template.MaxPlayers, template.JoinLink));
        }

        await transaction.CommitAsync();
@@ -1245,7 +1245,7 @@ public sealed class SessionService(
            await using var conn = await dataSource.OpenConnectionAsync();

            var sessions = (await conn.QueryAsync<SessionBatchDto>(
-                "SELECT id AS SessionId, scheduled_at AS ScheduledAt, status AS Status, max_players AS MaxPlayers FROM sessions WHERE batch_id = @BatchId ORDER BY scheduled_at",
+                "SELECT id AS SessionId, scheduled_at AS ScheduledAt, status AS Status, max_players AS MaxPlayers, join_link AS JoinLink FROM sessions WHERE batch_id = @BatchId ORDER BY scheduled_at",
                new { BatchId = batchId })).ToList();

            var participants = (await conn.QueryAsync<ParticipantBatchDto>(
@@ -20,6 +20,11 @@ public static class TelegramSessionBatchRenderer
                ? $"👥 Места: {session.ActivePlayerCount}/{session.MaxPlayers.Value}\n"
                : $"👥 Игроки ({session.ActivePlayerCount}):\n";

+            if (!string.IsNullOrEmpty(session.JoinLink))
+            {
+                messageText += $"🔗 <a href=\"{System.Net.WebUtility.HtmlEncode(session.JoinLink)}\">Ссылка на игру</a>\n";
+            }
+
            if (session.ActivePlayers.Count > 0)
            {
                messageText += string.Join("\n", session.ActivePlayers.Select(p =>
@@ -877,8 +877,13 @@ select option {
 }

 .login-logo {
-    font-size: 2.5rem;
+    width: 2.5rem;
+    height: 2.5rem;
+    object-fit: contain;
    margin-bottom: 0.5rem;
+    display: block;
+    margin-left: auto;
+    margin-right: auto;
 }

 .login-title {
@@ -919,8 +924,13 @@ select option {
 }

 .mini-app-logo {
-    font-size: 2.25rem;
+    width: 2.25rem;
+    height: 2.25rem;
+    object-fit: contain;
    margin-bottom: 0.75rem;
+    display: block;
+    margin-left: auto;
+    margin-right: auto;
 }

 .mini-app-auth-card h1 {
@@ -147,6 +147,7 @@ public sealed class TelegramLandingPromisesSmokeTests
            string title,
            IReadOnlyList<DateTimeOffset> scheduledTimes,
            int? maxPlayers,
+            string joinLink,
            SessionNotificationMode notificationMode)
        {
            Title = title;
@@ -156,7 +157,8 @@ public sealed class TelegramLandingPromisesSmokeTests
                    Guid.NewGuid(),
                    scheduledAt.UtcDateTime,
                    SessionStatus.Planned,
-                    maxPlayers))
+                    maxPlayers,
+                    joinLink))
                .ToList();
        }

@@ -173,6 +175,7 @@ public sealed class TelegramLandingPromisesSmokeTests
                parseResult.Title!,
                parseResult.ScheduledTimes,
                parseResult.MaxPlayers,
+                parseResult.Link!,
                notificationMode);

            scenario.RenderBatch();
@@ -318,7 +321,8 @@ public sealed class TelegramLandingPromisesSmokeTests
                        session.Id,
                        session.ScheduledAt,
                        session.Status,
-                        session.MaxPlayers))
+                        session.MaxPlayers,
+                        session.JoinLink))
                    .ToList(),
                participants
                    .Select(participant => new ParticipantBatchDto(
@@ -371,7 +375,8 @@ public sealed class TelegramLandingPromisesSmokeTests
        Guid Id,
        DateTime ScheduledAt,
        string Status,
-        int? MaxPlayers)
+        int? MaxPlayers,
+        string JoinLink)
    {
        public DateTime ScheduledAt { get; set; } = ScheduledAt;
    }
@@ -14,9 +14,9 @@ public sealed class SessionBatchViewBuilderTests

        var sessions = new[]
        {
-            new SessionBatchDto(secondSessionId, new DateTime(2026, 4, 27, 18, 0, 0, DateTimeKind.Utc), SessionStatus.Planned, 4),
-            new SessionBatchDto(cancelledSessionId, new DateTime(2026, 4, 28, 18, 0, 0, DateTimeKind.Utc), SessionStatus.Cancelled, null),
-            new SessionBatchDto(firstSessionId, new DateTime(2026, 4, 26, 18, 0, 0, DateTimeKind.Utc), SessionStatus.Planned, 2)
+            new SessionBatchDto(secondSessionId, new DateTime(2026, 4, 27, 18, 0, 0, DateTimeKind.Utc), SessionStatus.Planned, 4, "https://example.com/game"),
+            new SessionBatchDto(cancelledSessionId, new DateTime(2026, 4, 28, 18, 0, 0, DateTimeKind.Utc), SessionStatus.Cancelled, null, ""),
+            new SessionBatchDto(firstSessionId, new DateTime(2026, 4, 26, 18, 0, 0, DateTimeKind.Utc), SessionStatus.Planned, 2, "https://example.com/game")
        };
        var participants = new[]
        {
@@ -38,7 +38,7 @@ public sealed class SessionBatchViewBuilderTests
    public void Build_ShouldCalculatePlayerCounts()
    {
        var sessionId = Guid.NewGuid();
-        var sessions = new[] { new SessionBatchDto(sessionId, DateTime.UtcNow, SessionStatus.Planned, 4) };
+        var sessions = new[] { new SessionBatchDto(sessionId, DateTime.UtcNow, SessionStatus.Planned, 4, "https://example.com/game") };
        var participants = new[]
        {
            new ParticipantBatchDto(sessionId, "Alice", "alice", ParticipantRegistrationStatus.Active),
@@ -59,7 +59,7 @@ public sealed class SessionBatchViewBuilderTests
    public void Build_ShouldIncludeActionsForActiveSessions()
    {
        var sessionId = Guid.NewGuid();
-        var sessions = new[] { new SessionBatchDto(sessionId, DateTime.UtcNow, SessionStatus.Planned, 4) };
+        var sessions = new[] { new SessionBatchDto(sessionId, DateTime.UtcNow, SessionStatus.Planned, 4, "https://example.com/game") };
        var participants = Array.Empty<ParticipantBatchDto>();

        var result = SessionBatchViewBuilder.Build("Test", sessions, participants);
@@ -76,7 +76,7 @@ public sealed class SessionBatchViewBuilderTests
    public void Build_ShouldNotIncludeActionsForCancelledSessions()
    {
        var sessionId = Guid.NewGuid();
-        var sessions = new[] { new SessionBatchDto(sessionId, DateTime.UtcNow, SessionStatus.Cancelled, null) };
+        var sessions = new[] { new SessionBatchDto(sessionId, DateTime.UtcNow, SessionStatus.Cancelled, null, "") };
        var participants = Array.Empty<ParticipantBatchDto>();

        var result = SessionBatchViewBuilder.Build("Test", sessions, participants);
@@ -88,7 +88,7 @@ public sealed class SessionBatchViewBuilderTests
    public void Build_ShouldMarkWaitlistActionWhenFull()
    {
        var sessionId = Guid.NewGuid();
-        var sessions = new[] { new SessionBatchDto(sessionId, DateTime.UtcNow, SessionStatus.Planned, 1) };
+        var sessions = new[] { new SessionBatchDto(sessionId, DateTime.UtcNow, SessionStatus.Planned, 1, "https://example.com/game") };
        var participants = new[] { new ParticipantBatchDto(sessionId, "Alice", "alice", ParticipantRegistrationStatus.Active) };

        var result = SessionBatchViewBuilder.Build("Test", sessions, participants);
@@ -101,7 +101,7 @@ public sealed class SessionBatchViewBuilderTests
    public void Build_ShouldIncludePlayerUsernames()
    {
        var sessionId = Guid.NewGuid();
-        var sessions = new[] { new SessionBatchDto(sessionId, DateTime.UtcNow, SessionStatus.Planned, null) };
+        var sessions = new[] { new SessionBatchDto(sessionId, DateTime.UtcNow, SessionStatus.Planned, null, "https://example.com/game") };
        var participants = new[] { new ParticipantBatchDto(sessionId, "Alice", "alice", ParticipantRegistrationStatus.Active) };

        var result = SessionBatchViewBuilder.Build("Test", sessions, participants);
@@ -16,9 +16,9 @@ public sealed class TelegramSessionBatchRendererTests

        var sessions = new[]
        {
-            new SessionBatchDto(secondSessionId, new DateTime(2026, 4, 27, 18, 0, 0, DateTimeKind.Utc), SessionStatus.Planned, 4),
-            new SessionBatchDto(cancelledSessionId, new DateTime(2026, 4, 28, 18, 0, 0, DateTimeKind.Utc), SessionStatus.Cancelled, null),
-            new SessionBatchDto(firstSessionId, new DateTime(2026, 4, 26, 18, 0, 0, DateTimeKind.Utc), SessionStatus.Planned, 2)
+            new SessionBatchDto(secondSessionId, new DateTime(2026, 4, 27, 18, 0, 0, DateTimeKind.Utc), SessionStatus.Planned, 4, "https://example.com/game2"),
+            new SessionBatchDto(cancelledSessionId, new DateTime(2026, 4, 28, 18, 0, 0, DateTimeKind.Utc), SessionStatus.Cancelled, null, ""),
+            new SessionBatchDto(firstSessionId, new DateTime(2026, 4, 26, 18, 0, 0, DateTimeKind.Utc), SessionStatus.Planned, 2, "https://example.com/game1")
        };
        var participants = new[]
        {
@@ -35,6 +35,9 @@ public sealed class TelegramSessionBatchRendererTests
        Assert.Contains("Charlie", text);
        Assert.Contains("Bob", text);
        Assert.Contains("Сессия отменена", text);
+        Assert.Contains("Ссылка на игру", text);
+        Assert.Contains("https://example.com/game1", text);
+        Assert.Contains("https://example.com/game2", text);

        var buttons = markup.InlineKeyboard.SelectMany(row => row).ToList();
        Assert.Equal(4, buttons.Count); // 2 sessions x 2 buttons each
@@ -51,7 +54,7 @@ public sealed class TelegramSessionBatchRendererTests
    public void Render_ShouldSkipButtonsForCancelledSessions()
    {
        var cancelledSessionId = Guid.NewGuid();
-        var sessions = new[] { new SessionBatchDto(cancelledSessionId, DateTime.UtcNow, SessionStatus.Cancelled, null) };
+        var sessions = new[] { new SessionBatchDto(cancelledSessionId, DateTime.UtcNow, SessionStatus.Cancelled, null, "") };
        var participants = Array.Empty<ParticipantBatchDto>();

        var view = SessionBatchViewBuilder.Build("Test", sessions, participants);
@@ -64,7 +67,7 @@ public sealed class TelegramSessionBatchRendererTests
    public void Render_ShouldShowWaitlistButtonWhenFull()
    {
        var sessionId = Guid.NewGuid();
-        var sessions = new[] { new SessionBatchDto(sessionId, DateTime.UtcNow, SessionStatus.Planned, 1) };
+        var sessions = new[] { new SessionBatchDto(sessionId, DateTime.UtcNow, SessionStatus.Planned, 1, "https://example.com/game") };
        var participants = new[] { new ParticipantBatchDto(sessionId, "Alice", "alice", ParticipantRegistrationStatus.Active) };

        var view = SessionBatchViewBuilder.Build("Test", sessions, participants);
Author	SHA1	Message	Date
Toutsu	c0c8f852d2	feat(#19 ): добавить ссылку на игру в карточку батча PR Checks / test-and-build (pull_request) Successful in 3m49s Details - SessionBatchDto: добавлено поле JoinLink - SessionViewItem: добавлено поле JoinLink - SessionBatchViewBuilder: прокидывание JoinLink из DTO в ViewModel - CreateSessionHandler, SessionService: обновлены все вызовы конструктора - TelegramSessionBatchRenderer (Bot + Web): рендеринг ссылки в карточке - Добавлены тесты на наличие ссылки в рендере - Все 7 SQL-запросов, загружающих SessionBatchDto, обновлены с join_link AS JoinLink - Бамп версии до 1.11.0 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-10 18:13:55 +03:00
Toutsu	ac6e2455a1	Merge pull request #50 : fix(ui): prevent NavMenu logo from overlapping hamburger on mobile Deploy Telegram Bot / build-and-push (push) Successful in 3m47s Details Deploy Telegram Bot / deploy (push) Successful in 11s Details	2026-05-08 13:57:04 +03:00
Toutsu	9374ff16ed	fix(ui): prevent NavMenu logo from overlapping hamburger on mobile PR Checks / test-and-build (pull_request) Successful in 3m37s Details On viewports ≤768px the burger button is position:fixed at the viewport edge, while the header retained its default 1rem left padding. The logo image therefore sat completely underneath the button, causing a visible overlap on hover. Increase .nav-header padding-left to 3.75rem on mobile so the .nav-brand clears the 2.5rem fixed toggle with a 0.5rem gap. Bump version → 1.10.6 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-08 13:41:48 +03:00
Toutsu	17b92b25f4	Merge pull request #49 : feat(ui): replace emoji logos with new app icon across dashboard Deploy Telegram Bot / build-and-push (push) Successful in 3m43s Details Deploy Telegram Bot / deploy (push) Successful in 11s Details	2026-05-08 13:24:02 +03:00
Toutsu	d2edbf16cc	fix(ci): bump version to 1.10.5 PR Checks / test-and-build (pull_request) Successful in 3m49s Details Synchronize version across: - Directory.Build.props - compose.yaml (bot and web images) - deploy.yml - NavMenu version display Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-08 13:16:16 +03:00
Toutsu	b16627c2b6	feat(ui): replace emoji logos with new app icon across dashboard - NavMenu: swap 🐢 emoji for <img src="logo.png"> - Login page: swap 🎲 emoji for <img src="logo.png"> - Mini App page: swap 🎲 emoji for <img src="logo.png"> - Replace favicon.png with the new logo - Add logo.png to wwwroot - Update CSS for .nav-brand-icon, .login-logo, .mini-app-logo to use object-fit: contain sizing Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-08 13:15:53 +03:00