diff --git a/app/main/routes.py b/app/main/routes.py index dd4a50074ac1052936967c8dd8d5a82375aa6f52..eff0dadd60d30a877fc75bae8d2dd6a34a2f18a4 100644 --- a/app/main/routes.py +++ b/app/main/routes.py @@ -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') diff --git a/app/templates/corpora/public_corpus.html.j2 b/app/templates/corpora/public_corpus.html.j2 index ace8665f5add3ebab42a9e747735539287359df9..94b3524cee745f0e591636003d62d43e504c3d8a 100644 --- a/app/templates/corpora/public_corpus.html.j2 +++ b/app/templates/corpora/public_corpus.html.j2 @@ -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> diff --git a/app/templates/main/dashboard.html.j2 b/app/templates/main/dashboard.html.j2 index 0feba7b54f95160b63e9b42bc3234b7b0fa9f06f..ca5422df41903820e7055e9c723d8467ddff73e6 100644 --- a/app/templates/main/dashboard.html.j2 +++ b/app/templates/main/dashboard.html.j2 @@ -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 %}