From 0faec59d6bac5c22e6fc49e617c11f5d1533418d Mon Sep 17 00:00:00 2001
From: anon <morpheus.anonymous@protonmail.com>
Date: Thu, 1 Sep 2022 15:16:03 -0300
Subject: [PATCH] fixed chart

---
 charts/templates/charts/about.html            |   4 +-
 charts/templates/charts/fr.html               |   7 +-
 charts/templates/charts/index.html            |   6 +-
 .../charts/merchants_percentage.html          | 109 ++++--------------
 charts/templates/charts/pt.html               |   7 +-
 users/templates/users/base.html               |   8 +-
 6 files changed, 36 insertions(+), 105 deletions(-)

diff --git a/charts/templates/charts/about.html b/charts/templates/charts/about.html
index f4f2e10..e650263 100644
--- a/charts/templates/charts/about.html
+++ b/charts/templates/charts/about.html
@@ -44,7 +44,7 @@
                         <div class="col-xl-12 col-md-6 mb-4">
                             <div class="card border-left-new">
                                 <div class="card-body">
-                                    <h5 class="card-title text-white">Hi there</h5>
+                                    <h5 class="card-title text-white">Hi,</h5>
                                     <p class="card-text text-white">
                                         You can call me Morpheus. I made this website to help fellow members of Monero's
                                         community understand it, visualize adoption and to compare it against other
@@ -100,7 +100,7 @@
                                             <div class="text-xs font-weight-bold text-info text-uppercase mb-1">
                                                 E-mail</div>
                                             <div class="h5 mb-0 font-weight-bold text-gray-800"><a
-                                                    href="mailto:morpheus.anonymous@protonmail.com" target="_blank">morpheus.anonymous@protonmail.com</a>
+                                                    href="mailto:mail@moneroj.net" target="_blank">mail@moneroj.net</a>
                                             </div>
                                         </div>
                                         <div class="col-auto">
diff --git a/charts/templates/charts/fr.html b/charts/templates/charts/fr.html
index 3933c5e..0c7bc44 100644
--- a/charts/templates/charts/fr.html
+++ b/charts/templates/charts/fr.html
@@ -778,10 +778,9 @@
           <div class="col-lg-6 col-md-6 footer-contact">
             <h3>Moneroj.net</h3>
             <p>
-              Développé par<br>
-              Morphée<br>
-              <strong>Courriel:</strong> morpheus.anonymous@protonmail.com<br>
+              Développé par Morphée<br>
               <strong>Twitter:</strong> CryptoMorpheus_<br>
+              <strong>Courriel:</strong> mail@moneroj.net<br>
             </p>
           </div>
 
@@ -810,7 +809,7 @@
       <div class="social-links text-center text-lg-right pt-3 pt-lg-0">
         <a href="http://moneroj5xq4ttg4ec7e5secqdyw5mcovzvfvlq6i7omv353i6mnexlqd.onion" class="onion" alt="Tor Version"><i class="bx bx-hide"></i></a>
         <a href="https://twitter.com/CryptoMorpheus_" class="twitter" alt="Twitter Profile"><i class="bx bxl-twitter"></i></a>
-        <a href="mailto:morpheus.anonymous@protonmail.com" class="email" alt="Send E-mail"><i class="bx bx-mail-send"></i></a>
+        <a href="mailto:mail@moneroj.net" class="email" alt="Send E-mail"><i class="bx bx-mail-send"></i></a>
       </div>
     </div>
   </footer>
diff --git a/charts/templates/charts/index.html b/charts/templates/charts/index.html
index b044229..adfc424 100644
--- a/charts/templates/charts/index.html
+++ b/charts/templates/charts/index.html
@@ -101,18 +101,18 @@
               <div class="col">
                 <p>
                   <i class="bx bx-user"></i> Morpheus
-                  <i class="bx bx-calendar"></i> May 11,<br>40 contributions
+                  <i class="bx bx-calendar"></i> May 11,<br>61 contributions
                 </p>
               </div>
               <div class="col">
                 <p style="text-align: right;">
-                  (manual update) <i class="bx bx-money"></i> Raised<br>21.01 of 46 XMR
+                  (manual update) <i class="bx bx-money"></i> Raised<br>21.04 of 46 XMR
                 </p>
               </div>
             </div>
             <div class="progress">
               <div class="progress-bar bg-danger" role="progressbar" style="width: 46%; color: #ff4d21"
-                aria-valuenow="21.01" aria-valuemin="0" aria-valuemax="46"></div>
+                aria-valuenow="21.04" aria-valuemin="0" aria-valuemax="46"></div>
             </div>
           </div>
         </div>
diff --git a/charts/templates/charts/merchants_percentage.html b/charts/templates/charts/merchants_percentage.html
index 13920ef..1c2b9be 100644
--- a/charts/templates/charts/merchants_percentage.html
+++ b/charts/templates/charts/merchants_percentage.html
@@ -9,95 +9,34 @@
 <!-- Content Wrapper -->
 <div id="content-wrapper" style="background-color:rgb(48, 44, 41)">
 
-    <!-- Main Content -->
-    <div id="content">
-
-        <!-- Begin Page Content -->
-        <div class="container-fluid"><br>
-            <div class="row">
-                <div class="col-xl-12 col-lg-12">
-                    <div class="card" id="graph1">
-                        <div
-                            class="card-header py-3 d-flex flex-row align-items-center justify-content-between text-white">
-                            <h6 class="m-0 text-light">Increase in number of merchants accepting cryptocurrency (percentage)</h6>
-                            <div class="dropdown no-arrow">
-                                <a class="dropdown-toggle" href="#" role="button"
-                                    onclick="$('#graph1').toggleClass('fullscreen');window.dispatchEvent(new Event('resize'));">
-                                    <i class="bx bx-expand text-gray-400"></i>
-                                </a>
-                            </div>
-                        </div>
-                        <div class="card-body pb-0 pt-0 pl-0 pr-0" style="height: 100px;">
-                            <div id="graph" style="height: 100%; width:100%;"></div>
-                        </div>
-                    </div>
-                    <br>
+    <!-- Content Row -->
+    <div class="row" style="height: 92%; margin: 10px 10px 10px 10px;">
+        <div class="card" id="graph1" style="width: 100%; height: 100%;">
+            <div class="card-header py-3 d-flex flex-row align-items-center justify-content-between text-white">
+                <h6 class="m-0 text-light">
+                    Increase in number of merchants accepting cryptocurrency (percentage)
+                </h6>
+                
+                <div class="dropdown no-arrow">
+                    <a data-toggle="modal" href="#" class="link_graph" data-target="#id_Modal">
+                        About this chart?
+                    </a>
+                    <a class="dropdown-toggle" href="#" role="button"
+                        onclick="$('#graph1').toggleClass('fullscreen');window.dispatchEvent(new Event('resize'));">
+                        <i class="bx bx-expand text-gray-400"></i>
+                    </a>
                 </div>
             </div>
-
-
-            <!-- Content Row -->
-            <div class="row">
-
-                <!-- Card  -->
-                <div class="col-xl-4 col-md-6 mb-4">
-                    <div class="card border-left-new h-100 py-2">
-                        <div class="card-body">
-                            <div class="text-xs font-weight-bold text-info text-uppercase mb-1">
-                                Monero</div>
-                            <div class="h5 mb-0 font-weight-bold text-gray-800">{{ now_xmr }}%</div>
-                        </div>
-                    </div>
-                </div>
-                <!-- Card -->
-                <div class="col-xl-4 col-md-6 mb-4">
-                    <div class="card border-left-new h-100 py-2">
-                        <div class="card-body">
-                            <div class="text-xs font-weight-bold text-info text-uppercase mb-1">
-                                Bitcoin</div>
-                            <div class="h5 mb-0 font-weight-bold text-gray-800">{{ now_btc }}%</div>
-                        </div>
-                    </div>
-                </div>
-                <!-- Card -->
-                <div class="col-xl-4 col-md-6 mb-4">
-                    <div class="card border-left-new h-100 py-2">
-                        <div class="card-body">
-                            <div class="text-xs font-weight-bold text-info text-uppercase mb-1">
-                                Ethereum</div>
-                            <div class="h5 mb-0 font-weight-bold text-gray-800">{{ now_eth }}%</div>
-                        </div>
-                    </div>
-                </div>
-
+            <div class="card-body"  style="width: 100%; height: 100%; margin: 0px 0px 0px 0px; padding: 0px 0px 0px 0px;">
+                <div id="graph"  style="width: 100%; height: 100%;  margin: 0px 0px 0px 0px; padding: 0px 0px 0px 0px;"></div>
             </div>
-            <!-- Content Row -->
-            <div class="row">
-                <div class="col-xl-11 col-md-6 mb-4">
-                    <div class="alert alert-dark" role="alert">
-                        Not financial advice.
-                        For information about the chart, click the button >
-                    </div>
-                </div>
-                <div class="col-xl-1">
-                    <button type="button" class="btn btn-dark btn-block" data-toggle="modal" href="#"
-                        data-target="#id_Modal">
-                        <div class="col-auto">
-                            +
-                        </div>
-                    </button>
-                </div>
-            </div>
-
         </div>
-        <!-- /.container-fluid -->
-
     </div>
-    <!-- End of Main Content -->
 
 </div>
 <!-- End of Content Wrapper -->
 
+
 <!-- Modal -->
 <div class="modal fade" id="id_Modal" tabindex="-1" role="dialog" aria-labelledby="Modal" aria-hidden="true">
     <div class="modal-dialog" role="document">
@@ -300,9 +239,9 @@
               {
                   xref: 'paper',
                   yref: 'paper',
-                  x: 0.98,
+                  x: 0.02,
                   xanchor: 'auto',
-                  y: 0.02,
+                  y: 0.60,
                   yanchor: 'auto',
                   text: 'Moneroj<br>https://www.moneroj.net',
                   showarrow: false,
@@ -318,7 +257,7 @@
               }],
               separators: ",.",
               legend: {
-                  x: 0.98, 
+                  x: 0.02, 
                   y: 0.98, 
                   bgcolor: '#333333', 
                   bordercolor: '#5f5f5f', 
@@ -361,7 +300,6 @@
                     ,size: 13
                 }
                 ,gridcolor: "#333333"
-                ,range: ['2020-08-01', '2022-11-01']
                 ,zeroline: true
               },
               margin: {
@@ -415,7 +353,6 @@
                     ,size: 13
                 }
                 ,gridcolor: "#333333"
-                ,range: ['2020-08-01', '2022-11-01']
                 ,zeroline: true
               },
               margin: {
@@ -450,11 +387,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});
           }
     </script>
diff --git a/charts/templates/charts/pt.html b/charts/templates/charts/pt.html
index d22a452..76ee116 100644
--- a/charts/templates/charts/pt.html
+++ b/charts/templates/charts/pt.html
@@ -508,10 +508,9 @@
           <div class="col-lg-6 col-md-6 footer-contact">
             <h3>Moneroj.net</h3>
             <p>
-              Desenvolvido por<br>
-              Morpheus<br>
-              <strong>Email:</strong> morpheus.anonymous@protonmail.com<br>
+              Desenvolvido por Morpheus<br>
               <strong>Twitter:</strong> CryptoMorpheus_<br>
+              <strong>Email:</strong> mail@moneroj.net<br>
             </p>
           </div>
 
@@ -540,7 +539,7 @@
       <div class="social-links text-center text-lg-right pt-3 pt-lg-0">
         <a href="http://moneroj5xq4ttg4ec7e5secqdyw5mcovzvfvlq6i7omv353i6mnexlqd.onion" class="onion" alt="Tor Version"><i class="bx bx-hide"></i></a>
         <a href="https://twitter.com/CryptoMorpheus_" class="twitter" alt="Twitter Profile"><i class="bx bxl-twitter"></i></a>
-        <a href="mailto:morpheus.anonymous@protonmail.com" class="email" alt="Send E-mail"><i class="bx bx-mail-send"></i></a>
+        <a href="mailto:mail@moneroj.net" class="email" alt="Send E-mail"><i class="bx bx-mail-send"></i></a>
       </div>
     </div>
   </footer>
diff --git a/users/templates/users/base.html b/users/templates/users/base.html
index 362b9a3..9f4a28f 100644
--- a/users/templates/users/base.html
+++ b/users/templates/users/base.html
@@ -114,11 +114,9 @@
           <div class="col-lg-6 col-md-6 footer-contact">
             <h3>Moneroj.net</h3>
             <p>
-              Developed by <br>
-              Morpheus<br>
-              <strong>Email:</strong> morpheus.anonymous@protonmail.com<br>
+              Developed by Morpheus<br>
               <strong>Twitter:</strong> CryptoMorpheus_<br>
-              <strong>Github:</strong> cryptomorpheuss<br>
+              <strong>Email:</strong> mail@moneroj.net<br>
             </p>
           </div>
 
@@ -146,7 +144,7 @@
       <div class="social-links text-center text-lg-right pt-3 pt-lg-0">
         <a href="http://moneroj5xq4ttg4ec7e5secqdyw5mcovzvfvlq6i7omv353i6mnexlqd.onion" class="onion" alt="Tor Version"><i class="bx bx-hide"></i></a>
         <a href="https://twitter.com/CryptoMorpheus_" class="twitter" alt="Twitter Profile"><i class="bx bxl-twitter"></i></a>
-        <a href="mailto:morpheus.anonymous@protonmail.com" class="email" alt="Send E-mail"><i class="bx bx-mail-send"></i></a>
+        <a href="mailto:mail@moneroj.net" class="email" alt="Send E-mail"><i class="bx bx-mail-send"></i></a>
       </div>
     </div>