From 2402cf699247f5d389fce56a2e851246a8fa4adc Mon Sep 17 00:00:00 2001 From: Seth Call Date: Sun, 1 Dec 2024 10:01:14 -0600 Subject: [PATCH] Fix social urls --- .../app/views/layouts/user_mailer_beta.html.erb | 11 +++++------ web/bin/start | 2 +- web/config/application.rb | 1 + web/config/environments/development.rb | 3 +-- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/ruby/lib/jam_ruby/app/views/layouts/user_mailer_beta.html.erb b/ruby/lib/jam_ruby/app/views/layouts/user_mailer_beta.html.erb index d91cfc24b..cfbff2158 100644 --- a/ruby/lib/jam_ruby/app/views/layouts/user_mailer_beta.html.erb +++ b/ruby/lib/jam_ruby/app/views/layouts/user_mailer_beta.html.erb @@ -44,20 +44,19 @@ <%= I18n.t "mailer_layout.footer.connect_with_us" -%> - + " alt="Facebook" style="width: 24px; height: 24px; margin: 0 5px;"> - - + " alt="Instagram" style="width: 24px; height: 24px; margin: 0 5px;"> - + " alt="TikTok" style="width: 24px; height: 24px; margin: 0 5px;"> - + " alt="YouTube" style="width: 24px; height: 24px; margin: 0 5px;"> - + " alt="X.com" style="width: 24px; height: 24px; margin: 0 5px;"> diff --git a/web/bin/start b/web/bin/start index 142b09e05..bd7f9fb57 100755 --- a/web/bin/start +++ b/web/bin/start @@ -2,7 +2,7 @@ #REAL_IP=192.168.0.42 REAL_IP=127.0.0.1 - +REAL_IP=192.168.4.235 if [ ! -z "$1" ]; then REAL_IP="$1" fi diff --git a/web/config/application.rb b/web/config/application.rb index d43bbd722..dccc32560 100644 --- a/web/config/application.rb +++ b/web/config/application.rb @@ -519,5 +519,6 @@ if defined?(Bundler) config.spa_origin = "http://beta.jamkazam.local:4000" config.user_match_monitoring_email = "user_match_monitoring_email@jamkazam.com" config.send_user_match_mail_only_to_jamkazam_team = true + config.action_mailer.asset_host = config.action_controller.asset_host end end diff --git a/web/config/environments/development.rb b/web/config/environments/development.rb index 5de879b92..7947aa1c4 100644 --- a/web/config/environments/development.rb +++ b/web/config/environments/development.rb @@ -123,8 +123,7 @@ SampleApp::Application.configure do config.session_cookie_domain = ".jamkazam.local" - config.action_controller.asset_host = 'http://www.jamkazam.local:3000/assets' - config.action_mailer.asset_host = config.action_controller.asset_host + config.action_controller.asset_host = 'http://www.jamkazam.local:3000' config.send_user_match_mail_only_to_jamkazam_team = false end