From 8e9f1309ce51c59c945d2ee9ae6bddf15f29f291 Mon Sep 17 00:00:00 2001
From: Kirill Fedoseev <k.fedoseev@innopolis.university>
Date: Sun, 24 Oct 2021 11:56:34 +0300
Subject: [PATCH 1/2] Remove redundant banners and links

---
 handlers/api.go            | 2 +-
 handlers/pageData.go       | 2 +-
 templates/index/index.html | 2 +-
 templates/layout.html      | 6 +++++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/handlers/api.go b/handlers/api.go
index 57a77822b9..030c83977b 100644
--- a/handlers/api.go
+++ b/handlers/api.go
@@ -1136,7 +1136,7 @@ func GetUserPremiumByPackage(pkg string) PremiumUser {
 		MaxNodes:               1,
 		WidgetSupport:          false,
 		NotificationThresholds: false,
-		NoAds:                  false,
+		NoAds:                  true,
 	}
 
 	if pkg == "" || pkg == "standard" {
diff --git a/handlers/pageData.go b/handlers/pageData.go
index 206bf308d4..b8ed305b3f 100644
--- a/handlers/pageData.go
+++ b/handlers/pageData.go
@@ -67,7 +67,7 @@ func InitPageData(w http.ResponseWriter, r *http.Request, active, path, title st
 		Lang:                  "en-US",
 		DefaultCurrency:       utils.Config.Frontend.Eth1Currency,
 		DefaultCurrencyName:   utils.Config.Frontend.Eth1CurrencyName,
-		NoAds:                 user.Authenticated && user.Subscription != "",
+		NoAds:                 true,
 		Eth1Label:             utils.Config.Frontend.Eth1Label,
 		Eth2Label:             utils.Config.Frontend.Eth2Label,
 	}
diff --git a/templates/index/index.html b/templates/index/index.html
index 1a79cab993..802f1fe384 100644
--- a/templates/index/index.html
+++ b/templates/index/index.html
@@ -364,7 +364,7 @@
                     {{if and (and (not .ShowSyncingMessage) .Genesis) (not .GenesisPeriod)}}
                         {{ template "participationWarning" .}}
                     {{end}}
-                    {{ template "hero" . }}
+                    {{if not $.NoAds}} {{ template "hero" . }} {{end}}
                 {{end}}
                 {{if not .NoAds}} {{template "banner"}} {{end}}
                 {{with .Data}}
diff --git a/templates/layout.html b/templates/layout.html
index d16fb4db35..55d7bb7590 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -446,10 +446,12 @@
                                 <span class="nav-icon"><i class="fas fa-project-diagram mr-2"></i></span>
                                 <span class="nav-text">Block Viz</span>
                             </a>
+                            {{if not .NoAds}}
                             <a ga-outbound class="dropdown-item" href="https://eth2.ethernodes.org/">
                                 <span class="nav-icon"><i class="fas fa-network-wired mr-2"></i></span>
                                 <span class="nav-text">Nodes</span>
                             </a>
+                            {{end}}
                         </div>
                     </li>
                     <style>
@@ -569,8 +571,9 @@
                         </a>
                     </li>
                 </li>
-                
 
+
+                {{if not .NoAds}}
                 <li class="nav-item {{ if eq .Active "services"}}active{{end}} dropdown">
                     <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button"
                     data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">  
@@ -673,6 +676,7 @@
                             </a>
                         </div>
                     </li>
+                {{end}}
                 </ul>
             </div>
         </div>

From d56dae3d9ed218bf6b0f7507d946c7f0ed0f5cb5 Mon Sep 17 00:00:00 2001
From: Kirill Fedoseev <k.fedoseev@innopolis.university>
Date: Sun, 24 Oct 2021 12:00:37 +0300
Subject: [PATCH 2/2] Update footer

---
 templates/layout.html | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/templates/layout.html b/templates/layout.html
index 55d7bb7590..c4445ac31d 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -759,6 +759,7 @@
         <hr>
         <footer class="container">
             <div class="row">
+                {{if not .NoAds}}
                 <div class="col-md-4 mb-2">
                     <h5>Legal Notices</h5>
                     <div class="d-flex flex-column">
@@ -771,24 +772,17 @@ <h5>Legal Notices</h5>
                         <a class="my-1" href="/legal/privacy.pdf">Privacy</a>
                     </div>
                 </div>
+                {{end}}
                 <div class="col-md-4 mb-2">
                     <h5>Resources</h5>
                     <div class="d-flex flex-column">
-                        <a class="my-1" href="/advertisewithus"><i class="fas fa-ad mr-2"></i>Advertise</a>
-                        <a class="my-1" href="/premium"><i class="fas fa-user-astronaut mr-2"></i></i>Beaconcha.in Premium</a>
-                        <a class="my-1" href="https://shop.beaconcha.in"><i class="fas fa-shopping-cart mr-2"></i>Swag
-                            Shop</a>
-                        <a class="my-1" href="/pricing"><i class="fas fa-laptop-code mr-2"></i></i>API Pricing</a>
-                        <!-- <a class="my-1" href="https://github.com/gobitfly/eth2-beaconchain-explorer"><i
-                                    class="fab fa-github mr-2"></i>Github</a> -->
+                        <a class="my-1" href="https://www.xdaichain.com/for-validators/consensus/stake-beacon-chain-r-and-d"><i class="fas fa-info-circle mr-2"></i>Overview</a>
                     </div>
                 </div>
                 <div class="col-md-4 mb-2">
                     <h5>Links</h5>
                     <div class="d-flex flex-column">
-                        <a class="my-1" href="https://twitter.com/beaconcha_in"><i class="fab fa-twitter mr-2"></i>Beaconcha.in</a>
-                        <a class="my-1" href="https://github.com/gobitfly/eth2-beaconchain-explorer"><i class="fab fa-github mr-2"></i>Github</a>
-                        <a class="my-1" href="https://github.com/gobitfly/eth2-beaconchain-explorer-app"><i class="fab fa-github mr-2"></i>Github Mobile App</a>
+                        <a class="my-1" href="https://github.com/openethereum/sbc-explorer"><i class="fab fa-github mr-2"></i>Github</a>
 
                         <!-- <a class="my-1" href="https://www.reddit.com/u/etherchain/"><i class="fab fa-reddit mr-2"></i>Reddit</a> -->
                         <!-- <a class="my-1" href="https://gitter.im/gobitfly/beaconchain-explorer"><i