Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove banners #31

Merged
merged 2 commits into from
Oct 24, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion handlers/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -1136,7 +1136,7 @@ func GetUserPremiumByPackage(pkg string) PremiumUser {
MaxNodes: 1,
WidgetSupport: false,
NotificationThresholds: false,
NoAds: false,
NoAds: true,
}

if pkg == "" || pkg == "standard" {
Expand Down
2 changes: 1 addition & 1 deletion handlers/pageData.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
Expand Down
2 changes: 1 addition & 1 deletion templates/index/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand Down
20 changes: 9 additions & 11 deletions templates/layout.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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">
Expand Down Expand Up @@ -673,6 +676,7 @@
</a>
</div>
</li>
{{end}}
</ul>
</div>
</div>
Expand Down Expand Up @@ -755,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">
Expand All @@ -767,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
Expand Down