mirror of
https://github.com/jcwimer/wrestlingApp
synced 2026-03-25 01:14:43 +00:00
Moved the tournament navbar to the bottom of the page and made site responsive. Fixed puma solid queue in development. Added a note about clobbering assets in the README. Fixed the ad blocker check due to turbolinks it had to be idempotent. Added migrations for all dbs in the rails-dev-db-create.sh script.
This commit is contained in:
@@ -10,7 +10,7 @@
|
||||
<a class="navbar-brand" href="/">WrestlingDev</a>
|
||||
</div>
|
||||
<div id="navbar" class="collapse navbar-collapse">
|
||||
<ul class="nav navbar-nav">
|
||||
<ul class="nav navbar-nav navbar-right">
|
||||
<li><%= link_to "Browse Tournaments", "/tournaments/" %></li>
|
||||
<li><%= link_to "About", "/static_pages/about" %></li>
|
||||
<li><%= link_to "Tutorials", "/static_pages/tutorials" %></li>
|
||||
|
||||
@@ -1,13 +1,21 @@
|
||||
<% if @tournament and @tournament.id %>
|
||||
<h2><%= @tournament.name %> Links</h2>
|
||||
<nav class="navbar navbar-default navbar-static-top" role="navigation" id="tournament-navbar">
|
||||
<nav class="navbar navbar-default navbar-fixed-top" role="navigation" id="tournament-navbar">
|
||||
<div class="container">
|
||||
<div class="collapse navbar-collapse">
|
||||
<ul class="nav navbar-nav">
|
||||
<li><%= link_to " Tournament Home" , "/tournaments/#{@tournament.id}", class: "fas fa-home" %></li>
|
||||
<div class="navbar-header">
|
||||
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#tournament-navbar-collapse" aria-expanded="false" aria-controls="navbar">
|
||||
<span class="sr-only">Toggle navigation</span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
</button>
|
||||
<%= link_to "Tournament Menu", "/tournaments/#{@tournament.id}", class: "navbar-brand" %>
|
||||
</div>
|
||||
<div id="tournament-navbar-collapse" class="collapse navbar-collapse">
|
||||
<ul class="nav navbar-nav navbar-right">
|
||||
<li><%= link_to " Home" , "/tournaments/#{@tournament.id}", class: "fas fa-home" %></li>
|
||||
<% if can? :read, @tournament %>
|
||||
<li class="dropdown">
|
||||
<a class="dropdown-toggle" data-toggle="dropdown" href="#"><i class="fas fa-poll-h"> Tournament Results/Brackets</i>
|
||||
<a class="dropdown-toggle" data-toggle="dropdown" href="#"><i class="fas fa-poll-h"> Results/Brackets</i>
|
||||
<span class="caret"></span></a>
|
||||
<ul class="dropdown-menu">
|
||||
<li><strong>Results</strong></li>
|
||||
@@ -24,7 +32,7 @@
|
||||
<% end %>
|
||||
<% if can? :manage, @tournament %>
|
||||
<li class="dropdown">
|
||||
<a class="dropdown-toggle" data-toggle="dropdown" href="#director"><i class="fas fa-tools"> Tournament Director Links</i>
|
||||
<a class="dropdown-toggle" data-toggle="dropdown" href="#director"><i class="fas fa-tools"> Director Links</i>
|
||||
<span class="caret"></span></a>
|
||||
<ul class="dropdown-menu">
|
||||
<li><strong>Pages</strong></li>
|
||||
|
||||
@@ -14,21 +14,37 @@
|
||||
<p>We've detected that you have an ad blocker enabled! Please consider disabling it for <strong>wrestlingdev.com</strong>. This site is free for users and supported by ads. Ad blockers also block performance monitoring that help us with user experience.</p>
|
||||
</div>
|
||||
<script>
|
||||
let fakeAd = document.createElement("div");
|
||||
fakeAd.className = "textads banner-ads banner_ads ad-unit ad-zone ad-space adsbox"
|
||||
// Only run ad blocker check if fakeAd hasn't been checked yet in this context
|
||||
if (typeof window.adBlockerCheckExecuted === 'undefined') {
|
||||
let fakeAd = document.createElement("div");
|
||||
fakeAd.className = "textads banner-ads banner_ads ad-unit ad-zone ad-space adsbox"
|
||||
|
||||
fakeAd.style.height = "1px"
|
||||
fakeAd.style.position = "absolute"; // Prevent potential layout shift
|
||||
fakeAd.style.top = "-10px";
|
||||
fakeAd.style.left = "-10px";
|
||||
|
||||
fakeAd.style.height = "1px"
|
||||
|
||||
document.body.appendChild(fakeAd)
|
||||
|
||||
let x_width = fakeAd.offsetHeight;
|
||||
let msg = document.getElementById("msg")
|
||||
|
||||
document.body.appendChild(fakeAd)
|
||||
|
||||
if(x_width){
|
||||
console.log("No AdBlocker Detected")
|
||||
}else{
|
||||
console.log("AdBlocker detected")
|
||||
document.getElementById("blocked_message").style.display = 'block';
|
||||
}
|
||||
// Use requestAnimationFrame to ensure the element is rendered before checking offsetHeight
|
||||
requestAnimationFrame(() => {
|
||||
let x_width = fakeAd.offsetHeight;
|
||||
// let msg = document.getElementById("msg") // msg variable wasn't used
|
||||
|
||||
if(x_width){
|
||||
console.log("No AdBlocker Detected")
|
||||
}else{
|
||||
console.log("AdBlocker detected")
|
||||
const blockedMessage = document.getElementById("blocked_message");
|
||||
if (blockedMessage) {
|
||||
blockedMessage.style.display = 'block';
|
||||
}
|
||||
}
|
||||
// Clean up the fake element
|
||||
document.body.removeChild(fakeAd);
|
||||
});
|
||||
|
||||
// Mark check as executed
|
||||
window.adBlockerCheckExecuted = true;
|
||||
}
|
||||
</script>
|
||||
|
||||
@@ -16,25 +16,24 @@
|
||||
<% else %>
|
||||
<head>
|
||||
<title>WrestlingDev</title>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<% if Rails.env.production? %>
|
||||
<%= render 'layouts/analytics' %>
|
||||
<% end %>
|
||||
<%= stylesheet_link_tag "application", media: "all",
|
||||
"data-turbolinks-track" => true %>
|
||||
<%= javascript_include_tag "application", "data-turbolinks-track" => true %>
|
||||
<%= stylesheet_link_tag "application" %>
|
||||
<%= javascript_include_tag "application" %>
|
||||
<%= csrf_meta_tags %>
|
||||
<%= render 'layouts/cdn' %>
|
||||
<%= render 'layouts/shim' %>
|
||||
</head>
|
||||
<body style="padding-top: 70px;">
|
||||
<body style="padding-top: 100px;">
|
||||
<%= render 'layouts/header' %>
|
||||
<%= render 'layouts/tournament-navbar' %>
|
||||
|
||||
<div class="container">
|
||||
<div class="navbar-roof"></div>
|
||||
<%= render 'layouts/header' %>
|
||||
|
||||
<div id="page-content">
|
||||
<div class="row">
|
||||
<%= render 'layouts/tournament-navbar' %>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-12"><%= render 'layouts/underheader' %></div>
|
||||
</div>
|
||||
@@ -46,7 +45,9 @@
|
||||
<% if alert %>
|
||||
<p id="alert" class="alert alert-danger alert-dismissible"><a href="#" class="close" data-dismiss="alert" aria-label="close">×</a><%= alert %></p>
|
||||
<% end %>
|
||||
<div id="view"><%= yield %></div>
|
||||
<div id="view" style="overflow-x: auto; overflow-y: hidden;"> <%# Horizontal scroll only %>
|
||||
<%= yield %>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user