Skip to content

Commit

Permalink
Additional changes by 'rails app:update'
Browse files Browse the repository at this point in the history
  • Loading branch information
asideofcode-dev committed Jul 23, 2023
1 parent 087e2aa commit f9e3b89
Show file tree
Hide file tree
Showing 19 changed files with 74 additions and 10 deletions.
15 changes: 15 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Rakefile
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
//= require bootstrap
//= require jquery
//= require rails-ujs
//= require activestorage
//= require jquery-ui
//= require autocomplete-rails
//= require chosen-jquery
Expand Down
13 changes: 13 additions & 0 deletions app/assets/javascripts/cable.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
// Action Cable provides the framework to deal with WebSockets in Rails.
// You can generate new channels where WebSocket features live using the `rails generate channel` command.
//
//= require action_cable
//= require_self
//= require_tree ./channels

(function() {
this.App || (this.App = {});

App.cable = ActionCable.createConsumer();

}).call(this);
4 changes: 4 additions & 0 deletions app/channels/application_cable/channel.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
module ApplicationCable
class Channel < ActionCable::Channel::Base
end
end
4 changes: 4 additions & 0 deletions app/channels/application_cable/connection.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
module ApplicationCable
class Connection < ActionCable::Connection::Base
end
end
2 changes: 2 additions & 0 deletions app/jobs/application_job.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
class ApplicationJob < ActiveJob::Base
end
4 changes: 4 additions & 0 deletions app/mailers/application_mailer.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
class ApplicationMailer < ActionMailer::Base
default from: 'from@example.com'
layout 'mailer'
end
2 changes: 1 addition & 1 deletion app/mailers/contact_mailer.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class ContactMailer < ActionMailer::Base
class ContactMailer < ApplicationMailer
include EmailHeaderHelper

helper ApplicationHelper
Expand Down
2 changes: 1 addition & 1 deletion app/mailers/event_invitation_mailer.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class EventInvitationMailer < ActionMailer::Base
class EventInvitationMailer < ApplicationMailer
include EmailHeaderHelper
include ApplicationHelper

Expand Down
2 changes: 1 addition & 1 deletion app/mailers/feedback_request_mailer.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class FeedbackRequestMailer < ActionMailer::Base
class FeedbackRequestMailer < ApplicationMailer
include EmailHeaderHelper

helper ApplicationHelper
Expand Down
2 changes: 1 addition & 1 deletion app/mailers/meeting_invitation_mailer.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class MeetingInvitationMailer < ActionMailer::Base
class MeetingInvitationMailer < ApplicationMailer
include EmailHeaderHelper
include ApplicationHelper

Expand Down
2 changes: 1 addition & 1 deletion app/mailers/member_mailer.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class MemberMailer < ActionMailer::Base
class MemberMailer < ApplicationMailer
include EmailHeaderHelper

def welcome(member)
Expand Down
2 changes: 1 addition & 1 deletion app/mailers/virtual_workshop_invitation_mailer.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class VirtualWorkshopInvitationMailer < ActionMailer::Base
class VirtualWorkshopInvitationMailer < ApplicationMailer
include EmailHelper
include EmailHeaderHelper
include ApplicationHelper
Expand Down
2 changes: 1 addition & 1 deletion app/mailers/workshop_invitation_mailer.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class WorkshopInvitationMailer < ActionMailer::Base
class WorkshopInvitationMailer < ApplicationMailer
include EmailHelper
include EmailHeaderHelper
include ApplicationHelper
Expand Down
5 changes: 3 additions & 2 deletions app/views/layouts/application.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 13 additions & 0 deletions app/views/layouts/mailer.html.erb
Original file line number Diff line number Diff line change
@@ -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>
1 change: 1 addition & 0 deletions app/views/layouts/mailer.text.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<%= yield %>
6 changes: 6 additions & 0 deletions config/spring.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
%w[
.ruby-version
.rbenv-vars
tmp/restart.txt
tmp/caching-dev.txt
].each { |path| Spring.watch(path) }

0 comments on commit f9e3b89

Please sign in to comment.