Fix the problems

Author: vtm9

services/app/apps/codebattle/assets/css/external.scss

@@ -325,35 +325,6 @@ $dark-red: #b00020;
   padding-bottom: 16px;
 }
 
-.cb-ticker-line-wrap {
-  white-space: pre;
-  overflow: hidden;
-
-  background: url('../static/images/eventStripesPink.svg');
-  background-size: 200px 43px;
-  background-position: bottom 0px right 25%;
-  background-repeat: no-repeat;
-  background-color: #8C64FF;
-}
-
-.cb-ticker-line {
-  display: inline-block;
-  font-size: 18px;
-  color: white;
-  white-space: pre;
-  white-space-collapse: collapse;
-}
-
-.cb-ticker-line-head {
-  animation: ticker_1 70s linear infinite;
-  padding-left: 15px;
-  animation-delay: -70s;
-}
-
-.cb-ticker-line-tail {
-  animation: ticker_2 70s linear infinite;
-  animation-delay: -35s;
-}
 
 .cb-custom-event-text-success {
   color: #2ae881;
@@ -806,3 +777,39 @@ $dark-red: #b00020;
   bottom: -15%;
   right: -5%;
 }
+
+@keyframes ticker {
+  0% {
+    transform: translateX(0);
+  }
+
+  100% {
+    transform: translateX(-50%);
+  }
+}
+
+.cb-ticker-line-wrap {
+  overflow: hidden;
+  width: 100%;
+  background: url('../static/images/eventStripesPink.svg');
+  background-size: 200px 43px;
+  background-position: bottom 0px right 25%;
+  background-repeat: no-repeat;
+  background-color: #8C64FF;
+  padding: 10px 0;
+}
+
+.cb-ticker-content {
+  display: inline-block;
+  white-space: nowrap;
+  animation: ticker 60s linear infinite;
+  will-change: transform;
+  width: 200%;
+}
+
+.cb-ticker-line {
+  display: inline-block;
+  font-size: 18px;
+  color: white;
+  padding-right: 25px;
+}

services/app/apps/codebattle/assets/css/style.scss

@@ -1446,26 +1446,6 @@ a {
     transform 200ms;
 }
 
-@keyframes ticker_1 {
-  0% {
-    transform: translateX(100%);
-  }
-
-  100% {
-    transform: translateX(-100%);
-  }
-}
-
-@keyframes ticker_2 {
-  0% {
-    transform: translateX(0);
-  }
-
-  100% {
-    transform: translateX(-200%);
-  }
-}
-
 @keyframes scale {
   0% {
     transform: scale(0.5);

services/app/apps/codebattle/assets/js/widgets/components/AccordeonBox.jsx

@@ -9,6 +9,12 @@ import Tooltip from 'react-bootstrap/Tooltip';
 import i18n from '../../i18n';
 import color from '../config/statusColor';
 
+// Custom JSON stringify function that preserves original key formats
+const safeJsonStringify = obj => {
+  if (obj === undefined || obj === null) return '???';
+  return JSON.stringify(obj, null, 0);
+};
+
 const getMessage = status => {
   switch (status) {
     case 'error':
@@ -158,13 +164,13 @@ function SubMenu({
         </div>
         <pre className="my-1">
           <span className={assertClassName}>
-            {`${i18n.t('Receive:')} ${result === undefined ? '???' : JSON.stringify(result)}`}
+            {`${i18n.t('Receive:')} ${safeJsonStringify(result)}`}
           </span>
           <span className={assertClassName}>
-            {`${i18n.t('Expected:')} ${assert.expected === undefined ? '???' : JSON.stringify(assert.expected)}`}
+            {`${i18n.t('Expected:')} ${safeJsonStringify(assert.expected)}`}
           </span>
           <span className={assertClassName}>
-            {`${i18n.t('Arguments:')} ${assert.arguments === undefined ? '???' : JSON.stringify(assert.arguments)}`}
+            {`${i18n.t('Arguments:')} ${safeJsonStringify(assert.arguments)}`}
           </span>
         </pre>
         {hasOutput && (

services/app/apps/codebattle/lib/codebattle/code_check/output_parser_v2.ex

@@ -152,19 +152,21 @@ defmodule Codebattle.CodeCheck.OutputParser.V2 do
       end
 
     check_result =
-      token.solution_results
-      |> Enum.filter(fn item -> item["type"] != "output" end)
-      |> Enum.zip(token.task.asserts)
+      token.task.asserts
+      |> Enum.zip(
+        Enum.filter(token.solution_results, fn item -> item["type"] != "output" end)
+      )
       |> Enum.reduce(
         %Result.V2{output_error: output_error},
-        fn {solution_result, assert_item}, acc ->
+        fn {assert_item, solution_result}, acc ->
+
           assert_result = %Result.V2.AssertResult{
             output: solution_result["output"],
             execution_time: solution_result["time"],
             result: solution_result["value"],
             status:
               if solution_result["type"] == "result" and
-                   AtomizedMap.atomize(solution_result["value"]) == assert_item.expected do
+                   AtomizedMap.atomize(solution_result["value"]) == AtomizedMap.atomize(assert_item.expected) do
                 "success"
               else
                 "failure"

services/app/apps/codebattle/lib/codebattle_web/controllers/ext_api/task_pack_controller.ex

@@ -15,7 +15,17 @@ defmodule CodebattleWeb.ExtApi.TaskPackController do
 
     task_names = Map.get(params, :task_names, [])
     tasks = Task.get_by_names(task_names)
-    task_ids = Enum.map(task_names, fn name -> tasks |> Enum.find(fn task -> task.name == name end) |> Map.get(:id) end)
+
+    task_ids =
+      task_names
+      |> Enum.map(fn name ->
+        task = Enum.find(tasks, fn task -> task.name == name end)
+
+        if task do
+          task.id
+        end
+      end)
+      |> Enum.filter(& &1)
 
     params = Map.put(params, :task_ids, task_ids)
 

services/app/apps/codebattle/lib/codebattle_web/live/admin/user_show_view.ex

@@ -253,9 +253,9 @@ defmodule CodebattleWeb.Live.Admin.UserShowView do
                 </li>
                 <li class="list-group-item">
                   <strong>Clan:</strong>
-                  <%= if @user.clan do %>
+                  <%= if @user.clan_id do %>
                     <div>
-                      <span class="badge bg-secondary"><%= @user.clan %></span>
+                      <span class="badge bg-secondary"><%= @user.clan_id %></span>
                       <% clan = Clan.get(@user.clan_id) %>
                       <%= if clan do %>
                         <div class="mt-2 small">

services/app/apps/codebattle/lib/codebattle_web/templates/layout/external.html.heex

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="en" class="bg-dark">
   <head>
     <meta charset="utf-8" />
     <meta content="IE=edge" http-equiv="X-UA-Compatible" />
@@ -41,12 +41,6 @@
     <title><%= Application.get_env(:codebattle, :app_title) %></title>
     <meta content="width=device-width, initial-scale=1, shrink-to-fit=no" name="viewport" />
 
-    <%= if @ticker_text do %>
-      <div class="d-flex cb-ticker-line-wrap p-2 vw-100">
-        <span class="cb-ticker-line cb-ticker-line-head"><%= @ticker_text %></span>
-        <span class="cb-ticker-line cb-ticker-line-tail"><%= @ticker_text %></span>
-      </div>
-    <% end %>
     <link
       phx-track-static
       rel="stylesheet"
@@ -61,7 +55,7 @@
     </script>
   </head>
   <body>
-    <div class="d-flex flex-column min-vh-100">
+    <div class="d-flex flex-column min-vh-100 bg-dark">
       <%= if assigns[:show_header] do %>
         <div class="bg-dark">
           <div class="container-lg">
@@ -89,7 +83,7 @@
                     src={collab_logo_minor(@current_user)}
                   />
                 <% end %>
-                <div class="d-none d-sm-none d-md-flex d-lg-flex flex-column text-gray ml-1 pb-1">
+                <div class="d-none d-sm-none d-md-flex d-lg-flex flex-column text-gray ml-1 pb">
                   <span class="font-weight-bold">
                     <%= Application.get_env(:codebattle, :logo_title) %>
                   </span>
@@ -167,9 +161,19 @@
           </div>
         </div>
       <% end %>
+      <%= if @ticker_text do %>
+        <div class="cb-ticker-line-wrap">
+          <div class="cb-ticker-content">
+            <%= for _ <- 1..20 do %>
+              <span class="cb-ticker-line"><%= @ticker_text %></span>
+            <% end %>
+          </div>
+        </div>
+      <% end %>
 
       <%= @inner_content %>
     </div>
+
     <%= render_gon_script(@conn) %>
   </body>
 </html>

services/app/apps/codebattle/priv/gettext/ru/LC_MESSAGES/default.po

@@ -1003,3 +1003,6 @@ msgstr "Время на этап"
 
 msgid "You already passed this stage"
 msgstr "Вы уже прошли этот этап"
+
+msgid "Stage confirmation"
+msgstr "Подтверждение этапа"

services/app/apps/codebattle/priv/repo/seeds.exs

@@ -371,7 +371,7 @@ stages =
         access_type: "token",
         score_strategy: "win_loss",
         state: "waiting_participants",
-        task_pack_name: "7_elementary",
+        task_pack_name: "qualification",
         tournament_timeout_seconds: 75 * 60,
         players_limit: 128,
         ranking_type: "void",