1
0
mirror of https://github.com/jcwimer/wrestlingApp synced 2026-04-08 07:22:38 +00:00

Migrated from Sprockets to Propshaft.

This commit is contained in:
Your Name
2025-05-16 17:14:05 -04:00
parent 5296b71bb9
commit 0326d87261
124 changed files with 8796 additions and 35841 deletions

View File

@@ -1,3 +1,11 @@
//= link_tree ../images
//= link_directory ../javascripts .js
//= link_directory ../stylesheets .css
// Link all .js files from app/javascript for importmap, and vendor/javascript if needed directly
//= link_tree ../../javascript .js
//= link_tree ../../../vendor/assets/javascripts .js
// Explicitly link all .css files from app/assets/stylesheets and vendor/assets/stylesheets
//= link_tree ../stylesheets .css
//= link_tree ../../../vendor/assets/stylesheets .css
//= link_tree ../../../vendor/assets/webfonts

View File

@@ -1,3 +0,0 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/

View File

@@ -1,3 +0,0 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/

View File

@@ -1,32 +1,27 @@
// This is a manifest file that'll be compiled into application.js, which will include all the files
// listed below.
//
// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
//
// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
// compiled file.
//
// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
// about supported directives.
//
//= require jquery
//= require jquery_ujs
// Bootstrap 3.3.6 in vendor/assets/javascripts
//= require bootstrap.min.js
// Data Tables 1.10.6 in vendor/assets/javascripts
//= require jquery.dataTables.min.js
//= require turbolinks
//
//= require actioncable
//= require_self
//= require_tree .
// Entry point for your JavaScript application
// Create the Action Cable consumer instance
// These are pinned in config/importmap.rb
import "@hotwired/turbo-rails";
import { createConsumer } from "@rails/actioncable"; // Import createConsumer directly
import "jquery";
import "bootstrap";
import "datatables.net";
// Your existing Action Cable consumer setup
(function() {
this.App || (this.App = {});
App.cable = ActionCable.createConsumer();
try {
window.App || (window.App = {});
window.App.cable = createConsumer(); // Use the imported createConsumer
console.log('Action Cable Consumer Created via app/javascript/application.js');
} catch (e) {
console.error('Error creating ActionCable consumer:', e);
console.error('ActionCable not loaded or createConsumer failed, App.cable not created.');
}
}).call(this);
console.log("Propshaft/Importmap application.js initialized with jQuery, Bootstrap, and DataTables.");
// If you have custom JavaScript files in app/javascript/ that were previously
// handled by Sprockets `require_tree`, you'll need to import them here explicitly.
// For example:
// import "./my_custom_logic";

View File

@@ -1,4 +0,0 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/

View File

@@ -1,3 +0,0 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/

View File

@@ -1,3 +0,0 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/

View File

@@ -1,3 +0,0 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/

View File

@@ -1,3 +0,0 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/

View File

@@ -1,3 +0,0 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/

View File

@@ -1,3 +0,0 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/

View File

@@ -1,3 +0,0 @@
// Place all the styles related to the Admin controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/

View File

@@ -1,4 +0,0 @@
/*
Place all the styles related to the matching controller here.
They will automatically be included in application.css.
*/

View File

@@ -1,35 +1,17 @@
/*
* This is a manifest file that'll be compiled into application.css, which will include all the files
* listed below.
*
* Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
* or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
*
* You're free to add application-wide styles to this file and they'll appear at the bottom of the
* compiled file so the styles you add here take precedence over styles defined in any styles
* defined in the other CSS/SCSS files in this directory. It is generally better to create a new
* file per style scope.
*
* For some reason this needs to be above bootstrap for the zindex of the main navbar to work.
* With it lower, bootstraps css overrides it.
*= require custom
* Bootstrap 3.3.6 in vendor/assets/stylesheets
*= require bootstrap.min.css
*= require bootstrap-theme.min.css
* Font Awesome 5.7.1 in vendor/assets/stylesheets/fontawesome
*= require fontawesome/all
*= require_tree .
*= require_self
*/
/* relative pathing from /vender/assets/stylesheets = / */
@import url("/bootstrap.min.css");
@import url("/bootstrap-theme.min.css");
@import url("/fontawesome/all.css");
@import url("/custom.css");
@import url("/scaffolds.css");
@font-face {
font-family: 'Font Awesome 5 Brands';
/* other properties */
src: url("/webfonts/fa-brands-400.eot");
src: url("/webfonts/fa-brands-400.eot?#iefix") format("embedded-opentype"),
url("/webfonts/fa-brands-400.woff2") format("woff2"),
url("/webfonts/fa-brands-400.woff") format("woff"),
url("/webfonts/fa-brands-400.ttf") format("truetype"),
url("/webfonts/fa-brands-400.svg#fontawesome") format("svg");
}
font-family: 'Font Awesome 5 Brands';
/* relative pathing from /vender/assets/stylesheets = / */
src: url("/webfonts/fa-brands-400.eot");
src: url("/webfonts/fa-brands-400.eot?#iefix") format("embedded-opentype"),
url("/webfonts/fa-brands-400.woff2") format("woff2"),
url("/webfonts/fa-brands-400.woff") format("woff"),
url("/webfonts/fa-brands-400.ttf") format("truetype"),
url("/webfonts/fa-brands-400.svg#fontawesome") format("svg");
}

View File

@@ -1,3 +0,0 @@
// Place all the styles related to the Matches controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/

View File

@@ -1,3 +0,0 @@
// Place all the styles related to the Mats controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/

View File

@@ -1,3 +0,0 @@
// Place all the styles related to the Schools controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/

View File

@@ -1,3 +0,0 @@
// Place all the styles related to the StaticPages controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/

View File

@@ -1,3 +0,0 @@
// Place all the styles related to the tournaments controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/

View File

@@ -1,3 +0,0 @@
// Place all the styles related to the Weights controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/

View File

@@ -1,3 +0,0 @@
// Place all the styles related to the Wrestlers controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/

View File

@@ -5,9 +5,8 @@
<%= csrf_meta_tags %>
<%= action_cable_meta_tag %>
<title>WrestlingDev</title>
<%= stylesheet_link_tag "application", media: "all",
"data-turbolinks-track" => true %>
<%= javascript_include_tag "application", "data-turbolinks-track" => true %>
<%= stylesheet_link_tag "application", media: "all", "data-turbo-track": "reload" %>
<%= javascript_importmap_tags %>
<%= render 'layouts/cdn' %>
<%= render 'layouts/shim' %>
</head>
@@ -22,8 +21,8 @@
<% if Rails.env.production? %>
<%= render 'layouts/analytics' %>
<% end %>
<%= stylesheet_link_tag "application" %>
<%= javascript_include_tag "application" %>
<%= stylesheet_link_tag "application", media: "all", "data-turbo-track": "reload" %>
<%= javascript_importmap_tags %>
<%= csrf_meta_tags %>
<%= render 'layouts/cdn' %>
<%= render 'layouts/shim' %>

View File

@@ -384,7 +384,7 @@ function initializeFromLocalStorage() {
}
// ############### ACTION CABLE LIFECYCLE (Define Before Listeners) #############
var matchSubscription = null; // Use var for safety with Turbolinks re-evaluation
var matchSubscription = null; // Use var for safety with Turbo re-evaluation / page navigation
function cleanupSubscription() {
if (matchSubscription) {
@@ -484,8 +484,8 @@ function setupSubscription(matchId) {
// ############### EVENT LISTENERS (Define Last) #############
document.addEventListener("turbolinks:load", () => {
console.log("Stats Event: turbolinks:load fired.");
document.addEventListener("turbo:load", () => {
console.log("Stats Event: turbo:load fired.");
// --- Check if we are actually on the match stats page ---
const statsElementCheck = document.getElementById('match_w1_stat'); // Check for stats textarea
@@ -507,12 +507,12 @@ document.addEventListener("turbolinks:load", () => {
if (matchId) {
setupSubscription(matchId);
} else {
console.warn("Stats Event: turbolinks:load - Could not determine match ID for AC setup.");
console.warn("Stats Event: turbo:load - Could not determine match ID for AC setup.");
}
});
document.addEventListener("turbolinks:before-cache", () => {
console.log("Event: turbolinks:before-cache fired. Cleaning up subscription.");
document.addEventListener("turbo:before-cache", () => {
console.log("Event: turbo:before-cache fired. Cleaning up subscription.");
cleanupSubscription();
});

View File

@@ -238,7 +238,7 @@ function createTextInput(id, placeholder, label) {
return container;
}
// Initialize on both DOMContentLoaded and turbolinks:load
// Initialize on both DOMContentLoaded and turbo:load
document.addEventListener("DOMContentLoaded", initializeScoreFields);
document.addEventListener("turbolinks:load", initializeScoreFields);
document.addEventListener("turbo:load", initializeScoreFields);
</script>

View File

@@ -78,8 +78,8 @@
</style>
<script>
// ############### ACTION CABLE LIFECYCLE & SETUP #############
var matchSubscription = null; // Use var for Turbolinks compatibility
// ############### ACTION CABLE LIFECYCLE #############
var matchSubscription = null; // Use var for handling Turbo page navigations
// Function to tear down the existing subscription
function cleanupSubscription() {
@@ -188,12 +188,12 @@ function setupSubscription(matchId) {
);
}
// ############### EVENT LISTENERS (Define Last) #############
// ############### EVENT LISTENERS #############
document.addEventListener("turbolinks:load", () => {
console.log("Spectator Event: turbolinks:load fired.");
// --- Check if we are actually on the spectator page ---
document.addEventListener("turbo:load", () => {
console.log("Spectator Event: turbo:load fired.");
// Check for necessary elements before proceeding
const spectatorElementCheck = document.getElementById('w1-stats-display');
if (!spectatorElementCheck) {
console.log("Spectator Event: Not on spectator page, skipping AC setup.");
@@ -201,18 +201,17 @@ document.addEventListener("turbolinks:load", () => {
cleanupSubscription();
return;
}
// --- End Check ---
const matchId = <%= @match.id %>; // Get match ID from ERB
if (matchId) {
setupSubscription(matchId);
} else {
console.warn("Spectator Event: turbolinks:load - Could not determine match ID");
console.warn("Spectator Event: turbo:load - Could not determine match ID");
}
});
document.addEventListener("turbolinks:before-cache", () => {
console.log("Spectator Event: turbolinks:before-cache fired. Cleaning up subscription.");
document.addEventListener("turbo:before-cache", () => {
console.log("Spectator Event: turbo:before-cache fired. Cleaning up subscription.");
cleanupSubscription();
});