Improve logic and add working "delete" links

And add pw validations

lib/outlook/accounts/user.ex

@@ -45,7 +45,7 @@ defmodule Outlook.Accounts.User do
   defp validate_email(changeset, opts) do
     changeset
     |> validate_required([:email])
-    |> validate_format(:email, ~r/^[^\s]+@[^\s]+$/, message: "must have the @ sign and no spaces")
+    |> validate_format(:email, ~r/^[^\s]+@[^\s]+$/u, message: "must have the @ sign and no spaces")
     |> validate_length(:email, max: 160)
     |> maybe_validate_unique_email(opts)
   end
@@ -53,10 +53,10 @@ defmodule Outlook.Accounts.User do
   defp validate_password(changeset, opts) do
     changeset
     |> validate_required([:password])
-    |> validate_length(:password, min: 12, max: 72)
-    # |> validate_format(:password, ~r/[a-z]/, message: "at least one lower case character")
-    # |> validate_format(:password, ~r/[A-Z]/, message: "at least one upper case character")
-    # |> validate_format(:password, ~r/[!?@#$%^&*_0-9]/, message: "at least one digit or punctuation character")
+    |> validate_length(:password, min: 8, max: 72)
+    |> validate_format(:password, ~r/[a-z]/u, message: "at least one lower case character")
+    |> validate_format(:password, ~r/[A-Z]/u, message: "at least one upper case character")
+    |> validate_format(:password, ~r/[!?@#$%^&*_0-9]/u, message: "at least one digit or punctuation character")
     |> maybe_hash_password(opts)
   end
 

lib/outlook/html_preparations/html_preparation.ex

@@ -63,7 +63,7 @@ defmodule Outlook.HtmlPreparations.HtmlPreparation do
 
   def set_sibling_with([ node | rest ]) do
     sib_with = case node.type do
-      :text    -> Regex.match?(~r/^\s*$/, node.content) && :both || :inline
+      :text    -> Regex.match?(~r/^\s*$/u, node.content) && :both || :inline
       :comment -> :both
     end
     [ %InternalNode{ node | eph: %{sibling_with: sib_with} } | set_sibling_with(rest) ]
@@ -73,7 +73,7 @@ defmodule Outlook.HtmlPreparations.HtmlPreparation do
 
 
   def strip_whitespace_textnodes [ %{type: :text} = node | rest] do
-    if Regex.match?(~r/^\s*$/, node.content) do
+    if Regex.match?(~r/^\s*$/u, node.content) do
       strip_whitespace_textnodes(rest)
     else
       [ node | strip_whitespace_textnodes(rest)]

lib/outlook_web.ex

@@ -86,11 +86,15 @@ defmodule OutlookWeb do
       import Phoenix.HTML
       # Core UI components and translation
       import OutlookWeb.CoreComponents
+
+      # custom components and module
       import OutlookWeb.HtmlTreeComponent
       import OutlookWeb.HtmlDocComponent
       import OutlookWeb.TunitEditorComponent
       import OutlookWeb.PublicComponents
       import OutlookWeb.DarkModeComponent
+      import OutlookWeb.ViewHelpers
+
       import OutlookWeb.Gettext
 
       # Shortcut for generating JS commands

lib/outlook_web/components/public_components.ex

@@ -5,11 +5,7 @@ defmodule OutlookWeb.PublicComponents do
   use Phoenix.Component
   import OutlookWeb.ViewHelpers
 
-  use Phoenix.VerifiedRoutes,
-    endpoint: OutlookWeb.Endpoint,
-    router: OutlookWeb.Router,
-    statics: OutlookWeb.static_paths()
-  import Phoenix.HTML
+  use OutlookWeb, :verified_routes
 
   alias Phoenix.LiveView.JS
 
@@ -20,7 +16,7 @@ defmodule OutlookWeb.PublicComponents do
     <a href={"/autoren/#{@autor.id}"}>
       <div class="p-4 my-2 border rounded-lg border-stone-400 text-stone-800 dark:text-stone-300 ">
         <div class="font-bold"><%= @autor.name %></div>
-        <div class=""><%= @autor.description %></div>
+        <div class=""><%= @autor.description |> tidy_raw %></div>
       </div>
     </a>
     """
@@ -36,7 +32,7 @@ defmodule OutlookWeb.PublicComponents do
         <h4 class="font-bold  text-stone-800 dark:text-stone-300 py-2"><%= @artikel.title %></h4>
         <div :if={@show_author}><small><%= @artikel.article.author.name %></small></div>
         <div><small><%= @artikel.date |> Calendar.strftime("%d.%m.%Y") %></small></div>
-        <div><%= @artikel.teaser |> raw %></div>
+        <div><%= @artikel.teaser |> tidy_raw %></div>
       </div>
     </.link>
     """

lib/outlook_web/controllers/artikel_controller.ex

@@ -8,8 +8,13 @@ defmodule OutlookWeb.ArtikelController do
     render(conn, :index, artikel: artikel, page_title: "Artikel")
   end
 
-  def show(conn, %{"id" => id}) do
-    artikel = Artikel.get_artikel!(id)
-    render(conn, :show, artikel: artikel, page_title: artikel.title)
+  def show(conn, %{"tid" => tid} = params) do
+    case Artikel.get_artikel_by_tid(tid) do
+      {:ok, artikel} -> render(conn, :show, artikel: artikel, page_title: artikel.title)
+      {:error, message} -> conn
+        |> put_status(404)
+        |> render(OutlookWeb.ErrorHTML, "404.html")
+        |> halt()
+    end
   end
 end

lib/outlook_web/live/article_live/show.ex

@@ -1,8 +1,7 @@
 defmodule OutlookWeb.ArticleLive.Show do
   use OutlookWeb, :live_view
 
-  alias Outlook.Articles
-  alias Outlook.InternalTree
+  alias Outlook.{Articles,InternalTree,Translations}
 
   @impl true
   def mount(_params, _session, socket) do
@@ -11,12 +10,24 @@ defmodule OutlookWeb.ArticleLive.Show do
 
   @impl true
   def handle_params(%{"id" => id}, _, socket) do
+    {:noreply, socket
+      |> assign(:page_title, page_title(socket.assigns.live_action))
+      |> get_and_assign_article(id)}
+  end
+
+  @impl true
+  def handle_event("delete_translation", %{"id" => id}, socket) do
+    translation = Translations.get_translation!(id)
+    {:ok, _} = Translations.delete_translation(translation)
+
+    {:noreply, socket |> get_and_assign_article(socket.assigns.article.id)}
+  end
+
+  defp get_and_assign_article(socket, id) do
     article = Articles.get_article_with_translations!(id)
-    {:noreply,
-     socket
-     |> assign(:page_title, page_title(socket.assigns.live_action))
-     |> assign(:article_content, InternalTree.garnish(article.content, %{tunits: %{class: "tunit"}}))
-     |> assign(:article, article)}
+    socket
+    |> assign(:article_content, InternalTree.garnish(article.content, %{tunits: %{class: "tunit"}}))
+    |> assign(:article, article)
   end
 
   defp page_title(:show), do: "Show Article"

lib/outlook_web/live/article_live/show.html.heex

@@ -19,7 +19,7 @@
 <.table id="translations" rows={@article.translations} row_click={&JS.navigate(~p"/translations/#{(&1).id}")}>
   <:col :let={translation} label="Language"><%= translation.language %></:col>
   <:col :let={translation} label="Title"><%= translation.title %></:col>
-  <:col :let={translation} label="Teaser"><%= translation.teaser %></:col>
+  <:col :let={translation} label="Teaser"><%= translation.teaser |> tidy_raw %></:col>
   <:col :let={translation} label="Date"><%= translation.date %></:col>
   <:col :let={translation} label="Public"><%= translation.public %></:col>
   <:action :let={translation}>
@@ -28,11 +28,11 @@
     </div>
     <.link navigate={~p"/translations/#{translation.id}/edit"}>Edit</.link>
   </:action>
-  <%!-- <:action :let={translation}>
-    <.link phx-click={JS.push("delete", value: %{id: translation.id})} data-confirm="Are you sure?">
+  <:action :let={translation}>
+    <.link phx-click={JS.push("delete_translation", value: %{id: translation.id})} data-confirm="Are you sure?">
       Delete
     </.link>
-  </:action> --%>
+  </:action>
 </.table>
 
 <div class="article">
@@ -40,10 +40,11 @@
   <a href="#" class="hide-link" phx-click={JS.remove_class("show-boundary", to: ".article")}>hide boundaries</a>
   <.render_doc tree={@article_content} />
 </div>
+<div class="h-10" />
 
-<.link navigate={~p"/translations/new?article_id=#{@article.id}"}>New Translation</.link>
+<.link class="text-sm font-semibold" navigate={~p"/translations/new?article_id=#{@article.id}"}>New Translation</.link>
 
-<.back navigate={~p"/articles"}>Back to articles</.back>
+<.back navigate={~p"/authors/#{@article.author}"}>Back to author</.back>
 
 <.modal :if={@live_action == :edit} id="article-modal" show on_cancel={JS.patch(~p"/articles/#{@article}")}>
   <.live_component

lib/outlook_web/live/author_live/index.html.heex

@@ -9,7 +9,7 @@
 
 <.table id="authors" rows={@authors} row_click={&JS.navigate(~p"/authors/#{&1}")}>
   <:col :let={author} label="Name"><%= author.name %></:col>
-  <:col :let={author} label="Description"><%= author.description %></:col>
+  <:col :let={author} label="Description"><%= author.description |> tidy_raw %></:col>
   <:col :let={author} label="Homepage name"><%= author.homepage_name %></:col>
   <:col :let={author} label="Homepage url"><%= author.homepage_url %></:col>
   <:action :let={author}>

lib/outlook_web/live/author_live/show.ex

@@ -1,7 +1,7 @@
 defmodule OutlookWeb.AuthorLive.Show do
   use OutlookWeb, :live_view
 
-  alias Outlook.Authors
+  alias Outlook.{Authors,Articles}
 
   @impl true
   def mount(_params, _session, socket) do
@@ -16,6 +16,15 @@ defmodule OutlookWeb.AuthorLive.Show do
      |> assign(:author, Authors.get_author_with_articles!(id))}
   end
 
+  @impl true
+  def handle_event("delete_article", %{"id" => id}, socket) do
+    article = Articles.get_article!(id)
+    {:ok, _} = Articles.delete_article(article)
+
+    {:noreply, socket
+      |> assign(:author, Authors.get_author_with_articles!(socket.assigns.author.id))}
+  end
+
   defp page_title(:show), do: "Show Author"
   defp page_title(:edit), do: "Edit Author"
 end

lib/outlook_web/live/author_live/show.html.heex

@@ -31,7 +31,7 @@
     <.link patch={~p"/articles/#{article}/edit"}>Edit</.link>
   </:action>
   <:action :let={article}>
-    <.link phx-click={JS.push("delete", value: %{id: article.id})} data-confirm="Are you sure?">
+    <.link phx-click={JS.push("delete_article", value: %{id: article.id})} data-confirm="Are you sure?">
       Delete
     </.link>
   </:action>

lib/outlook_web/live/translation_live/index.html.heex

@@ -5,7 +5,7 @@
 <.table id="translations" rows={@translations} row_click={&JS.navigate(~p(/translations/#{(&1).id}))}>
   <:col :let={translation} label="Language"><%= translation.language %></:col>
   <:col :let={translation} label="Title"><%= translation.title %></:col>
-  <:col :let={translation} label="Teaser"><%= translation.teaser %></:col>
+  <:col :let={translation} label="Teaser"><%= translation.teaser |> tidy_raw %></:col>
   <%!-- <:col :let={translation} label="Content"><%= translation.content %></:col> --%>
   <:col :let={translation} label="Date"><%= translation.date %></:col>
   <:col :let={translation} label="Public"><%= translation.public %></:col>
@@ -22,19 +22,3 @@
     </.link>
   </:action>
 </.table>
-
-<.modal
-  :if={@live_action in [:new, :edit]}
-  id="translation-modal"
-  show
-  on_cancel={JS.navigate(~p"/translations")}
->
-  <.live_component
-    module={OutlookWeb.TranslationLive.FormComponent}
-    id={@translation.id || :new}
-    title={@page_title}
-    action={@live_action}
-    translation={@translation}
-    navigate={~p"/translations"}
-  />
-</.modal>

lib/outlook_web/live/translation_live/show.html.heex

@@ -22,4 +22,4 @@
   <.render_doc tree={InternalTree.render_translation(@translation.article.content, @translation.content)} />
 </div>
 
-<.back navigate={~p"/translations"}>Back to translations</.back>
+<.back navigate={~p"/articles/#{@translation.article}"}>Back to <article></article></.back>

lib/outlook_web/view_helpers.ex

@@ -0,0 +1,12 @@
+defmodule OutlookWeb.ViewHelpers do
+
+  import Phoenix.HTML, only: [raw: 1]
+
+  @doc "Just sanitize tags"
+  def tidy_raw(html) do
+    html
+    |> Floki.parse_fragment!()
+    |> Floki.raw_html()
+    |> raw
+  end
+end