ryan/friends
1
0
Fork 0
Code Issues Pull Requests Projects 1 Releases Wiki Activity

Compare commits

base: ryan:8577c9dddb9c16ddfdaebf2ef9fb02156a04ed0f
Branches Tags
ryan:master
ryan:dev
..
compare: ryan:23e738ddc9f73afa7cb19a3762ff595b001ddb3c
Branches Tags
ryan:dev
ryan:master

No commits in common. "8577c9dddb9c16ddfdaebf2ef9fb02156a04ed0f" and "23e738ddc9f73afa7cb19a3762ff595b001ddb3c" have entirely different histories.
8577c9dddb ... 23e738ddc9

2 changed files with 57 additions and 86 deletions
Show Stats Expand all files Collapse all files

30
friends/lib/friends_web/templates/user_session/new.html.heex
View File

@ -6,23 +6,19 @@
<p><%= @error_message %></p> <p><%= @error_message %></p>
</div> </div>
<% end %> <% end %>
<ul class="w-1/2 pl-0 flex flex-col gap-6">
<li class="flex flex-row gap-4"> <%= label f, :email %>
<%= label f, :email, class: "w-1/3" %> <%= email_input f, :email, required: true %>
<%= email_input f, :email, required: true %>
</li> <%= label f, :password %>
<li class="flex flex-row gap-4"> <%= password_input f, :password, required: true %>
<%= label f, :password, class: "w-1/3" %>
<%= password_input f, :password, required: true %> <%= label f, :remember_me, "Keep me logged in for 60 days" %>
</li> <%= checkbox f, :remember_me %>
<li class="flex flex-row gap-4">
<%= label f, :remember_me, "Keep me logged in for 60 days", class: "w-fit" %> <div>
<%= checkbox f, :remember_me %> <%= submit "Log in" %>
</li> </div>
<li class="flex">
<%= submit "Log in", class: "btn btn-primary" %>
</li>
</ul>
</.form> </.form>
<p> <p>

113
friends/lib/friends_web/templates/user_settings/edit.html.heex
View File

@ -1,78 +1,53 @@
<h1>Settings</h1> <h1>Settings</h1>
<div class="flex gap-16 flex-col md:flex-row justify-evenly"> <h3>Change email</h3>
<.form
let={f}
for={@email_changeset}
action={Routes.user_settings_path(@conn, :update)}
id="update_email"
class="w-max"
>
<%= if @email_changeset.action do %>
<div class="alert alert-danger">
<p>Oops, something went wrong! Please check the errors below.</p>
</div>
<% end %>
<%= hidden_input f, :action, name: "action", value: "update_email" %> <.form let={f} for={@email_changeset} action={Routes.user_settings_path(@conn, :update)} id="update_email">
<%= if @email_changeset.action do %>
<div class="alert alert-danger">
<p>Oops, something went wrong! Please check the errors below.</p>
</div>
<% end %>
<%= hidden_input f, :action, name: "action", value: "update_email" %>
<h3>Change email</h3> <%= label f, :email %>
<ul class="w-full pl-0 flex flex-col gap-6"> <%= email_input f, :email, required: true %>
<%= error_tag f, :email %>
<li class="flex flex-row gap-4"> <%= label f, :current_password, for: "current_password_for_email" %>
<%= label f, :email, class: "w-1/3" %> <%= password_input f, :current_password, required: true, name: "current_password", id: "current_password_for_email" %>
<%= email_input f, :email, required: true %> <%= error_tag f, :current_password %>
<%= error_tag f, :email %>
</li>
<li class="flex flex-row gap-4">
<%= label f, :current_password, for: "current_password_for_email", class: "w-1/3" %>
<%= password_input f, :password, required: true %>
<%= error_tag f, :current_password %>
</li>
<li class="flex place-self-stretch">
<%= submit "Change email", class: "btn btn-primary" %>
</li>
</ul>
</.form>
<.form <div>
let={f} <%= submit "Change email" %>
for={@password_changeset} </div>
action={Routes.user_settings_path(@conn, :update)} </.form>
id="update_password"
class="w-max"
>
<h3>Change password</h3>
<ul class="w-full pl-0 flex flex-col gap-6 md:h-full">
<%= if @password_changeset.action do %>
<div class="alert alert-danger">
<p>Oops, something went wrong! Please check the errors below.</p>
</div>
<% end %>
<%= hidden_input f, :action, name: "action", value: "update_password" %> <h3>Change password</h3>
<li class="flex flex-row gap-4"> <.form let={f} for={@password_changeset} action={Routes.user_settings_path(@conn, :update)} id="update_password">
<%= label f, :current_password, for: "current_password_for_password", class: "w-1/3" %> <%= if @password_changeset.action do %>
<%= password_input f, :current_password, required: true, name: "current_password", id: "current_password_for_password" %> <div class="alert alert-danger">
<%= error_tag f, :current_password %> <p>Oops, something went wrong! Please check the errors below.</p>
</li> </div>
<li class="flex flex-row gap-4"> <% end %>
<%= label f, :password, "New password", class: "w-1/3" %>
<%= password_input f, :password, required: true, class: "shrink-0" %> <%= hidden_input f, :action, name: "action", value: "update_password" %>
<%= error_tag f, :password %>
</li> <%= label f, :password, "New password" %>
<li class="flex flex-row gap-4"> <%= password_input f, :password, required: true %>
<%= label f, :password_confirmation, "Confirm new password", class: "w-1/3" %> <%= error_tag f, :password %>
<%= password_input f, :password_confirmation, required: true %>
<%= error_tag f, :password_confirmation %> <%= label f, :password_confirmation, "Confirm new password" %>
</li> <%= password_input f, :password_confirmation, required: true %>
<li class="flex"> <%= error_tag f, :password_confirmation %>
<%= submit "Change password", class: "btn btn-primary" %>
</li> <%= label f, :current_password, for: "current_password_for_password" %>
</ul> <%= password_input f, :current_password, required: true, name: "current_password", id: "current_password_for_password" %>
</.form> <%= error_tag f, :current_password %>
</div>
<div>
<%= submit "Change password" %>
</div>
</.form>