Skip to content

Commit

Permalink
working on usernames update
Browse files Browse the repository at this point in the history
  • Loading branch information
ThomasConnolly committed Jul 26, 2023
1 parent ee43849 commit 61108b2
Show file tree
Hide file tree
Showing 14 changed files with 16 additions and 17 deletions.
2 changes: 1 addition & 1 deletion app/views/comment_mailer/comment_created.html.erb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<p>
Hello <%=@post_user.first_name.titleize%>, <%=@current_user.username.titleize%> has commented on your post.
Hello <%=@post_user.first_name.titleize%>, <%=@current_user.username%> has commented on your post.
</p>
<p>
<%= link_to "See that comment here", post_url(@post) %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/comments/_comments.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<% commentable.comments.each do |comment| %>
<p>
<%= comment.body %><br>
<em> By <%= comment.user.username.titleize %></em>
<em> By <%= comment.user.username %></em>
</p>
<% end %>
</div>
2 changes: 1 addition & 1 deletion app/views/devise/mailer/unlock_instructions.html.erb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<p>Hello <%= @resource.username.titleize %>!</p>
<p>Hello <%= @resource.username %>!</p>

<p>Your account has been locked due to an excessive number of unsuccessful sign in attempts.</p>

Expand Down
2 changes: 1 addition & 1 deletion app/views/donations/show.html.erb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<h1>
<%= @donation.user.username.titleize %> is donating <%= formatted_amount @donation.amount %>
<%= @donation.user.username %> is donating <%= formatted_amount @donation.amount %>
</h1>
<div class="text-center my-5" max-width="500px">
<p>If this is correct, select the "Next" button to enter payment details. If not, "Edit or delete."</p>
Expand Down
2 changes: 1 addition & 1 deletion app/views/members/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<h2> Members in the diaspora </h2>
<% @diaspora.each do |d| %>
<p><%=d.username.titleize %>
<p><%=d.username %>
<%= d.email %>
<%= link_to 'Edit' , edit_member_path(d) %>
<%= link_to ' | Delete' , member_path(d), data: { turbo_confirm: "Are you sure?" , turbo_method: :delete } %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/opportunities/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<p><strong>Where </strong>&#09;<%= opportunity.where %>
</p>
<!--<%# if opportunity.user.present? %>
<p><strong>Vestry liaison person </strong>&#09;<%#= opportunity.user.username.titleize %>, <span class="email"><%#= opportunity.user.email %></span></p> -->
<p><strong>Vestry liaison person </strong>&#09;<%#= opportunity.user.username %>, <span class="email"><%#= opportunity.user.email %></span></p> -->
<%# end %>
<% if user_signed_in? && current_user.admin? %>
<p><small>
Expand Down
2 changes: 1 addition & 1 deletion app/views/pledges/show.html.erb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="mt-5"></div>
<div class="row">
<div class="col-md-6 offset-md-3">
<h3> <%= @pledge.user.username.titleize %> is pledging <%= number_to_currency@pledge.dollars %> <%= @pledge.plan %>
<h3> <%= @pledge.user.username %> is pledging <%= number_to_currency@pledge.dollars %> <%= @pledge.plan %>
</h3>
<p>If this is correct, select the "Next" button to enter payment details. If not, "Edit or delete."</p>
<%= button_to "Next" , checkout_pledges_create_path, method: :post, params: { id: @pledge.id }, data: { turbo: 'false'}, class: "btn btn-success btn-lg", id: "pledge-checkout-button" %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/posts/show.html.erb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="row">
<div class="col-md-8 col-md-offset-2">
<h1>Here's the post</h1>
<p class="list">By <%= @post.user.username.titleize %>,
<p class="list">By <%= @post.user.username %>,
<%= @post.created_at.strftime("%b %d, %Y") %></p>

<% if @post.picture.present? %>
Expand Down
1 change: 0 additions & 1 deletion app/views/stories/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
<p><strong>
<%= story.title %>, &nbsp;
</strong> <small> by
<%= story.user.username.titleize %>
</small> &nbsp;
<%= link_to " Show this story" , story %>
</p>
Expand Down
2 changes: 1 addition & 1 deletion app/views/story_ideas/_story_ideas.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<p><%= simple_format(story_idea.body).html_safe %><br>
<div class="comments-user"><p><small>Idea submitted
<%= time_ago_in_words(story_idea.created_at) %> ago by
<%= story_idea.user.username.titleize %> |
<%= story_idea.user.username %> |
<%= link_to "Show", story_idea_path(story_idea) %> |
<% if current_user == story_idea.user %>
<%= link_to "Edit", edit_story_idea_path(story_idea) %> &nbsp;
Expand Down
2 changes: 1 addition & 1 deletion app/views/story_ideas/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<div class="comments-user">
<p><small>Submitted
<%= time_ago_in_words(@story_idea.created_at) %> ago by
<%= @story_idea.user.username.titleize %> |
<%= @story_idea.user.username %> |
</small>
<% if current_user==@story_idea.user %>
<span>
Expand Down
10 changes: 5 additions & 5 deletions app/views/users/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,23 @@
<div class="col-md-8 col-md-offset-2">
<h3>All Users</h3>
<% @users.each do |user| %>
<p><strong><%= user.username.titleize %></strong> &nbsp;
<p><strong><%= user.username %></strong> &nbsp;
<%= user.email %> &nbsp; <%=user.id %> &nbsp;
<%= link_to "Delete" , user, data: { turbo_method: :delete } %></p>
<% end %><br>
<h3> Vestry Members </h3>
<% @users.where(" 'vestry' = ANY (roles)" ).each do |v| %>
<p><strong><%= v.username.titleize %></strong>&nbsp;
<p><strong><%= v.username %></strong>&nbsp;
<%= v.email %> <br></p>
<% end %><br>
<h3>Administrators</h3>
<% @users.where("admin: true").each do |admin| %>
<p><strong><%= admin.username.titleize %></strong>&nbsp;
<% @users.where(" 'admin' =ANY (roles)").each do |admin| %>
<p><strong><%= admin.username %></strong>&nbsp;
<%= admin.email %></p>
<% end %><br>
<h3>Communicators</h3>
<% @users.where(" 'communicator' = ANY (roles)" ).each do |comm| %>
<p><strong><%= comm.username.titleize %></strong>&nbsp;
<p><strong><%= comm.username %></strong>&nbsp;
<%= comm.email %></p>
<% end %>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/views/users/show.html.erb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="col-md-4 offset-md-4">
<h3><%= @user.username.titleize %> &nbsp; <%= @user.email %></h3>
<h3><%= @user.username %> &nbsp; <%= @user.email %></h3>
<% if @user.avatar.attached? %>
<%= cl_image_tag(@user.avatar.key, width: 300, class: "center-image" ) %>
<% else %>
Expand Down
Binary file modified dump.rdb
Binary file not shown.

0 comments on commit 61108b2

Please sign in to comment.