add count of comments to idea cards

b310-digital · Nov 12, 2024 · 155f9a2 · 155f9a2
1 parent 9be977e
commit 155f9a2
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 45 deletions.
diff --git a/lib/mindwendel/ideas.ex b/lib/mindwendel/ideas.ex
@@ -389,7 +389,15 @@ defmodule Mindwendel.Ideas do
   """
   def decrement_comment_count(idea_id) do
     idea = Repo.get!(Idea, idea_id)
-    changeset = Idea.changeset(idea, %{comments_count: idea.comments_count - 1})
+
+    new_comments_count =
+      if(idea.comments_count - 1 >= 0) do
+        idea.comments_count - 1
+      else
+        0
+      end
+
+    changeset = Idea.changeset(idea, %{comments_count: new_comments_count})
     Repo.update(changeset)
   end
 

diff --git a/lib/mindwendel_web/live/lane_live/index_component.html.heex b/lib/mindwendel_web/live/lane_live/index_component.html.heex
@@ -175,36 +175,16 @@
               </div>
 
               <div class="card-footer-mindwendel">
-                <small class="text-muted">
-                  <%= gettext("By") %> <%= Gettext.gettext(MindwendelWeb.Gettext, idea.username) %> <%= Timex.format!(
-                    idea.inserted_at,
-                    "{relative}",
-                    :relative
-                  ) %>
-                </small>
-                <div class="float-end">
-                  <span class="me-1"><%= length(idea.likes) %></span>
-                  <%= unless Mindwendel.Likes.exists_like_for_idea?(idea.id, @current_user.id) do %>
-                    <.link
-                      phx-click="like"
-                      phx-target={@myself}
-                      phx-value-id={idea.id}
-                      title="Like"
-                    >
-                      <i class="bi-arrow-up-circle"></i>
-                    </.link>
-                  <% else %>
-                    <.link
-                      phx-click="unlike"
-                      phx-target={@myself}
-                      phx-value-id={idea.id}
-                      title="Unlike"
-                    >
-                      <i class="bi-arrow-up-circle-fill"></i>
-                    </.link>
-                  <% end %>
+                <div class="d-block">
+                  <small class="text-muted">
+                    <%= gettext("By") %> <%= Gettext.gettext(MindwendelWeb.Gettext, idea.username) %> <%= Timex.format!(
+                      idea.inserted_at,
+                      "{relative}",
+                      :relative
+                    ) %>
+                  </small>
                 </div>
-                <div class="IndexComponent__IdeaLabelSection">
+                <div class="d-inline IndexComponent__IdeaLabelSection">
                   <%= for brainstorming_idea_label <- @brainstorming.labels do %>
                     <%= unless Enum.find(idea.idea_labels, fn idea_label -> idea_label.id == brainstorming_idea_label.id end) do %>
                       <.link
@@ -247,6 +227,32 @@
                     <% end %>
                   <% end %>
                 </div>
+                <div class="float-end ms-2">
+                  <span>
+                    <%= idea.comments_count %>
+                    <i class="bi-person-lines-fill"></i>
+                  </span>
+                  <span class="me-1"><%= length(idea.likes) %></span>
+                  <%= unless Mindwendel.Likes.exists_like_for_idea?(idea.id, @current_user.id) do %>
+                    <.link
+                      phx-click="like"
+                      phx-target={@myself}
+                      phx-value-id={idea.id}
+                      title="Like"
+                    >
+                      <i class="bi-arrow-up-circle"></i>
+                    </.link>
+                  <% else %>
+                    <.link
+                      phx-click="unlike"
+                      phx-target={@myself}
+                      phx-value-id={idea.id}
+                      title="Unlike"
+                    >
+                      <i class="bi-arrow-up-circle-fill"></i>
+                    </.link>
+                  <% end %>
+                </div>
               </div>
             </div>
           <% end %>

diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po
@@ -113,7 +113,7 @@ msgstr "Neues Brainstorming"
 msgid "New idea"
 msgstr "Neue Idee"
 
-#: lib/mindwendel_web/live/lane_live/index_component.html.heex:257
+#: lib/mindwendel_web/live/lane_live/index_component.html.heex:263
 #, elixir-autogen, elixir-format
 msgid "No ideas brainstormed"
 msgstr "Bisher keine Ideen vorhanden"
@@ -202,7 +202,7 @@ msgstr "Nutzername"
 
 #: lib/mindwendel_web/controllers/admin/brainstorming_html/export.html.heex:3
 #: lib/mindwendel_web/live/comment_live/show_component.html.heex:40
-#: lib/mindwendel_web/live/lane_live/index_component.html.heex:179
+#: lib/mindwendel_web/live/lane_live/index_component.html.heex:180
 #, elixir-autogen, elixir-format
 msgid "By"
 msgstr "Von"
@@ -421,7 +421,7 @@ msgstr "Name"
 #: lib/mindwendel_web/live/brainstorming_live/show.html.heex:26
 #: lib/mindwendel_web/live/brainstorming_live/show.html.heex:28
 #: lib/mindwendel_web/live/brainstorming_live/show.html.heex:114
-#: lib/mindwendel_web/live/lane_live/index_component.html.heex:278
+#: lib/mindwendel_web/live/lane_live/index_component.html.heex:284
 #, elixir-autogen, elixir-format
 msgid "New lane"
 msgstr "Neue Spalte"
@@ -455,7 +455,7 @@ msgstr "Spalte aktualisiert"
 
 #: lib/mindwendel_web/live/lane_live/index_component.html.heex:10
 #: lib/mindwendel_web/live/lane_live/index_component.html.heex:13
-#: lib/mindwendel_web/live/lane_live/index_component.html.heex:262
+#: lib/mindwendel_web/live/lane_live/index_component.html.heex:268
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Add idea"
 msgstr "Neue Idee"
@@ -465,7 +465,7 @@ msgstr "Neue Idee"
 msgid "Default lane"
 msgstr "Eine Spalte"
 
-#: lib/mindwendel_web/live/lane_live/index_component.html.heex:273
+#: lib/mindwendel_web/live/lane_live/index_component.html.heex:279
 #, elixir-autogen, elixir-format
 msgid "No lanes available"
 msgstr "Keine Spalten vorhanden"

diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot
@@ -112,7 +112,7 @@ msgstr ""
 msgid "New idea"
 msgstr ""
 
-#: lib/mindwendel_web/live/lane_live/index_component.html.heex:257
+#: lib/mindwendel_web/live/lane_live/index_component.html.heex:263
 #, elixir-autogen, elixir-format
 msgid "No ideas brainstormed"
 msgstr ""
@@ -201,7 +201,7 @@ msgstr ""
 
 #: lib/mindwendel_web/controllers/admin/brainstorming_html/export.html.heex:3
 #: lib/mindwendel_web/live/comment_live/show_component.html.heex:40
-#: lib/mindwendel_web/live/lane_live/index_component.html.heex:179
+#: lib/mindwendel_web/live/lane_live/index_component.html.heex:180
 #, elixir-autogen, elixir-format
 msgid "By"
 msgstr ""
@@ -420,7 +420,7 @@ msgstr ""
 #: lib/mindwendel_web/live/brainstorming_live/show.html.heex:26
 #: lib/mindwendel_web/live/brainstorming_live/show.html.heex:28
 #: lib/mindwendel_web/live/brainstorming_live/show.html.heex:114
-#: lib/mindwendel_web/live/lane_live/index_component.html.heex:278
+#: lib/mindwendel_web/live/lane_live/index_component.html.heex:284
 #, elixir-autogen, elixir-format
 msgid "New lane"
 msgstr ""
@@ -454,7 +454,7 @@ msgstr ""
 
 #: lib/mindwendel_web/live/lane_live/index_component.html.heex:10
 #: lib/mindwendel_web/live/lane_live/index_component.html.heex:13
-#: lib/mindwendel_web/live/lane_live/index_component.html.heex:262
+#: lib/mindwendel_web/live/lane_live/index_component.html.heex:268
 #, elixir-autogen, elixir-format
 msgid "Add idea"
 msgstr ""
@@ -464,7 +464,7 @@ msgstr ""
 msgid "Default lane"
 msgstr ""
 
-#: lib/mindwendel_web/live/lane_live/index_component.html.heex:273
+#: lib/mindwendel_web/live/lane_live/index_component.html.heex:279
 #, elixir-autogen, elixir-format
 msgid "No lanes available"
 msgstr ""

diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po
@@ -113,7 +113,7 @@ msgstr ""
 msgid "New idea"
 msgstr ""
 
-#: lib/mindwendel_web/live/lane_live/index_component.html.heex:257
+#: lib/mindwendel_web/live/lane_live/index_component.html.heex:263
 #, elixir-autogen, elixir-format
 msgid "No ideas brainstormed"
 msgstr ""
@@ -202,7 +202,7 @@ msgstr ""
 
 #: lib/mindwendel_web/controllers/admin/brainstorming_html/export.html.heex:3
 #: lib/mindwendel_web/live/comment_live/show_component.html.heex:40
-#: lib/mindwendel_web/live/lane_live/index_component.html.heex:179
+#: lib/mindwendel_web/live/lane_live/index_component.html.heex:180
 #, elixir-autogen, elixir-format
 msgid "By"
 msgstr ""
@@ -421,7 +421,7 @@ msgstr ""
 #: lib/mindwendel_web/live/brainstorming_live/show.html.heex:26
 #: lib/mindwendel_web/live/brainstorming_live/show.html.heex:28
 #: lib/mindwendel_web/live/brainstorming_live/show.html.heex:114
-#: lib/mindwendel_web/live/lane_live/index_component.html.heex:278
+#: lib/mindwendel_web/live/lane_live/index_component.html.heex:284
 #, elixir-autogen, elixir-format
 msgid "New lane"
 msgstr ""
@@ -455,7 +455,7 @@ msgstr ""
 
 #: lib/mindwendel_web/live/lane_live/index_component.html.heex:10
 #: lib/mindwendel_web/live/lane_live/index_component.html.heex:13
-#: lib/mindwendel_web/live/lane_live/index_component.html.heex:262
+#: lib/mindwendel_web/live/lane_live/index_component.html.heex:268
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Add idea"
 msgstr ""
@@ -465,7 +465,7 @@ msgstr ""
 msgid "Default lane"
 msgstr ""
 
-#: lib/mindwendel_web/live/lane_live/index_component.html.heex:273
+#: lib/mindwendel_web/live/lane_live/index_component.html.heex:279
 #, elixir-autogen, elixir-format
 msgid "No lanes available"
 msgstr ""