Skip to content

Commit 448d789

Browse files
elixirprogrammerelixirprogrammer
committed
fixes live votes when not logged in
1 parent 07fc65b commit 448d789

File tree

5 files changed

+51
-51
lines changed

5 files changed

+51
-51
lines changed

‎lib/reddit_web/controllers/page_controller.ex‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ defmodule RedditWeb.PageController do
22
use RedditWeb, :controller
33

44
alias Reddit.Category
5+
alias Reddit.Community, as: Post
56

67
### def index(conn, _params) do
78
### if Pow.Plug.current_user(conn) do
@@ -14,6 +15,17 @@ defmodule RedditWeb.PageController do
1415

1516
def index(conn, _params) do
1617
communities = Category.list_communities()
17-
render conn, :index, communities: communities
18+
posts = Post.list_posts()
19+
logged_in_user_id = logged_in(conn.assigns.current_user)
20+
render conn, :index, communities: communities, posts: posts, logged_in_user_id: logged_in_user_id
21+
end
22+
23+
defp logged_in(current_user) do
24+
case current_user do
25+
nil ->
26+
false
27+
current_user ->
28+
current_user.id
29+
end
1830
end
1931
end

‎lib/reddit_web/templates/page/index.html.eex‎

Lines changed: 25 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -5,58 +5,35 @@
55
</div>
66
<div class="row">
77
<div class="col-8">
8-
<div class="card p-3 mb-3">
9-
<div class="row">
10-
<div class="col-1 text-center">
11-
<div id="vote-actions-1" class="vote" data-id="1">
12-
<div class="fa fa-arrow-up upvote"></div>
13-
<span class="font-weight-bold score">2</span>
14-
<div class="fa fa-arrow-down downvote"></div>
8+
<%= for post <- @posts do %>
9+
<div class="card p-3 mb-3">
10+
<div class="row">
11+
<div class="col-1 text-center">
12+
<div class="vote">
13+
<%= if Pow.Plug.current_user(@conn) do %>
14+
<%= live_render(@conn, RedditWeb.VotesLive, session: %{"post_id" => post.id, "user_id" => @logged_in_user_id}) %>
15+
<% else %>
16+
<%= render RedditWeb.PostView, "votes_live.html", post_count: post.votes_count %>
17+
<% end %>
18+
</div>
1519
</div>
16-
</div>
17-
<div class="col-11">
18-
<h4 class="mb-1">
19-
<a href="/communities/1/posts/1">Webpackets vs Sprockets</a>
20-
</h4>
21-
<p>
22-
<small
23-
><a href="/communities/1">Ruby on Rails Community</a> Posted by
24-
<a href="/u/davidb">David Battersby</a> about 2 months ago.</small
25-
>
26-
</p>
27-
<p>
28-
Watch my video on adding Sprockets to a Rails 6 app. This can be
29-
helpful if you are upgrading an older app and want to work with the
30-
existing asset pipeline. https://www.youtube.com/watch?v=S-1x...
31-
</p>
32-
</div>
33-
</div>
34-
</div>
35-
<div class="card p-3 mb-3">
36-
<div class="row">
37-
<div class="col-1 text-center">
38-
<div id="vote-actions-2" class="vote" data-id="2">
39-
<div class="fa fa-arrow-up upvote"></div>
40-
<span class="font-weight-bold score">0</span>
41-
<div class="fa fa-arrow-down downvote"></div>
20+
<div class="col-11">
21+
<h4 class="mb-1">
22+
<%= link post.title, to: Routes.post_path(@conn, :show, post.community.name, post.id) %>
23+
</h4>
24+
<p>
25+
<small>
26+
<%= link post.community.name, to: Routes.community_path(@conn, :show, post.community.name) %> Posted by
27+
<%= link post.user.full_name, to: Routes.user_path(@conn, :profile, post.user.username) %> <%= Timex.from_now(post.inserted_at) %>
28+
</small>
29+
</p>
30+
<p>
31+
<%= post.body %>
32+
</p>
4233
</div>
4334
</div>
44-
<div class="col-11">
45-
<h4 class="mb-1">
46-
<a href="/communities/3/posts/2">Hi, I&#39;m John</a>
47-
</h4>
48-
<p>
49-
<small
50-
><a href="/communities/3">Introduce Yourself</a> Posted by
51-
<a href="/u/johnsmith">John Smith</a> about 2 months ago.</small
52-
>
53-
</p>
54-
<p>
55-
Nice to meet you all. Thanks for letting me join this community!
56-
</p>
57-
</div>
5835
</div>
59-
</div>
36+
<% end %>
6037
</div>
6138
<div class="col-4">
6239
<p class="h5 mb-4">Up and coming Communities</p>

‎lib/reddit_web/templates/post/index.html.eex‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@
33
<div class="row">
44
<div class="col-1 text-center">
55
<div class="vote">
6-
<%= live_render(@conn, RedditWeb.VotesLive, session: %{"post_id" => post.id, "user_id" => @logged_in_user_id}) %>
6+
<%= if Pow.Plug.current_user(@conn) do %>
7+
<%= live_render(@conn, RedditWeb.VotesLive, session: %{"post_id" => post.id, "user_id" => @logged_in_user_id}) %>
8+
<% else %>
9+
<%= render RedditWeb.PostView, "votes_live.html", post_count: post.votes_count %>
10+
<% end %>
711
</div>
812
</div>
913
<div class="col-11">

‎lib/reddit_web/templates/post/show.html.eex‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
<div class="row">
22
<div class="col-1 text-center">
33
<div class="vote">
4-
<%= live_render(@conn, RedditWeb.VotesLive, session: %{"post_id" => @post.id, "user_id" => @logged_in_user_id}) %>
4+
<%= if Pow.Plug.current_user(@conn) do %>
5+
<%= live_render(@conn, RedditWeb.VotesLive, session: %{"post_id" => @post.id, "user_id" => @logged_in_user_id}) %>
6+
<% else %>
7+
<%= render RedditWeb.PostView, "votes_live.html", post_count: @post.votes_count %>
8+
<% end %>
59
</div>
610
</div>
711
<div class="col-11">

‎lib/reddit_web/templates/post/votes_live.html.eex‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<div class="fa fa-arrow-up upvote"></div>
2+
<span class="font-weight-bold score"><%= @post_count %></span>
3+
<div class="fa fa-arrow-down downvote"></div>

0 commit comments

Comments
 (0)