Itmens/lib.itmens
Itmens/lib.itmens
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

migration

Browse source
This commit is contained in:
Your Name 2023-06-19 19:50:49 -04:00 • committed by Henri Dickson
parent 39505cec38
commit d96e926912
6 changed files with 46 additions and 143 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
catalog/migrations/0009_remove_tvepisode_show.py Normal file
View file

@ -0,0 +1,16 @@
# Generated by Django 3.2.19 on 2023-06-19 23:47
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
("catalog", "0008_delete_historicalitem"),
]
operations = [
migrations.RemoveField(
model_name="tvepisode",
name="show",
),
]

2
catalog/templates/discover.html
View file

@ -104,7 +104,7 @@
{% if request.user.is_authenticated %}
{% include "_sidebar.html" with show_progress=1 %}
{% else %}
{% include "partial/_sidebar_anonymous.html" %}
{% include "_sidebar_anonymous.html" %}
{% endif %}
</main>
{% include "_footer.html" %}

0
common/templates/partial/_sidebar_anonymous.html → common/templates/_sidebar_anonymous.html
View file

142
common/templates/partial/_sidebar.html
View file

@ -1,142 +0,0 @@
{% load static %}
{% load i18n %}
{% load admin_url %}
{% load mastodon %}
{% load oauth_token %}
{% load truncate %}
{% load thumb %}
{% load collection %}
{% load bleach_tags %}
<div class="grid__aside grid__aside--reverse-order grid__aside--tablet-column">
<div class="aside-section-wrapper aside-section-wrapper--no-margin">
<div class="user-profile" id="userInfoCard">
<div class="user-profile__header">
<!-- <img src=""
class="user-profile__avatar mast-avatar"
alt="{{ user.username }}"> -->
<img src="{{ user.mastodon_account.avatar }}"
class="user-profile__avatar mast-avatar"
alt="">
<a href="{% url 'journal:user_profile' user.mastodon_username %}">
<h5 class="user-profile__username mast-displayname">{{ user.mastodon_account.display_name }}</h5>
</a>
<!-- {{ user.id }} -->
</div>
<p>
<a class="user-profile__link mast-acct"
target="_blank"
rel="me noopener"
href="{{ user.mastodon_account.url }}">@{{ user.username }}@{{ user.mastodon_site }}</a>
{% current_user_relationship user as relationship %}
{% if relationship %}<a class="user-profile__report-link">{{ relationship }}</a>{% endif %}
</p>
<div class="relation-dropdown">
<div class="relation-dropdown__body">
<p class="user-profile__bio mast-brief">{{ user.mastodon_account.note|bleach:"a,p,span,br" }}</p>
{% if request.user != user %}
<a href="{% url 'users:report' %}?user_id={{ user.id }}"
class="user-profile__report-link">{% trans '投诉用户' %}</a>
{% endif %}
</div>
</div>
</div>
</div>
<div class="relation-dropdown">
<div class="relation-dropdown__button">
<span class="icon-arrow">
<i class="fas fa-angle-down"></i>
</span>
</div>
{% if user.featured_collections.all %}
<div class="relation-dropdown__body">
<div class="aside-section-wrapper aside-section-wrapper--transparent aside-section-wrapper--collapse">
<div class="user-relation">
<h5 class="user-relation__label">{% trans '当前目标' %}</h5>
{% for featured_collection in user.featured_collections.all %}
{% user_visibility_of featured_collection as visible %}
{% if visible %}
{% user_progress_of collection=featured_collection user=user as progress %}
<div class="tag-collection" style="margin-left: 10%;">
<a href="{{ featured_collection.collection.url }}">{{ featured_collection.collection.title }}</a>
<br>
已完成{{ progress }}%
<br>
<progress value="{{ progress }}" max="100" />
</div>
{% endif %}
{% endfor %}
<br>
</div>
</div>
</div>
{% endif %}
{% if user == request.user %}
<div class="relation-dropdown__body">
<div class="aside-section-wrapper aside-section-wrapper--transparent aside-section-wrapper--collapse">
<div class="user-relation" id="followings">
<h5 class="user-relation__label">{% trans '关注的人' %}</h5>
<a href="{% url 'users:following' user.mastodon_username %}"
class="user-relation__more-link mast-following-more">{% trans '更多' %}</a>
<ul class="user-relation__related-user-list mast-following">
<li class="user-relation__related-user">
<a>
<img src="" alt="" class="user-relation__related-user-avatar">
<div class="user-relation__related-user-name mast-displayname"></div>
</a>
</li>
</ul>
</div>
<div class="user-relation" id="followers">
<h5 class="user-relation__label">{% trans '被他们关注' %}</h5>
<a href="{% url 'users:followers' user.mastodon_username %}"
class="user-relation__more-link mast-followers-more">{% trans '更多' %}</a>
<ul class="user-relation__related-user-list mast-followers">
<li class="user-relation__related-user">
<a>
<img src="" alt="" class="user-relation__related-user-avatar">
<div class="user-relation__related-user-name mast-displayname"></div>
</a>
</li>
</ul>
</div>
{% if top_tags %}
<div class="user-relation">
<h5 class="user-relation__label">{% trans '常用标签' %}</h5>
<a href="{% url 'journal:user_tag_list' user.mastodon_username %}">{% trans '更多' %}</a>
<div class="tag-collection" style="margin-left: 0;">
{% for t in top_tags %}
<span class="tag-collection__tag">
<a href="{% url 'journal:user_tag_member_list' user.mastodon_username t %}">{{ t }}</a>
</span>
{% endfor %}
<div class="clearfix"></div>
</div>
</div>
{% endif %}
</div>
</div>
{% endif %}
</div>
</div>
{% if user == request.user %}
<div id="oauth2Token" hidden="true">{{ request.user.mastodon_token }}</div>
<div id="mastodonURI" hidden="true">{{ request.user.mastodon_site }}</div>
<div id="userMastodonID" hidden="true">{{ user.mastodon_id }}</div>
<div id="userPageURL" hidden="true">{% url 'journal:user_profile' 0 %}</div>
<div id="spinner" hidden>
<div class="spinner">
<div></div>
<div></div>
<div></div>
<div></div>
<div></div>
<div></div>
<div></div>
<div></div>
<div></div>
<div></div>
<div></div>
<div></div>
</div>
</div>
{% endif %}

1
journal/templates/profile.html
View file

@ -187,5 +187,6 @@
{% include "_sidebar.html" with show_progress=1 show_profile=1 %}
</main>
{% include "_footer.html" %}
<a href="{{ user.mastodon_account.url }}" rel="me" style="display:none">Mastodon verification</a>
</body>
</html>

28
social/migrations/0005_alter_localactivity_template.py Normal file
View file

@ -0,0 +1,28 @@
# Generated by Django 3.2.19 on 2023-06-19 23:47
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("social", "0004_alter_localactivity_template"),
]
operations = [
migrations.AlterField(
model_name="localactivity",
name="template",
field=models.CharField(
choices=[
("mark_item", "Markitem"),
("review_item", "Reviewitem"),
("create_collection", "Createcollection"),
("like_collection", "Likecollection"),
("feature_collection", "Featurecollection"),
("comment_child_item", "Commentchilditem"),
("comment_focus_item", "Commentfocusitem"),
],
max_length=50,
),
),
]