diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 4c17e6d..fa0f90d 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -10,5 +10,10 @@ * files in this directory. Styles in this file should be added after the last require_* statement. * It is generally better to create a new file per style scope. * + *= require actiontext *= require_self */ + .trix-content h1 { + font-size: 1.8em; + line-height: 1.2; +} diff --git a/app/assets/stylesheets/application.tailwind.css b/app/assets/stylesheets/application.tailwind.css index ac05469..95d0475 100644 --- a/app/assets/stylesheets/application.tailwind.css +++ b/app/assets/stylesheets/application.tailwind.css @@ -10,5 +10,5 @@ } } +@import 'actiontext.css'; */ -@import 'actiontext.css'; \ No newline at end of file diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index 7678e87..b2ed391 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -48,6 +48,6 @@ class MembersController < ApplicationController # Only allow a list of trusted parameters through. def member_params - params.require(:member).permit(:name, :public) + params.require(:member).permit(:name, :public, :bio) end end diff --git a/app/models/member.rb b/app/models/member.rb index 4b3b965..48e6ef5 100644 --- a/app/models/member.rb +++ b/app/models/member.rb @@ -4,7 +4,8 @@ class Member < ApplicationRecord devise :database_authenticatable, :registerable,:confirmable, :recoverable, :rememberable, :validatable - + has_rich_text :bio + def admin? true end diff --git a/app/views/layouts/application.haml b/app/views/layouts/application.haml index 4c303b9..10c2014 100644 --- a/app/views/layouts/application.haml +++ b/app/views/layouts/application.haml @@ -6,8 +6,8 @@ %meta{:content => "width=device-width,initial-scale=1", :name => "viewport"}/ = csrf_meta_tags = csp_meta_tag + = stylesheet_link_tag "tailwind" , "data-turbo-track": "reload" = stylesheet_link_tag "application" - = stylesheet_link_tag "tailwind" #, "inter-font", "data-turbo-track": "reload" = javascript_importmap_tags %body diff --git a/app/views/members/_form.html.haml b/app/views/members/_form.html.haml index 38dc344..a91c60e 100644 --- a/app/views/members/_form.html.haml +++ b/app/views/members/_form.html.haml @@ -13,5 +13,8 @@ .field = f.label :public = f.check_box :public + .field + = f.label :Bio + = f.rich_text_area :bio .actions = f.submit 'Save' diff --git a/app/views/members/show.html.haml b/app/views/members/show.html.haml index 74e0c0d..8f89df3 100644 --- a/app/views/members/show.html.haml +++ b/app/views/members/show.html.haml @@ -3,6 +3,9 @@ %p %b Name: = @member.name + %p + %b Bio: + = @member.bio %p %b Public: = @member.public diff --git a/config/environments/development.rb b/config/environments/development.rb index 9010114..fd35c01 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -41,6 +41,9 @@ Rails.application.configure do config.action_mailer.perform_caching = false config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } + routes.default_url_options = { host: 'localhost', port: 3000 } + + # Print deprecation notices to the Rails logger. config.active_support.deprecation = :log