Asset cleanup

jcraigk · Oct 7, 2023 · 6b05117 · 6b05117
1 parent 3a5cb93
commit 6b05117
Show file tree

Hide file tree

Showing 8 changed files with 206 additions and 18 deletions.
diff --git a/app/helpers/tag_helper.rb b/app/helpers/tag_helper.rb
@@ -77,7 +77,7 @@ def tag_notes(tag_instance, detail:)
   def transcript_or_link(tag_instance, title)
     return '' if tag_instance.try(:transcript).blank?
     str = '<br><br>' if title.present?
-    str += "<strong>TRANSCRIPT</strong><br><br> #{tag_instance.transcript.gsub("\n", '<br>')}"
+    str + "<strong>TRANSCRIPT</strong><br><br> #{tag_instance.transcript.gsub("\n", '<br>')}"
   end
 
   def time_range(tag_instance, detail:) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity

diff --git a/app/javascript/packs/application.css.scss b/app/javascript/packs/application.css.scss
@@ -1,5 +1,9 @@
-@import '~jquery-ui/themes/base/all.css';
+@import '~@fontsource/marck-script/400.css';
+@import '~@fontsource/open-sans-condensed/300.css';
+@import '~@fontsource/open-sans-condensed/700.css';
 @import '~bootstrap/dist/css/bootstrap.css';
+@import '~jquery-ui/themes/base/all.css';
+@import '~mapbox-gl/dist/mapbox-gl.css';
 
 $text_gray: #6d6f71;
 $emphasis: #000;

diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js
@@ -3,10 +3,8 @@ const images = require.context('../images', true)
 const imagePath = (name) => images(name, true)
 
 // Global dependencies
-import 'jquery/src/jquery';
-import 'jquery-ujs'
-import 'bootstrap/dist/js/bootstrap';
-import 'soundmanager2'
+import 'jquery/src/jquery'
+import 'bootstrap/dist/js/bootstrap'
 
-// App logic (legacy CoffeeScript)
-import '../src/coffeescript/app.js.coffee';
+// CoffeeScript bundle
+import '../src/coffeescript/app.js.coffee'
diff --git a/app/javascript/src/coffeescript/app.js.coffee b/app/javascript/src/coffeescript/app.js.coffee
@@ -2,6 +2,7 @@ import $ from 'jquery'
 import 'jquery-ui/ui/widgets/slider'
 import 'jquery-ui/ui/widgets/tooltip'
 import 'jquery-ui/ui/widgets/dialog'
+import 'soundmanager2'
 
 import Detector from './detector.js'
 import Map from './map.js'

diff --git a/app/javascript/src/coffeescript/map.js.coffee b/app/javascript/src/coffeescript/map.js.coffee
@@ -1,4 +1,5 @@
 import $ from 'jquery'
+import mapboxgl from 'mapbox-gl/dist/mapbox-gl'
 
 import Util from './util.js'
 

diff --git a/app/views/layouts/application.html.slim b/app/views/layouts/application.html.slim
@@ -4,19 +4,16 @@ html
     title = APP_NAME
     = render partial: 'layouts/meta'
     = auto_discovery_link_tag :rss, '/feeds/rss', title: 'Phish.in Updates'
-    = stylesheet_link_tag 'https://fonts.googleapis.com/css?family=Marck+Script|Open+Sans+Condensed:300,700|Molle'
-    = javascript_include_tag 'https://api.mapbox.com/mapbox-gl-js/v2.2.0/mapbox-gl.js'
-    = stylesheet_link_tag 'https://api.mapbox.com/mapbox-gl-js/v2.2.0/mapbox-gl.css'
     = stylesheet_pack_tag 'application', media: :all
     = javascript_pack_tag 'application'
     = csrf_meta_tags
 
-    body[
-      data-base-url=APP_BASE_URL
-      data-app-name=APP_NAME
-      data-anchor=params[:anchor]&.downcase
-      data-time-marker=(params[:t] || 0)
-    ]
+  body[
+    data-base-url=APP_BASE_URL
+    data-app-name=APP_NAME
+    data-anchor=params[:anchor]&.downcase
+    data-time-marker=(params[:t] || 0)
+  ]
 
     = render partial: 'layouts/ajax_loading'
     = render partial: 'layouts/feedback'

diff --git a/package.json b/package.json
@@ -6,6 +6,8 @@
     "@babel/plugin-transform-runtime": "7",
     "@babel/preset-env": "7",
     "@babel/runtime": "7",
+    "@fontsource/marck-script": "^5.0.14",
+    "@fontsource/open-sans-condensed": "^4.5.5",
     "@types/babel__core": "7",
     "@types/webpack": "5",
     "babel-loader": "8",
@@ -19,6 +21,7 @@
     "jquery-ui": "^1.13.2",
     "jquery-ujs": "^1.2.3",
     "jquery.cookie": "^1.4.1",
+    "mapbox-gl": "^2.15.0",
     "mini-css-extract-plugin": "^2.7.6",
     "sass": "^1.68.0",
     "sass-loader": "^13.3.2",