diff --git a/charts/templates/charts/base.html b/charts/templates/charts/base.html index 2518179..7726ad8 100644 --- a/charts/templates/charts/base.html +++ b/charts/templates/charts/base.html @@ -123,7 +123,7 @@
@@ -132,6 +132,7 @@ Price in Dollars (Log.) Price in Dollars (Lin.) Price in Sats (Lin.) + Price in Sats (Log.) New Fractal Multiple Inflation-Adjusted Fractal Golden Ratio Multiplier @@ -144,8 +145,8 @@ Power Law Thermocap Multiple Sharpe Ratio - Price Deviation - Market Cycle + Price Deviation New + Market Cycle New
@@ -174,7 +175,7 @@
@@ -189,11 +190,12 @@ Monthly Percentage (Lin.) Metcalfe's Law (Sats) Metcalfe's Law ($) - Metcalfe's Deviation (Sats) - Metcalfe's Deviation ($) - Transacted Price Deviation - Transaction Dominance - Shielded Transactions + Metc. Deviation (Sats) New + Metcalfe Deviation ($) New + Transac. Price Dev. New + Transac. Dominance New + Shielded Transactions New + Competitors' Transac. New
@@ -261,11 +263,11 @@ Blockchain Size (Bytes) Transaction Size (Bytes) Mining Difficulty - Security Budget - Breakeven Efficiency - P2Pool Hashrate - P2Pool Miners - P2Pool Blocks Found + Security Budget New + Breakeven Efficiency New + P2Pool Hashrate New + P2Pool Miners New + P2Pool Blocks Found New @@ -368,8 +370,8 @@ data-parent="#accordionSidebar">
Info:
+ Pageviews New About Us - Pageviews Twitter
diff --git a/charts/templates/charts/comptransactions.html b/charts/templates/charts/comptransactions.html new file mode 100644 index 0000000..b7d6564 --- /dev/null +++ b/charts/templates/charts/comptransactions.html @@ -0,0 +1,429 @@ +{% extends 'charts/base.html' %} + +{% block header %} +Moneroj.net - Inflation +{% endblock %} + +{% block content %} + + +
+ + +
+ + +

+
+
+
+
+
Daily Transactions for Monero and its competitors (Bitcoin and + privacy-oriented Dash, Zcash and Grin)
+
+ + + +
+
+
+
+
+
+
+
+
+ + + +
+ + +
+
+
+
+ Monero Daily Transactions
+
{{ now_xmr }}
+
+
+
+ + +
+
+
+
+ Dash Daily Transactions
+
{{ now_dash }}
+
+
+
+ +
+
+
+
+ Zcash Daily Transactions
+
{{ now_zcash }}
+
+
+
+ +
+
+
+
+ Grin Daily Transactions
+
{{ now_grin }}
+
+
+
+ +
+ +
+
+ +
+
+ +
+
+ +
+ + +
+ + +
+ + + + + + + + + +{% endblock %} \ No newline at end of file diff --git a/charts/templates/charts/marketcycle.html b/charts/templates/charts/marketcycle.html index d390c13..8158c53 100644 --- a/charts/templates/charts/marketcycle.html +++ b/charts/templates/charts/marketcycle.html @@ -19,7 +19,7 @@
-
Stock-to-flow Multiple (Price / SF Model)
+
Market Cycle
diff --git a/charts/templates/charts/pricesatslog.html b/charts/templates/charts/pricesatslog.html new file mode 100644 index 0000000..9609f98 --- /dev/null +++ b/charts/templates/charts/pricesatslog.html @@ -0,0 +1,352 @@ +{% extends 'charts/base.html' %} + +{% block header %} +Moneroj.net - Price +{% endblock %} + +{% block content %} + + +
+ + +
+ + +

+
+
+ +
+
+
+ + + +
+ + +
+
+
+
+ Last Price
+
{{ now_price }}
+
+
+
+ +
+
+
+
+ Bottom
+
{{ bottom }}
+
+
+
+ +
+
+
+
+ Last Top
+
{{ maximum }}
+
+
+
+ +
+ +
+
+ +
+
+ +
+
+ +
+ + +
+ + +
+ + + + + + + + + +{% endblock %} \ No newline at end of file diff --git a/charts/urls.py b/charts/urls.py index c8e9318..7e9fd49 100644 --- a/charts/urls.py +++ b/charts/urls.py @@ -92,6 +92,8 @@ urlpatterns = [ path('metcalfe_deviation/', views.metcalfe_deviation, name='metcalfe_deviation'), path('marketcycle/', views.marketcycle, name='marketcycle'), path('shielded/', views.shielded, name='shielded'), + path('pricesatslog/', views.pricesatslog, name='pricesatslog'), + path('comptransactions/', views.comptransactions, name='comptransactions'), # URLs to useful functions on charts/views.py # Only admins can use these diff --git a/charts/views.py b/charts/views.py index 4c1b4c8..12e33c5 100644 --- a/charts/views.py +++ b/charts/views.py @@ -2138,6 +2138,46 @@ def pricesats(request): context = {'values': values, 'dates': dates, 'maximum': maximum, 'now_price': now_price, 'color': color, 'bottom': bottom} return render(request, 'charts/pricesats.html', context) +def pricesatslog(request): + if request.user.username != "Administrador" and request.user.username != "Morpheus": + update_visitors(False) + + dt = datetime.datetime.now(timezone.utc).timestamp() + + dates = [] + color = [] + values = [] + now_price = 0 + maximum = 0 + bottom = 1 + + data = Sfmodel.objects.order_by('date') + for item in data: + dates.append(datetime.datetime.strftime(item.date, '%Y-%m-%d')) + if item.color != 0: + color.append(item.color) + else: + color.append('') + + if item.pricebtc > 0.0001: + values.append(item.pricebtc) + now_price = item.pricebtc + if bottom > item.pricebtc: + bottom = item.pricebtc + if maximum < item.pricebtc: + maximum = item.pricebtc + else: + values.append('') + + now_price = locale.format('%.4f', now_price, grouping=True) + ' BTC' + maximum = locale.format('%.4f', maximum, grouping=True) + ' BTC' + bottom = locale.format('%.4f', bottom, grouping=True) + ' BTC' + + dt = 'pricesatslog.html ' + locale.format('%.2f', datetime.datetime.now(timezone.utc).timestamp() - dt, grouping=True)+' seconds' + print(dt) + context = {'values': values, 'dates': dates, 'maximum': maximum, 'now_price': now_price, 'color': color, 'bottom': bottom} + return render(request, 'charts/pricesatslog.html', context) + def fractal(request): if request.user.username != "Administrador" and request.user.username != "Morpheus": update_visitors(False) @@ -3914,6 +3954,70 @@ def compinflation(request): 'now_xmr': now_xmr, 'now_btc': now_btc, 'now_dash': now_dash, 'now_grin': now_grin, 'now_zcash': now_zcash, 'now_btc': now_btc, 'dates': dates} return render(request, 'charts/compinflation.html', context) + +def comptransactions(request): + if request.user.username != "Administrador" and request.user.username != "Morpheus": + update_visitors(False) + + dt = datetime.datetime.now(timezone.utc).timestamp() + data = DailyData.objects.order_by('date') + + dates = [] + xmr = [] + dash = [] + grin = [] + zcash = [] + btc = [] + now_xmr = 999999 + now_dash = 999999 + now_grin = 999999 + now_zcash = 999999 + now_btc = 999999 + + for item in data: + dates.append(datetime.datetime.strftime(item.date, '%Y-%m-%d')) + + if item.btc_transactions > 10: + btc.append(item.btc_transactions) + now_btc = item.btc_transactions + else: + btc.append('') + + if item.zcash_transactions > 10: + zcash.append(item.zcash_transactions) + now_zcash = item.zcash_transactions + else: + zcash.append('') + + if item.dash_transactions > 10: + dash.append(item.dash_transactions) + now_dash = item.dash_transactions + else: + dash.append('') + + if item.xmr_transactions > 10: + xmr.append(item.xmr_transactions) + now_xmr = item.xmr_transactions + else: + xmr.append('') + + if item.grin_transactions > 10: + grin.append(item.grin_transactions) + now_grin = item.grin_transactions + else: + grin.append('') + + now_dash = locale.format('%.0f', now_dash, grouping=True) + now_grin = locale.format('%.0f', now_grin, grouping=True) + now_zcash = locale.format('%.0f', now_zcash, grouping=True) + now_xmr = locale.format('%.0f', now_xmr, grouping=True) + now_btc = locale.format('%.0f', now_btc, grouping=True) + + dt = 'comptransactions.html ' + locale.format('%.2f', datetime.datetime.now(timezone.utc).timestamp() - dt, grouping=True)+' seconds' + print(dt) + context = {'xmr': xmr, 'dash': dash, 'grin': grin, 'zcash': zcash, 'btc': btc, 'now_xmr': now_xmr, 'now_btc': now_btc, 'now_dash': now_dash, 'now_grin': now_grin, 'now_zcash': now_zcash, 'now_btc': now_btc, 'dates': dates} + return render(request, 'charts/comptransactions.html', context) + def sfmodel(request): if request.user.username != "Administrador" and request.user.username != "Morpheus": update_visitors(False) diff --git a/moneropro/settings.py b/moneropro/settings.py index 06092aa..5a28756 100644 --- a/moneropro/settings.py +++ b/moneropro/settings.py @@ -32,9 +32,9 @@ STATICFILES_DIRS = [ SECRET_KEY = 'dafsdasdfasfa7sdfs9d7das7f9as7df8ad43525fsffdssdg455$$###77saf9df79as79s' # SECURITY WARNING: don't run with debug turned on in production! -DEBUG = True -#DEBUG = False -#STATIC_ROOT = "/var/www/moneropro/static/" +#DEBUG = True +DEBUG = False +STATIC_ROOT = "/var/www/moneropro/static/" ALLOWED_HOSTS = ['www.moneroj.net', 'localhost', '127.0.0.1', 'moneroj.net', 'moneroj5xq4ttg4ec7e5secqdyw5mcovzvfvlq6i7omv353i6mnexlqd.onion']