Skip to content
Snippets Groups Projects
Commit dcdb71ac authored by Patrick Jentsch's avatar Patrick Jentsch
Browse files

Remove more UI leftovers from community update

parent 23cdfb14
No related branches found
No related tags found
No related merge requests found
......@@ -27,15 +27,20 @@ def faq():
@bp.route('/dashboard')
@login_required
def dashboard():
users = [
u.to_json_serializeable(filter_by_privacy_settings=True) for u
in User.query.filter(User.is_public == True, User.id != current_user.id).all()
]
corpora = [
c.to_json_serializeable() for c
in Corpus.query.filter(Corpus.is_public == True, Corpus.user != current_user).all()
]
return render_template('main/dashboard.html.j2', title='Dashboard', users=users, corpora=corpora)
# users = [
# u.to_json_serializeable(filter_by_privacy_settings=True) for u
# in User.query.filter(User.is_public == True, User.id != current_user.id).all()
# ]
# corpora = [
# c.to_json_serializeable() for c
# in Corpus.query.filter(Corpus.is_public == True, Corpus.user != current_user).all()
# ]
return render_template(
'main/dashboard.html.j2',
title='Dashboard',
# users=users,
# corpora=corpora
)
@bp.route('/dashboard2')
......
......@@ -14,7 +14,7 @@
<a class="action-button btn waves-effect waves-light" data-action="unfollow-request"><i class="material-icons left">add</i>Unfollow Corpus</a>
{% endif %}
{% if corpus.status.name in ['BUILT', 'STARTING_ANALYSIS_SESSION', 'RUNNING_ANALYSIS_SESSION', 'CANCELING_ANALYSIS_SESSION'] and current_user.is_following_corpus(corpus) %}
<a class="btn waves-effect waves-light" href="{{ url_for('corpora.analyse_corpus', corpus_id=corpus.id) }}">Analyse</a>
<a class="btn waves-effect waves-light" href="{{ url_for('corpora.analyse_corpus', corpus_id=corpus.id) }}">Analyze</a>
{% endif %}
</div>
</div>
......
......@@ -42,7 +42,7 @@
</div>
</div>
</div>
<div class="col s12" id="social">
{# <div class="col s12" id="social">
<h3>Social</h3>
<div class="card">
<div class="card-content">
......@@ -58,7 +58,7 @@
<div class="public-corpus-list no-autoinit"></div>
</div>
</div>
</div>
</div> #}
</div>
</div>
{% endblock page_content %}
......@@ -116,11 +116,11 @@
{% block scripts %}
{{ super() }}
<script>
{# <script>
let userList = new UserList(document.querySelector('.user-list'));
userList.add({{ users|tojson }});
let publicCorpusList = new PublicCorpusList(document.querySelector('.public-corpus-list'));
publicCorpusList.add({{ corpora|tojson }});
</script>
</script> #}
{% endblock scripts %}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment