zedfrigg/bookwyrm
1
0
Fork 0
Code Activity

User page redesign

Browse source
This commit is contained in:
Mouse Reeve 2020-03-16 17:09:45 -07:00
parent c41b53bdbe
commit 7e73bae07d
6 changed files with 136 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

26
fedireads/templates/followers.html Normal file
View file

@ -0,0 +1,26 @@
{% extends 'layout.html' %}
{% load fr_display %}
{% block content %}
{% include 'user_header.html' with user=user %}
<div class="content-container">
<h2>Followers</h2>
{% for followers in followers %}
<div class="row shrink">
<div>
{% include 'snippets/avatar.html' with user=followers %}
</div>
<div>
{% include 'snippets/username.html' with user=followers show_full=True %}
</div>
<div>
{% include 'snippets/follow_button.html' with user=followers %}
</div>
</div>
{% endfor %}
{% if not followers.count %}
<div>{{ user|username }} has no followers</div>
{% endif %}
</div>
{% endblock %}

26
fedireads/templates/following.html Normal file
View file

@ -0,0 +1,26 @@
{% extends 'layout.html' %}
{% load fr_display %}
{% block content %}
{% include 'user_header.html' %}
<div class="content-container">
<h2>Following</h2>
{% for follower in user.following.all %}
<div class="row shrink">
<div>
{% include 'snippets/avatar.html' with user=follower %}
</div>
<div>
{% include 'snippets/username.html' with user=follower show_full=True %}
</div>
<div>
{% include 'snippets/follow_button.html' with user=follower %}
</div>
</div>
{% endfor %}
{% if not following.count %}
<div>No one is following {{ user|username }}</div>
{% endif %}
</div>
{% endblock %}

4
fedireads/templates/snippets/follow_button.html
View file

@ -7,12 +7,12 @@ Follow request already sent.
<form action="/follow/" method="post">
{% csrf_token %}
<input type="hidden" name="user" value="{{ user.username }}"></input>
<input type="submit" value="Follow"></input>
<button type="submit">Follow</button>
</form>
{% else %}
<form action="/unfollow/" method="post">
{% csrf_token %}
<input type="hidden" name="user" value="{{ user.username }}"></input>
<input type="submit" value="Unfollow"></input>
<button type="submit">Unfollow</button>
</form>
{% endif %}

52
fedireads/templates/user.html
View file

@ -1,52 +1,7 @@
{% extends 'layout.html' %}
{% load humanize %}
{% block content %}
<div class="content-container user-profile">
<h2>User Profile
{% if is_self %}
<a href="/user-edit/">edit
<span class="icon icon-pencil">
<span class="hidden-text">Edit profile</span>
</span>
</a>
{% endif %}
</h2>
<div class="row">
<div class="pic-container">
{% include 'snippets/avatar.html' with user=user large=True %}
</div>
<div>
<p>{% if user.name %}{{ user.name }}{% else %}{{ user.localname }}{% endif %}</p>
<p>{{ user.username }}</p>
<p>Joined {{ user.created_date | naturaltime }}</p>
</div>
{% if user.summary %}
<blockquote><span class="icon icon-quote-open"></span>{{ user.summary | safe }}</blockquote>
{% endif %}
</div>
{% if not is_self %}
{% include 'snippets/follow_button.html' with user=user %}
{% endif %}
{% if is_self and user.follower_requests.all %}
<div class="follow-requests">
<h2>Follow Requests</h2>
{% for requester in user.follower_requests.all %}
<div class="row shrink">
<p>
{% include 'snippets/username.html' with user=requester show_full=True %}
</p>
{% include 'snippets/follow_request_buttons.html' with user=requester %}
</div>
{% endfor %}
</div>
{% endif %}
</div>
{% include 'user_header.html' with user=user %}
<div class="all-shelves content-container">
{% include 'snippets/covers_shelf.html' with shelves=shelves user=user %}
</div>
@ -58,6 +13,11 @@
{% include 'snippets/status.html' with status=activity %}
</div>
{% endfor %}
{% if not activities %}
<div class="content-container">
<p>No activities yet!</a>
</div>
{% endif %}
</div>
{% endblock %}

50
fedireads/templates/user_header.html Normal file
View file

@ -0,0 +1,50 @@
{% load humanize %}
{% load fr_display %}
<div class="content-container user-profile">
<h2>User Profile
{% if is_self %}
<a href="/user-edit/">edit
<span class="icon icon-pencil">
<span class="hidden-text">Edit profile</span>
</span>
</a>
{% endif %}
</h2>
<div class="row">
<div class="pic-container">
{% include 'snippets/avatar.html' with user=user large=True %}
</div>
<div>
<p>{% if user.name %}{{ user.name }}{% else %}{{ user.localname }}{% endif %}</p>
<p>{{ user.username }}</p>
<p>Joined {{ user.created_date | naturaltime }}</p>
<p>
<a href="/user/{{ user|username }}/followers">{{ user.followers.count }} follower{{ user.followers.count | pluralize }}</a>,
<a href="/user/{{ user|username }}/following">{{ user.following.count }} following</a></p>
</div>
{% if user.summary %}
<blockquote><span class="icon icon-quote-open"></span>{{ user.summary | safe }}</blockquote>
{% endif %}
</div>
{% if not is_self %}
{% include 'snippets/follow_button.html' with user=user %}
{% endif %}
{% if is_self and user.follower_requests.all %}
<div class="follow-requests">
<h2>Follow Requests</h2>
{% for requester in user.follower_requests.all %}
<div class="row shrink">
<p>
{% include 'snippets/username.html' with user=requester show_full=True %}
</p>
{% include 'snippets/follow_request_buttons.html' with user=requester %}
</div>
{% endfor %}
</div>
{% endif %}
</div>