diff --git a/lib/cannery_web/templates/user_confirmation/new.html.eex b/lib/cannery_web/templates/user_confirmation/new.html.eex deleted file mode 100644 index 4d71f6c..0000000 --- a/lib/cannery_web/templates/user_confirmation/new.html.eex +++ /dev/null @@ -1,24 +0,0 @@ -
-

- Resend confirmation instructions -

- - <%= form_for :user, Routes.user_confirmation_path(@conn, :create), - [class: "flex flex-col justify-center items-center space-y-4"], fn f -> %> -
- <%= label f, :email, class: "title text-lg text-primary-500" %> - <%= email_input f, :email, required: true, class: "input input-primary col-span-2" %> -
- - <%= submit "Resend confirmation instructions", class: "btn btn-primary" %> - -
- -
- <%= link "Register", to: Routes.user_registration_path(@conn, :new), - class: "btn btn-primary" %> - <%= link "Log in", to: Routes.user_session_path(@conn, :new), - class: "btn btn-primary" %> -
- <% end %> -
\ No newline at end of file diff --git a/lib/cannery_web/templates/user_confirmation/new.html.heex b/lib/cannery_web/templates/user_confirmation/new.html.heex new file mode 100644 index 0000000..f438f90 --- /dev/null +++ b/lib/cannery_web/templates/user_confirmation/new.html.heex @@ -0,0 +1,30 @@ +
+

+ <%= dgettext("actions", "Resend confirmation instructions") %> +

+ + <%= form_for :user, + Routes.user_confirmation_path(@conn, :create), + [class: "flex flex-col justify-center items-center space-y-4"], + fn f -> %> +
+ <%= label(f, :email, class: "title text-lg text-primary-500") %> + <%= email_input(f, :email, required: true, class: "input input-primary col-span-2") %> +
+ + <%= submit(dgettext("actions", "Resend confirmation instructions"), class: "btn btn-primary") %> + +
+ +
+ <%= link(dgettext("actions", "Register"), + to: Routes.user_registration_path(@conn, :new), + class: "btn btn-primary" + ) %> + <%= link(dgettext("actions", "Log in"), + to: Routes.user_session_path(@conn, :new), + class: "btn btn-primary" + ) %> +
+ <% end %> +
diff --git a/lib/cannery_web/templates/user_registration/new.html.eex b/lib/cannery_web/templates/user_registration/new.html.eex deleted file mode 100644 index f3ee7ec..0000000 --- a/lib/cannery_web/templates/user_registration/new.html.eex +++ /dev/null @@ -1,41 +0,0 @@ -
-

- Register -

- - <%= form_for @changeset, Routes.user_registration_path(@conn, :create), - [class: "flex flex-col justify-center items-center space-y-4"], fn f -> %> - <%= if @changeset.action do %> -
-

Oops, something went wrong! Please check the errors below.

-
- <% end %> - - <%= if @invite do %> - <%= hidden_input f, :invite_token, value: @invite.token %> - <% end %> - -
- <%= label f, :email, class: "title text-lg text-primary-500" %> - <%= email_input f, :email, required: true, class: "input input-primary col-span-2" %> -
- <%= error_tag f, :email %> - -
- <%= label f, :password, class: "title text-lg text-primary-500" %> - <%= password_input f, :password, required: true, class: "input input-primary col-span-2" %> -
- <%= error_tag f, :password %> - - <%= submit "Register", class: "btn btn-primary" %> - -
- -
- <%= link "Log in", to: Routes.user_session_path(@conn, :new), - class: "btn btn-primary" %> - <%= link "Forgot your password?", to: Routes.user_reset_password_path(@conn, :new), - class: "btn btn-primary" %> -
- <% end %> -
diff --git a/lib/cannery_web/templates/user_registration/new.html.heex b/lib/cannery_web/templates/user_registration/new.html.heex new file mode 100644 index 0000000..9b2fcad --- /dev/null +++ b/lib/cannery_web/templates/user_registration/new.html.heex @@ -0,0 +1,49 @@ +
+

+ <%= dgettext("actions", "Register") %> +

+ + <%= form_for @changeset, + Routes.user_registration_path(@conn, :create), + [class: "flex flex-col justify-center items-center space-y-4"], + fn f -> %> + <%= if @changeset.action do %> +
+

+ <%= dgettext("errors", "Oops, something went wrong! Please check the errors below.") %> +

+
+ <% end %> + + <%= if @invite do %> + <%= hidden_input(f, :invite_token, value: @invite.token) %> + <% end %> + +
+ <%= label(f, :email, class: "title text-lg text-primary-500") %> + <%= email_input(f, :email, required: true, class: "input input-primary col-span-2") %> +
+ <%= error_tag(f, :email) %> + +
+ <%= label(f, :password, class: "title text-lg text-primary-500") %> + <%= password_input(f, :password, required: true, class: "input input-primary col-span-2") %> +
+ <%= error_tag(f, :password) %> + + <%= submit(dgettext("actions", "Register"), class: "btn btn-primary") %> + +
+ +
+ <%= link(dgettext("actions", "Log in"), + to: Routes.user_session_path(@conn, :new), + class: "btn btn-primary" + ) %> + <%= link(dgettext("actions", "Forgot your password?"), + to: Routes.user_reset_password_path(@conn, :new), + class: "btn btn-primary" + ) %> +
+ <% end %> +
diff --git a/lib/cannery_web/templates/user_reset_password/edit.html.eex b/lib/cannery_web/templates/user_reset_password/edit.html.eex deleted file mode 100644 index 1404edd..0000000 --- a/lib/cannery_web/templates/user_reset_password/edit.html.eex +++ /dev/null @@ -1,37 +0,0 @@ -
-

- Reset password -

- - <%= form_for @changeset, Routes.user_reset_password_path(@conn, :update, @token), - [class: "flex flex-col justify-center items-center space-y-4"], fn f -> %> - <%= if @changeset.action do %> -
-

Oops, something went wrong! Please check the errors below.

-
- <% end %> - -
- <%= label f, :password, "New password", class: "title text-lg text-primary-500" %> - <%= password_input f, :password, required: true, class: "input input-primary col-span-2" %> -
- <%= error_tag f, :password %> - -
- <%= label f, :password_confirmation, "Confirm new password", class: "title text-lg text-primary-500" %> - <%= password_input f, :password_confirmation, required: true, class: "input input-primary col-span-2" %> -
- <%= error_tag f, :password_confirmation %> - - <%= submit "Reset password", class: "btn btn-primary" %> - -
- -
- <%= link "Register", to: Routes.user_registration_path(@conn, :new), - class: "btn btn-primary" %> - <%= link "Log in", to: Routes.user_session_path(@conn, :new), - class: "btn btn-primary" %> -
- <% end %> -
\ No newline at end of file diff --git a/lib/cannery_web/templates/user_reset_password/edit.html.heex b/lib/cannery_web/templates/user_reset_password/edit.html.heex new file mode 100644 index 0000000..c6c2fdd --- /dev/null +++ b/lib/cannery_web/templates/user_reset_password/edit.html.heex @@ -0,0 +1,45 @@ +
+

+ <%= dgettext("actions", "Reset password") %> +

+ + <%= form_for @changeset, + Routes.user_reset_password_path(@conn, :update, @token), + [class: "flex flex-col justify-center items-center space-y-4"], + fn f -> %> + <%= if @changeset.action do %> +
+

+ <%= dgettext("errors", "Oops, something went wrong! Please check the errors below.") %> +

+
+ <% end %> + +
+ <%= label(f, :password, "New password", class: "title text-lg text-primary-500") %> + <%= password_input(f, :password, required: true, class: "input input-primary col-span-2") %> +
+ <%= error_tag(f, :password) %> + +
+ <%= label(f, :password_confirmation, "Confirm new password", class: "title text-lg text-primary-500") %> + <%= password_input(f, :password_confirmation, required: true, class: "input input-primary col-span-2") %> +
+ <%= error_tag(f, :password_confirmation) %> + + <%= submit(dgettext("actions", "Reset password"), class: "btn btn-primary") %> + +
+ +
+ <%= link(dgettext("actions", "Register"), + to: Routes.user_registration_path(@conn, :new), + class: "btn btn-primary" + ) %> + <%= link(dgettext("actions", "Log in"), + to: Routes.user_session_path(@conn, :new), + class: "btn btn-primary" + ) %> +
+ <% end %> +
diff --git a/lib/cannery_web/templates/user_reset_password/new.html.eex b/lib/cannery_web/templates/user_reset_password/new.html.eex deleted file mode 100644 index 731ba7d..0000000 --- a/lib/cannery_web/templates/user_reset_password/new.html.eex +++ /dev/null @@ -1,25 +0,0 @@ -
-

- Forgot your password? -

- - <%= form_for :user, Routes.user_reset_password_path(@conn, :create), - [class: "flex flex-col justify-center items-center space-y-4"], fn f -> %> - -
- <%= label f, :email, class: "title text-lg text-primary-500" %> - <%= email_input f, :email, required: true, class: "input input-primary col-span-2" %> -
- - <%= submit "Send instructions to reset password", class: "btn btn-primary" %> - -
- -
- <%= link "Register", to: Routes.user_registration_path(@conn, :new), - class: "btn btn-primary" %> - <%= link "Log in", to: Routes.user_session_path(@conn, :new), - class: "btn btn-primary" %> -
- <% end %> -
\ No newline at end of file diff --git a/lib/cannery_web/templates/user_reset_password/new.html.heex b/lib/cannery_web/templates/user_reset_password/new.html.heex new file mode 100644 index 0000000..35e7d43 --- /dev/null +++ b/lib/cannery_web/templates/user_reset_password/new.html.heex @@ -0,0 +1,31 @@ +
+

+ <%= dgettext("actions", "Forgot your password?") %> +

+ + <%= form_for :user, + Routes.user_reset_password_path(@conn, :create), + [class: "flex flex-col justify-center items-center space-y-4"], + fn f -> %> + +
+ <%= label(f, :email, class: "title text-lg text-primary-500") %> + <%= email_input(f, :email, required: true, class: "input input-primary col-span-2") %> +
+ + <%= submit(dgettext("actions", "Send instructions to reset password"), class: "btn btn-primary") %> + +
+ +
+ <%= link(dgettext("actions", "Register"), + to: Routes.user_registration_path(@conn, :new), + class: "btn btn-primary" + ) %> + <%= link(dgettext("actions", "Log in"), + to: Routes.user_session_path(@conn, :new), + class: "btn btn-primary" + ) %> +
+ <% end %> +
diff --git a/lib/cannery_web/templates/user_session/new.html.eex b/lib/cannery_web/templates/user_session/new.html.eex deleted file mode 100644 index 33b5ba0..0000000 --- a/lib/cannery_web/templates/user_session/new.html.eex +++ /dev/null @@ -1,41 +0,0 @@ -
-

- Log in -

- - <%= form_for @conn, Routes.user_session_path(@conn, :create), [as: :user, - class: "flex flex-col justify-center items-center space-y-4"], fn f -> %> - <%= if @error_message do %> -
-

<%= @error_message %>

-
- <% end %> - -
- <%= label f, :email, class: "title text-lg text-primary-500" %> - <%= email_input f, :email, required: true, class: "input input-primary col-span-2" %> -
- -
- <%= label f, :password, class: "title text-lg text-primary-500" %> - <%= password_input f, :password, required: true, class: "input input-primary col-span-2" %> -
- -
- <%= label f, :remember_me, "Keep me logged in for 60 days", - class: "title text-lg text-primary-500" %> - <%= checkbox f, :remember_me, class: "checkbox" %> -
- - <%= submit "Log in", class: "btn btn-primary" %> - -
- -
- <%= link "Register", to: Routes.user_registration_path(@conn, :new), - class: "btn btn-primary" %> - <%= link "Forgot your password?", to: Routes.user_reset_password_path(@conn, :new), - class: "btn btn-primary" %> -
- <% end %> -
\ No newline at end of file diff --git a/lib/cannery_web/templates/user_session/new.html.heex b/lib/cannery_web/templates/user_session/new.html.heex new file mode 100644 index 0000000..c63baa9 --- /dev/null +++ b/lib/cannery_web/templates/user_session/new.html.heex @@ -0,0 +1,50 @@ +
+

+ <%= dgettext("actions", "Log in") %> +

+ + <%= form_for @conn, + Routes.user_session_path(@conn, :create), + [as: :user, class: "flex flex-col justify-center items-center space-y-4"], + fn f -> %> + <%= if @error_message do %> +
+

+ <%= @error_message %> +

+
+ <% end %> + +
+ <%= label(f, :email, class: "title text-lg text-primary-500") %> + <%= email_input(f, :email, required: true, class: "input input-primary col-span-2") %> +
+ +
+ <%= label(f, :password, class: "title text-lg text-primary-500") %> + <%= password_input(f, :password, required: true, class: "input input-primary col-span-2") %> +
+ +
+ <%= label(f, :remember_me, gettext("Keep me logged in for 60 days"), + class: "title text-lg text-primary-500" + ) %> + <%= checkbox(f, :remember_me, class: "checkbox") %> +
+ + <%= submit(dgettext("actions", "Log in"), class: "btn btn-primary") %> + +
+ +
+ <%= link(dgettext("actions", "Register"), + to: Routes.user_registration_path(@conn, :new), + class: "btn btn-primary" + ) %> + <%= link(dgettext("actions", "Forgot your password?"), + to: Routes.user_reset_password_path(@conn, :new), + class: "btn btn-primary" + ) %> +
+ <% end %> +
diff --git a/lib/cannery_web/templates/user_settings/edit.html.eex b/lib/cannery_web/templates/user_settings/edit.html.eex deleted file mode 100644 index c17956a..0000000 --- a/lib/cannery_web/templates/user_settings/edit.html.eex +++ /dev/null @@ -1,89 +0,0 @@ -
-

- Settings -

- -

- Change email -

- - <%= form_for @email_changeset, Routes.user_settings_path(@conn, :update), - [class: "flex flex-col justify-center items-center space-y-4"], fn f -> %> - <%= if @email_changeset.action do %> -
-

Oops, something went wrong! Please check the errors below.

-
- <% end %> - - <%= hidden_input f, :action, name: "action", value: "update_email" %> - -
- <%= label f, :email, class: "title text-lg text-primary-500" %> - <%= email_input f, :email, required: true, class: "input input-primary col-span-2" %> -
- <%= error_tag f, :email %> - -
- <%= label f, :current_password, for: "current_password_for_email", class: "title text-lg text-primary-500" %> - <%= password_input f, :current_password, - required: true, - name: "current_password", - id: "current_password_for_email", - class: "input input-primary col-span-2" %> -
- <%= error_tag f, :current_password %> - - <%= submit "Change email", class: "btn btn-primary" %> - <% end %> - -

- Change password -

- - <%= form_for @password_changeset, Routes.user_settings_path(@conn, :update), - [class: "flex flex-col justify-center items-center space-y-4"], fn f -> %> - <%= if @password_changeset.action do %> -
-

Oops, something went wrong! Please check the errors below.

-
- <% end %> - - <%= hidden_input f, :action, name: "action", value: "update_password" %> - -
- <%= label f, :password, "New password", - class: "title text-lg text-primary-500" %> - <%= password_input f, :password, - required: true, - class: "input input-primary col-span-2" %> -
- <%= error_tag f, :password %> - -
- <%= label f, :password_confirmation, "Confirm new password", - class: "title text-lg text-primary-500" %> - <%= password_input f, :password_confirmation, - required: true, - class: "input input-primary col-span-2" %> -
- <%= error_tag f, :password_confirmation %> - -
- <%= label f, :current_password, - for: "current_password_for_password", - class: "title text-lg text-primary-500" %> - <%= password_input f, :current_password, - required: true, - name: "current_password", - id: "current_password_for_password", - class: "input input-primary col-span-2" %> -
- <%= error_tag f, :current_password %> - - <%= submit "Change password", class: "btn btn-primary" %> - <% end %> - - <%= link "Delete User", to: Routes.user_settings_path(@conn, :delete, @current_user), - method: :delete, class: "btn btn-alert", - data: [confirm: "Are you sure you want to delete your account?"] %> -
diff --git a/lib/cannery_web/templates/user_settings/edit.html.heex b/lib/cannery_web/templates/user_settings/edit.html.heex new file mode 100644 index 0000000..4190ecf --- /dev/null +++ b/lib/cannery_web/templates/user_settings/edit.html.heex @@ -0,0 +1,106 @@ +
+

+ <%= gettext("Settings") %> +

+ +

+ <%= dgettext("actions", "Change email") %> +

+ + <%= form_for @email_changeset, + Routes.user_settings_path(@conn, :update), + [class: "flex flex-col justify-center items-center space-y-4"], + fn f -> %> + <%= if @email_changeset.action do %> +
+

+ <%= dgettext("errors", "Oops, something went wrong! Please check the errors below.") %> +

+
+ <% end %> + + <%= hidden_input(f, :action, name: "action", value: "update_email") %> + +
+ <%= label(f, :email, class: "title text-lg text-primary-500") %> + <%= email_input(f, :email, required: true, class: "input input-primary col-span-2") %> +
+ <%= error_tag(f, :email) %> + +
+ <%= label(f, :current_password, + for: "current_password_for_email", + class: "title text-lg text-primary-500" + ) %> + <%= password_input(f, :current_password, + required: true, + name: "current_password", + id: "current_password_for_email", + class: "input input-primary col-span-2" + ) %> +
+ <%= error_tag(f, :current_password) %> + + <%= submit(dgettext("actions", "Change email"), class: "btn btn-primary") %> + <% end %> + +

+ <%= dgettext("actions", "Change password") %> +

+ + <%= form_for @password_changeset, + Routes.user_settings_path(@conn, :update), + [class: "flex flex-col justify-center items-center space-y-4"], + fn f -> %> + <%= if @password_changeset.action do %> +
+

+ <%= dgettext("errors", "Oops, something went wrong! Please check the errors below.") %> +

+
+ <% end %> + + <%= hidden_input(f, :action, name: "action", value: "update_password") %> + +
+ <%= label(f, :password, "New password", class: "title text-lg text-primary-500") %> + <%= password_input(f, :password, + required: true, + class: "input input-primary col-span-2" + ) %> +
+ <%= error_tag(f, :password) %> + +
+ <%= label(f, :password_confirmation, "Confirm new password", class: "title text-lg text-primary-500") %> + <%= password_input(f, :password_confirmation, + required: true, + class: "input input-primary col-span-2" + ) %> +
+ <%= error_tag(f, :password_confirmation) %> + +
+ <%= label(f, :current_password, + for: "current_password_for_password", + class: "title text-lg text-primary-500" + ) %> + <%= password_input(f, :current_password, + required: true, + name: "current_password", + id: "current_password_for_password", + class: "input input-primary col-span-2" + ) %> +
+ <%= error_tag(f, :current_password) %> + + <%= submit(dgettext("actions", "Change password"), class: "btn btn-primary") %> + <% end %> + + <%= link(dgettext("actions", "Delete User"), + to: Routes.user_settings_path(@conn, :delete, @current_user), + method: :delete, + class: "btn btn-alert", + data: [confirm: dgettext("prompts", "Are you sure you want to delete your account?")] + ) %> +
diff --git a/priv/gettext/actions.pot b/priv/gettext/actions.pot index 97809f8..fff3050 100644 --- a/priv/gettext/actions.pot +++ b/priv/gettext/actions.pot @@ -13,11 +13,64 @@ msgstr "" #, elixir-format, ex-autogen #: lib/cannery_web/component/topbar.ex:96 #: lib/cannery_web/templates/layout/topbar.html.heex:36 +#: lib/cannery_web/templates/user_confirmation/new.html.heex:24 +#: lib/cannery_web/templates/user_registration/new.html.heex:39 +#: lib/cannery_web/templates/user_reset_password/edit.html.heex:39 +#: lib/cannery_web/templates/user_reset_password/new.html.heex:25 +#: lib/cannery_web/templates/user_session/new.html.heex:3 +#: lib/cannery_web/templates/user_session/new.html.heex:35 msgid "Log in" msgstr "" #, elixir-format, ex-autogen #: lib/cannery_web/component/topbar.ex:89 #: lib/cannery_web/templates/layout/topbar.html.heex:28 +#: lib/cannery_web/templates/user_confirmation/new.html.heex:20 +#: lib/cannery_web/templates/user_registration/new.html.heex:3 +#: lib/cannery_web/templates/user_registration/new.html.heex:34 +#: lib/cannery_web/templates/user_reset_password/edit.html.heex:35 +#: lib/cannery_web/templates/user_reset_password/new.html.heex:21 +#: lib/cannery_web/templates/user_session/new.html.heex:40 msgid "Register" msgstr "" + +#, elixir-format, ex-autogen +#: lib/cannery_web/templates/user_settings/edit.html.heex:7 +#: lib/cannery_web/templates/user_settings/edit.html.heex:44 +msgid "Change email" +msgstr "" + +#, elixir-format, ex-autogen +#: lib/cannery_web/templates/user_settings/edit.html.heex:48 +#: lib/cannery_web/templates/user_settings/edit.html.heex:97 +msgid "Change password" +msgstr "" + +#, elixir-format, ex-autogen +#: lib/cannery_web/templates/user_settings/edit.html.heex:100 +msgid "Delete User" +msgstr "" + +#, elixir-format, ex-autogen +#: lib/cannery_web/templates/user_registration/new.html.heex:43 +#: lib/cannery_web/templates/user_reset_password/new.html.heex:3 +#: lib/cannery_web/templates/user_session/new.html.heex:44 +msgid "Forgot your password?" +msgstr "" + +#, elixir-format, ex-autogen +#: lib/cannery_web/templates/user_confirmation/new.html.heex:3 +#: lib/cannery_web/templates/user_confirmation/new.html.heex:15 +msgid "Resend confirmation instructions" +msgstr "" + +#, elixir-format, ex-autogen +#: lib/cannery_web/templates/user_reset_password/edit.html.heex:3 +#: lib/cannery_web/templates/user_reset_password/edit.html.heex:30 +msgid "Reset password" +msgstr "" + +#, elixir-format, ex-autogen +#: lib/cannery_web/templates/user_reset_password/new.html.heex:16 +msgid "Send instructions to reset password" +msgstr "" diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot index 28f332f..2574858 100644 --- a/priv/gettext/default.pot +++ b/priv/gettext/default.pot @@ -99,3 +99,13 @@ msgstr "" #: lib/cannery_web/component/topbar.ex:35 msgid "Tags" msgstr "" + +#, elixir-format, ex-autogen +#: lib/cannery_web/templates/user_session/new.html.heex:29 +msgid "Keep me logged in for 60 days" +msgstr "" + +#, elixir-format, ex-autogen +#: lib/cannery_web/templates/user_settings/edit.html.heex:3 +msgid "Settings" +msgstr "" diff --git a/priv/gettext/errors.pot b/priv/gettext/errors.pot index 4d4ab6d..61c4a85 100644 --- a/priv/gettext/errors.pot +++ b/priv/gettext/errors.pot @@ -144,3 +144,11 @@ msgid "There is still %{amount} ammo group in this container" msgid_plural "There are still %{amount} ammo groups in this container" msgstr[0] "" msgstr[1] "" + +#, elixir-format, ex-autogen +#: lib/cannery_web/templates/user_registration/new.html.heex:13 +#: lib/cannery_web/templates/user_reset_password/edit.html.heex:13 +#: lib/cannery_web/templates/user_settings/edit.html.heex:17 +#: lib/cannery_web/templates/user_settings/edit.html.heex:58 +msgid "Oops, something went wrong! Please check the errors below." +msgstr "" diff --git a/priv/gettext/prompts.pot b/priv/gettext/prompts.pot index c64e0fa..6df2bdc 100644 --- a/priv/gettext/prompts.pot +++ b/priv/gettext/prompts.pot @@ -20,3 +20,8 @@ msgstr "" #: lib/cannery_web/templates/layout/topbar.html.heex:21 msgid "Are you sure you want to log out?" msgstr "" + +#, elixir-format, ex-autogen +#: lib/cannery_web/templates/user_settings/edit.html.heex:104 +msgid "Are you sure you want to delete your account?" +msgstr ""