FVDE/ennstatus Changeset - 89496c406287 · Chaos Computer Club Lëtzebuerg Projects

Changeset - 89496c406287

Parent rev.

Child rev.

[Not reviewed]

Merge v5.4.0 default

0 9 2

Dennis Fink - 9 years ago 2016-03-01 23:18:21
dennis.fink@c3l.lu

Merged dev

11 files changed with 121 insertions and 42 deletions:

README.rst

ennstatus/__init__.py

ennstatus/data/__init__.py

ennstatus/data/views.py

ennstatus/static/css/map.css

ennstatus/static/js/worldmap.js

ennstatus/statistics/views.py

ennstatus/templates/base.html

ennstatus/templates/donate/index.html

ennstatus/templates/statistics/worldmap.html

setup.py

0 comments (0 inline, 0 general)

README.rst

➞

Show inline comments

@@ @@ -51,13 +51,13 @@ Branch Structure @@
 The branch structure of this project is very similiar to the `git-flow`_
 branching model, but with some modifications (we don't have release branches).
 Description of the branches:
 - **default**: This is the stable branch.
-- **stable**: This is the main development branch.
+- **dev**: This is the main development branch.
 - **hotfix-***: These branches branch off from the default branch and are used to
   fix bugs which are in the stable version. They will be merged back into
   *default* and *dev*. After the bug is fixed, the *PATCH* number must be
   increased!
 - **feature-***: In these branches, we will implement new features. These will
   branch off from the *dev* branch and merged back into the *dev* branch, if

ennstatus/__init__.py

➞

Show inline comments

@@ @@ -79,13 +79,16 @@ def create_app(): @@
     app.register_blueprint(donate_page, url_prefix='/donate')
     from .status.views import status_page
     app.register_blueprint(status_page, url_prefix='/status')
     from .statistics.views import statistics_page
     app.register_blueprint(statistics_page, url_prefix='/stats')
     app.register_blueprint(statistics_page, url_prefix='/statistics')
     from .data.views import data_page
     app.register_blueprint(data_page, url_prefix='/data')
     from .log import init_logging
     init_logging(app)
     if 'ENNSTATUS_GPG_HOME' in app.config:
         gpg = gnupg.GPG(gnupghome=app.config['ENNSTATUS_GPG_HOME'])

ennstatus/data/__init__.py

➞

Show inline comments

@@ new file 100644 @@
 # Ënnstatus
 # Copyright (C) 2015  Dennis Fink
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.

ennstatus/data/views.py

➞

Show inline comments

@@ new file 100644 @@
 # Ënnstatus
 # Copyright (C) 2015  Dennis Fink
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 from collections import defaultdict
 from flask import Blueprint, jsonify
 from ennstatus.status.functions import split_all_servers_to_types
 data_page = Blueprint('data', __name__)
 @data_page.route('/worldmap')
 def worldmap():
     servers = split_all_servers_to_types()
     countries = {}
     for key, value in servers.items():
         for server in value:
             if server.country not in countries:
                 countries[server.country] = defaultdict(int)
             countries[server.country][server.type] += 1
             countries[server.country]['total'] += 1
     maximum = max(i['total'] for i in countries.values())
     countries['max'] = maximum
     return jsonify(countries)

ennstatus/static/css/map.css

➞

Show inline comments

@@ @@ -17,6 +17,17 @@ @@
 .country {
 	stroke: #000;
 	stroke-linejoin: round;
 	stroke-width: 0.1px;
+}
 .tooltip {
     color: #222;
     background: #fff;
     padding: .5em;
     text-shadow: #f5f5f5 0 1px 0;
     border-radius: 2px;
     box-shadow: 0px 0px 2px 0px #a6a6a6;
     opacity: 0.9;
     position: absolute;
+}

ennstatus/static/js/worldmap.js

➞

Show inline comments

@@ @@ -67,50 +67,66 @@ function draw(topo) { @@
 	g.append("path")
 		.datum({type: "LineString", coordinates: [[-180, 0], [-90, 0], [0, 0], [90, 0], [180, 0]]})
 		.attr("class", "equator")
 		.attr("d", path);
 	var country = g.selectAll(".country").data(topo);
-	d3.json("/stats/data/worldmap", function(err, data) {
 	d3.json("/data/worldmap", function(err, data) {
 		var colorscale = d3.scale.threshold().domain([2, 4, 8, 16, 32, 48]).range(["#f2f0f7", "#dadaeb", "#bcbddc", "#9e9ac8", "#756bb1", "#54278f"])
 		var colorscale = d3.scale.threshold().domain(d3.range(1, (data.max+1)/3).map(function(n) { var a=1, b=1, f=1; for(var i = 2; i <= n; i++) { f = a+b; a=b; b=f } return f;})).range([
 			"#aeffb9",
 			"#87ff97",
 			"#60ff76",
 			"#38ff54",
 			"#11ff32",
 			"#00e920",
 			"#00c21b",
 			"#009a15",
 			"#008713",
 			"#007310",
 			"#00600d",
 			"#004c0a"
 		])
 		country.enter().insert("path")
 			.attr("class", "country")
 			.attr("d", path)
 			.attr("id", function(d, i) { return d.id; })
 			.attr("title", function(d, i) {
 				if (d.properties.name in data) {
 					return "<p>" + d.properties.name + "</p>" + data[d.properties.name];
 				} else {
 					return d.properties.name;
+				}
 			})
 			.style("fill", function(d, i) {
 				if (d.properties.name in data) {
 					return colorscale(data[d.properties.name]);
+					return colorscale(data[d.properties.name]['total']);
 				} else {
 					return "#fdf6e3";
+				}
 			});
 		var offsetL = document.getElementById('chart').offsetLet+20;
 		var offsetT = document.getElementById('chart').offsetTop+10;
 		var tooltip = d3.select('#chart').append('div')
 			.attr('class', 'tooltip')
 		country.on("mousemove", function(d, i) {
 			var mouse = d3.mouse(svg.node()).map(function(d) { return parseInt(d); });
 			tooltip.classed("hidden", false)
 				.attr("style", "left:"+(mouse[0]+offsetL)+"px;top:"+(mouse[1]+offsetT)+"px")
 				.html(function(d, i) {
 				.attr("style", "left:"+(mouse[0]+40)+"px;top:"+mouse[1]+"px")
 				.html(function() {
 					if (d.properties.name in data) {
 						return d.properties.name + " " + data[d.properties.name];
 						var text = "<b>" + d.properties.name + "</b>" + "<br>Total servers: " + data[d.properties.name]['total']
 						if ('bridge' in data[d.properties.name]) {
 							text = text + "<br>Bridge servers: " + data[d.properties.name]['bridge']
+						}
 						if ('exit' in data[d.properties.name]) {
 							text = text + "<br>Exit servers: " + data[d.properties.name]['exit']
+						}
 						if ('relay' in data[d.properties.name]) {
 							text = text + "<br>Relay server: " + data[d.properties.name]['relay']
+						}
 						return text
 					} else {
-						return d.properties.name;
+						return "<b>" + d.properties.name + "</b>"
+					}
 				})
 		})
 		.on("mouseout", function(d, i) {
 			tooltip.classed("hidden", true);
 		});

ennstatus/statistics/views.py

➞

Show inline comments

@@ @@ -11,34 +11,14 @@ @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 from collections import defaultdict
 from flask import Blueprint, render_template, current_app, jsonify
 from ennstatus.status.functions import split_all_servers_to_types
 from flask import Blueprint, render_template
 statistics_page = Blueprint('statistics', __name__)
 @statistics_page.route('/worldmap')
 def worldmap():
     return render_template('statistics/worldmap.html')
 @statistics_page.route('/data/worldmap')
 def data_worldmap():
     servers = split_all_servers_to_types()
     countries = defaultdict(int)
     for key, value in servers.items():
         for server in value:
             countries[server['country']] += 1
     maximum = max(countries.values())
     countries['max'] = maximum
     return jsonify(countries)

ennstatus/templates/base.html

➞

Show inline comments

@@ @@ -105,12 +105,18 @@ @@
             <li><a href="{{ url_for('root.abuse') }}">Abuse</a></li>
             <li class="divider"></li>
             <li><a href="https://twitter.com/FrennVunDerEnn" target="blank">Twitter</a></li>
             <li><a href="http://lists.enn.lu/listinfo/discuss" target="blank">Mailing List</a></li>
           </ul>
         </li>
         <li class="dropdown">
           <a href="#" class="dropdown-toggle" data-toggle="dropdown">Statistics <b class="caret"></b></a>
           <ul class="dropdown-menu">
             <li><a href="{{ url_for('statistics.worldmap') }}">Worldmap</a></li>
           </ul>
         </li>
       </ul>
     </div>
   </div>
   {% endblock %}
   <div class="row" id="content">
   {% with messages = get_flashed_messages(with_categories=True) %}

ennstatus/templates/donate/index.html

➞

Show inline comments

@@ @@ -108,13 +108,12 @@ @@
           <h3>Bitcoin</h3>
         </center>
         <div class="well well-sm">
           <p>
             <strong>Bitcoin Address:</strong> 1EYZCq2ZL6chWXYYkJoDo7fz39UC7do5cC
           </p>
         </div>
         <form class="bitpay-donate form-horizontal" action="https://bitpay.com/checkout" method="POST" onsubmit="return checkRequiredFields(this);">
           <input name="action" type="hidden" value="checkout">
           <div class="form-group">
             <label class="col-sm-2 control-label">Email:</label>
             <div class="col-sm-10">
               <input class="bitpay-donate-field-email form-control" name="orderID" type="email" placeholder="Email address (optional)" maxlenght=50 autocapitalize=off autocorrect=off />
@@ @@ -168,44 +167,49 @@ @@
             <input class="bitpay-donate-button" name="submit" src="https://bitpay.com/img/donate-button.svg" onerror="this.onerror=null; this.src='https://bitpay.com/img/donate-button-md.png'" width="126" height="48" type="image" alt="BitPay, the easy way the easy way to pay with bitcoins." border="0">
           </div>
         </form>
       </div>
     </div>
   </div>
   </div>
   <div class="col-md-12">
     <div class="col-md-4">
       <div class="thumbnail">
         <center>
           <h3>PayPal <small><span class="label label-danger">high fees</span></small></h3>
           <div class="well well-sm">
           <p>Use your existing PayPal account or check-out as guest. (Credit cards accepted)</p>
         <form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
     		  <input type="hidden" name="cmd" value="_s-xclick">
     		  <input type="hidden" name="hosted_button_id" value="JKNKAGHS65QN4">
     		  <input type="image" src="https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
     		  <img alt="" border="0" src="https://www.paypalobjects.com/en_US/i/scr/pixel.gif" width="1" height="1">
     		</form>
           </div>
       </center>
       </div>
     </div>
     <div class="col-md-4">
       <div class="thumbnail">
         <center>
           <h3>Flattr</h3>
           <div class="well well-sm">
           <p>Flattr us!</p>
           <a href="https://flattr.com/submit/auto?user_id=FVDE&url=https%3A%2F%2Fenn.lu/donate/flattr" target="_blank">
             <img src="https://button.flattr.com/flattr-badge-large.png" alt="Flattr this" title="Flattr this" border="0"></img>
           </a>
           </div>
         </center>
       </div>
     </div>
     <div class="col-md-4">
       <div class="thumbnail">
         <center>
           <h3>BPM Points</h3>
           <div class="well well-sm">
           <p>For our parcel station and international mail boxes.</p>
           <div class="well well-sm">
             <p>
               Send your BPM voucher code to: <br>
               <abbr title="E-Mail"><span class="glyphicon glyphicon-envelope"></span></abbr> : <a href="mailto:info@enn.lu">info@enn.lu</a> <span class="glyphicon glyphicon-lock"></span> GPG: <a href="http://keyserver.cypherpunk.lu:11371/pks/lookup?search=info@enn.lu&op=vindex" target="_blank">0x02225522</a>
             </p>
           </div>
         </center>

ennstatus/templates/statistics/worldmap.html

➞

Show inline comments

@@ @@ -23,12 +23,13 @@ @@
   {{ super() }}
   <link rel="stylesheet" href="{{ url_for('static', filename='css/map.css') }}" />
 {% endblock %}
 {% block content %}
   <div class="col-md-12">
     <h2>Worldmap</h2>
     <div id="chart">
     </div>
   </div>
 {% endblock %}
 {% block scripts %}

setup.py

➞

Show inline comments

@@ @@ -8,13 +8,13 @@ def _get_requirements(): @@
     lines = [line[:-1] for line in lines if not line.startswith('#')]
     return lines
 setup(name='Ennstatus',
-      version='5.3.1',
+      version='5.4.0',
       description=('Ennstatus provides the user with vital information about '
                    'the status of the organizations Tor servers.'),
       author='Frënn vun der Ënn',
       author_email='info@enn.lu',
       url='https://bitbucket.org/fvde/ennstatus',
       license='GPLv3+',

0 comments (0 inline, 0 general)