diff --git a/charts/forms.py b/charts/forms.py new file mode 100644 index 0000000..637e858 --- /dev/null +++ b/charts/forms.py @@ -0,0 +1,7 @@ +from .models import * +from django import forms + +class CoinForm(forms.ModelForm): + class Meta: + model = Coin + fields = ['name', 'date', 'priceusd', 'pricebtc', 'inflation', 'transactions', 'hashrate', 'supply', 'fee', 'revenue', 'blocksize', 'difficulty'] diff --git a/charts/models.py b/charts/models.py index 7fa9276..efb94c3 100644 --- a/charts/models.py +++ b/charts/models.py @@ -2,15 +2,16 @@ from __future__ import unicode_literals from django.contrib.postgres.fields import ArrayField from django.contrib.auth.models import User from django.db import models +from django.forms import BooleanField # Create your models here. class Coin(models.Model): - name = models.CharField(max_length=4) - date = models.DateField() - priceusd = models.FloatField() - pricebtc = models.FloatField() - inflation = models.FloatField() - transactions = models.FloatField() + name = models.CharField(max_length=4, default="0") + date = models.DateField(default="0") + priceusd = models.FloatField(default="0") + pricebtc = models.FloatField(default="0") + inflation = models.FloatField(default="0") + transactions = models.FloatField(default="0") hashrate = models.FloatField(default="0") stocktoflow = models.FloatField(default="0") supply = models.FloatField(default="0") @@ -18,6 +19,7 @@ class Coin(models.Model): revenue = models.FloatField(default="0") blocksize = models.FloatField(default="0") difficulty = models.FloatField(default="0") + def __str__(self): return self.priceusd @@ -135,4 +137,16 @@ class DailyData(models.Model): crypto_postsPerHour = models.FloatField() def __str__(self): - return self.date \ No newline at end of file + return self.date + +class P2Pool(models.Model): + date = models.DateField() + mini = models.BooleanField() + hashrate = models.IntegerField() + percentage = models.FloatField() + miners = models.IntegerField() + totalhashes = models.IntegerField() + totalblocksfound = models.IntegerField() + + def __str__(self): + return self.date diff --git a/charts/templates/charts/add_coin.html b/charts/templates/charts/add_coin.html new file mode 100644 index 0000000..bf26193 --- /dev/null +++ b/charts/templates/charts/add_coin.html @@ -0,0 +1,204 @@ +{% extends "users/base.html" %} +{% block header %} + +Moneroj.net - New Article + + + +{% endblock %} +{% block content %} + +


+
+ + {% if message %} +
+ +
{{ message }}
+ +
+ {% endif %} + +

Add a new coin:


+
+ {% csrf_token %} +
+
+ + +
+ OK +
+
+ This field is required +
+
+ +
+ + +
+ OK +
+
+ This field is required +
+
+ +
+ + +
+ OK +
+
+ This field is required +
+
+
+ +
+
+ + +
+ OK +
+
+ This field is required +
+
+ +
+ + +
+ OK +
+
+ This field is required +
+
+ +
+ + +
+ OK +
+
+ This field is required +
+
+
+ +
+
+ + +
+ OK +
+
+ This field is required +
+
+ +
+ + +
+ OK +
+
+ This field is required +
+
+ +
+ + +
+ OK +
+
+ This field is required +
+
+
+ +
+
+ + +
+ OK +
+
+ This field is required +
+
+ +
+ + +
+ OK +
+
+ This field is required +
+
+ +
+ + +
+ OK +
+
+ This field is required +
+
+
+ +
+
+ + +
+
+ +
+

+
+ + +


+ +{% endblock %} \ No newline at end of file diff --git a/charts/templates/charts/articles.html b/charts/templates/charts/articles.html deleted file mode 100644 index 3635ad3..0000000 --- a/charts/templates/charts/articles.html +++ /dev/null @@ -1,152 +0,0 @@ - - -{% load static %} - - - - - Moneroj.net - - - - - - - - - - - - - - - - - -
-
-

Articles section is not ready yet! -

-

It's on our plan to build it, but we lack time for now. Check back later.

-
-
- - - -




- - - - - - - - - - - - - - - - - - diff --git a/charts/templates/charts/artigos.html b/charts/templates/charts/artigos.html deleted file mode 100644 index aa916e1..0000000 --- a/charts/templates/charts/artigos.html +++ /dev/null @@ -1,140 +0,0 @@ - - -{% load static %} - - - - - Moneroj.net - - - - - - - - - - - - - - - - - -
-
-

A seção de artigos ainda não está pronta.

-

Volte novamente mais tarde.

-
-
- -




- - - - - - - - - - diff --git a/charts/templates/charts/base.html b/charts/templates/charts/base.html index 2f84090..24d0d20 100644 --- a/charts/templates/charts/base.html +++ b/charts/templates/charts/base.html @@ -61,12 +61,6 @@ padding-right: 12px; } - html, - body { - height: 100%; - margin: 0; - } - #graph1.fullscreen { z-index: 9999; width: 100%; @@ -80,16 +74,14 @@ min-height: 100%; } - #graph1 { - height: 650px; + .link_graph { + color: #ff4d21; + text-decoration: none; } - #link_graph { - color: #FF0000; - } - - #link_graph:hover { - color: #00FF00; + .link_graph:hover { + color: #af3517; + text-decoration: none; } @@ -113,6 +105,7 @@ href="{% url 'charts:index' %}">
Moneroj
+

@@ -123,7 +116,7 @@
@@ -132,9 +125,9 @@ Price in Dollars (Log.) Price in Dollars (Lin.) Price in Sats (Lin.) + Price in Sats (Log.) New Fractal Multiple - Inflation-Adjusted - Fractal + Inflation-Adjusted Fractal Golden Ratio Multiplier Performance ($, Log.) Performance ($, Lin.) @@ -145,7 +138,8 @@ Power Law Thermocap Multiple Sharpe Ratio - Price Deviation + Price Deviation New + Market Cycle New
@@ -174,7 +168,7 @@
@@ -189,8 +183,12 @@ Monthly Percentage (Lin.) Metcalfe's Law (Sats) Metcalfe's Law ($) - Transacted Price Deviation - Transaction Dominance + Metc. Deviation (Sats) New + Metcalfe Deviation ($) New + Transac. Price Dev. New + Transac. Dominance New + Shielded Transactions New + Competitors' Transac. New
@@ -238,7 +236,7 @@
@@ -251,6 +249,7 @@ Miner Revenue (Ntv.) Miner Fees ($) Miner Fees (Ntv.) + Mining Profitability New Revenue / Marketcap (%) Miner Commitment ($) Miner Commitment (Ntv.) @@ -258,8 +257,13 @@ Blockchain Size (Bytes) Transaction Size (Bytes) Mining Difficulty - Security Budget - Breakeven Efficiency + Security Budget New + Breakeven Efficiency New + P2Pool Hashrate New + P2Pool Dominance New + P2Pool Miners New + P2Pool Blocks Found New + P2Pool Hashes Found New @@ -362,14 +366,13 @@ data-parent="#accordionSidebar">
Info:
+ Pageviews New About Us - Pageviews Twitter
- diff --git a/charts/templates/charts/bitcoin.html b/charts/templates/charts/bitcoin.html index fb90641..1f46d48 100644 --- a/charts/templates/charts/bitcoin.html +++ b/charts/templates/charts/bitcoin.html @@ -286,7 +286,7 @@ ,size: 13 } ,gridcolor: "#333333" - ,range: ['2011-01-01', '2023-01-01'] + ,range: ['2011-01-01', ''] ,zeroline: true }, margin: { @@ -420,7 +420,7 @@ ,size: 7 } ,gridcolor: "#444444" - ,range: ['2009-01-01', '2023-06-01'] + ,range: ['2009-01-01', ''] ,zeroline: true }, margin: { diff --git a/charts/templates/charts/blockchainsize.html b/charts/templates/charts/blockchainsize.html index dd7304b..f4f447a 100644 --- a/charts/templates/charts/blockchainsize.html +++ b/charts/templates/charts/blockchainsize.html @@ -9,81 +9,29 @@
- -
- - -

-
-
-
-
-
Total Blockchain Size for Monero and Bitcoin (Bytes)
-
- - - -
-
-
-
-
-
-
+ +
+
+
+
+ Total Blockchain Size for Monero and Bitcoin (Bytes) +
+ +
+ + About this chart? + + + +
- - - -
- - -
-
-
-
- Current Monero Blockchain Size
-
{{ now_xmr }}
-
-
-
- -
-
-
-
- Current Bitcoin Blockchain Size
-
{{ now_btc }}
-
-
-
- +
+
- -
-
- -
-
- -
-
-
- -
-
@@ -235,11 +183,11 @@ ,zeroline: true }, margin: { - l: 120, - r: 60, - b: 35, - t: 10, - pad: 4 + l: 100, + r: 50, + b: 50, + t: 20, + pad: 10 } }; @@ -289,11 +237,11 @@ ,zeroline: true }, margin: { - l: 40, - r: 0, - b: 35, - t: 10, - pad: 0 + l: 100, + r: 50, + b: 50, + t: 20, + pad: 10 } }; @@ -320,11 +268,9 @@ } env_size = findBootstrapEnvironment(); if (env_size == "xs") { - document.getElementById("graph1").style.height="350px"; Plotly.newPlot('graph', data_mobile, layout_mobile, {responsive: true, modeBarButtonsToRemove: ['toImage', 'hoverCompareCartesian', 'hoverClosest2d', 'toggleSpikelines', 'lasso2d', 'select2d', 'hoverClosestCartesian'], displaylogo: false}); } else { - document.getElementById("graph1").style.height="700px"; Plotly.newPlot('graph', data, layout, {responsive: true, modeBarButtonsToRemove: ['toImage', 'hoverCompareCartesian', 'hoverClosest2d', 'toggleSpikelines', 'lasso2d', 'select2d', 'hoverClosestCartesian'], displaylogo: false}); } diff --git a/charts/templates/charts/blocksize.html b/charts/templates/charts/blocksize.html index b642899..1b852bb 100644 --- a/charts/templates/charts/blocksize.html +++ b/charts/templates/charts/blocksize.html @@ -9,81 +9,29 @@
- -
- - -

-
-
-
-
-
Average Block Size for both Monero and Bitcoin (Bytes)
-
- - - -
-
-
-
-
-
-
+ +
+
+
+
+ Average Block Size for both Monero and Bitcoin (Bytes) +
+ +
+ + About this chart? + + + +
- - - -
- - -
-
-
-
- Current Monero Average Block Size
-
{{ now_xmr }}
-
-
-
- -
-
-
-
- Current Bitcoin Average Block Size
-
{{ now_btc }}
-
-
-
- +
+
- -
-
- -
-
- -
-
-
- -
-
@@ -173,7 +121,7 @@ yref: 'paper', x: 1, xanchor: 'auto', - y: 0.6, + y: 0.2, yanchor: 'auto', text: 'Moneroj
https://www.moneroj.net', showarrow: false, @@ -190,7 +138,7 @@ separators: ",.", legend: { x: 1, - y: 0.95, + y: 0.05, bgcolor: '#333333', bordercolor: '#5f5f5f', borderwidth: 1, @@ -232,15 +180,14 @@ ,size: 13 } ,gridcolor: "#333333" - ,range: ['2009-01-01', '2026-01-01'] ,zeroline: true }, margin: { - l: 120, - r: 60, - b: 35, - t: 10, - pad: 4 + l: 100, + r: 50, + b: 50, + t: 20, + pad: 10 } }; @@ -286,15 +233,14 @@ ,size: 7 } ,gridcolor: "#444444" - ,range: ['2009-01-01', '2026-01-01'] ,zeroline: true }, margin: { - l: 40, - r: 0, - b: 35, - t: 10, - pad: 0 + l: 100, + r: 50, + b: 50, + t: 20, + pad: 10 } }; @@ -321,11 +267,9 @@ } env_size = findBootstrapEnvironment(); if (env_size == "xs") { - document.getElementById("graph1").style.height="350px"; Plotly.newPlot('graph', data_mobile, layout_mobile, {responsive: true, modeBarButtonsToRemove: ['toImage', 'hoverCompareCartesian', 'hoverClosest2d', 'toggleSpikelines', 'lasso2d', 'select2d', 'hoverClosestCartesian'], displaylogo: false}); } else { - document.getElementById("graph1").style.height="700px"; Plotly.newPlot('graph', data, layout, {responsive: true, modeBarButtonsToRemove: ['toImage', 'hoverCompareCartesian', 'hoverClosest2d', 'toggleSpikelines', 'lasso2d', 'select2d', 'hoverClosestCartesian'], displaylogo: false}); } diff --git a/charts/templates/charts/coincards.html b/charts/templates/charts/coincards.html index 619609c..9301885 100644 --- a/charts/templates/charts/coincards.html +++ b/charts/templates/charts/coincards.html @@ -9,101 +9,29 @@
- -
- - -

-
-
-
-
-
Coincards Usage (%)
-
- - - -
-
-
-
-
-
-
+ +
+
+
+
+ Coincards Usage (%) +
+ +
+ + About this chart? + + + +
- - - -
- - -
-
-
-
- Monero
-
{{ now_xmr }}%
-
-
-
- -
-
-
-
- Bitcoin
-
{{ now_btc }}%
-
-
-
- -
-
-
-
- Ethereum
-
{{ now_eth }}%
-
-
-
- -
-
-
-
- Others
-
{{ now_others }}%
-
-
-
- +
+
- -
-
- -
-
- -
-
-
- -
-
@@ -299,16 +227,15 @@ ,size: 13 } ,gridcolor: "#333333" - ,range: ['2021-03-01', '2022-08-01'] ,zeroline: true }, - margin: { - l: 120, - r: 60, - b: 35, - t: 10, - pad: 4 - } + margin: { + l: 100, + r: 50, + b: 50, + t: 20, + pad: 10 + } }; var layout_mobile = { @@ -353,16 +280,15 @@ ,size: 13 } ,gridcolor: "#333333" - ,range: ['2021-03-01', '2022-08-01'] ,zeroline: true }, - margin: { - l: 40, - r: 0, - b: 35, - t: 10, - pad: 0 - } + margin: { + l: 100, + r: 50, + b: 50, + t: 20, + pad: 10 + } }; function findBootstrapEnvironment() { @@ -388,11 +314,9 @@ } env_size = findBootstrapEnvironment(); if (env_size == "xs") { - document.getElementById("graph1").style.height="350px"; Plotly.newPlot('graph', data_mobile, layout_mobile, {responsive: true, modeBarButtonsToRemove: ['toImage', 'hoverCompareCartesian', 'hoverClosest2d', 'toggleSpikelines', 'lasso2d', 'select2d', 'hoverClosestCartesian'], displaylogo: false}); } else { - document.getElementById("graph1").style.height="700px"; Plotly.newPlot('graph', data, layout, {responsive: true, modeBarButtonsToRemove: ['toImage', 'hoverCompareCartesian', 'hoverClosest2d', 'toggleSpikelines', 'lasso2d', 'select2d', 'hoverClosestCartesian'], displaylogo: false}); } diff --git a/charts/templates/charts/coins.html b/charts/templates/charts/coins.html index bbb414e..642e083 100644 --- a/charts/templates/charts/coins.html +++ b/charts/templates/charts/coins.html @@ -9,82 +9,30 @@
- -
+ +
+
+
+
+ Coins in Circulation - -

-
-
-
-
-
Coins in Circulation -
-
- - - -
-
-
-
-
-
-
+
+ +
+ + About this chart? + + + +
- - - -
- - -
-
-
-
- Monero's Supply
-
{{ now_xmr }} XMR
-
-
-
- -
-
-
-
- Bitcoin's Supply
-
{{ now_btc }} BTC
-
-
-
- +
+
- -
-
- -
-
- -
-
-
- -
-
@@ -282,16 +230,15 @@ ,size: 13 } ,gridcolor: "#333333" - ,range: ['2009-01-01', '2045-01-01'] ,zeroline: true }, - margin: { - l: 120, - r: 60, - b: 35, - t: 10, - pad: 4 - } + margin: { + l: 100, + r: 50, + b: 50, + t: 20, + pad: 10 + } }; var layout_mobile = { @@ -336,16 +283,15 @@ ,size: 7 } ,gridcolor: "#444444" - ,range: ['2009-01-01', '2045-01-01'] ,zeroline: true }, - margin: { - l: 40, - r: 0, - b: 35, - t: 10, - pad: 0 - } + margin: { + l: 100, + r: 50, + b: 50, + t: 20, + pad: 10 + } }; function findBootstrapEnvironment() { @@ -371,11 +317,9 @@ } env_size = findBootstrapEnvironment(); if (env_size == "xs") { - document.getElementById("graph1").style.height="350px"; Plotly.newPlot('graph', data_mobile, layout_mobile, {responsive: true, modeBarButtonsToRemove: ['toImage', 'hoverCompareCartesian', 'hoverClosest2d', 'toggleSpikelines', 'lasso2d', 'select2d', 'hoverClosestCartesian'], displaylogo: false}); } else { - document.getElementById("graph1").style.height="700px"; Plotly.newPlot('graph', data, layout, {responsive: true, modeBarButtonsToRemove: ['toImage', 'hoverCompareCartesian', 'hoverClosest2d', 'toggleSpikelines', 'lasso2d', 'select2d', 'hoverClosestCartesian'], displaylogo: false}); } diff --git a/charts/templates/charts/commit.html b/charts/templates/charts/commit.html index 3d7396f..eb2eef1 100644 --- a/charts/templates/charts/commit.html +++ b/charts/templates/charts/commit.html @@ -9,82 +9,29 @@
- -
- - -

-
-
-
-
-
Miner Commitment (Hashrate divided by revenue, hashs/dollar) - - WARNING: DON'T COMPARE DIRECTLY BOTH COINS
-
- - - -
-
-
-
-
-
-
+ +
+
+
+
+ Miner Commitment (Hashrate divided by revenue, hashs/dollar) - WARNING: DON'T COMPARE DIRECTLY BOTH COINS +
+ +
+ + About this chart? + + + +
- - - -
- - -
-
-
-
- Monero Miner Commitment
-
{{ now_xmr }}
-
-
-
- -
-
-
-
- Bitcoin Miner Commitment
-
{{ now_btc }}
-
-
-
- +
+
- -
-
- -
-
- -
-
-
- -
-
@@ -240,10 +187,10 @@ }, margin: { l: 120, - r: 60, - b: 35, - t: 10, - pad: 4 + r: 50, + b: 50, + t: 20, + pad: 10 } }; @@ -293,11 +240,11 @@ ,zeroline: true }, margin: { - l: 40, - r: 0, - b: 35, - t: 10, - pad: 0 + l: 120, + r: 50, + b: 50, + t: 20, + pad: 10 } }; @@ -324,11 +271,9 @@ } env_size = findBootstrapEnvironment(); if (env_size == "xs") { - document.getElementById("graph1").style.height="350px"; Plotly.newPlot('graph', data_mobile, layout_mobile, {responsive: true, modeBarButtonsToRemove: ['toImage', 'hoverCompareCartesian', 'hoverClosest2d', 'toggleSpikelines', 'lasso2d', 'select2d', 'hoverClosestCartesian'], displaylogo: false}); } else { - document.getElementById("graph1").style.height="700px"; Plotly.newPlot('graph', data, layout, {responsive: true, modeBarButtonsToRemove: ['toImage', 'hoverCompareCartesian', 'hoverClosest2d', 'toggleSpikelines', 'lasso2d', 'select2d', 'hoverClosestCartesian'], displaylogo: false}); } diff --git a/charts/templates/charts/commitntv.html b/charts/templates/charts/commitntv.html index 9a426c4..03fdbaa 100644 --- a/charts/templates/charts/commitntv.html +++ b/charts/templates/charts/commitntv.html @@ -9,82 +9,29 @@
- -
- - -

-
-
-
-
-
Miner Commitment (Hashrate divided by revenue, hashs/coin) - - WARNING: DON'T COMPARE DIRECTLY BOTH COINS
-
- - - -
-
-
-
-
-
-
+ +
+
+
+
+ Miner Commitment (Hashrate divided by revenue, hashs/coin) - WARNING: DON'T COMPARE DIRECTLY BOTH COINS +
+ +
+ + About this chart? + + + +
- - - -
- - -
-
-
-
- Monero Miner Commitment
-
{{ now_xmr }}
-
-
-
- -
-
-
-
- Bitcoin Miner Commitment
-
{{ now_btc }}
-
-
-
- +
+
- -
-
- -
-
- -
-
-
- -
-
@@ -240,11 +187,11 @@ ,zeroline: true }, margin: { - l: 120, - r: 60, - b: 35, - t: 10, - pad: 4 + l: 100, + r: 50, + b: 50, + t: 20, + pad: 10 } }; @@ -294,11 +241,11 @@ ,zeroline: true }, margin: { - l: 40, - r: 0, - b: 35, - t: 10, - pad: 0 + l: 100, + r: 50, + b: 50, + t: 20, + pad: 10 } }; @@ -325,11 +272,9 @@ } env_size = findBootstrapEnvironment(); if (env_size == "xs") { - document.getElementById("graph1").style.height="350px"; Plotly.newPlot('graph', data_mobile, layout_mobile, {responsive: true, modeBarButtonsToRemove: ['toImage', 'hoverCompareCartesian', 'hoverClosest2d', 'toggleSpikelines', 'lasso2d', 'select2d', 'hoverClosestCartesian'], displaylogo: false}); } else { - document.getElementById("graph1").style.height="700px"; Plotly.newPlot('graph', data, layout, {responsive: true, modeBarButtonsToRemove: ['toImage', 'hoverCompareCartesian', 'hoverClosest2d', 'toggleSpikelines', 'lasso2d', 'select2d', 'hoverClosestCartesian'], displaylogo: false}); } diff --git a/charts/templates/charts/competitors.html b/charts/templates/charts/competitors.html index e71a80c..dbed165 100644 --- a/charts/templates/charts/competitors.html +++ b/charts/templates/charts/competitors.html @@ -9,99 +9,29 @@
- -
- - -

-
-
-
-
-
Competitor Performance (Log Scale)
-
- - - -
-
-
-
-
-
-
+ +
+
+
+
+ Competitor Performance (Log Scale) +
+ +
+ + About this chart? + + + +
- - -
- - -
-
-
-
- Monero's Return on Capital
-
{{ now_xmr }}
-
-
-
- -
-
-
-
- Dash's Return on Capital
-
{{ now_dash }}
-
-
-
- -
-
-
-
- Grin's Return on Capital
-
{{ now_grin }}
-
-
-
- -
-
-
-
- Zcash's Return on Capital
-
{{ now_zcash }}
-
-
-
+
+
- -
-
- -
-
- -
-
-
- -
-
@@ -302,15 +232,14 @@ ,size: 13 } ,gridcolor: "#333333" - ,range: ['1', '3200'] ,zeroline: true }, margin: { - l: 120, - r: 60, - b: 35, - t: 10, - pad: 4 + l: 100, + r: 50, + b: 50, + t: 20, + pad: 10 } }; @@ -356,15 +285,14 @@ ,size: 7 } ,gridcolor: "#444444" - ,range: ['1', '3200'] ,zeroline: true }, margin: { - l: 40, - r: 0, - b: 35, - t: 10, - pad: 0 + l: 100, + r: 50, + b: 50, + t: 20, + pad: 10 } }; @@ -391,11 +319,9 @@ } env_size = findBootstrapEnvironment(); if (env_size == "xs") { - document.getElementById("graph1").style.height="350px"; Plotly.newPlot('graph', data_mobile, layout_mobile, {responsive: true, modeBarButtonsToRemove: ['toImage', 'hoverCompareCartesian', 'hoverClosest2d', 'toggleSpikelines', 'lasso2d', 'select2d', 'hoverClosestCartesian'], displaylogo: false}); } else { - document.getElementById("graph1").style.height="700px"; Plotly.newPlot('graph', data, layout, {responsive: true, modeBarButtonsToRemove: ['toImage', 'hoverCompareCartesian', 'hoverClosest2d', 'toggleSpikelines', 'lasso2d', 'select2d', 'hoverClosestCartesian'], displaylogo: false}); } diff --git a/charts/templates/charts/competitorslin.html b/charts/templates/charts/competitorslin.html index 81699e6..95a83ba 100644 --- a/charts/templates/charts/competitorslin.html +++ b/charts/templates/charts/competitorslin.html @@ -9,100 +9,29 @@
- -
- - -

-
-
-
-
-
Competitor Performance (Linear Scale)
-
- - - -
-
-
-
-
-
-
+ +
+
+
+
+ Competitor Performance (Linear Scale) +
+ +
+ + About this chart? + + + +
- - - -
- - -
-
-
-
- Monero's Return on Capital
-
{{ now_xmr }}
-
-
-
- -
-
-
-
- Dash's Return on Capital
-
{{ now_dash }}
-
-
-
- -
-
-
-
- Grin's Return on Capital
-
{{ now_grin }}
-
-
-
- -
-
-
-
- Zcash's Return on Capital
-
{{ now_zcash }}
-
-
-
+
+
- -
-
- -
-
- -
-
-
- -
-
@@ -244,7 +173,7 @@ yref: 'paper', x: 0.02, xanchor: 'auto', - y: 0.50, + y: 0.80, yanchor: 'auto', text: 'Moneroj
https://www.moneroj.net', showarrow: false, @@ -303,15 +232,14 @@ ,size: 13 } ,gridcolor: "#333333" - ,range: ['1', '3200'] ,zeroline: true }, margin: { - l: 120, - r: 60, - b: 35, - t: 10, - pad: 4 + l: 100, + r: 50, + b: 50, + t: 20, + pad: 10 } }; @@ -323,8 +251,8 @@ namelength: -1 }, legend: { - x: 0.02, - y: 0.98, + x: 0.98, + y: 0.05, bgcolor: '#000000', bordercolor: '#5f5f5f', borderwidth: 1, @@ -357,15 +285,14 @@ ,size: 7 } ,gridcolor: "#444444" - ,range: ['1', '3200'] ,zeroline: true }, margin: { - l: 40, - r: 0, - b: 35, - t: 10, - pad: 0 + l: 100, + r: 50, + b: 50, + t: 20, + pad: 10 } }; @@ -392,11 +319,9 @@ } env_size = findBootstrapEnvironment(); if (env_size == "xs") { - document.getElementById("graph1").style.height="350px"; Plotly.newPlot('graph', data_mobile, layout_mobile, {responsive: true, modeBarButtonsToRemove: ['toImage', 'hoverCompareCartesian', 'hoverClosest2d', 'toggleSpikelines', 'lasso2d', 'select2d', 'hoverClosestCartesian'], displaylogo: false}); } else { - document.getElementById("graph1").style.height="700px"; Plotly.newPlot('graph', data, layout, {responsive: true, modeBarButtonsToRemove: ['toImage', 'hoverCompareCartesian', 'hoverClosest2d', 'toggleSpikelines', 'lasso2d', 'select2d', 'hoverClosestCartesian'], displaylogo: false}); } diff --git a/charts/templates/charts/competitorssats.html b/charts/templates/charts/competitorssats.html index cffdb52..03645c7 100644 --- a/charts/templates/charts/competitorssats.html +++ b/charts/templates/charts/competitorssats.html @@ -9,104 +9,34 @@
- -
- - -

-
-
-
-
-
Competitor Performance
-
- - - -
-
-
-
-
-
-
+ +
+
+
+
+ Competitor Performance +
+ +
+ + About this chart? + + + +
- - - -
- - -
-
-
-
- Monero's Return on Capital
-
{{ now_xmr }}
-
-
-
- -
-
-
-
- Dash's Return on Capital
-
{{ now_dash }}
-
-
-
- -
-
-
-
- Grin's Return on Capital
-
{{ now_grin }}
-
-
-
- -
-
-
-
- Zcash's Return on Capital
-
{{ now_zcash }}
-
-
-
+
+
- -
-
- -
-
- -
-
-
- -
-
+