From a54bad02cf7770bcdd8850180f1976df68a5cdda Mon Sep 17 00:00:00 2001 From: FreakJoe Date: Wed, 15 Mar 2017 21:04:34 +0100 Subject: [PATCH 1/9] Search box and set up for api call --- rein/cli.py | 7 +++++++ rein/html/css/style_v2.css | 6 ++++++ rein/html/js/search.js | 18 ++++++++++++++++++ rein/html/layout.html | 7 +++++++ 4 files changed, 38 insertions(+) create mode 100644 rein/html/js/search.js diff --git a/rein/cli.py b/rein/cli.py index 0411411..70af08d 100644 --- a/rein/cli.py +++ b/rein/cli.py @@ -1624,6 +1624,13 @@ 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('/user_search/', methods=['GET']) + def user_search(search_input): + if not search_input: + return 'false' + + return 'true' + @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/js/search.js b/rein/html/js/search.js new file mode 100644 index 0000000..e59edbe --- /dev/null +++ b/rein/html/js/search.js @@ -0,0 +1,18 @@ +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) { + alert(data); + if (data != 'true') { + alert('User could not be found') + } + } + }) +} \ No newline at end of file diff --git a/rein/html/layout.html b/rein/html/layout.html index 0b476d4..0992a2a 100644 --- a/rein/html/layout.html +++ b/rein/html/layout.html @@ -61,6 +61,12 @@
about
    +
  • + +
    • +
  • + +
    • From 2566bbe8ef81dd83ee0597fe1b273d3d74517105 Mon Sep 17 00:00:00 2001 From: FreakJoe Date: Thu, 16 Mar 2017 21:03:59 +0100 Subject: [PATCH 2/9] Get user data from server --- rein/cli.py | 9 +++++++++ rein/html/js/search.js | 3 +-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/rein/cli.py b/rein/cli.py index 70af08d..076ca53 100644 --- a/rein/cli.py +++ b/rein/cli.py @@ -1629,6 +1629,15 @@ 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' + + # Reroute to display page with data + return 'true' @app.route("/post", methods=['POST', 'GET']) diff --git a/rein/html/js/search.js b/rein/html/js/search.js index e59edbe..144c120 100644 --- a/rein/html/js/search.js +++ b/rein/html/js/search.js @@ -7,9 +7,8 @@ function search(inputId) { $.ajax({ method: "GET", url: "/user_search/" + searchInput, - contentType: "application/json" + contentType: "application/json", success: function(data) { - alert(data); if (data != 'true') { alert('User could not be found') } From 23036369b7ee1a4fb753b6948ce2d65290c646c7 Mon Sep 17 00:00:00 2001 From: FreakJoe Date: Fri, 17 Mar 2017 22:57:44 +0100 Subject: [PATCH 3/9] Display search results --- rein/cli.py | 26 +++++++++++++++++++++++--- rein/html/display-users.html | 30 ++++++++++++++++++++++++++++++ rein/html/js/search.js | 6 ++++-- 3 files changed, 57 insertions(+), 5 deletions(-) create mode 100644 rein/html/display-users.html diff --git a/rein/cli.py b/rein/cli.py index 076ca53..98f67d2 100644 --- a/rein/cli.py +++ b/rein/cli.py @@ -1624,6 +1624,28 @@ 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['Master signing address'] + 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: @@ -1636,9 +1658,7 @@ def user_search(search_input): if 'error' in data or not data: return 'false' - # Reroute to display page with data - - return 'true' + return json.dumps(data) @app.route("/post", methods=['POST', 'GET']) def job_post(): diff --git a/rein/html/display-users.html b/rein/html/display-users.html new file mode 100644 index 0000000..c9b1af8 --- /dev/null +++ b/rein/html/display-users.html @@ -0,0 +1,30 @@ +{% extends "layout.html" %} +{% from "_form_helpers.html" import render_error %} +{% block body %} + +
    +
    +

    + name/handle (linked to /profile/), contact (linked with mailto:), SIN, simple rating + + + + + + + + + {% 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/search.js b/rein/html/js/search.js index 144c120..ac2c182 100644 --- a/rein/html/js/search.js +++ b/rein/html/js/search.js @@ -9,8 +9,10 @@ function search(inputId) { url: "/user_search/" + searchInput, contentType: "application/json", success: function(data) { - if (data != 'true') { - alert('User could not be found') + if (data == 'false') { + alert('User could not be found'); + } else { + document.location = '/display-users?data=' + data; } } }) From d06fa5a2f2d7702e83aeb18eb80e48c025243fd6 Mon Sep 17 00:00:00 2001 From: FreakJoe Date: Sat, 18 Mar 2017 14:43:10 +0100 Subject: [PATCH 4/9] Table sorting --- rein/cli.py | 2 +- rein/html/display-users.html | 6 ++++-- rein/html/js/displayUsers.js | 9 +++++++++ rein/html/layout.html | 2 ++ .../html/plugins/datatables/dataTables.bootstrap.min.css | 1 + rein/html/plugins/datatables/dataTables.bootstrap.min.js | 8 ++++++++ 6 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 rein/html/js/displayUsers.js create mode 100644 rein/html/plugins/datatables/dataTables.bootstrap.min.css create mode 100644 rein/html/plugins/datatables/dataTables.bootstrap.min.js diff --git a/rein/cli.py b/rein/cli.py index 98f67d2..0e97568 100644 --- a/rein/cli.py +++ b/rein/cli.py @@ -1640,7 +1640,7 @@ def display_users(): 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['Master signing address'] + 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) diff --git a/rein/html/display-users.html b/rein/html/display-users.html index c9b1af8..2301aa4 100644 --- a/rein/html/display-users.html +++ b/rein/html/display-users.html @@ -2,11 +2,13 @@ {% from "_form_helpers.html" import render_error %} {% block body %} + + +

    - name/handle (linked to /profile/), contact (linked with mailto:), SIN, simple rating - +
    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/layout.html b/rein/html/layout.html index 0992a2a..e77b47e 100644 --- a/rein/html/layout.html +++ b/rein/html/layout.html @@ -220,6 +220,8 @@

    ReinProject

    + + diff --git a/rein/html/plugins/datatables/dataTables.bootstrap.min.css b/rein/html/plugins/datatables/dataTables.bootstrap.min.css new file mode 100644 index 0000000..7400cf0 --- /dev/null +++ b/rein/html/plugins/datatables/dataTables.bootstrap.min.css @@ -0,0 +1 @@ +table.dataTable{clear:both;margin-top:6px !important;margin-bottom:6px !important;max-width:none !important;border-collapse:separate !important}table.dataTable td,table.dataTable th{-webkit-box-sizing:content-box;box-sizing:content-box}table.dataTable td.dataTables_empty,table.dataTable th.dataTables_empty{text-align:center}table.dataTable.nowrap th,table.dataTable.nowrap td{white-space:nowrap}div.dataTables_wrapper div.dataTables_length label{font-weight:normal;text-align:left;white-space:nowrap}div.dataTables_wrapper div.dataTables_length select{width:75px;display:inline-block}div.dataTables_wrapper div.dataTables_filter{text-align:right}div.dataTables_wrapper div.dataTables_filter label{font-weight:normal;white-space:nowrap;text-align:left}div.dataTables_wrapper div.dataTables_filter input{margin-left:0.5em;display:inline-block;width:auto}div.dataTables_wrapper div.dataTables_info{padding-top:8px;white-space:nowrap}div.dataTables_wrapper div.dataTables_paginate{margin:0;white-space:nowrap;text-align:right}div.dataTables_wrapper div.dataTables_paginate ul.pagination{margin:2px 0;white-space:nowrap}div.dataTables_wrapper div.dataTables_processing{position:absolute;top:50%;left:50%;width:200px;margin-left:-100px;margin-top:-26px;text-align:center;padding:1em 0}table.dataTable thead>tr>th.sorting_asc,table.dataTable thead>tr>th.sorting_desc,table.dataTable thead>tr>th.sorting,table.dataTable thead>tr>td.sorting_asc,table.dataTable thead>tr>td.sorting_desc,table.dataTable thead>tr>td.sorting{padding-right:30px}table.dataTable thead>tr>th:active,table.dataTable thead>tr>td:active{outline:none}table.dataTable thead .sorting,table.dataTable thead .sorting_asc,table.dataTable thead .sorting_desc,table.dataTable thead .sorting_asc_disabled,table.dataTable thead .sorting_desc_disabled{cursor:pointer;position:relative}table.dataTable thead .sorting:after,table.dataTable thead .sorting_asc:after,table.dataTable thead .sorting_desc:after,table.dataTable thead .sorting_asc_disabled:after,table.dataTable thead .sorting_desc_disabled:after{position:absolute;bottom:8px;right:8px;display:block;font-family:'Glyphicons Halflings';opacity:0.5}table.dataTable thead .sorting:after{opacity:0.2;content:"\e150"}table.dataTable thead .sorting_asc:after{content:"\e155"}table.dataTable thead .sorting_desc:after{content:"\e156"}table.dataTable thead .sorting_asc_disabled:after,table.dataTable thead .sorting_desc_disabled:after{color:#eee}div.dataTables_scrollHead table.dataTable{margin-bottom:0 !important}div.dataTables_scrollBody table{border-top:none;margin-top:0 !important;margin-bottom:0 !important}div.dataTables_scrollBody table thead .sorting:after,div.dataTables_scrollBody table thead .sorting_asc:after,div.dataTables_scrollBody table thead .sorting_desc:after{display:none}div.dataTables_scrollBody table tbody tr:first-child th,div.dataTables_scrollBody table tbody tr:first-child td{border-top:none}div.dataTables_scrollFoot table{margin-top:0 !important;border-top:none}@media screen and (max-width: 767px){div.dataTables_wrapper div.dataTables_length,div.dataTables_wrapper div.dataTables_filter,div.dataTables_wrapper div.dataTables_info,div.dataTables_wrapper div.dataTables_paginate{text-align:center}}table.dataTable.table-condensed>thead>tr>th{padding-right:20px}table.dataTable.table-condensed .sorting:after,table.dataTable.table-condensed .sorting_asc:after,table.dataTable.table-condensed .sorting_desc:after{top:6px;right:6px}table.table-bordered.dataTable th,table.table-bordered.dataTable td{border-left-width:0}table.table-bordered.dataTable th:last-child,table.table-bordered.dataTable th:last-child,table.table-bordered.dataTable td:last-child,table.table-bordered.dataTable td:last-child{border-right-width:0}table.table-bordered.dataTable tbody th,table.table-bordered.dataTable tbody td{border-bottom-width:0}div.dataTables_scrollHead table.table-bordered{border-bottom-width:0}div.table-responsive>div.dataTables_wrapper>div.row{margin:0}div.table-responsive>div.dataTables_wrapper>div.row>div[class^="col-"]:first-child{padding-left:0}div.table-responsive>div.dataTables_wrapper>div.row>div[class^="col-"]:last-child{padding-right:0} diff --git a/rein/html/plugins/datatables/dataTables.bootstrap.min.js b/rein/html/plugins/datatables/dataTables.bootstrap.min.js new file mode 100644 index 0000000..98661c6 --- /dev/null +++ b/rein/html/plugins/datatables/dataTables.bootstrap.min.js @@ -0,0 +1,8 @@ +/*! + DataTables Bootstrap 3 integration + ©2011-2015 SpryMedia Ltd - datatables.net/license +*/ +(function(b){"function"===typeof define&&define.amd?define(["jquery","datatables.net"],function(a){return b(a,window,document)}):"object"===typeof exports?module.exports=function(a,d){a||(a=window);if(!d||!d.fn.dataTable)d=require("datatables.net")(a,d).$;return b(d,a,a.document)}:b(jQuery,window,document)})(function(b,a,d,m){var f=b.fn.dataTable;b.extend(!0,f.defaults,{dom:"<'row'<'col-sm-6'l><'col-sm-6'f>><'row'<'col-sm-12'tr>><'row'<'col-sm-5'i><'col-sm-7'p>>",renderer:"bootstrap"});b.extend(f.ext.classes, +{sWrapper:"dataTables_wrapper form-inline dt-bootstrap",sFilterInput:"form-control input-sm",sLengthSelect:"form-control input-sm",sProcessing:"dataTables_processing panel panel-default"});f.ext.renderer.pageButton.bootstrap=function(a,h,r,s,j,n){var o=new f.Api(a),t=a.oClasses,k=a.oLanguage.oPaginate,u=a.oLanguage.oAria.paginate||{},e,g,p=0,q=function(d,f){var l,h,i,c,m=function(a){a.preventDefault();!b(a.currentTarget).hasClass("disabled")&&o.page()!=a.data.action&&o.page(a.data.action).draw("page")}; +l=0;for(h=f.length;l",{"class":t.sPageButton+" "+g,id:0===r&&"string"===typeof c?a.sTableId+"_"+c:null}).append(b("",{href:"#", +"aria-controls":a.sTableId,"aria-label":u[c],"data-dt-idx":p,tabindex:a.iTabIndex}).html(e)).appendTo(d),a.oApi._fnBindAction(i,{action:c},m),p++)}},i;try{i=b(h).find(d.activeElement).data("dt-idx")}catch(v){}q(b(h).empty().html('
    Handle Contact