Merge pull request #152 from CruGlobal/revert-149-js_fix2

Revert "Use sprockets to serve js file"
CruGlobal · Dec 5, 2023 · e5a603f · e5a603f
2 parents ea8b0f3 + 7f2939c
commit e5a603f
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/app/javascript/application.js b/app/javascript/application.js
@@ -6,3 +6,4 @@ import 'jquery-validation'
 import '@activeadmin/activeadmin'
 
 import './custom/active_admin_custom'
+import './custom/campaign-form'
diff --git a/public/campaign-form.js → app/javascript/custom/campaign-form.js b/public/campaign-form.js → app/javascript/custom/campaign-form.js
diff --git a/app/views/admin/forms/_form.html.erb b/app/views/admin/forms/_form.html.erb
@@ -33,5 +33,4 @@
   <a href="https://policies.google.com/terms">Terms of Service</a> apply.
 </small>
 <style>.grecaptcha-badge { visibility: hidden; } </style>
-<script type="application/javascript" src="<%= asset_url '/assets/campaign-form.js' %>"></script>
 <% if form.use_recaptcha %><script type="application/javascript" src='https://www.google.com/recaptcha/api.js<%= "?render=#{form.recaptcha_key}" if form.recaptcha_v3 %>'></script><% end %>
diff --git a/config/routes.rb b/config/routes.rb
@@ -21,6 +21,6 @@
 
   get "monitors/lb"
   get "/login/new", to: "login#new"
-  get "/assets/campaign-form.js", to: redirect("/campaign-form.js")
-  get "/packs/campaign.js", to: redirect("/campaign-form.js")
+  get "/assets/campaign-form.js", to: redirect("/assets/custom/campaign-form.js")
+  get "/packs/campaign.js", to: redirect("/assets/custom/campaign-form.js")
 end
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,3 +6,4 @@ import 'jquery-validation'
		import '@activeadmin/activeadmin'

		import './custom/active_admin_custom'
		import './custom/campaign-form'