shibao/cannery
1
2
Fork 1
Code Issues 14 Pull Requests Projects 1 Releases 40 Wiki Activity

mix format

Browse Source
This commit is contained in:
shibao
2022-02-16 22:15:47 -05:00
committed by oliviasculley
parent 5d02ed6369
commit 059004ba78
8 changed files with 157 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/lokal_web/templates/layout/app.html.heex
View File

@@ -1,19 +1,17 @@
<main class="m-0 p-0 w-full h-full"> <main class="m-0 p-0 w-full h-full">
<header> <header>
<.topbar current_user={assigns[:current_user]}></.topbar> <.topbar current_user={assigns[:current_user]}>
</.topbar>
<%= if get_flash(@conn, :info) do %> <%= if get_flash(@conn, :info) do %>
<p class="alert alert-info" role="alert"> <p class="alert alert-info" role="alert">
<%= get_flash(@conn, :info) %> <%= get_flash(@conn, :info) %>
</p> </p>
<% end %> <% end %>
<%= if get_flash(@conn, :error) do %> <%= if get_flash(@conn, :error) do %>
<p class="alert alert-danger" role="alert"> <p class="alert alert-danger" role="alert">
<%= get_flash(@conn, :error) %> <%= get_flash(@conn, :error) %>
</p> </p>
<% end %> <% end %>
</header> </header>
<%= @inner_content %> <%= @inner_content %>
</main> </main>

6
lib/lokal_web/templates/layout/live.html.heex
View File

@@ -1,19 +1,17 @@
<main class="m-0 p-0 w-full h-full"> <main class="m-0 p-0 w-full h-full">
<header> <header>
<.topbar current_user={assigns[:current_user]}></.topbar> <.topbar current_user={assigns[:current_user]}>
</.topbar>
<%= if @flash && @flash |> Map.has_key?(:info) do %> <%= if @flash && @flash |> Map.has_key?(:info) do %>
<p class="alert alert-info" role="alert" phx-click="lv:clear-flash" phx-value-key="info"> <p class="alert alert-info" role="alert" phx-click="lv:clear-flash" phx-value-key="info">
<%= live_flash(@flash, :info) %> <%= live_flash(@flash, :info) %>
</p> </p>
<% end %> <% end %>
<%= if @flash && @flash |> Map.has_key?(:error) do %> <%= if @flash && @flash |> Map.has_key?(:error) do %>
<p class="alert alert-danger" role="alert" phx-click="lv:clear-flash" phx-value-key="error"> <p class="alert alert-danger" role="alert" phx-click="lv:clear-flash" phx-value-key="error">
<%= live_flash(@flash, :error) %> <%= live_flash(@flash, :error) %>
</p> </p>
<% end %> <% end %>
</header> </header>
<%= @inner_content %> <%= @inner_content %>
</main> </main>

30
lib/lokal_web/templates/user_confirmation/new.html.heex
View File

@@ -2,23 +2,25 @@
<h1 class="title text-primary-500 text-xl"> <h1 class="title text-primary-500 text-xl">
Resend confirmation instructions Resend confirmation instructions
</h1> </h1>
<%= form_for :user,
<%= form_for :user, Routes.user_confirmation_path(@conn, :create), Routes.user_confirmation_path(@conn, :create),
[class: "flex flex-col justify-center items-center space-y-4"], fn f -> %> [class: "flex flex-col justify-center items-center space-y-4"],
fn f -> %>
<div class="grid grid-cols-3 justify-center items-center text-center space-x-4"> <div class="grid grid-cols-3 justify-center items-center text-center space-x-4">
<%= label f, :email, class: "title text-lg text-primary-500" %> <%= label(f, :email, class: "title text-lg text-primary-500") %>
<%= email_input f, :email, required: true, class: "input input-primary col-span-2" %> <%= email_input(f, :email, required: true, class: "input input-primary col-span-2") %>
</div> </div>
<%= submit("Resend confirmation instructions", class: "btn btn-primary") %>
<%= submit "Resend confirmation instructions", class: "btn btn-primary" %>
<hr class="hr"> <hr class="hr">
<div class="flex flex-row justify-center items-center space-x-4"> <div class="flex flex-row justify-center items-center space-x-4">
<%= link "Register", to: Routes.user_registration_path(@conn, :new), <%= link("Register",
class: "btn btn-primary" %> to: Routes.user_registration_path(@conn, :new),
<%= link "Log in", to: Routes.user_session_path(@conn, :new), class: "btn btn-primary"
class: "btn btn-primary" %> ) %>
<%= link("Log in",
to: Routes.user_session_path(@conn, :new),
class: "btn btn-primary"
) %>
</div> </div>
<% end %> <% end %>
</div> </div>

42
lib/lokal_web/templates/user_registration/new.html.heex
View File

@@ -2,36 +2,36 @@
<h1 class="title text-primary-500 text-xl"> <h1 class="title text-primary-500 text-xl">
Register Register
</h1> </h1>
<%= form_for @changeset,
<%= form_for @changeset, Routes.user_registration_path(@conn, :create), Routes.user_registration_path(@conn, :create),
[class: "flex flex-col justify-center items-center space-y-4"], fn f -> %> [class: "flex flex-col justify-center items-center space-y-4"],
<%= if @changeset.action && not(@changeset.valid?) do %> fn f -> %>
<%= if @changeset.action && not @changeset.valid? do %>
<div class="alert alert-danger"> <div class="alert alert-danger">
<p>Oops, something went wrong! Please check the errors below.</p> <p>Oops, something went wrong! Please check the errors below.</p>
</div> </div>
<% end %> <% end %>
<div class="grid grid-cols-3 justify-center items-center text-center space-x-4"> <div class="grid grid-cols-3 justify-center items-center text-center space-x-4">
<%= label f, :email, class: "title text-lg text-primary-500" %> <%= label(f, :email, class: "title text-lg text-primary-500") %>
<%= email_input f, :email, required: true, class: "input input-primary col-span-2" %> <%= email_input(f, :email, required: true, class: "input input-primary col-span-2") %>
</div> </div>
<%= error_tag f, :email %> <%= error_tag(f, :email) %>
<div class="grid grid-cols-3 justify-center items-center text-center space-x-4"> <div class="grid grid-cols-3 justify-center items-center text-center space-x-4">
<%= label f, :password, class: "title text-lg text-primary-500" %> <%= label(f, :password, class: "title text-lg text-primary-500") %>
<%= password_input f, :password, required: true, class: "input input-primary col-span-2" %> <%= password_input(f, :password, required: true, class: "input input-primary col-span-2") %>
</div> </div>
<%= error_tag f, :password %> <%= error_tag(f, :password) %>
<%= submit("Register", class: "btn btn-primary") %>
<%= submit "Register", class: "btn btn-primary" %>
<hr class="hr"> <hr class="hr">
<div class="flex flex-row justify-center items-center space-x-4"> <div class="flex flex-row justify-center items-center space-x-4">
<%= link "Log in", to: Routes.user_session_path(@conn, :new), <%= link("Log in",
class: "btn btn-primary" %> to: Routes.user_session_path(@conn, :new),
<%= link "Forgot your password?", to: Routes.user_reset_password_path(@conn, :new), class: "btn btn-primary"
class: "btn btn-primary" %> ) %>
<%= link("Forgot your password?",
to: Routes.user_reset_password_path(@conn, :new),
class: "btn btn-primary"
) %>
</div> </div>
<% end %> <% end %>
</div> </div>

42
lib/lokal_web/templates/user_reset_password/edit.html.heex
View File

@@ -2,36 +2,36 @@
<h1 class="title text-primary-500 text-xl"> <h1 class="title text-primary-500 text-xl">
Reset password Reset password
</h1> </h1>
<%= form_for @changeset,
<%= form_for @changeset, Routes.user_reset_password_path(@conn, :update, @token), Routes.user_reset_password_path(@conn, :update, @token),
[class: "flex flex-col justify-center items-center space-y-4"], fn f -> %> [class: "flex flex-col justify-center items-center space-y-4"],
<%= if @changeset.action && not(@changeset.valid?) do %> fn f -> %>
<%= if @changeset.action && not @changeset.valid? do %>
<div class="alert alert-danger"> <div class="alert alert-danger">
<p>Oops, something went wrong! Please check the errors below.</p> <p>Oops, something went wrong! Please check the errors below.</p>
</div> </div>
<% end %> <% end %>
<div class="grid grid-cols-3 justify-center items-center text-center space-x-4"> <div class="grid grid-cols-3 justify-center items-center text-center space-x-4">
<%= label f, :password, "New password", class: "title text-lg text-primary-500" %> <%= 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" %> <%= password_input(f, :password, required: true, class: "input input-primary col-span-2") %>
</div> </div>
<%= error_tag f, :password %> <%= error_tag(f, :password) %>
<div class="grid grid-cols-3 justify-center items-center text-center space-x-4"> <div class="grid grid-cols-3 justify-center items-center text-center space-x-4">
<%= label f, :password_confirmation, "Confirm new password", class: "title text-lg text-primary-500" %> <%= 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" %> <%= password_input(f, :password_confirmation, required: true, class: "input input-primary col-span-2") %>
</div> </div>
<%= error_tag f, :password_confirmation %> <%= error_tag(f, :password_confirmation) %>
<%= submit("Reset password", class: "btn btn-primary") %>
<%= submit "Reset password", class: "btn btn-primary" %>
<hr class="hr"> <hr class="hr">
<div class="flex flex-row justify-center items-center space-x-4"> <div class="flex flex-row justify-center items-center space-x-4">
<%= link "Register", to: Routes.user_registration_path(@conn, :new), <%= link("Register",
class: "btn btn-primary" %> to: Routes.user_registration_path(@conn, :new),
<%= link "Log in", to: Routes.user_session_path(@conn, :new), class: "btn btn-primary"
class: "btn btn-primary" %> ) %>
<%= link("Log in",
to: Routes.user_session_path(@conn, :new),
class: "btn btn-primary"
) %>
</div> </div>
<% end %> <% end %>
</div> </div>

31
lib/lokal_web/templates/user_reset_password/new.html.heex
View File

@@ -2,24 +2,25 @@
<h1 class="title text-primary-500 text-xl"> <h1 class="title text-primary-500 text-xl">
Forgot your password? Forgot your password?
</h1> </h1>
<%= form_for :user,
<%= form_for :user, Routes.user_reset_password_path(@conn, :create), Routes.user_reset_password_path(@conn, :create),
[class: "flex flex-col justify-center items-center space-y-4"], fn f -> %> [class: "flex flex-col justify-center items-center space-y-4"],
fn f -> %>
<div class="grid grid-cols-3 justify-center items-center text-center space-x-4"> <div class="grid grid-cols-3 justify-center items-center text-center space-x-4">
<%= label f, :email, class: "title text-lg text-primary-500" %> <%= label(f, :email, class: "title text-lg text-primary-500") %>
<%= email_input f, :email, required: true, class: "input input-primary col-span-2" %> <%= email_input(f, :email, required: true, class: "input input-primary col-span-2") %>
</div> </div>
<%= submit("Send instructions to reset password", class: "btn btn-primary") %>
<%= submit "Send instructions to reset password", class: "btn btn-primary" %>
<hr class="hr"> <hr class="hr">
<div class="flex flex-row justify-center items-center space-x-4"> <div class="flex flex-row justify-center items-center space-x-4">
<%= link "Register", to: Routes.user_registration_path(@conn, :new), <%= link("Register",
class: "btn btn-primary" %> to: Routes.user_registration_path(@conn, :new),
<%= link "Log in", to: Routes.user_session_path(@conn, :new), class: "btn btn-primary"
class: "btn btn-primary" %> ) %>
<%= link("Log in",
to: Routes.user_session_path(@conn, :new),
class: "btn btn-primary"
) %>
</div> </div>
<% end %> <% end %>
</div> </div>

46
lib/lokal_web/templates/user_session/new.html.heex
View File

@@ -2,40 +2,40 @@
<h1 class="title text-primary-500 text-xl"> <h1 class="title text-primary-500 text-xl">
Log in Log in
</h1> </h1>
<%= form_for @conn,
<%= form_for @conn, Routes.user_session_path(@conn, :create), [as: :user, Routes.user_session_path(@conn, :create),
class: "flex flex-col justify-center items-center space-y-4"], fn f -> %> [as: :user, class: "flex flex-col justify-center items-center space-y-4"],
fn f -> %>
<%= if @error_message do %> <%= if @error_message do %>
<div class="alert alert-danger"> <div class="alert alert-danger">
<p><%= @error_message %></p> <p>
<%= @error_message %>
</p>
</div> </div>
<% end %> <% end %>
<div class="grid grid-cols-3 justify-center items-center text-center space-x-4"> <div class="grid grid-cols-3 justify-center items-center text-center space-x-4">
<%= label f, :email, class: "title text-lg text-primary-500" %> <%= label(f, :email, class: "title text-lg text-primary-500") %>
<%= email_input f, :email, required: true, class: "input input-primary col-span-2" %> <%= email_input(f, :email, required: true, class: "input input-primary col-span-2") %>
</div> </div>
<div class="grid grid-cols-3 justify-center items-center text-center space-x-4"> <div class="grid grid-cols-3 justify-center items-center text-center space-x-4">
<%= label f, :password, class: "title text-lg text-primary-500" %> <%= label(f, :password, class: "title text-lg text-primary-500") %>
<%= password_input f, :password, required: true, class: "input input-primary col-span-2" %> <%= password_input(f, :password, required: true, class: "input input-primary col-span-2") %>
</div> </div>
<div class="flex flex-row justify-center items-center text-center space-x-4"> <div class="flex flex-row justify-center items-center text-center space-x-4">
<%= label f, :remember_me, "Keep me logged in for 60 days", <%= label(f, :remember_me, "Keep me logged in for 60 days", class: "title text-lg text-primary-500") %>
class: "title text-lg text-primary-500" %> <%= checkbox(f, :remember_me, class: "checkbox") %>
<%= checkbox f, :remember_me, class: "checkbox" %>
</div> </div>
<%= submit("Log in", class: "btn btn-primary") %>
<%= submit "Log in", class: "btn btn-primary" %>
<hr class="hr"> <hr class="hr">
<div class="flex flex-row justify-center items-center space-x-4"> <div class="flex flex-row justify-center items-center space-x-4">
<%= link "Register", to: Routes.user_registration_path(@conn, :new), <%= link("Register",
class: "btn btn-primary" %> to: Routes.user_registration_path(@conn, :new),
<%= link "Forgot your password?", to: Routes.user_reset_password_path(@conn, :new), class: "btn btn-primary"
class: "btn btn-primary" %> ) %>
<%= link("Forgot your password?",
to: Routes.user_reset_password_path(@conn, :new),
class: "btn btn-primary"
) %>
</div> </div>
<% end %> <% end %>
</div> </div>

83
lib/lokal_web/templates/user_settings/edit.html.heex
View File

@@ -2,84 +2,81 @@
<h1 class="title text-primary-500 text-xl"> <h1 class="title text-primary-500 text-xl">
Settings Settings
</h1> </h1>
<h3 class="title text-primary-500 text-lg"> <h3 class="title text-primary-500 text-lg">
Change email Change email
</h3> </h3>
<%= form_for @email_changeset,
<%= form_for @email_changeset, Routes.user_settings_path(@conn, :update), Routes.user_settings_path(@conn, :update),
[class: "flex flex-col justify-center items-center space-y-4"], fn f -> %> [class: "flex flex-col justify-center items-center space-y-4"],
fn f -> %>
<%= if @email_changeset.action do %> <%= if @email_changeset.action do %>
<div class="alert alert-danger"> <div class="alert alert-danger">
<p>Oops, something went wrong! Please check the errors below.</p> <p>Oops, something went wrong! Please check the errors below.</p>
</div> </div>
<% end %> <% end %>
<%= hidden_input(f, :action, name: "action", value: "update_email") %>
<%= hidden_input f, :action, name: "action", value: "update_email" %>
<div class="grid grid-cols-3 justify-center items-center text-center space-x-4"> <div class="grid grid-cols-3 justify-center items-center text-center space-x-4">
<%= label f, :email, class: "title text-lg text-primary-500" %> <%= label(f, :email, class: "title text-lg text-primary-500") %>
<%= email_input f, :email, required: true, class: "input input-primary col-span-2" %> <%= email_input(f, :email, required: true, class: "input input-primary col-span-2") %>
</div> </div>
<%= error_tag f, :email %> <%= error_tag(f, :email) %>
<div class="grid grid-cols-3 justify-center items-center text-center space-x-4"> <div class="grid grid-cols-3 justify-center items-center text-center space-x-4">
<%= label f, :current_password, for: "current_password_for_email", class: "title text-lg text-primary-500" %> <%= label(f, :current_password,
<%= password_input f, :current_password, for: "current_password_for_email",
class: "title text-lg text-primary-500"
) %>
<%= password_input(f, :current_password,
required: true, required: true,
name: "current_password", name: "current_password",
id: "current_password_for_email", id: "current_password_for_email",
class: "input input-primary col-span-2" %> class: "input input-primary col-span-2"
) %>
</div> </div>
<%= error_tag f, :current_password %> <%= error_tag(f, :current_password) %>
<%= submit("Change email", class: "btn btn-primary") %>
<%= submit "Change email", class: "btn btn-primary" %>
<% end %> <% end %>
<h3 class="title text-primary-500 text-lg"> <h3 class="title text-primary-500 text-lg">
Change password Change password
</h3> </h3>
<%= form_for @password_changeset,
<%= form_for @password_changeset, Routes.user_settings_path(@conn, :update), Routes.user_settings_path(@conn, :update),
[class: "flex flex-col justify-center items-center space-y-4"], fn f -> %> [class: "flex flex-col justify-center items-center space-y-4"],
fn f -> %>
<%= if @password_changeset.action do %> <%= if @password_changeset.action do %>
<div class="alert alert-danger"> <div class="alert alert-danger">
<p>Oops, something went wrong! Please check the errors below.</p> <p>Oops, something went wrong! Please check the errors below.</p>
</div> </div>
<% end %> <% end %>
<%= hidden_input(f, :action, name: "action", value: "update_password") %>
<%= hidden_input f, :action, name: "action", value: "update_password" %>
<div class="grid grid-cols-3 justify-center items-center text-center space-x-4"> <div class="grid grid-cols-3 justify-center items-center text-center space-x-4">
<%= label f, :password, "New password", <%= label(f, :password, "New password", class: "title text-lg text-primary-500") %>
class: "title text-lg text-primary-500" %> <%= password_input(f, :password,
<%= password_input f, :password,
required: true, required: true,
class: "input input-primary col-span-2" %> class: "input input-primary col-span-2"
) %>
</div> </div>
<%= error_tag f, :password %> <%= error_tag(f, :password) %>
<div class="grid grid-cols-3 justify-center items-center text-center space-x-4"> <div class="grid grid-cols-3 justify-center items-center text-center space-x-4">
<%= label f, :password_confirmation, "Confirm new password", <%= label(f, :password_confirmation, "Confirm new password", class: "title text-lg text-primary-500") %>
class: "title text-lg text-primary-500" %> <%= password_input(f, :password_confirmation,
<%= password_input f, :password_confirmation,
required: true, required: true,
class: "input input-primary col-span-2" %> class: "input input-primary col-span-2"
) %>
</div> </div>
<%= error_tag f, :password_confirmation %> <%= error_tag(f, :password_confirmation) %>
<div class="grid grid-cols-3 justify-center items-center text-center space-x-4"> <div class="grid grid-cols-3 justify-center items-center text-center space-x-4">
<%= label f, :current_password, <%= label(f, :current_password,
for: "current_password_for_password", for: "current_password_for_password",
class: "title text-lg text-primary-500" %> class: "title text-lg text-primary-500"
<%= password_input f, :current_password, ) %>
<%= password_input(f, :current_password,
required: true, required: true,
name: "current_password", name: "current_password",
id: "current_password_for_password", id: "current_password_for_password",
class: "input input-primary col-span-2" %> class: "input input-primary col-span-2"
) %>
</div> </div>
<%= error_tag f, :current_password %> <%= error_tag(f, :current_password) %>
<%= submit("Change password", class: "btn btn-primary") %>
<%= submit "Change password", class: "btn btn-primary" %>
<% end %> <% end %>
</div> </div>