Skip to content

Commit 486915d

Browse files
committed
Added friends list
1 parent 213d19c commit 486915d

File tree

5 files changed

+34
-15
lines changed

5 files changed

+34
-15
lines changed

accounts/templates/accounts/profile.html

+2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ <h1>Profile</h1>
1616
<p>Phone: {{ user.userprofile.phone }}</p>
1717
<p>City: {{ user.userprofile.city }}</p>
1818
<p>Website: {{ user.userprofile.website }}</p>
19+
{% if user.userprofile.image %}
1920
<img src="{{ user.userprofile.image.url }}" width="240">
21+
{% endif %}
2022
</div>
2123

2224
{% endblock %}

accounts/urls.py

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
url(r'^logout/$', logout, {'template_name': 'accounts/logout.html'}, name='logout'),
1111
url(r'^register/$', views.register, name='register'),
1212
url(r'^profile/$', views.view_profile, name='view_profile'),
13+
url(r'^profile/(?P<pk>\d+)/$', views.view_profile, name='view_profile_with_pk'),
1314
url(r'^profile/edit/$', views.edit_profile, name='edit_profile'),
1415
url(r'^change-password/$', views.change_password, name='change_password'),
1516

accounts/views.py

+6-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,12 @@ def register(request):
2424
args = {'form': form}
2525
return render(request, 'accounts/reg_form.html', args)
2626

27-
def view_profile(request):
28-
args = {'user': request.user}
27+
def view_profile(request, pk=None):
28+
if pk:
29+
user = User.objects.get(pk=pk)
30+
else:
31+
user = request.user
32+
args = {'user': user}
2933
return render(request, 'accounts/profile.html', args)
3034

3135
def edit_profile(request):

home/templates/home/home.html

+22-12
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,27 @@
22

33
{% block body %}
44
<div class="container">
5-
<h1>Home</h1>
6-
<form method="post">
7-
{% csrf_token %}
8-
{{ form.post }}
9-
<br>
10-
<button type="submit">Submit</button>
11-
</form>
12-
<h2>{{ text }}</h2>
13-
{% for post in posts %}
14-
<h1>{{ post.post }}</h1>
15-
<p>Posted by {{ post.user.get_full_name }} on {{ post.created }}</p>
16-
{% endfor %}
5+
<div class="col-md-8">
6+
<h2>Home</h2>
7+
<form method="post">
8+
{% csrf_token %}
9+
{{ form.post }}
10+
<br>
11+
<button type="submit">Submit</button>
12+
</form>
13+
<h2>{{ text }}</h2>
14+
{% for post in posts %}
15+
<h1>{{ post.post }}</h1>
16+
<p>Posted by {{ post.user.get_full_name }} on {{ post.created }}</p>
17+
{% endfor %}
18+
</div>
19+
<div class="col-md-4">
20+
<h2>Other People</h2>
21+
{% for user in users %}
22+
<a href="{% url 'accounts:view_profile_with_pk' pk=user.pk %}">
23+
<h3>{{ user.username }}</h3>
24+
</a>
25+
{% endfor %}
26+
</div>
1727
</div>
1828
{% endblock %}

home/views.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
from django.views.generic import TemplateView
22
from django.shortcuts import render, redirect
3+
from django.contrib.auth.models import User
34

45
from home.forms import HomeForm
56
from home.models import Post
@@ -11,8 +12,9 @@ class HomeView(TemplateView):
1112
def get(self, request):
1213
form = HomeForm()
1314
posts = Post.objects.all().order_by('-created')
15+
users = User.objects.all()
1416

15-
args = {'form': form, 'posts': posts}
17+
args = {'form': form, 'posts': posts, 'users': users}
1618
return render(request, self.template_name, args)
1719

1820
def post(self, request):

0 commit comments

Comments
 (0)