From c71aa9b8ec7683765d8ca09b08863dc066879e2e Mon Sep 17 00:00:00 2001
From: Philipp Kempgen <office@kempgen.net>
Date: Thu, 22 Feb 2024 19:55:31 +0100
Subject: [PATCH 1/9] fix form labels (#58)

---
 lib/animina_web/live/potential_partner_live.ex | 10 +++++-----
 lib/animina_web/live/root_live.ex              | 18 +++++++++---------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/lib/animina_web/live/potential_partner_live.ex b/lib/animina_web/live/potential_partner_live.ex
index a344165d..8333e524 100644
--- a/lib/animina_web/live/potential_partner_live.ex
+++ b/lib/animina_web/live/potential_partner_live.ex
@@ -111,7 +111,7 @@ defmodule AniminaWeb.PotentialPartnerLive do
       >
         <div>
           <label
-            for="minimum_partner_height"
+            for="form_minimum_partner_height"
             class="block text-sm font-medium leading-6 text-gray-900"
           >
             <%= gettext("Minimum height") %>
@@ -138,7 +138,7 @@ defmodule AniminaWeb.PotentialPartnerLive do
 
         <div>
           <label
-            for="maximum_partner_height"
+            for="form_maximum_partner_height"
             class="block text-sm font-medium leading-6 text-gray-900"
           >
             <%= gettext("Maximum height") %>
@@ -163,7 +163,7 @@ defmodule AniminaWeb.PotentialPartnerLive do
         </div>
 
         <div>
-          <label for="minimum_partner_age" class="block text-sm font-medium leading-6 text-gray-900">
+          <label for="form_minimum_partner_age" class="block text-sm font-medium leading-6 text-gray-900">
             <%= gettext("Minimum age") %>
           </label>
           <div phx-feedback-for={f[:minimum_partner_age].name} class="mt-2">
@@ -184,7 +184,7 @@ defmodule AniminaWeb.PotentialPartnerLive do
         </div>
 
         <div>
-          <label for="maximum_partner_age" class="block text-sm font-medium leading-6 text-gray-900">
+          <label for="form_maximum_partner_age" class="block text-sm font-medium leading-6 text-gray-900">
             <%= gettext("Maximum age") %>
           </label>
           <div phx-feedback-for={f[:maximum_partner_age].name} class="mt-2">
@@ -205,7 +205,7 @@ defmodule AniminaWeb.PotentialPartnerLive do
         </div>
 
         <div>
-          <label for="search_range" class="block text-sm font-medium leading-6 text-gray-900">
+          <label for="form_search_range" class="block text-sm font-medium leading-6 text-gray-900">
             <%= gettext("Search range") %>
           </label>
           <div phx-feedback-for={f[:search_range].name} class="mt-2">
diff --git a/lib/animina_web/live/root_live.ex b/lib/animina_web/live/root_live.ex
index 0d06d08d..9593eaaf 100644
--- a/lib/animina_web/live/root_live.ex
+++ b/lib/animina_web/live/root_live.ex
@@ -105,7 +105,7 @@ defmodule AniminaWeb.RootLive do
         phx-submit="submit"
       >
         <div>
-          <label for="username" class="block text-sm font-medium leading-6 text-gray-900">
+          <label for="user_username" class="block text-sm font-medium leading-6 text-gray-900">
             <%= gettext("Username") %>
           </label>
           <div phx-feedback-for={f[:username].name} class="mt-2">
@@ -136,7 +136,7 @@ defmodule AniminaWeb.RootLive do
         <%= text_input(f, :language, type: :hidden, value: @language) %>
 
         <div>
-          <label for="name" class="block text-sm font-medium leading-6 text-gray-900">
+          <label for="user_name" class="block text-sm font-medium leading-6 text-gray-900">
             <%= gettext("Name") %>
           </label>
           <div phx-feedback-for={f[:name].name} class="mt-2">
@@ -161,7 +161,7 @@ defmodule AniminaWeb.RootLive do
         </div>
 
         <div>
-          <label for="email" class="block text-sm font-medium leading-6 text-gray-900">
+          <label for="user_email" class="block text-sm font-medium leading-6 text-gray-900">
             <%= gettext("E-mail address") %>
           </label>
           <div phx-feedback-for={f[:email].name} class="mt-2">
@@ -187,7 +187,7 @@ defmodule AniminaWeb.RootLive do
 
         <div>
           <div class="flex items-center justify-between">
-            <label for="password" class="block text-sm font-medium leading-6 text-gray-900">
+            <label for="user_password" class="block text-sm font-medium leading-6 text-gray-900">
               <%= gettext("Password") %>
             </label>
           </div>
@@ -212,7 +212,7 @@ defmodule AniminaWeb.RootLive do
 
         <div>
           <div class="flex items-center justify-between">
-            <label for="birthday" class="block text-sm font-medium leading-6 text-gray-900">
+            <label for="user_birthday" class="block text-sm font-medium leading-6 text-gray-900">
               <%= gettext("Date of birth") %>
             </label>
           </div>
@@ -243,7 +243,7 @@ defmodule AniminaWeb.RootLive do
 
         <div>
           <div class="flex items-center justify-between">
-            <label for="gender" class="block text-sm font-medium leading-6 text-gray-900">
+            <label for="user_gender" class="block text-sm font-medium leading-6 text-gray-900">
               <%= gettext("Gender") %>
             </label>
           </div>
@@ -286,7 +286,7 @@ defmodule AniminaWeb.RootLive do
 
         <div>
           <div class="flex items-center justify-between">
-            <label for="zip_code" class="block text-sm font-medium leading-6 text-gray-900">
+            <label for="user_zip_code" class="block text-sm font-medium leading-6 text-gray-900">
               <%= gettext("Postal code") %>
             </label>
           </div>
@@ -312,7 +312,7 @@ defmodule AniminaWeb.RootLive do
 
         <div>
           <div class="flex items-center justify-between">
-            <label for="height" class="block text-sm font-medium leading-6 text-gray-900">
+            <label for="user_height" class="block text-sm font-medium leading-6 text-gray-900">
               <%= gettext("Height") %>
               <span class="text-gray-400">
                 (<%= gettext("in cm") %>)
@@ -340,7 +340,7 @@ defmodule AniminaWeb.RootLive do
 
         <div>
           <div class="flex items-center justify-between">
-            <label for="mobile_phone" class="block text-sm font-medium leading-6 text-gray-900">
+            <label for="user_mobile_phone" class="block text-sm font-medium leading-6 text-gray-900">
               <%= gettext("Mobile phone number") %>
               <span class="text-gray-400">
                 (<%= gettext("to receive a verification code") %>)

From a90f4e3b7335a74f98e79848ee0aef75d2b1c7d2 Mon Sep 17 00:00:00 2001
From: Philipp Kempgen <office@kempgen.net>
Date: Thu, 22 Feb 2024 23:57:21 +0100
Subject: [PATCH 2/9] validate postal code (#46)

---
 lib/animina/validations/postal_code.ex | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/animina/validations/postal_code.ex b/lib/animina/validations/postal_code.ex
index d46fac07..0f8ee445 100644
--- a/lib/animina/validations/postal_code.ex
+++ b/lib/animina/validations/postal_code.ex
@@ -21,8 +21,8 @@ defmodule Animina.Validations.PostalCode do
       zip_code == nil ->
         :ok
 
-      String.length(zip_code) < 5 || String.length(zip_code) > 5 ->
-        {:error, field: opts[:attribute], message: "length must be 5"}
+      ! String.match?(zip_code, ~r/\A [0-9]{5} \z/x) ->
+        {:error, field: opts[:attribute], message: "must have 5 digits"}
 
       true ->
         :ok

From 707bba836e806643c2fc419c75928f1a9baf6d1e Mon Sep 17 00:00:00 2001
From: Philipp Kempgen <office@kempgen.net>
Date: Fri, 23 Feb 2024 02:32:21 +0100
Subject: [PATCH 3/9] validate gender (#55)

---
 lib/animina/accounts/resources/basic_user.ex |  9 ++-
 lib/animina/accounts/resources/user.ex       |  9 ++-
 lib/animina_web/live/root_live.ex            | 65 +++++++++-----------
 test/animina/accounts/user_test.exs          |  2 +-
 4 files changed, 47 insertions(+), 38 deletions(-)

diff --git a/lib/animina/accounts/resources/basic_user.ex b/lib/animina/accounts/resources/basic_user.ex
index 59eb6ea9..9a0476bd 100644
--- a/lib/animina/accounts/resources/basic_user.ex
+++ b/lib/animina/accounts/resources/basic_user.ex
@@ -42,7 +42,14 @@ defmodule Animina.Accounts.BasicUser do
                   allow_empty?: false
     end
 
-    attribute :gender, :string, allow_nil?: false
+    attribute :gender, :string do
+      allow_nil? false
+      
+      constraints(
+        match: ~r/\A [mfx] \z/x,
+        allow_empty?: false,
+      )
+    end
 
     attribute :height, :integer do
       allow_nil? false
diff --git a/lib/animina/accounts/resources/user.ex b/lib/animina/accounts/resources/user.ex
index 3bc3db79..a1226674 100644
--- a/lib/animina/accounts/resources/user.ex
+++ b/lib/animina/accounts/resources/user.ex
@@ -41,7 +41,14 @@ defmodule Animina.Accounts.User do
                   allow_empty?: false
     end
 
-    attribute :gender, :string, allow_nil?: false
+    attribute :gender, :string do
+      allow_nil? false
+      
+      constraints(
+        match: ~r/\A [mfx] \z/x,
+        allow_empty?: false,
+      )
+    end
 
     attribute :height, :integer do
       allow_nil? false
diff --git a/lib/animina_web/live/root_live.ex b/lib/animina_web/live/root_live.ex
index 9593eaaf..e5741b83 100644
--- a/lib/animina_web/live/root_live.ex
+++ b/lib/animina_web/live/root_live.ex
@@ -122,7 +122,6 @@ defmodule AniminaWeb.RootLive do
               value: f[:username].value,
               type: :text,
               required: true,
-              autofocus: true,
               autocomplete: :username
             ) %>
 
@@ -248,39 +247,30 @@ defmodule AniminaWeb.RootLive do
             </label>
           </div>
           <div class="mt-2">
-            <div class="flex items-center mb-4">
-              <%= radio_button(f, :gender, "male",
-                id: "gender_male",
-                class: "h-4 w-4 border-gray-300 text-indigo-600 focus:ring-indigo-500",
-                checked: true
-              ) %>
-              <%= label(f, :gender, gettext("Male"),
-                for: "gender_male",
-                class: "ml-3 block text-sm font-medium text-gray-700"
-              ) %>
-            </div>
-
-            <div class="flex items-center mb-4">
-              <%= radio_button(f, :gender, "female",
-                id: "gender_female",
-                class: "h-4 w-4 border-gray-300 text-indigo-600 focus:ring-indigo-500"
-              ) %>
-              <%= label(f, :gender, gettext("Female"),
-                for: "gender_female",
-                class: "ml-3 block text-sm font-medium text-gray-700"
-              ) %>
-            </div>
-
-            <div class="flex items-center mb-4">
-              <%= radio_button(f, :gender, gettext("Diverse / non-binary"),
-                id: "gender_divers",
-                class: "h-4 w-4 border-gray-300 text-indigo-600 focus:ring-indigo-500"
-              ) %>
-              <%= label(f, :gender, "Diverse / non-binary",
-                for: "gender_divers",
-                class: "ml-3 block text-sm font-medium text-gray-700"
-              ) %>
-            </div>
+            
+            <%= for { item_code, item_title } <- [
+              { "m", gettext("Male")},
+              { "f", gettext("Female")},
+              { "x", gettext("Diverse / non-binary")},
+            ] do %>
+              
+              <div class="flex items-center mb-4">
+                <%= radio_button(f, :gender, item_code,
+                  id: "input-gender_" <> item_code,
+                  class: "h-4 w-4 border-gray-300 text-indigo-600 focus:ring-indigo-500"
+                ) %>
+                <%= label(f, :gender, item_title,
+                  for: "input-gender_" <> item_code,
+                  class: "ml-3 block text-sm font-medium text-gray-700"
+                ) %>
+              </div>
+              
+            <% end %>
+            
+            <.error :for={msg <- get_field_errors(f[:gender], :gender)}>
+              <%= gettext("Gender") <> " " <> msg %>
+            </.error>
+
           </div>
         </div>
 
@@ -301,6 +291,8 @@ defmodule AniminaWeb.RootLive do
               # Postal code of the Bundestag :-)
               placeholder: "11011",
               value: f[:zip_code].value,
+              pattern: "[0-9]{5}",
+              inputmode: "numeric",
               autocomplete: "postal-code"
             ) %>
 
@@ -319,7 +311,6 @@ defmodule AniminaWeb.RootLive do
               </span>
             </label>
           </div>
-
           <div phx-feedback-for={f[:height].name} class="mt-2">
             <%= text_input(f, :height,
               class:
@@ -329,6 +320,8 @@ defmodule AniminaWeb.RootLive do
                     else: "ring-gray-300 focus:ring-indigo-600"
                   ),
               placeholder: "160",
+              pattern: "[1-9][0-9]{2}",
+              inputmode: "numeric",
               value: f[:height].value
             ) %>
 
@@ -356,6 +349,8 @@ defmodule AniminaWeb.RootLive do
                     else: "ring-gray-300 focus:ring-indigo-600"
                   ),
               placeholder: "0151-12345678",
+              pattern: "[0-9+ \-]*",
+              inputmode: "numeric",
               value: f[:mobile_phone].value
             ) %>
 
diff --git a/test/animina/accounts/user_test.exs b/test/animina/accounts/user_test.exs
index 930eadba..746fa316 100644
--- a/test/animina/accounts/user_test.exs
+++ b/test/animina/accounts/user_test.exs
@@ -14,7 +14,7 @@ defmodule Animina.Accounts.UserTest do
           birthday: "1950-01-01",
           height: 180,
           zip_code: "12345",
-          gender: "male",
+          gender: "m",
           mobile_phone: "0151-12345678",
           language: "en"
           # subscribed_at: 1706659201,

From 71a8fe6a6369a1aa45b5a74a68baf333b55bde4b Mon Sep 17 00:00:00 2001
From: Philipp Kempgen <office@kempgen.net>
Date: Fri, 23 Feb 2024 02:32:51 +0100
Subject: [PATCH 4/9] add .editorconfig

---
 .editorconfig | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 .editorconfig

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..43b760dd
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,8 @@
+[*.{html.heex,ex,exs}]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = false
+indent_style = space
+indent_size = 2
+

From 6752018010fac8cc24906da062c945ee2250f6d4 Mon Sep 17 00:00:00 2001
From: Philipp Kempgen <office@kempgen.net>
Date: Fri, 23 Feb 2024 02:38:21 +0100
Subject: [PATCH 5/9] fix elixir github workflow

---
 .github/workflows/elixir.yml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/elixir.yml b/.github/workflows/elixir.yml
index a466dbe3..f11b5e0d 100644
--- a/.github/workflows/elixir.yml
+++ b/.github/workflows/elixir.yml
@@ -1,10 +1,12 @@
 name: Elixir CI
 
-on:
-  push:
-    branches: [main]
-  pull_request:
-    branches: [main]
+#on:
+#  push:
+#    branches: [main]
+#  pull_request:
+#    branches: [main]
+
+on: push
 
 jobs:
   build:

From 57baf8e6692e4a9d9577751cff650027ec963664 Mon Sep 17 00:00:00 2001
From: Philipp Kempgen <office@kempgen.net>
Date: Wed, 28 Feb 2024 02:07:19 +0100
Subject: [PATCH 6/9] seed hashtags in docker-entrypoint.sh (amends commit
 79cdf1cb30918a5bfbb59eae48f781d29487585a from
 https://github.com/animina-dating/animina/pull/66)

---
 docker-entrypoint.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 831bb89a..a6ac0c3c 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -7,6 +7,9 @@ echo "Create the database and run migrations ..."
 mix ash_postgres.create
 mix ash_postgres.migrate
 
+echo "Seeding hashtags ..."
+mix run priv/repo/flag_seeds.exs || true    #TODO No need to run every time. Should these go into a migration?
+
 echo "Starting application ..."
 mix phx.server
 #iex -S mix phx.server

From 33c25b6271981e3517ce3875a97076569a61e40b Mon Sep 17 00:00:00 2001
From: Philipp Kempgen <office@kempgen.net>
Date: Wed, 28 Feb 2024 02:10:23 +0100
Subject: [PATCH 7/9] fix elixir github workflow

---
 .github/workflows/elixir.yml | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/elixir.yml b/.github/workflows/elixir.yml
index f11b5e0d..eb26d0b3 100644
--- a/.github/workflows/elixir.yml
+++ b/.github/workflows/elixir.yml
@@ -1,12 +1,8 @@
 name: Elixir CI
 
-#on:
-#  push:
-#    branches: [main]
-#  pull_request:
-#    branches: [main]
-
-on: push
+on:
+  push:
+  pull_request:
 
 jobs:
   build:

From c835e93f325dc3ce1cb4fe795d40f4489addc9f1 Mon Sep 17 00:00:00 2001
From: Philipp Kempgen <office@kempgen.net>
Date: Wed, 28 Feb 2024 02:22:53 +0100
Subject: [PATCH 8/9] trying to make the diff to upstream smaller

---
 lib/animina_web/live/root_live.ex | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/animina_web/live/root_live.ex b/lib/animina_web/live/root_live.ex
index 49eb0066..cd167ea1 100644
--- a/lib/animina_web/live/root_live.ex
+++ b/lib/animina_web/live/root_live.ex
@@ -190,8 +190,8 @@ defmodule AniminaWeb.RootLive do
                   ),
               placeholder: gettext("Password"),
               value: f[:password].value,
-              "phx-debounce": "300",
-              autocomplete: "new-password"
+              autocomplete: "new-password",
+              "phx-debounce": "300"
             ) %>
 
             <.error :for={msg <- get_field_errors(f[:password], :password)}>
@@ -216,8 +216,8 @@ defmodule AniminaWeb.RootLive do
                   ),
               placeholder: "",
               value: f[:birthday].value,
-              "phx-debounce": "300",
-              autocomplete: "bday"
+              autocomplete: "bday",
+              "phx-debounce": "300"
             ) %>
 
             <.error :for={msg <- get_field_errors(f[:birthday], :birthday)}>
@@ -241,8 +241,8 @@ defmodule AniminaWeb.RootLive do
             <div class="flex items-center mb-4">
               <%= radio_button(f, :gender, item_code,
                 id: "gender_" <> item_code,
-                checked: true,
-                class: "h-4 w-4 border-gray-300 text-indigo-600 focus:ring-indigo-500"
+                class: "h-4 w-4 border-gray-300 text-indigo-600 focus:ring-indigo-500",
+                checked: true
               ) %>
               <%= label(f, :gender, item_title,
                 for: "gender_" <> item_code,
@@ -302,8 +302,8 @@ defmodule AniminaWeb.RootLive do
               value: f[:zip_code].value,
               pattern: "[0-9]{5}",
               inputmode: "numeric",
-              "phx-debounce": "300",
-              autocomplete: "postal-code"
+              autocomplete: "postal-code",
+              "phx-debounce": "300"
             ) %>
 
             <.error :for={msg <- get_field_errors(f[:zip_code], :zip_code)}>
@@ -332,8 +332,8 @@ defmodule AniminaWeb.RootLive do
               placeholder: "160",
               pattern: "[1-9][0-9]{2}",
               inputmode: "numeric",
-              "phx-debounce": "300",
-              value: f[:height].value
+              value: f[:height].value,
+              "phx-debounce": "300"
             ) %>
 
             <.error :for={msg <- get_field_errors(f[:height], :height)}>
@@ -362,8 +362,8 @@ defmodule AniminaWeb.RootLive do
               placeholder: "0151-12345678",
               pattern: "[0-9+ \-]*",
               inputmode: "numeric",
-              "phx-debounce": "300",
-              value: f[:mobile_phone].value
+              value: f[:mobile_phone].value,
+              "phx-debounce": "300"
             ) %>
 
             <.error :for={msg <- get_field_errors(f[:mobile_phone], :mobile_phone)}>

From d659aab6bb22375abc78c322555f62515609991f Mon Sep 17 00:00:00 2001
From: Philipp Kempgen <office@kempgen.net>
Date: Wed, 28 Feb 2024 02:31:34 +0100
Subject: [PATCH 9/9] removed pattern from input fields, as that's not in
 upstream

---
 lib/animina_web/live/root_live.ex | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/animina_web/live/root_live.ex b/lib/animina_web/live/root_live.ex
index cd167ea1..20f1c43e 100644
--- a/lib/animina_web/live/root_live.ex
+++ b/lib/animina_web/live/root_live.ex
@@ -300,7 +300,7 @@ defmodule AniminaWeb.RootLive do
               # Postal code of the Bundestag :-)
               placeholder: "11011",
               value: f[:zip_code].value,
-              pattern: "[0-9]{5}",
+              #pattern: "[0-9]{5}",
               inputmode: "numeric",
               autocomplete: "postal-code",
               "phx-debounce": "300"
@@ -330,7 +330,7 @@ defmodule AniminaWeb.RootLive do
                     else: "ring-gray-300 focus:ring-indigo-600"
                   ),
               placeholder: "160",
-              pattern: "[1-9][0-9]{2}",
+              #pattern: "[1-9][0-9]{2}",
               inputmode: "numeric",
               value: f[:height].value,
               "phx-debounce": "300"
@@ -360,7 +360,7 @@ defmodule AniminaWeb.RootLive do
                     else: "ring-gray-300 focus:ring-indigo-600"
                   ),
               placeholder: "0151-12345678",
-              pattern: "[0-9+ \-]*",
+              #pattern: "[0-9+ \-]*",
               inputmode: "numeric",
               value: f[:mobile_phone].value,
               "phx-debounce": "300"