diff --git a/apps/app/priv/templates/phx.gen.html/edit.html.eex b/apps/app/priv/templates/phx.gen.html/edit.html.eex
index 36abad5b..8d6656f7 100644
--- a/apps/app/priv/templates/phx.gen.html/edit.html.eex
+++ b/apps/app/priv/templates/phx.gen.html/edit.html.eex
@@ -1,20 +1,15 @@
-
+
Edit <%= schema.human_singular %>
<%%= styled_button_link "Back", to: Routes.<%= schema.route_helper %>_path(@conn, :index)%>
-
-
- <%%= changeset_error_block(@changeset) %>
-
- <%%= render "form.html", Map.put(assigns, :action, Routes.<%= schema.route_helper %>_path(@conn, :update, @<%= schema.singular %>)) %>
-
-
-
+ <%%= changeset_error_block(@changeset) %>
+
+ <%%= render "form.html", Map.put(assigns, :action, Routes.<%= schema.route_helper %>_path(@conn, :update, @<%= schema.singular %>)) %>
diff --git a/apps/app/priv/templates/phx.gen.html/form.html.eex b/apps/app/priv/templates/phx.gen.html/form.html.eex
index 18afbff6..f4600da3 100644
--- a/apps/app/priv/templates/phx.gen.html/form.html.eex
+++ b/apps/app/priv/templates/phx.gen.html/form.html.eex
@@ -1,4 +1,4 @@
-<%%= form_for @changeset, @action, [class: "ui large form"], fn f -> %>
+<%%= form_for @changeset, @action, [], fn f -> %>
<%= for input <- Mix.Legendary.inputs(schema) do %>
<%= input %>
diff --git a/apps/app/priv/templates/phx.gen.html/new.html.eex b/apps/app/priv/templates/phx.gen.html/new.html.eex
index 80807925..44314f06 100644
--- a/apps/app/priv/templates/phx.gen.html/new.html.eex
+++ b/apps/app/priv/templates/phx.gen.html/new.html.eex
@@ -8,13 +8,8 @@
-
+ <%%= render "form.html", Map.put(assigns, :action, Routes.<%= schema.route_helper %>_path(@conn, :create)) %>
diff --git a/apps/auth/lib/auth/user.ex b/apps/auth/lib/auth/user.ex
index 409e95cf..6ef69c3f 100644
--- a/apps/auth/lib/auth/user.ex
+++ b/apps/auth/lib/auth/user.ex
@@ -27,7 +27,7 @@ defmodule Auth.User do
user_or_changeset
|> pow_user_id_field_changeset(attrs)
- |> Changeset.cast(attrs, [:roles])
+ |> Changeset.cast(attrs, [:roles, :display_name])
|> pow_extension_changeset(attrs)
end
diff --git a/apps/auth_web/lib/auth_web/templates/pow/registration/edit.html.eex b/apps/auth_web/lib/auth_web/templates/pow/registration/edit.html.eex
index e7d73c7f..08debddb 100644
--- a/apps/auth_web/lib/auth_web/templates/pow/registration/edit.html.eex
+++ b/apps/auth_web/lib/auth_web/templates/pow/registration/edit.html.eex
@@ -1,24 +1,19 @@
-
-
-
- <%= flash_block(@conn) %>
- <%= changeset_error_block(@changeset) %>
- <%= form_for @changeset, @action, [as: :user, class: "ui large form"], fn f -> %>
-
- <%= styled_input f, :current_password, icon: "lock", type: "password" %>
+<%= floating_page_wrapper do %>
+ <%= floating_form "Update My Account", @changeset do %>
+ <%= form_for @changeset, @action, [as: :user], fn f -> %>
+
+ <%= styled_input f, :current_password, icon: "lock", type: "password", autocomplete: "current-password" %>
<%= styled_input f, Pow.Ecto.Schema.user_id_field(@changeset), icon: "user" %>
- <%= styled_input f, :password, icon: "lock", label: "New Password", type: "password", class: "right labeled" do %>
-
+ <%= styled_input f, :password, [icon: "lock", label: "New Password", type: "password", autocomplete: "new-password"], nil do %>
+
+
+
<% end %>
- <%= submit "Create My Account", class: "ui fluid large teal submit button" %>
+ <%= styled_button "Create My Account" %>
<% end %>
-
-
+ <% end %>
+<% end %>
diff --git a/apps/auth_web/lib/auth_web/templates/pow/registration/new.html.eex b/apps/auth_web/lib/auth_web/templates/pow/registration/new.html.eex
index 92663a2c..457582d3 100644
--- a/apps/auth_web/lib/auth_web/templates/pow/registration/new.html.eex
+++ b/apps/auth_web/lib/auth_web/templates/pow/registration/new.html.eex
@@ -1,12 +1,10 @@
<%= floating_page_wrapper do %>
<%= floating_form "Sign Up", @changeset do %>
- <%= form_for @changeset, @action, [as: :user, class: "ui large form"], fn f -> %>
-
- <%= styled_input f, Pow.Ecto.Schema.user_id_field(@changeset), placeholder: "E-mail address" %>
- <%= styled_input f, :password, placeholder: "Password" %>
+ <%= form_for @changeset, @action, [as: :user], fn f -> %>
+ <%= styled_input f, Pow.Ecto.Schema.user_id_field(@changeset), placeholder: "E-mail address" %>
+ <%= styled_input f, :password, placeholder: "Password", autocomplete: "new-password" %>
- <%= styled_button "Create My Account" %>
-
+ <%= styled_button "Create My Account" %>
<% end %>
<% end %>
diff --git a/apps/auth_web/lib/auth_web/templates/pow/session/new.html.eex b/apps/auth_web/lib/auth_web/templates/pow/session/new.html.eex
index fd5e5a7e..df4c5396 100644
--- a/apps/auth_web/lib/auth_web/templates/pow/session/new.html.eex
+++ b/apps/auth_web/lib/auth_web/templates/pow/session/new.html.eex
@@ -1,8 +1,8 @@
<%= floating_page_wrapper do %>
<%= floating_form "Log In", @changeset do %>
- <%= form_for @changeset, @action, [as: :user, class: "ui large form"], fn f -> %>
+ <%= form_for @changeset, @action, [as: :user], fn f -> %>
<%= styled_input f, Pow.Ecto.Schema.user_id_field(@changeset), icon: "user", placeholder: "joe@example.org" %>
- <%= styled_input f, :password, icon: "lock", type: "password" %>
+ <%= styled_input f, :password, icon: "lock", type: "password", autocomplete: "current-password" %>
<%= hidden_input f, :persistent_session, value: "true" %>
<%= styled_button "Sign In" %>
diff --git a/apps/auth_web/lib/auth_web/templates/pow_reset_password/reset_password/edit.html.eex b/apps/auth_web/lib/auth_web/templates/pow_reset_password/reset_password/edit.html.eex
index 1173dde6..ff74757a 100644
--- a/apps/auth_web/lib/auth_web/templates/pow_reset_password/reset_password/edit.html.eex
+++ b/apps/auth_web/lib/auth_web/templates/pow_reset_password/reset_password/edit.html.eex
@@ -1,19 +1,12 @@
-
-
-
- <%= flash_block(@conn) %>
- <%= changeset_error_block(@changeset) %>
- <%= form_for @changeset, @action, [as: :user, class: "ui large form"], fn f -> %>
-
- <%= styled_input f, :password, [icon: "lock", type: "password", class: "right labeled"] do %>
-
- <% end %>
-
- <%= submit "Reset My Password", class: "ui fluid large teal submit button" %>
+<%= floating_page_wrapper do %>
+ <%= floating_form "Reset Password", @changeset do %>
+ <%= form_for @changeset, @action, [as: :user], fn f -> %>
+ <%= styled_input f, :password, [icon: "lock", label: "New Password", type: "password", autocomplete: "new-password"], nil do %>
+
+
+
+ <% end %>
+ <%= styled_button "Reset My Password" %>
<% end %>
-
-
+ <% end %>
+<% end %>
diff --git a/apps/auth_web/lib/auth_web/templates/pow_reset_password/reset_password/new.html.eex b/apps/auth_web/lib/auth_web/templates/pow_reset_password/reset_password/new.html.eex
index 76ff242a..db337038 100644
--- a/apps/auth_web/lib/auth_web/templates/pow_reset_password/reset_password/new.html.eex
+++ b/apps/auth_web/lib/auth_web/templates/pow_reset_password/reset_password/new.html.eex
@@ -1,6 +1,6 @@
<%= floating_page_wrapper do %>
<%= floating_form "Reset Password", @changeset do %>
- <%= form_for @changeset, @action, [as: :user, class: "ui large form"], fn f -> %>
+ <%= form_for @changeset, @action, [as: :user], fn f -> %>
<%= styled_input f, :email, [placeholder: "joe@example.org", icon: "user"] %>
<%= styled_button "Reset My Password" %>
<% end %>
diff --git a/apps/content/lib/content_web/templates/posts/comments.html.eex b/apps/content/lib/content_web/templates/posts/comments.html.eex
index c9b2bf3d..f9d3d1d2 100644
--- a/apps/content/lib/content_web/templates/posts/comments.html.eex
+++ b/apps/content/lib/content_web/templates/posts/comments.html.eex
@@ -1,22 +1,20 @@
-
+
<%= Enum.map(Content.Comments.children(@parent_id, @post.comments), fn comment -> %>
-
-
-
-
-
-
-
+
+
+
+
+
<%= comment.author || "Anonymous" %>
-
-
+
+
<%= comment.date |> Timex.format!("%F", :strftime) %>
-
-
-
+
<% end) %>
diff --git a/apps/content/lib/content_web/templates/posts/index.html.eex b/apps/content/lib/content_web/templates/posts/index.html.eex
index e92a1f77..892eb9bf 100644
--- a/apps/content/lib/content_web/templates/posts/index.html.eex
+++ b/apps/content/lib/content_web/templates/posts/index.html.eex
@@ -1,17 +1,15 @@
<%= for post <- @posts do %>
-
-
-
- <%= post_topmatter(@conn, post) %>
-
+
+
+ <%= link to: Routes.posts_path(@conn, :show, post), class: "u-url" do %>
+ <%= raw post.title %>
+ <% end %>
+
+ <%= post_topmatter(@conn, post) %>
<%= if authenticated_for_post?(@conn, post) do %>
<%= render "thumb.html", post: post, thumbs: @thumbs %>
-
+
<%= raw post |> Content.Post.content_page(1) |> Content.Post.before_more |> process_content |> raw %>
<%= if post.content =~ "" do %>
@@ -24,61 +22,30 @@
<%= render "password_form.html", post: post, conn: @conn %>
<% end %>
-
-
-
- <%= case post.categories || [] do %>
- <% [] -> %>
- <%= "" %>
- <% categories -> %>
- <%= for term <- categories do %>
-
- <%= link term.name, to: Routes.category_path(@conn, :index_posts, term.slug), class: "p-category" %>
-
- <% end %>
+
+ <%= case post.categories || [] do %>
+ <% [] -> %>
+ <%= "" %>
+ <% categories -> %>
+
+
Categories
+
+ <%= for term <- categories do %>
+ <%= link term.name, to: Routes.category_path(@conn, :index_posts, term.slug), class: "rounded-full bg-gray-300 px-4 py-1 mr-2" %>
<% end %>
-
-
+ <% end %>
<% end %>
-
-
-
-
-
-
-
- <%= if @page > 1 do %>
- <%= link 1, to: paginated_posts_path(@conn, @category, 1), class: "ui button" %>
- <% end %>
-
- <%= if @page > 3 do %>
- ...
- <% end %>
-
- <%= if @page > 2 do %>
- <%= link @page - 1, to: paginated_posts_path(@conn, @category, @page - 1), class: "ui button" %>
- <% end %>
-
- <%= @page %>
-
- <%= if @page + 1 < @last_page do %>
- <%= link @page + 1, to: paginated_posts_path(@conn, @category, @page + 1), class: "ui button" %>
- <% end %>
-
- <%= if @page + 2 < @last_page do %>
- ...
- <% end %>
-
- <%= if @page < @last_page do %>
- <%= link @last_page, to: paginated_posts_path(@conn, @category, @last_page), class: "ui button" %>
- <% end %>
-
-
-
+
+
+ <%= paginator(1..@last_page, @page, fn first..last, page ->
+ link page,
+ to: paginated_posts_path(@conn, @category, page),
+ style: "min-width: 3.5rem",
+ class: "#{if page == @page, do: "font-bold"} text-center flex-1 border bg-gray-100 hover:bg-gray-300 text-gray-500 p-4 #{group_rounding_class(first..last, page)}"
+ end)
+ %>
diff --git a/apps/content/lib/content_web/templates/posts/reply_form.html.eex b/apps/content/lib/content_web/templates/posts/reply_form.html.eex
index 0383676f..9f19b7ed 100644
--- a/apps/content/lib/content_web/templates/posts/reply_form.html.eex
+++ b/apps/content/lib/content_web/templates/posts/reply_form.html.eex
@@ -1,35 +1,11 @@
-
-
-
- <%= changeset_error_block(@comment_changeset) %>
-
- <%= form_for @comment_changeset, Routes.comment_path(@conn, :create), [class: "ui form"], fn f -> %>
- <%= hidden_input f, :parent %>
- <%= hidden_input f, :post_id %>
- <%= label f, :author do %>
- Your Name
- <%= text_input f, :author %>
- <% end %>
- <%= label f, :author_email do %>
- Your Email
- <%= email_input f, :author_email %>
- <% end %>
- <%= label f, :author_url do %>
- Your Website
- <%= text_input f, :author_url %>
- <% end %>
- <%= label f, :content do %>
- Comment
- <%= textarea f, :content %>
- <% end %>
-
- <%= submit "Leave My Comment", class: "ui fluid large teal submit button" %>
-
- <% end %>
-
-
-
+<%= floating_form "Leave My Comment", @comment_changeset do %>
+ <%= form_for @comment_changeset, Routes.comment_path(@conn, :create), fn f -> %>
+ <%= hidden_input f, :parent %>
+ <%= hidden_input f, :post_id %>
+ <%= styled_input f, :author, label: "Your Name" %>
+ <%= styled_input f, :author_email, label: "Your Email" %>
+ <%= styled_input f, :author_url, label: "Your Website" %>
+ <%= styled_input f, :content, label: "Comment", input_helper: :textarea %>
+ <%= styled_button "Leave My Comment" %>
+ <% end %>
+<% end %>
diff --git a/apps/content/lib/content_web/templates/posts/show.html.eex b/apps/content/lib/content_web/templates/posts/show.html.eex
index bfee4784..47dbed6d 100644
--- a/apps/content/lib/content_web/templates/posts/show.html.eex
+++ b/apps/content/lib/content_web/templates/posts/show.html.eex
@@ -1,35 +1,31 @@
-
-
-