changelog.md

@@ -1,8 +1,3 @@
-# v0.1.2
-- fix more typos
-- add to faq
-- check for slug uniqueness before submitting
-
 # v0.1.1
 - improve search a whole lot
 - improve table information for notes and contexts

lib/memex/contexts/context.ex

@@ -7,7 +7,7 @@ defmodule Memex.Contexts.Context do
   import Ecto.Changeset
   import MemexWeb.Gettext
   alias Ecto.{Changeset, UUID}
-  alias Memex.{Accounts.User, Repo}
+  alias Memex.Accounts.User
 
   @primary_key {:id, :binary_id, autogenerate: true}
   @foreign_key_type :binary_id
@@ -49,8 +49,6 @@ defmodule Memex.Contexts.Context do
       message: dgettext("errors", "invalid format: only numbers, letters and hyphen are accepted")
     )
     |> validate_required([:slug, :content, :user_id, :visibility])
-    |> unique_constraint(:slug)
-    |> unsafe_validate_unique(:slug, Repo)
   end
 
   @spec update_changeset(t(), attrs :: map(), User.t()) :: changeset()
@@ -62,8 +60,6 @@ defmodule Memex.Contexts.Context do
       message: dgettext("errors", "invalid format: only numbers, letters and hyphen are accepted")
     )
     |> validate_required([:slug, :content, :visibility])
-    |> unique_constraint(:slug)
-    |> unsafe_validate_unique(:slug, Repo)
   end
 
   defp cast_tags_string(changeset, %{"tags_string" => tags_string})

lib/memex/notes/note.ex

@@ -6,7 +6,7 @@ defmodule Memex.Notes.Note do
   import Ecto.Changeset
   import MemexWeb.Gettext
   alias Ecto.{Changeset, UUID}
-  alias Memex.{Accounts.User, Repo}
+  alias Memex.Accounts.User
 
   @primary_key {:id, :binary_id, autogenerate: true}
   @foreign_key_type :binary_id
@@ -48,8 +48,6 @@ defmodule Memex.Notes.Note do
       message: dgettext("errors", "invalid format: only numbers, letters and hyphen are accepted")
     )
     |> validate_required([:slug, :content, :user_id, :visibility])
-    |> unique_constraint(:slug)
-    |> unsafe_validate_unique(:slug, Repo)
   end
 
   @spec update_changeset(t(), attrs :: map(), User.t()) :: changeset()
@@ -61,8 +59,6 @@ defmodule Memex.Notes.Note do
       message: dgettext("errors", "invalid format: only numbers, letters and hyphen are accepted")
     )
     |> validate_required([:slug, :content, :visibility])
-    |> unique_constraint(:slug)
-    |> unsafe_validate_unique(:slug, Repo)
   end
 
   defp cast_tags_string(changeset, %{"tags_string" => tags_string})

lib/memex/pipelines/pipeline.ex

@@ -6,7 +6,7 @@ defmodule Memex.Pipelines.Pipeline do
   import Ecto.Changeset
   import MemexWeb.Gettext
   alias Ecto.{Changeset, UUID}
-  alias Memex.{Accounts.User, Pipelines.Steps.Step, Repo}
+  alias Memex.{Accounts.User, Pipelines.Steps.Step}
 
   @primary_key {:id, :binary_id, autogenerate: true}
   @foreign_key_type :binary_id
@@ -50,8 +50,6 @@ defmodule Memex.Pipelines.Pipeline do
       message: dgettext("errors", "invalid format: only numbers, letters and hyphen are accepted")
     )
     |> validate_required([:slug, :user_id, :visibility])
-    |> unique_constraint(:slug)
-    |> unsafe_validate_unique(:slug, Repo)
   end
 
   @spec update_changeset(t(), attrs :: map(), User.t()) :: changeset()
@@ -63,8 +61,6 @@ defmodule Memex.Pipelines.Pipeline do
       message: dgettext("errors", "invalid format: only numbers, letters and hyphen are accepted")
     )
     |> validate_required([:slug, :visibility])
-    |> unique_constraint(:slug)
-    |> unsafe_validate_unique(:slug, Repo)
   end
 
   defp cast_tags_string(changeset, %{"tags_string" => tags_string})

lib/memex_web/controllers/user_reset_password_controller.ex

@@ -6,7 +6,7 @@ defmodule MemexWeb.UserResetPasswordController do
   plug :get_user_by_reset_password_token when action in [:edit, :update]
 
   def new(conn, _params) do
-    render(conn, "new.html", page_title: gettext("forgot your password?"))
+    render(conn, "new.html", page_title: gettext("Forgot your password?"))
   end
 
   def create(conn, %{"user" => %{"email" => email}}) do

lib/memex_web/controllers/user_session_controller.ex

@@ -20,7 +20,7 @@ defmodule MemexWeb.UserSessionController do
 
   def delete(conn, _params) do
     conn
-    |> put_flash(:info, dgettext("prompts", "logged out successfully."))
+    |> put_flash(:info, dgettext("prompts", "Logged out successfully."))
     |> UserAuth.log_out_user()
   end
 end

lib/memex_web/live/faq_live.html.heex

@@ -120,26 +120,5 @@
         ) %>
       </p>
     </li>
-
-    <li class="flex flex-col justify-center items-stretch space-y-2">
-      <b class="whitespace-nowrap">
-        <%= gettext("how many people should i invite?") %>
-      </b>
-      <p>
-        <%= gettext(
-          "while memEx fully supports multiple users, each memEx instance should be treated as a single cohesive and collaborative document."
-        ) %>
-      </p>
-      <p>
-        <%= gettext(
-          "note, context and pipeline slugs must be unique, and you are free to backlink to notes not written by you."
-        ) %>
-      </p>
-      <p>
-        <%= gettext(
-          "so, i'd recommend inviting anyone you'd like to work on your collective memEx. however, when in doubt, hopefully setting up a new instance is easy enough. if it isn't, then feel free to let me know :)"
-        ) %>
-      </p>
-    </li>
   </ul>
 </div>

lib/memex_web/templates/user_registration/new.html.heex

@@ -33,7 +33,7 @@
     <%= select(
       f,
       :locale,
-      [{gettext("english"), "en_US"}],
+      [{gettext("English"), "en_US"}],
       class: "input input-primary col-span-2"
     ) %>
     <%= error_tag(f, :locale) %>
@@ -48,7 +48,7 @@
       <%= dgettext("actions", "log in") %>
     </.link>
     <.link href={Routes.user_reset_password_path(@conn, :new)} class="btn btn-primary">
-      <%= dgettext("actions", "forgot your password?") %>
+      <%= dgettext("actions", "Forgot your password?") %>
     </.link>
   </div>
 </div>

lib/memex_web/templates/user_reset_password/new.html.heex

@@ -1,6 +1,6 @@
 <div class="mx-auto mb-8 max-w-2xl flex flex-col justify-center items-center space-y-4">
   <h1 class="title text-primary-400 text-xl">
-    <%= dgettext("actions", "forgot your password?") %>
+    <%= dgettext("actions", "Forgot your password?") %>
   </h1>
 
   <.form
@@ -12,7 +12,7 @@
     <%= label(f, :email, class: "title text-lg text-primary-400") %>
     <%= email_input(f, :email, required: true, class: "input input-primary col-span-2") %>
 
-    <%= submit(dgettext("actions", "send instructions to reset password"),
+    <%= submit(dgettext("actions", "Send instructions to reset password"),
       class: "mx-auto btn btn-primary col-span-3"
     ) %>
   </.form>

lib/memex_web/templates/user_session/new.html.heex

@@ -41,7 +41,7 @@
       </.link>
     <% end %>
     <.link href={Routes.user_reset_password_path(@conn, :new)} class="btn btn-primary">
-      <%= dgettext("actions", "forgot your password?") %>
+      <%= dgettext("actions", "Forgot your password?") %>
     </.link>
   </div>
 </div>

mix.exs

@@ -4,7 +4,7 @@ defmodule Memex.MixProject do
   def project do
     [
       app: :memex,
-      version: "0.1.2",
+      version: "0.1.1",
       elixir: "~> 1.14",
       elixirc_paths: elixirc_paths(Mix.env()),
       compilers: Mix.compilers(),

priv/gettext/actions.pot

@@ -15,6 +15,13 @@ msgstr ""
 msgid "Copy to clipboard"
 msgstr ""
 
+#: lib/memex_web/templates/user_registration/new.html.heex:51
+#: lib/memex_web/templates/user_reset_password/new.html.heex:3
+#: lib/memex_web/templates/user_session/new.html.heex:44
+#, elixir-autogen, elixir-format
+msgid "Forgot your password?"
+msgstr ""
+
 #: lib/memex_web/templates/user_confirmation/new.html.heex:3
 #: lib/memex_web/templates/user_confirmation/new.html.heex:15
 #, elixir-autogen, elixir-format
@@ -32,6 +39,11 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
+#: lib/memex_web/templates/user_reset_password/new.html.heex:15
+#, elixir-autogen, elixir-format
+msgid "Send instructions to reset password"
+msgstr ""
+
 #: lib/memex_web/templates/user_settings/edit.html.heex:15
 #: lib/memex_web/templates/user_settings/edit.html.heex:44
 #, elixir-autogen, elixir-format
@@ -143,15 +155,3 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "add step"
 msgstr ""
-
-#: lib/memex_web/templates/user_registration/new.html.heex:51
-#: lib/memex_web/templates/user_reset_password/new.html.heex:3
-#: lib/memex_web/templates/user_session/new.html.heex:44
-#, elixir-autogen, elixir-format
-msgid "forgot your password?"
-msgstr ""
-
-#: lib/memex_web/templates/user_reset_password/new.html.heex:15
-#, elixir-autogen, elixir-format
-msgid "send instructions to reset password"
-msgstr ""

priv/gettext/de/LC_MESSAGES/actions.po

@@ -16,6 +16,13 @@ msgstr ""
 msgid "Copy to clipboard"
 msgstr ""
 
+#: lib/memex_web/templates/user_registration/new.html.heex:51
+#: lib/memex_web/templates/user_reset_password/new.html.heex:3
+#: lib/memex_web/templates/user_session/new.html.heex:44
+#, elixir-autogen, elixir-format
+msgid "Forgot your password?"
+msgstr ""
+
 #: lib/memex_web/templates/user_confirmation/new.html.heex:3
 #: lib/memex_web/templates/user_confirmation/new.html.heex:15
 #, elixir-autogen, elixir-format
@@ -33,6 +40,11 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
+#: lib/memex_web/templates/user_reset_password/new.html.heex:15
+#, elixir-autogen, elixir-format
+msgid "Send instructions to reset password"
+msgstr ""
+
 #: lib/memex_web/templates/user_settings/edit.html.heex:15
 #: lib/memex_web/templates/user_settings/edit.html.heex:44
 #, elixir-autogen, elixir-format
@@ -144,15 +156,3 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "add step"
 msgstr ""
-
-#: lib/memex_web/templates/user_registration/new.html.heex:51
-#: lib/memex_web/templates/user_reset_password/new.html.heex:3
-#: lib/memex_web/templates/user_session/new.html.heex:44
-#, elixir-autogen, elixir-format, fuzzy
-msgid "forgot your password?"
-msgstr ""
-
-#: lib/memex_web/templates/user_reset_password/new.html.heex:15
-#, elixir-autogen, elixir-format, fuzzy
-msgid "send instructions to reset password"
-msgstr ""

priv/gettext/de/LC_MESSAGES/default.po

@@ -31,6 +31,16 @@ msgstr ""
 msgid "Confirm your account"
 msgstr ""
 
+#: lib/memex_web/templates/user_registration/new.html.heex:36
+#, elixir-autogen, elixir-format
+msgid "English"
+msgstr ""
+
+#: lib/memex_web/controllers/user_reset_password_controller.ex:9
+#, elixir-autogen, elixir-format
+msgid "Forgot your password?"
+msgstr ""
+
 #: lib/memex_web/templates/user_session/new.html.heex:27
 #, elixir-autogen, elixir-format
 msgid "Keep me logged in for 60 days"
@@ -172,7 +182,6 @@ msgstr ""
 msgid "enable"
 msgstr ""
 
-#: lib/memex_web/templates/user_registration/new.html.heex:36
 #: lib/memex_web/templates/user_settings/edit.html.heex:126
 #, elixir-autogen, elixir-format
 msgid "english"
@@ -640,28 +649,3 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "memEx | %{title}"
 msgstr ""
-
-#: lib/memex_web/controllers/user_reset_password_controller.ex:9
-#, elixir-autogen, elixir-format, fuzzy
-msgid "forgot your password?"
-msgstr ""
-
-#: lib/memex_web/live/faq_live.html.heex:126
-#, elixir-autogen, elixir-format
-msgid "how many people should i invite?"
-msgstr ""
-
-#: lib/memex_web/live/faq_live.html.heex:134
-#, elixir-autogen, elixir-format
-msgid "note, context and pipeline slugs must be unique, and you are free to backlink to notes not written by you."
-msgstr ""
-
-#: lib/memex_web/live/faq_live.html.heex:139
-#, elixir-autogen, elixir-format
-msgid "so, i'd recommend inviting anyone you'd like to work on your collective memEx. however, when in doubt, hopefully setting up a new instance is easy enough. if it isn't, then feel free to let me know :)"
-msgstr ""
-
-#: lib/memex_web/live/faq_live.html.heex:129
-#, elixir-autogen, elixir-format
-msgid "while memEx fully supports multiple users, each memEx instance should be treated as a single cohesive and collaborative document."
-msgstr ""

priv/gettext/de/LC_MESSAGES/errors.po

@@ -103,11 +103,11 @@ msgid "oops, something went wrong! Please check the errors below"
 msgstr ""
 
 #: lib/memex/contexts/context.ex:49
-#: lib/memex/contexts/context.ex:62
+#: lib/memex/contexts/context.ex:60
 #: lib/memex/notes/note.ex:48
-#: lib/memex/notes/note.ex:61
+#: lib/memex/notes/note.ex:59
 #: lib/memex/pipelines/pipeline.ex:50
-#: lib/memex/pipelines/pipeline.ex:63
+#: lib/memex/pipelines/pipeline.ex:61
 #, elixir-autogen, elixir-format
 msgid "invalid format: only numbers, letters and hyphen are accepted"
 msgstr ""

priv/gettext/de/LC_MESSAGES/prompts.po

@@ -81,6 +81,11 @@ msgstr ""
 msgid "Language updated successfully."
 msgstr ""
 
+#: lib/memex_web/controllers/user_session_controller.ex:23
+#, elixir-autogen, elixir-format
+msgid "Logged out successfully."
+msgstr ""
+
 #: lib/memex_web/controllers/user_reset_password_controller.ex:46
 #, elixir-autogen, elixir-format
 msgid "Password reset successfully."
@@ -152,8 +157,3 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "register to setup %{name}"
 msgstr ""
-
-#: lib/memex_web/controllers/user_session_controller.ex:23
-#, elixir-autogen, elixir-format, fuzzy
-msgid "logged out successfully."
-msgstr ""

priv/gettext/default.pot

@@ -20,6 +20,16 @@ msgstr ""
 msgid "Confirm your account"
 msgstr ""
 
+#: lib/memex_web/templates/user_registration/new.html.heex:36
+#, elixir-autogen, elixir-format
+msgid "English"
+msgstr ""
+
+#: lib/memex_web/controllers/user_reset_password_controller.ex:9
+#, elixir-autogen, elixir-format
+msgid "Forgot your password?"
+msgstr ""
+
 #: lib/memex_web/templates/user_session/new.html.heex:27
 #, elixir-autogen, elixir-format
 msgid "Keep me logged in for 60 days"
@@ -161,7 +171,6 @@ msgstr ""
 msgid "enable"
 msgstr ""
 
-#: lib/memex_web/templates/user_registration/new.html.heex:36
 #: lib/memex_web/templates/user_settings/edit.html.heex:126
 #, elixir-autogen, elixir-format
 msgid "english"
@@ -629,28 +638,3 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "memEx | %{title}"
 msgstr ""
-
-#: lib/memex_web/controllers/user_reset_password_controller.ex:9
-#, elixir-autogen, elixir-format
-msgid "forgot your password?"
-msgstr ""
-
-#: lib/memex_web/live/faq_live.html.heex:126
-#, elixir-autogen, elixir-format
-msgid "how many people should i invite?"
-msgstr ""
-
-#: lib/memex_web/live/faq_live.html.heex:134
-#, elixir-autogen, elixir-format
-msgid "note, context and pipeline slugs must be unique, and you are free to backlink to notes not written by you."
-msgstr ""
-
-#: lib/memex_web/live/faq_live.html.heex:139
-#, elixir-autogen, elixir-format
-msgid "so, i'd recommend inviting anyone you'd like to work on your collective memEx. however, when in doubt, hopefully setting up a new instance is easy enough. if it isn't, then feel free to let me know :)"
-msgstr ""
-
-#: lib/memex_web/live/faq_live.html.heex:129
-#, elixir-autogen, elixir-format
-msgid "while memEx fully supports multiple users, each memEx instance should be treated as a single cohesive and collaborative document."
-msgstr ""

priv/gettext/errors.pot

@@ -102,11 +102,11 @@ msgid "oops, something went wrong! Please check the errors below"
 msgstr ""
 
 #: lib/memex/contexts/context.ex:49
-#: lib/memex/contexts/context.ex:62
+#: lib/memex/contexts/context.ex:60
 #: lib/memex/notes/note.ex:48
-#: lib/memex/notes/note.ex:61
+#: lib/memex/notes/note.ex:59
 #: lib/memex/pipelines/pipeline.ex:50
-#: lib/memex/pipelines/pipeline.ex:63
+#: lib/memex/pipelines/pipeline.ex:61
 #, elixir-autogen, elixir-format
 msgid "invalid format: only numbers, letters and hyphen are accepted"
 msgstr ""

priv/gettext/prompts.pot

@@ -80,6 +80,11 @@ msgstr ""
 msgid "Language updated successfully."
 msgstr ""
 
+#: lib/memex_web/controllers/user_session_controller.ex:23
+#, elixir-autogen, elixir-format
+msgid "Logged out successfully."
+msgstr ""
+
 #: lib/memex_web/controllers/user_reset_password_controller.ex:46
 #, elixir-autogen, elixir-format
 msgid "Password reset successfully."
@@ -151,8 +156,3 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "register to setup %{name}"
 msgstr ""
-
-#: lib/memex_web/controllers/user_session_controller.ex:23
-#, elixir-autogen, elixir-format
-msgid "logged out successfully."
-msgstr ""

test/memex_web/controllers/user_reset_password_controller_test.exs

@@ -17,7 +17,7 @@ defmodule MemexWeb.UserResetPasswordControllerTest do
     test "renders the reset password page", %{conn: conn} do
       conn = get(conn, Routes.user_reset_password_path(conn, :new))
       response = html_response(conn, 200)
-      assert response =~ dgettext("actions", "forgot your password?")
+      assert response =~ dgettext("actions", "Forgot your password?")
     end
   end
 

test/memex_web/controllers/user_session_controller_test.exs

@@ -88,14 +88,14 @@ defmodule MemexWeb.UserSessionControllerTest do
       conn = conn |> log_in_user(current_user) |> delete(Routes.user_session_path(conn, :delete))
       assert redirected_to(conn) == "/"
       refute get_session(conn, :user_token)
-      assert get_flash(conn, :info) =~ gettext("logged out successfully")
+      assert get_flash(conn, :info) =~ gettext("Logged out successfully")
     end
 
     test "succeeds even if the user is not logged in", %{conn: conn} do
       conn = delete(conn, Routes.user_session_path(conn, :delete))
       assert redirected_to(conn) == "/"
       refute get_session(conn, :user_token)
-      assert get_flash(conn, :info) =~ gettext("logged out successfully")
+      assert get_flash(conn, :info) =~ gettext("Logged out successfully")
     end
   end
 end