remove pages and do flat, randomized list

levin
lza_menace 4 years ago
parent 5cda6ecf81
commit 1f932f880c

@ -5,6 +5,7 @@ import re
import logging import logging
import click import click
from os import makedirs from os import makedirs
from random import shuffle
from datetime import datetime, timedelta from datetime import datetime, timedelta
from flask import Flask, request, redirect from flask import Flask, request, redirect
from flask import render_template, flash, url_for from flask import render_template, flash, url_for
@ -27,18 +28,9 @@ app.secret_key = app.config["SECRET_KEY"]
@app.route("/", methods=["GET", "POST"]) @app.route("/", methods=["GET", "POST"])
def index(): def index():
form = SubmitNode() form = SubmitNode()
itp = 10
page = request.args.get("page", 1)
try:
page = int(page)
except:
flash("Wow, wtf hackerman. Cool it.")
page = 1
nettype = request.args.get("nettype", "mainnet") nettype = request.args.get("nettype", "mainnet")
crypto = request.args.get("crypto", "monero") crypto = request.args.get("crypto", "monero")
onion = request.args.get("onion", False) onion = request.args.get("onion", False)
nodes = Node.select().where( nodes = Node.select().where(
Node.validated==True Node.validated==True
).where( ).where(
@ -51,13 +43,12 @@ def index():
if onion: if onion:
nodes = nodes.where(Node.is_tor==True) nodes = nodes.where(Node.is_tor==True)
paginated = nodes.paginate(page, itp) nodes = [n for n in nodes]
total_pages = int(nodes.count() / itp) + 1 shuffle(nodes)
return render_template( return render_template(
"index.html", "index.html",
nodes=paginated, nodes=nodes,
page=page,
total_pages=total_pages,
form=form form=form
) )

@ -69,3 +69,13 @@ input[type="text"] {
.current-page-btn { .current-page-btn {
background-color: #b8b8b8; background-color: #b8b8b8;
} }
.xmrnodes {
width: 95%;
margin: auto;
font-size: .83em;
}
#nodes {
padding-top: 1em;
}

@ -41,16 +41,21 @@
{% endif %} {% endif %}
{% endwith %} {% endwith %}
<div id="" class="center">
<br>
<a href="https://twitter.com/lza_menace" target="_blank">Contact me</a>
-
<a href="https://github.com/lalanza808/monero.fail" target="_blank">Source Code</a>
-
<a href="{{ url_for('resources') }}">Resources</a>
</div>
<!-- Page Content --> <!-- Page Content -->
{% block content %} {% endblock %} {% block content %} {% endblock %}
<!-- Footer --> <!-- Footer -->
<div id="footer" class="center"> <div id="footer" class="center">
<a href="https://twitter.com/lza_menace" target="_blank">Holler at me</a> <a href="#">Go to top</a>
-
<a href="https://github.com/lalanza808/monero.fail" target="_blank">Source Code</a>
-
<a href="{{ url_for('resources') }}">Resources</a>
</div> </div>
</body> </body>

@ -29,8 +29,17 @@
<div id="nodes" class="pure-u-1 section"> <div id="nodes" class="pure-u-1 section">
<h2 class="center">Find a Node</h2> <h2 class="center">Find a Node</h2>
<div class="center" id="filters">
<a href="{% if 'crypto' in request.args %}{{ request.url }}&{% else %}/?{% endif %}nettype=mainnet"><button class="pure-button search-btn">Mainnet</button></a>
<a href="{% if 'crypto' in request.args %}{{ request.url }}&{% else %}/?{% endif %}nettype=testnet"><button class="pure-button search-btn">Testnet</button></a>
<a href="{% if 'crypto' in request.args %}{{ request.url }}&{% else %}/?{% endif %}nettype=stagenet"><button class="pure-button search-btn">Stagenet</button></a>
{% if 'onion' not in request.args %}<a href="{% if 'nettype' in request.args or 'crypto' in request.args %}{{ request.url }}&{% else %}/?{% endif %}onion=true"><button class="pure-button search-btn"><img src="/static/images/tor.svg" width=15px> Onion</button></a>{% endif %}
<a href="/?crypto=wownero"><button class="pure-button search-btn wownero"><img src="/static/images/wownero.svg" width=50px></button></a>
<a href="/"><button class="pure-button search-btn button-warning" style="border: dashed red;">x Clear</button></a>
</div>
<br> <br>
{% if nodes %} {% if nodes %}
<div class="xmrnodes">
<table class="pure-table pure-table-horizontal pure-table-striped"> <table class="pure-table pure-table-horizontal pure-table-striped">
<thead> <thead>
<tr> <tr>
@ -66,24 +75,10 @@
{% endfor %} {% endfor %}
</tbody> </tbody>
</table> </table>
<div class="page-btn">
{% for p in range(1, total_pages + 1) %}
<a href="/?page={{ p }}" class="pure-button btn {% if p == page %}current-page-btn{% endif %}">{{ p }}</a>
{% endfor %}
</div> </div>
{% else %} {% else %}
<p>No nodes in the database yet...</p> <p>No nodes in the database yet...</p>
{% endif %} {% endif %}
<br>
<div class="center" id="filters">
<a href="{% if 'crypto' in request.args %}{{ request.url }}&{% else %}/?{% endif %}nettype=mainnet"><button class="pure-button search-btn">Mainnet</button></a>
<a href="{% if 'crypto' in request.args %}{{ request.url }}&{% else %}/?{% endif %}nettype=testnet"><button class="pure-button search-btn">Testnet</button></a>
<a href="{% if 'crypto' in request.args %}{{ request.url }}&{% else %}/?{% endif %}nettype=stagenet"><button class="pure-button search-btn">Stagenet</button></a>
{% if 'onion' not in request.args %}<a href="{% if 'nettype' in request.args or 'crypto' in request.args %}{{ request.url }}&{% else %}/?{% endif %}onion=true"><button class="pure-button search-btn"><img src="/static/images/tor.svg" width=15px> Onion</button></a>{% endif %}
<a href="/?crypto=wownero"><button class="pure-button search-btn wownero"><img src="/static/images/wownero.svg" width=50px></button></a>
<br>
<a href="/"><button class="pure-button search-btn button-warning">Clear</button></a>
</div>
</div> </div>
</div> </div>

@ -15,8 +15,8 @@
Try out these popular Monero projects: Try out these popular Monero projects:
</p> </p>
<ul> <ul>
<li><a href="https://featherwallet.org/" target="_blank">Feather (desktop)</a></li>
<li><a href="https://www.getmonero.org/downloads/" target="_blank">Official Community Funded Monero Software (desktop)</a></li> <li><a href="https://www.getmonero.org/downloads/" target="_blank">Official Community Funded Monero Software (desktop)</a></li>
<li><a href="https://featherwallet.org/" target="_blank">Feather (desktop)</a></li>
<li><a href="https://cakewallet.com/" target="_blank">Cake Wallet (iOS, Android)</a></li> <li><a href="https://cakewallet.com/" target="_blank">Cake Wallet (iOS, Android)</a></li>
<li><a href="https://www.monerujo.io/" target="_blank">Monerujo (Android)</a></li> <li><a href="https://www.monerujo.io/" target="_blank">Monerujo (Android)</a></li>
<li><a href="https://mymonero.com/" target="_blank">MyMonero (Desktop, Web)</a></li> <li><a href="https://mymonero.com/" target="_blank">MyMonero (Desktop, Web)</a></li>

Loading…
Cancel
Save