diff --git a/website/server.py b/website/server.py index 1af782a..8514b2a 100644 --- a/website/server.py +++ b/website/server.py @@ -45,33 +45,6 @@ def resources(): return flask.render_template('resources.html', link=res) -@app.route('/members') -def members(): - all_users = json.loads(database.get_all_users()) - if not all_users['ok']: - flask.abort(500) - - users = [User(username=user['username'], skills=user['skills'], points=user['points'], last_seen='Not Available') - for user in all_users['response']] - - order = flask.request.args.get('order') - lang = flask.request.args.get('lang', '').lower() - - if order == 'points': - users.sort(key=attrgetter('points'), reverse=True) - else: - users.sort(key=attrgetter('username')) - - if lang: - t1, t2 = tee(users) - lang_yes = filter(lambda user: lang in user.skills.lower(), t1) - lang_no = filterfalse(lambda user: lang in user.skills.lower(), t2) - - users = list(lang_yes) + list(lang_no) - - return flask.render_template('members.html', members=users) - - @app.route('/join', methods=['GET', 'POST']) def join(): if flask.request.method == 'POST': diff --git a/website/static/css/light.css b/website/static/css/light.css index 3d3034d..2661480 100644 --- a/website/static/css/light.css +++ b/website/static/css/light.css @@ -344,55 +344,3 @@ kbd { color: #1AADFF !important; text-decoration: underline; } - -/* Members */ -.members_container { - background-color: white; - color: #072B40; - font-size: 1em; - font-weight: bold; - padding: 0; - margin: 1em 0 1em 0; - border: 1px solid #AAA; - box-shadow: 0 0 6px rgba(0,0,0,0.1); -} -.members_table { - width: 100%; - color: #444444; - overflow: hidden; - border-collapse: separate; -} -.members_table th { - background-color: #EDEDED; - border-bottom: 1px solid #E0E0E0; - height: 32px; - line-height: 32px; - padding-left: 8px; - font-size: 0.9em; -} -.members_table td { - border-left: 1px solid #E0E0E0; - padding: 4px 8px; -} -.members_table td:first-child { - border-left: 0; -} -.members_table tr { - transition: 0.1s all; -} -.members_table tr td:last-child { - border-right: 2px solid transparent; -} -.members_table tr:nth-child(2n+1) { - background-color: #F6F6F6; -} -.members_table tr:hover { - background-color: #EDEDED; -} -.members_table tr:hover td:first-child { - border-left: 2px solid #0D94CF; - padding-left: 6px; -} -.members_table tr:hover td:last-child { - border-right: 2px solid #0D94CF; -} diff --git a/website/static/js/members-search.js b/website/static/js/members-search.js deleted file mode 100644 index c9964ee..0000000 --- a/website/static/js/members-search.js +++ /dev/null @@ -1,37 +0,0 @@ -function search_lang (){ - - var order = document.getElementById("order_dropdown").value; - var query = document.getElementById("member_search_box").value; - - var req_url = 'members?order=' + order + '&lang=' + encodeURIComponent(query); - - var xhttp; - if (window.XMLHttpRequest) { - xhttp = new XMLHttpRequest(); - } else { - //code for IE 5 and 6 - xhttp = new ActiveXObject("Microsoft.XMLHTTP"); - } - - xhttp.onreadystatechange = function() { - console.log(xhttp.readyState) - if (xhttp.readyState == 1) { - var newSpan = document.createElement("span"); - newSpan.id = "load_text"; - newSpan.innerHTML = "Loading..."; - var oldTable = document.getElementsByClassName("members_table")[0]; - oldTable.parentNode.replaceChild(newSpan, oldTable);//this function makes the page scroll to top and I want to stop that, halp pls! - } else if (xhttp.readyState == 4 && xhttp.status == 200) { - var parser = new DOMParser() - , doc = parser.parseFromString(xhttp.responseText, "text/html"); - var newTable = doc.getElementsByClassName("members_table")[0]; - var load_text = document.getElementById("load_text"); - load_text.parentNode.replaceChild(newTable, load_text); - } - } - - xhttp.open('GET', req_url, true); - xhttp.send(); - - return true; -} diff --git a/website/templates/layout.html b/website/templates/layout.html index 1362ac2..59ac2b6 100644 --- a/website/templates/layout.html +++ b/website/templates/layout.html @@ -25,8 +25,7 @@ ('/', 'index', 'Home'), ('/docs', 'docs', 'Docs'), ('/about', 'about', 'About'), - ('/resources', 'resources', 'Resources'), - ('/members', 'members', 'Members') + ('/resources', 'resources', 'Resources') ] -%} {% endif %} diff --git a/website/templates/members.html b/website/templates/members.html deleted file mode 100644 index 6f0c7bf..0000000 --- a/website/templates/members.html +++ /dev/null @@ -1,57 +0,0 @@ -{% extends "layout.html" %} -{% set activepage = "members" %} -{% block title %}Members{% endblock %} -{% block head %} - {{ super() }} - -{% endblock %} - -{% block content %} -
- -

Members

- - -
- -
-
-
-
- - - - - - - - {% for member in members %} - - - - - - - {% endfor %} -
USERNAMELANGUAGESPOINTSLAST SEEN
{{ member.username }}{{ member.skills }}{{ member.points }}{{ member.last_seen }}
-
-
-
-
- - -{% endblock %}