Version 2.1.1

ClaperCo · Oct 5, 2024 · 767c15b · 767c15b
1 parent 8099fa8
commit 767c15b
Show file tree

Hide file tree

Showing 18 changed files with 96 additions and 57 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,15 @@
+## v2.1.1
+
+### Fixes and improvements
+
+- Fix OIDC to allow only client_secret_basic and client_secret_post auth methods
+- Fix minimum length for 2 characters messages
+- Fix poll option order
+- Fix translations for current interactions
+- Improve poll results UI
+- Optimize resource usage of the manager when attendees join the event
+- Fix duplicate event being inaccesible
+
 ## v2.1.0
 
 ### Features

diff --git a/assets/js/app.js b/assets/js/app.js
@@ -226,7 +226,7 @@ Hooks.PostForm = {
       e.preventDefault();
       submitBtn.click();
     } else {
-      if (TA.value.length > 1 && TA.value.length < 256) {
+      if (TA.value.length > 0 && TA.value.length < 256) {
         submitBtn.classList.remove("opacity-50");
         submitBtn.classList.add("opacity-100");
         submitBtn.disabled = false;
@@ -261,7 +261,7 @@ Hooks.PostForm = {
   updated() {
     const submitBtn = document.getElementById("submitBtn");
     const TA = document.getElementById("postFormTA");
-    if (TA.value.length > 1 && TA.value.length < 256) {
+    if (TA.value.length > 0 && TA.value.length < 256) {
       submitBtn.classList.remove("opacity-50");
       submitBtn.classList.add("opacity-100");
       submitBtn.disabled = false;
@@ -316,6 +316,13 @@ Hooks.Pickr = {
     this.pickr.destroy();
   },
 };
+Hooks.UpdateAttendees = {
+  mounted() {
+    this.handleEvent("update-attendees", ({ count }) => {
+      this.el.textContent = count;
+    });
+  },
+};
 Hooks.Presenter = {
   mounted() {
     this.presenter = new Presenter(this);

diff --git a/lib/claper/events.ex b/lib/claper/events.ex
@@ -428,7 +428,7 @@ defmodule Claper.Events do
              |> Map.drop([:id, :inserted_at, :updated_at])
              |> Map.put(:presentation_file_id, new_presentation_file.id)
              |> Map.put(:position, 0)
-             |> Map.put(:banned, nil)
+             |> Map.put(:banned, [])
 
            Claper.Presentations.create_presentation_state(attrs)
          end)

diff --git a/lib/claper_web/controllers/user_oidc_auth.ex b/lib/claper_web/controllers/user_oidc_auth.ex
@@ -78,7 +78,8 @@ defmodule ClaperWeb.UserOidcAuth do
 
     %{
       redirect_uri: "#{url}/users/oidc/callback",
-      scopes: scopes()
+      scopes: scopes(),
+      preferred_auth_methods: [:client_secret_basic, :client_secret_post]
     }
   end
 

diff --git a/lib/claper_web/live/event_live/embed_component.ex b/lib/claper_web/live/event_live/embed_component.ex
@@ -17,21 +17,17 @@ defmodule ClaperWeb.EventLive.EmbedComponent do
           <div class="text-white flex space-x-2 items-center">
             <svg
               xmlns="http://www.w3.org/2000/svg"
-              class="h-6 w-6"
+              fill="none"
               viewBox="0 0 24 24"
               stroke-width="1.5"
               stroke="currentColor"
-              fill="none"
-              stroke-linecap="round"
-              stroke-linejoin="round"
+              class="h-6 w-6"
             >
-              <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
-              <path d="M12 3a3 3 0 0 0 -3 3v12a3 3 0 0 0 3 3"></path>
-              <path d="M6 3a3 3 0 0 1 3 3v12a3 3 0 0 1 -3 3"></path>
-              <path d="M13 7h7a1 1 0 0 1 1 1v8a1 1 0 0 1 -1 1h-7"></path>
-              <path d="M5 7h-1a1 1 0 0 0 -1 1v8a1 1 0 0 0 1 1h1"></path>
-              <path d="M17 12h.01"></path>
-              <path d="M13 12h.01"></path>
+              <path
+                stroke-linecap="round"
+                stroke-linejoin="round"
+                d="M14.25 9.75L16.5 12l-2.25 2.25m-4.5 0L7.5 12l2.25-2.25M6 20.25h12A2.25 2.25 0 0020.25 18V6A2.25 2.25 0 0018 3.75H6A2.25 2.25 0 003.75 6v12A2.25 2.25 0 006 20.25z"
+              />
             </svg>
             <span class="font-bold"><%= gettext("See current web content") %></span>
           </div>

diff --git a/lib/claper_web/live/event_live/manage.ex b/lib/claper_web/live/event_live/manage.ex
@@ -86,7 +86,7 @@ defmodule ClaperWeb.EventLive.Manage do
   @impl true
   def handle_info(%{event: "presence_diff"}, %{assigns: %{event: event}} = socket) do
     attendees = Presence.list("event:#{event.uuid}")
-    {:noreply, assign(socket, :attendees_nb, Enum.count(attendees))}
+    {:noreply, push_event(socket, "update-attendees", %{count: Enum.count(attendees)})}
   end
 
   @impl true

diff --git a/lib/claper_web/live/event_live/manage.html.heex b/lib/claper_web/live/event_live/manage.html.heex
@@ -402,7 +402,9 @@
                   clip-rule="evenodd"
                 />
               </svg>
-              <span><%= @attendees_nb %></span>
+              <span id="attendees-count" phx-update="ignore" phx-hook="UpdateAttendees">
+                <%= @attendees_nb %>
+              </span>
             </div>
           </div>
         </div>

diff --git a/lib/claper_web/live/event_live/poll_component.ex b/lib/claper_web/live/event_live/poll_component.ex
@@ -53,17 +53,17 @@ defmodule ClaperWeb.EventLive.PollComponent do
           <% end %>
         </div>
         <div>
-          <div class="flex flex-col space-y-3">
+          <div class="flex flex-col space-y-3 overflow-y-auto max-h-[500px]">
             <%= if (length @poll.poll_opts) > 0 do %>
               <%= for {opt, idx} <- Enum.with_index(@poll.poll_opts) do %>
                 <%= if (length @current_poll_vote) > 0 do %>
-                  <button class="bg-gray-500 px-3 py-2 rounded-full flex justify-between items-center relative text-white">
+                  <button class="bg-gray-500 px-3 py-2 rounded-3xl flex justify-between items-center relative text-white">
                     <div
                       style={"width: #{if @show_results, do: opt.percentage, else: 0}%;"}
-                      class={"bg-gradient-to-r from-primary-500 to-secondary-500 h-full absolute left-0 transition-all rounded-l-full #{if opt.percentage == "100", do: "rounded-r-full"}"}
+                      class={"bg-gradient-to-r from-primary-500 to-secondary-500 h-full absolute left-0 transition-all rounded-l-3xl #{if opt.percentage == "100", do: "rounded-r-3xl"}"}
                     >
                     </div>
-                    <div class="flex space-x-3 z-10 text-left">
+                    <div class="flex space-x-3 items-center z-10 text-left">
                       <%= if (length Enum.filter(@current_poll_vote, fn(vote) -> vote.poll_opt_id == opt.id end)) > 0 do %>
                         <%= if @poll.multiple do %>
                           <span class="h-5 w-5 mt-0.5 point-select bg-white"></span>
@@ -78,7 +78,7 @@ defmodule ClaperWeb.EventLive.PollComponent do
                           </span>
                         <% end %>
                       <% end %>
-                      <span class="flex-1"><%= opt.content %></span>
+                      <span class="flex-1 pr-2"><%= opt.content %></span>
                     </div>
                     <span :if={@show_results} class="text-sm z-10">
                       <%= opt.percentage %>% (<%= opt.vote_count %>)
@@ -89,14 +89,14 @@ defmodule ClaperWeb.EventLive.PollComponent do
                     id={"poll-opt-#{idx}"}
                     phx-click="select-poll-opt"
                     phx-value-opt={idx}
-                    class="bg-gray-500 px-3 py-2 rounded-full flex justify-between items-center relative text-white"
+                    class="bg-gray-500 px-3 py-2 flex justify-between items-center rounded-3xl relative text-white"
                   >
                     <div
                       style={"width: #{if @show_results, do: opt.percentage, else: 0}%;"}
-                      class={"bg-gradient-to-r from-primary-500 to-secondary-500 h-full absolute left-0 transition-all rounded-l-full #{if opt.percentage == "100", do: "rounded-r-full"}"}
+                      class={"bg-gradient-to-r from-primary-500 to-secondary-500 h-full absolute left-0 transition-all rounded-l-3xl #{if opt.percentage == "100", do: "rounded-r-3xl"}"}
                     >
                     </div>
-                    <div class="flex space-x-3 z-10 text-left">
+                    <div class="flex space-x-3 items-center z-10 text-left">
                       <%= if Enum.member?(@selected_poll_opt, "#{idx}") do %>
                         <%= if @poll.multiple do %>
                           <span class="h-5 w-5 mt-0.5 point-select bg-white"></span>
@@ -111,7 +111,7 @@ defmodule ClaperWeb.EventLive.PollComponent do
                           </span>
                         <% end %>
                       <% end %>
-                      <span class="flex-1"><%= opt.content %></span>
+                      <span class="flex-1 pr-2"><%= opt.content %></span>
                     </div>
                     <span :if={@show_results} class="text-sm z-10">
                       <%= opt.percentage %>% (<%= opt.vote_count %>)
@@ -123,14 +123,14 @@ defmodule ClaperWeb.EventLive.PollComponent do
           </div>
 
           <%= if (length @selected_poll_opt) == 0 || (length @current_poll_vote) > 0 do %>
-            <button class="px-3 py-2 text-white font-semibold bg-gray-500 rounded-md my-5 cursor-default">
+            <button class="px-3 py-2 text-white font-semibold bg-gray-500 rounded-md mt-3 mb-4 cursor-default">
               <%= gettext("Vote") %>
             </button>
           <% else %>
             <button
               phx-click="vote"
               phx-disable-with="..."
-              class="px-3 py-2 text-white font-semibold bg-primary-500 hover:bg-primary-600 rounded-md my-5"
+              class="px-3 py-2 text-white font-semibold bg-primary-500 hover:bg-primary-600 rounded-md mt-3 mb-4"
             >
               <%= gettext("Vote") %>
             </button>

diff --git a/lib/claper_web/live/event_live/presenter.ex b/lib/claper_web/live/event_live/presenter.ex
@@ -84,7 +84,7 @@ defmodule ClaperWeb.EventLive.Presenter do
   @impl true
   def handle_info(%{event: "presence_diff"}, %{assigns: %{event: event}} = socket) do
     attendees = Presence.list("event:#{event.uuid}")
-    {:noreply, assign(socket, :attendees_nb, Enum.count(attendees))}
+    {:noreply, push_event(socket, "update-attendees", %{count: Enum.count(attendees)})}
   end
 
   @impl true
@@ -163,7 +163,7 @@ defmodule ClaperWeb.EventLive.Presenter do
 
   @impl true
   def handle_info({:form_updated, form}, socket) do
-    if form.active do
+    if form.enabled do
       {:noreply,
        socket
        |> update(:current_form, fn _current_form -> form end)}

diff --git a/lib/claper_web/live/event_live/presenter.html.heex b/lib/claper_web/live/event_live/presenter.html.heex
@@ -56,14 +56,14 @@
         <div class={"#{if @iframe, do: "space-y-5", else: "space-y-8"} flex flex-col"}>
           <%= if (length @current_poll.poll_opts) > 0 do %>
             <%= for opt <- @current_poll.poll_opts do %>
-              <div class={"#{if @iframe, do: "py-1", else: "py-4"} bg-gray-500 px-6 rounded-full flex justify-between items-center relative text-white"}>
+              <div class={"#{if @iframe, do: "py-1", else: "py-4"} bg-gray-500 px-6 rounded-3xl flex justify-between items-center relative text-white"}>
                 <div
                   style={"width: #{opt.percentage}%;"}
-                  class="bg-gradient-to-r from-primary-500 to-secondary-500 rounded-full h-full absolute left-0 transition-all"
+                  class="bg-gradient-to-r from-primary-500 to-secondary-500 rounded-3xl h-full absolute left-0 transition-all"
                 >
                 </div>
                 <div class="flex space-x-3 z-10 text-left">
-                  <span class={"#{if @iframe, do: "text-base", else: "text-2xl"} flex-1 font-bold"}>
+                  <span class={"#{if @iframe, do: "text-base", else: "text-2xl"} flex-1 font-bold pr-2"}>
                     <%= opt.content %>
                   </span>
                 </div>
@@ -234,7 +234,9 @@
 
     <div class="inline-flex justify-between items-center text-white text-2xl">
       <img src="/images/icons/online-users.svg" class="h-12 mr-2" />
-      <span id="counter"><%= @attendees_nb %></span>
+      <span id="counter" phx-hook="UpdateAttendees" phx-update="ignore">
+        <%= @attendees_nb %>
+      </span>
     </div>
   </div>
 </div>
diff --git a/lib/claper_web/live/event_live/show.ex b/lib/claper_web/live/event_live/show.ex
@@ -166,7 +166,7 @@ defmodule ClaperWeb.EventLive.Show do
   def handle_info(%{event: "presence_diff"}, %{assigns: %{event: event}} = socket) do
     attendees = Presence.list("event:#{event.uuid}")
 
-    {:noreply, assign(socket, :attendees_nb, Enum.count(attendees))}
+    {:noreply, push_event(socket, "update-attendees", %{count: Enum.count(attendees)})}
   end
 
   @impl true
@@ -238,7 +238,7 @@ defmodule ClaperWeb.EventLive.Show do
         {:current_interaction, interaction},
         socket
       ) do
-    {:noreply, socket |> load_current_interaction(interaction)}
+    {:noreply, socket |> load_current_interaction(interaction, false)}
   end
 
   @impl true
@@ -278,7 +278,7 @@ defmodule ClaperWeb.EventLive.Show do
   def handle_info({:poll_updated, %Claper.Polls.Poll{enabled: true} = poll}, socket) do
     {:noreply,
      socket
-     |> load_current_interaction(poll)}
+     |> load_current_interaction(poll, true)}
   end
 
   @impl true
@@ -292,7 +292,7 @@ defmodule ClaperWeb.EventLive.Show do
   def handle_info({:form_updated, %Claper.Forms.Form{enabled: true} = form}, socket) do
     {:noreply,
      socket
-     |> load_current_interaction(form)}
+     |> load_current_interaction(form, true)}
   end
 
   @impl true
@@ -306,7 +306,7 @@ defmodule ClaperWeb.EventLive.Show do
   def handle_info({:embed_updated, %Claper.Embeds.Embed{enabled: true} = embed}, socket) do
     {:noreply,
      socket
-     |> load_current_interaction(embed)}
+     |> load_current_interaction(embed, true)}
   end
 
   @impl true
@@ -695,20 +695,37 @@ defmodule ClaperWeb.EventLive.Show do
 
   defp get_current_interaction(socket, event, position) do
     with interaction <- Interactions.get_active_interaction(event, position) do
-      socket |> assign(:current_interaction, interaction) |> load_current_interaction(interaction)
+      socket
+      |> assign(:current_interaction, interaction)
+      |> load_current_interaction(interaction, false)
     end
   end
 
-  defp load_current_interaction(socket, %Polls.Poll{} = interaction) do
+  defp load_current_interaction(socket, %Polls.Poll{} = interaction, same_interaction) do
     poll = Polls.set_percentages(interaction)
-    socket |> assign(:current_interaction, poll) |> get_current_vote(poll.id)
+
+    socket
+    |> assign(
+      :current_interaction,
+      %{poll | poll_opts: Enum.sort_by(poll.poll_opts, & &1.id, :asc)}
+    )
+    |> maybe_reset_selected_poll_opt(same_interaction)
+    |> get_current_vote(poll.id)
   end
 
-  defp load_current_interaction(socket, %Forms.Form{} = interaction) do
+  defp load_current_interaction(socket, %Forms.Form{} = interaction, _same_interaction) do
     socket |> assign(:current_interaction, interaction) |> get_current_form_submit(interaction.id)
   end
 
-  defp load_current_interaction(socket, interaction) do
+  defp load_current_interaction(socket, interaction, _same_interaction) do
     socket |> assign(:current_interaction, interaction)
   end
+
+  defp maybe_reset_selected_poll_opt(socket, true) do
+    socket
+  end
+
+  defp maybe_reset_selected_poll_opt(socket, _same_interaction) do
+    socket |> assign(:selected_poll_opt, [])
+  end
 end
diff --git a/lib/claper_web/live/event_live/show.html.heex b/lib/claper_web/live/event_live/show.html.heex
@@ -50,7 +50,9 @@
 
         <div class="inline-flex justify-between items-center text-white text-sm">
           <img src="/images/icons/online-users.svg" class="h-6 mr-2" />
-          <span id="counter"><%= @attendees_nb %></span>
+          <span id="counter" phx-update="ignore" phx-hook="UpdateAttendees">
+            <%= @attendees_nb %>
+          </span>
         </div>
       </div>
     </div>

diff --git a/lib/claper_web/live/stat_live/index.html.heex b/lib/claper_web/live/stat_live/index.html.heex
@@ -191,15 +191,15 @@
                         else: 0 %>
                     <button
                       id={"poll-opt-#{idx}"}
-                      class="bg-gray-500 px-3 py-2 rounded-full flex justify-between items-center relative text-white"
+                      class="bg-gray-500 px-3 py-2 rounded-3xl flex justify-between items-center relative text-white"
                     >
                       <div
                         style={"width: #{percentage}%;"}
-                        class={"bg-gradient-to-r from-primary-500 to-secondary-500 h-full absolute left-0 transition-all rounded-l-full #{if percentage == "100", do: "rounded-r-full"}"}
+                        class={"bg-gradient-to-r from-primary-500 to-secondary-500 h-full absolute left-0 transition-all rounded-l-3xl #{if percentage == "100", do: "rounded-r-3xl"}"}
                       >
                       </div>
-                      <div class="flex space-x-3 z-10 text-left">
-                        <span class="flex-1"><%= opt.content %></span>
+                      <div class="flex space-x-3 items-center z-10 text-left">
+                        <span class="flex-1 pr-2"><%= opt.content %></span>
                       </div>
                       <span class="text-sm z-10"><%= percentage %>% (<%= opt.vote_count %>)</span>
                     </button>

diff --git a/mix.exs b/mix.exs
@@ -1,7 +1,7 @@
 defmodule Claper.MixProject do
   use Mix.Project
 
-  @version "2.1.0"
+  @version "2.1.1"
 
   def project do
     [

diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po
@@ -724,7 +724,7 @@ msgstr "Es wurde kein Formular gesendet"
 #: lib/claper_web/live/event_live/form_component.ex:32
 #, elixir-autogen, elixir-format
 msgid "See current form"
-msgstr "Siehe aktuelles Formular"
+msgstr "Aktuelles Formular anzeigen"
 
 #: lib/claper_web/live/event_live/form_component.ex:97
 #, elixir-autogen, elixir-format
@@ -929,7 +929,7 @@ msgstr "Neuer Webinhalt"
 #: lib/claper_web/live/event_live/embed_component.ex:36
 #, elixir-autogen, elixir-format, fuzzy
 msgid "See current web content"
-msgstr "Aktuellen Webinhalt anzeigen"
+msgstr "Aktuelle Webinhalte anzeigen"
 
 #: lib/claper_web/live/embed_live/form_component.html.heex:80
 #, elixir-autogen, elixir-format, fuzzy

diff --git a/priv/gettext/es/LC_MESSAGES/default.po b/priv/gettext/es/LC_MESSAGES/default.po
@@ -929,7 +929,7 @@ msgstr "Nuevo contenido web"
 #: lib/claper_web/live/event_live/embed_component.ex:36
 #, elixir-autogen, elixir-format
 msgid "See current web content"
-msgstr "Ver contenido"
+msgstr "Ver contenido web actual"
 
 #: lib/claper_web/live/embed_live/form_component.html.heex:80
 #, elixir-autogen, elixir-format