Additional changes by 'rails app:update'

codebar · Jul 23, 2023 · 6deb936 · 6deb936
1 parent 087e2aa
commit 6deb936
Show file tree

Hide file tree

Showing 16 changed files with 53 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,6 +14,21 @@
 # Ignore all logfiles and tempfiles.
 /log/*.log
 /tmp
+!/tmp/.keep
+
+# Ignore uploaded files in development
+/storage/*
+!/storage/.keep
+
+/node_modules
+/yarn-error.log
+
+/public/assets
+.byebug_history
+
+# Ignore master key for decrypting credentials and more.
+/config/master.key
+
 /coverage/
 
 TAGS

diff --git a/Rakefile b/Rakefile
@@ -1,6 +1,6 @@
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
-require File.expand_path('config/application', __dir__)
+require_relative 'config/application'
 
 Rails.application.load_tasks
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -14,6 +14,7 @@
 //= require bootstrap
 //= require jquery
 //= require rails-ujs
+//= require activestorage
 //= require jquery-ui
 //= require autocomplete-rails
 //= require chosen-jquery

diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb
@@ -0,0 +1,2 @@
+class ApplicationJob < ActiveJob::Base
+end
diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb
@@ -0,0 +1,4 @@
+class ApplicationMailer < ActionMailer::Base
+  default from: 'from@example.com'
+  layout 'mailer'
+end
diff --git a/app/mailers/contact_mailer.rb b/app/mailers/contact_mailer.rb
@@ -1,4 +1,4 @@
-class ContactMailer < ActionMailer::Base
+class ContactMailer < ApplicationMailer
   include EmailHeaderHelper
 
   helper ApplicationHelper

diff --git a/app/mailers/event_invitation_mailer.rb b/app/mailers/event_invitation_mailer.rb
@@ -1,4 +1,4 @@
-class EventInvitationMailer < ActionMailer::Base
+class EventInvitationMailer < ApplicationMailer
   include EmailHeaderHelper
   include ApplicationHelper
 

diff --git a/app/mailers/feedback_request_mailer.rb b/app/mailers/feedback_request_mailer.rb
@@ -1,4 +1,4 @@
-class FeedbackRequestMailer < ActionMailer::Base
+class FeedbackRequestMailer < ApplicationMailer
   include EmailHeaderHelper
 
   helper ApplicationHelper

diff --git a/app/mailers/meeting_invitation_mailer.rb b/app/mailers/meeting_invitation_mailer.rb
@@ -1,4 +1,4 @@
-class MeetingInvitationMailer < ActionMailer::Base
+class MeetingInvitationMailer < ApplicationMailer
   include EmailHeaderHelper
   include ApplicationHelper
 

diff --git a/app/mailers/member_mailer.rb b/app/mailers/member_mailer.rb
@@ -1,4 +1,4 @@
-class MemberMailer < ActionMailer::Base
+class MemberMailer < ApplicationMailer
   include EmailHeaderHelper
 
   def welcome(member)

diff --git a/app/mailers/virtual_workshop_invitation_mailer.rb b/app/mailers/virtual_workshop_invitation_mailer.rb
@@ -1,4 +1,4 @@
-class VirtualWorkshopInvitationMailer < ActionMailer::Base
+class VirtualWorkshopInvitationMailer < ApplicationMailer
   include EmailHelper
   include EmailHeaderHelper
   include ApplicationHelper

diff --git a/app/mailers/workshop_invitation_mailer.rb b/app/mailers/workshop_invitation_mailer.rb
@@ -1,4 +1,4 @@
-class WorkshopInvitationMailer < ActionMailer::Base
+class WorkshopInvitationMailer < ApplicationMailer
   include EmailHelper
   include EmailHeaderHelper
   include ApplicationHelper

diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
@@ -9,16 +9,17 @@
     %title
       = retrieve_title
     = favicon_link_tag 'favicon.ico'
-    = stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': true
+    = stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload'
     // = javascript_include_tag 'vendor/modernizr'
-    = javascript_include_tag 'application', 'data-turbolinks-track': true
+    = javascript_include_tag 'application', 'data-turbolinks-track': 'reload'
     %link{ href: 'https://fonts.googleapis.com/css?family=Open+Sans:400,300', rel:'stylesheet', type:'text/css' }
     %link{ href: 'https://fonts.googleapis.com/icon?family=Material+Icons', rel:'stylesheet', type:'text/css' }
 
     // this gets any content from page templates
     = content_for :head
 
     = csrf_meta_tags
+    = csp_meta_tag
 
   %body.no-js{ 'class': "#{params[:controller]}-#{params[:action]}", "data-no-jquery": "true"}
     #top

diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <style>
+      /* Email styles need to be inline */
+    </style>
+  </head>
+
+  <body>
+    <%= yield %>
+  </body>
+</html>
diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb
@@ -0,0 +1 @@
+<%= yield %>
diff --git a/config/spring.rb b/config/spring.rb
@@ -0,0 +1,6 @@
+%w[
+  .ruby-version
+  .rbenv-vars
+  tmp/restart.txt
+  tmp/caching-dev.txt
+].each { |path| Spring.watch(path) }