diff --git a/rein/cli.py b/rein/cli.py index e5f28e6..cd75be7 100644 --- a/rein/cli.py +++ b/rein/cli.py @@ -1615,7 +1615,7 @@ def config_web(): @app.route('/trust_score/', defaults={'source_msin': user.msin}) @app.route('/trust_score//', methods=['GET']) def trust_score(dest_msin, source_msin): - return calculate_trust_score(dest_msin, source_msin, rein) + return calculate_trust_score(dest_msin, source_msin, rein, url=url, user=user, log=log) @app.route('/settings', methods=['GET']) def settings(): @@ -1638,6 +1638,42 @@ def settings(): return render_template('settings.html', user=user, hidden_jobs=hidden_jobs, hidden_bids=hidden_bids, hidden_mediators=hidden_mediators, fee=fee, trust_score=trust_score) + @app.route('/display-users', methods=['GET']) + def display_users(): + data = [] + try: + data = request.args['data'] + + except: + pass + + data = json.loads(data) + users = [] + for enrollment in data: + enrolled_user = {} + enrollment = document_to_dict(enrollment) + enrolled_user['User'] = '{}'.format(enrollment['Master signing address'], enrollment['User']) + enrolled_user['Contact'] = '{}'.format(enrollment['Contact']) + enrolled_user['MSIN'] = enrollment['Secure Identity Number'] + enrolled_user['Rating'] = get_average_user_rating_display(log, url, user, rein, enrolled_user['MSIN']) + users.append(enrolled_user) + + return render_template('display-users.html', user=user, users=users) + + @app.route('/user_search/', methods=['GET']) + def user_search(search_input): + if not search_input: + return 'false' + + sel_url = "{0}query?owner={1}&query=get_user&testnet={2}&search_input={3}" + data = safe_get(log, sel_url.format(url, user.maddr, rein.testnet, search_input)) + data = data['get_user'] + + if 'error' in data or not data: + return 'false' + + return json.dumps(data) + @app.route("/post", methods=['POST', 'GET']) def job_post(): form = JobPostForm(request.form) diff --git a/rein/html/css/style_v2.css b/rein/html/css/style_v2.css index 5e6f42c..cbf21b4 100644 --- a/rein/html/css/style_v2.css +++ b/rein/html/css/style_v2.css @@ -2143,6 +2143,12 @@ border-radius: 50%;} right: 36px; background: url(../img/chevron-right.png) 0 0 no-repeat; } +ul li input { + line-height: normal; +} +ul li button { + line-height: normal; +} #social a { margin:0 15px 0 0; color:#e6e6e9; diff --git a/rein/html/display-users.html b/rein/html/display-users.html new file mode 100644 index 0000000..2301aa4 --- /dev/null +++ b/rein/html/display-users.html @@ -0,0 +1,32 @@ +{% extends "layout.html" %} +{% from "_form_helpers.html" import render_error %} +{% block body %} + + + + +
+
+

+ + + + + + + + + {% for user in users %} + + + + + + + {% endfor %} + +
HandleContactSINRating
{{ user.User|safe }}{{ user.Contact|safe }}{{ user.MSIN|safe }}{{ user.Rating|safe }}
+

+
+ +{% endblock %} \ No newline at end of file diff --git a/rein/html/js/displayUsers.js b/rein/html/js/displayUsers.js new file mode 100644 index 0000000..34f3eda --- /dev/null +++ b/rein/html/js/displayUsers.js @@ -0,0 +1,9 @@ +document.addEventListener("DOMContentLoaded", function(event) { + $('#userTable').DataTable( { + "paging": false, + "ordering": true, + "order": [[3, "desc"]], + "info": true, + "searching": false + }); +}); \ No newline at end of file diff --git a/rein/html/js/search.js b/rein/html/js/search.js new file mode 100644 index 0000000..ac2c182 --- /dev/null +++ b/rein/html/js/search.js @@ -0,0 +1,19 @@ +function search(inputId) { + searchInput = $("#" + inputId).val(); + if (searchInput == "") { + alert('Please enter user name, msin or contact information of the person you\'re trying to find.') + } + + $.ajax({ + method: "GET", + url: "/user_search/" + searchInput, + contentType: "application/json", + success: function(data) { + if (data == 'false') { + alert('User could not be found'); + } else { + document.location = '/display-users?data=' + data; + } + } + }) +} \ No newline at end of file diff --git a/rein/html/layout.html b/rein/html/layout.html index 0b476d4..769d5c9 100644 --- a/rein/html/layout.html +++ b/rein/html/layout.html @@ -61,6 +61,17 @@
about