effective_committees 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2a318a62bd5057b979e35eb0280f7db899f83367a80726e13471444bd80d758
-  data.tar.gz: 01d660c74f301d9a82627cf7d15782db30bac3bee2e717720fd1d54b77bdd3fb
+  metadata.gz: effc4579e15d6bbbf45ffb1113ebb129a0d809b9e600da98c3b10c5a70e2d385
+  data.tar.gz: 25ffa06fe7742f83f08fbac7c79521aa3b2155deb2639fa36559164bfc243c14
 SHA512:
-  metadata.gz: f07fb6ef7c974f646a35186845541752b522a286657efe3158eb99262244274efc09d610d7799218c0a92931cab86394946dd83f5b1ba91a7b3bad4cea43b40d
-  data.tar.gz: dfa60d6d7d0926ec9ada024243139fce61088251bff4da53b8a69a94b6db46207535f8ab9c785c46f992d1f346b387b96f6b89ced4697d6805199f23263f42d3
+  metadata.gz: 1593abb4700a2d23026405da7a7acfb82e042eac5a856bb84efb37afcbb7592817bcb53ab0f5870a10965258d905f9d06deaecd2af976adac4c244e6736417f5
+  data.tar.gz: 9bc7a3f7dc8aed23178a8e8d11704e09b470bd782e13a947de3bf2f6f13f1530ec71d6e636499bf4f07b71b7c3a9d97a01ec49f195a39b3726e7303100013540

data/app/controllers/effective/committees_controller.rb

@@ -9,17 +9,22 @@ module Effective
     page_title "More Activity", only: [:activity]
 
     def index
-      @committees = resource_scope.for_index
-      @page_title = EffectiveResources.et('effective_committees.name')
+      @committees = resource_scope.for_dashboard
+      @page_title = "My #{EffectiveResources.et('effective_committees.name')}"
 
       EffectiveResources.authorize!(self, :index, Effective::Committee)
-      EffectiveResources.authorize!(self, :all_committees, Effective::Committee)
 
       render 'index'
     end
 
+    def volunteers_and_committees
+      @committees = resource_scope.for_index
+      @page_title = "Volunteers and Committees"
+
+      EffectiveResources.authorize!(self, :index, Effective::Committee)
+    end
+
     # activity
-    # my_committees
 
     private
 

data/app/datatables/admin/effective_committee_files_datatable.rb

@@ -7,9 +7,9 @@ module Admin
       col :id, visible: false
 
       col :committee
-      col :committee_folder
+      col :committee_folder, label: "Folder"
       col :file
-      col :title
+      col :title, visible: false
       col :notes
 
       actions_col

data/app/datatables/admin/effective_committee_folders_datatable.rb

@@ -12,9 +12,9 @@ module Admin
 
       col :title, label: 'Folder'
       col :slug, visible: false
-      col :body
+      col :body, visible: false
 
-      col :committee_files, label: 'Files'
+      col :committee_files, label: 'Files', visible: false
       col :committee_files_count, label: 'Files Count', visible: false
 
       actions_col

data/app/datatables/admin/effective_committee_members_datatable.rb

@@ -1,6 +1,8 @@
 module Admin
   class EffectiveCommitteeMembersDatatable < Effective::Datatable
     datatable do
+      length 100
+
       col :id, visible: false
       col :user_id, visible: false
 

data/app/datatables/admin/effective_committees_datatable.rb

@@ -1,6 +1,9 @@
 module Admin
   class EffectiveCommitteesDatatable < Effective::Datatable
     datatable do
+      length 100
+      order :title
+
       col :updated_at, visible: false
       col :created_at, visible: false
 
@@ -13,7 +16,7 @@ module Admin
       col :display_on_index, label: "Display on #{committees_name_label} page"
       col :display_on_dashboard
 
-      col(:committee_members, label: committee_members_label) do |committee|
+      col(:committee_members, label: committee_members_label, visible: false) do |committee|
         committee.committee_members.select(&:active?).sort_by(&:to_s).map do |member|
           content_tag(:div, class: 'col-resource_item') do
             label = link_to(member.to_s, "/admin/users/#{member.user_id}/edit")
@@ -33,8 +36,8 @@ module Admin
       col :committee_files_count, label: 'Files Count', visible: false
 
       actions_col do |committee|
-        dropdown_link_to("View #{committee_label}", effective_committees.committee_path(committee), target: '_blank')
-        dropdown_clipboard_copy(committee.emails, label: "Copy all email addresses")
+        dropdown_link_to("Open dashboard", effective_committees.committee_path(committee), target: '_blank')
+        dropdown_clipboard_copy(committee.emails, label: "Copy emails")
       end
 
     end

data/app/datatables/effective_committee_members_datatable.rb

@@ -1,5 +1,8 @@
 class EffectiveCommitteeMembersDatatable < Effective::Datatable
   datatable do
+    length 100
+    order :user
+
     col :id, visible: false
 
     col :committee

data/app/datatables/effective_committees_datatable.rb

@@ -1,6 +1,7 @@
 # Dashboard Committees
 class EffectiveCommitteesDatatable < Effective::Datatable
   datatable do
+    length 100
     order :title
 
     col :id, visible: false

data/app/views/admin/committee_files/_form.html.haml

@@ -1,18 +1,3 @@
-= effective_form_with(model: [:admin, committee_file], engine: true) do |f|
-  - f.object.committee_type ||= Effective::Committee.name
-
-  = f.hidden_field :committee_type
-  = f.hidden_field :committee_id
-
-  - if inline_datatable? && inline_datatable.attributes[:committee_folder_id].present?
-    = f.hidden_field :committee_folder_id
-  - elsif inline_datatable?
-    = f.select :committee_folder_id, Effective::CommitteeFolder.deep.where(committee: committee_file.committee_id)
-  - else
-    = f.select :committee_id, Effective::Committee.sorted.all
-    = f.select :committee_folder_id, Effective::CommitteeFolder.sorted.all
-
-  = f.file_field :file
-  = f.text_area :notes
-
-  = f.submit
+= tabs do
+  = tab 'File Details' do
+    = render 'admin/committee_files/form_committee_file', committee_file: committee_file

data/app/views/admin/committee_files/_form_committee_file.html.haml

@@ -0,0 +1,18 @@
+= effective_form_with(model: [:admin, committee_file], engine: true) do |f|
+  - f.object.committee_type ||= Effective::Committee.name
+
+  = f.hidden_field :committee_type
+  = f.hidden_field :committee_id
+
+  - if inline_datatable? && inline_datatable.attributes[:committee_folder_id].present?
+    = f.hidden_field :committee_folder_id
+  - elsif inline_datatable?
+    = f.select :committee_folder_id, Effective::CommitteeFolder.deep.where(committee: committee_file.committee_id), label: "Folder"
+  - else
+    = f.select :committee_id, Effective::Committee.sorted.all
+    = f.select :committee_folder_id, Effective::CommitteeFolder.sorted.all, label: "Folder"
+
+  = f.file_field :file
+  = f.text_area :notes
+
+  = effective_submit(f)

data/app/views/admin/committee_folders/_form.html.haml

@@ -1,22 +1,8 @@
-= effective_form_with(model: [:admin, committee_folder], engine: true) do |f|
-  - if inline_datatable?
-    = f.hidden_field :committee_id
-    = f.hidden_field :committee_type
-  - else
-    = f.select :committee, { committees_label => Effective::Committee.sorted }, polymorphic: true
-
-  = f.text_field :title
-
-  = acts_as_slugged_fields(f, url: (effective_committees.commitee_url(f.object) rescue nil))
-
-  - if defined?(EffectiveArticleEditor)
-    = f.article_editor :body, hint: "Displayed on the #{committee_folder_label} page"
-  - else
-    = f.rich_text_area :body, hint: "Displayed on the #{commitee_fodler_label} page"
-
-  = f.submit
-
-- if committee_folder.persisted?
-  %h2 #{committee_folder} Files
-  - datatable = Admin::EffectiveCommitteeFilesDatatable.new(committee_folder: committee_folder, committee: committee_folder.committee)
-  = render_inline_datatable(datatable)
+= tabs do
+  - if committee_folder.persisted?
+    = tab 'Folder Files' do
+      - datatable = Admin::EffectiveCommitteeFilesDatatable.new(committee_folder: committee_folder, committee: committee_folder.committee)
+      = render_inline_datatable(datatable)
+
+  = tab 'Folder Details' do
+    = render 'admin/committee_folders/form_committee_folder', committee_folder: committee_folder

data/app/views/admin/committee_folders/_form_committee_folder.html.haml

@@ -0,0 +1,17 @@
+= effective_form_with(model: [:admin, committee_folder], engine: true) do |f|
+  - if inline_datatable?
+    = f.hidden_field :committee_id
+    = f.hidden_field :committee_type
+  - else
+    = f.select :committee, { committees_label => Effective::Committee.sorted }, polymorphic: true
+
+  = f.text_field :title
+
+  = acts_as_slugged_fields(f, url: (effective_committees.commitee_url(f.object) rescue nil))
+
+  - if defined?(EffectiveArticleEditor)
+    = f.article_editor :body, hint: "Displayed on the #{committee_folder_label} page"
+  - else
+    = f.rich_text_area :body, hint: "Displayed on the #{committee_folder_label} page"
+
+  = effective_submit(f)

data/app/views/admin/committee_members/_form.html.haml

@@ -1,37 +1,3 @@
-= effective_form_with(model: [:admin, committee_member], engine: true) do |f|
-  - f.object.user_type ||= current_user.class.name
-  - f.object.committee_type ||= Effective::Committee.name
-
-  = f.hidden_field :user_type
-  = f.hidden_field :user_id
-
-  = f.hidden_field :committee_type
-  = f.hidden_field :committee_id
-
-  - ajax_url = (effective_resources.users_effective_ajax_index_path unless Rails.env.test?)
-
-  - if f.object.new_record?
-    - if inline_datatable? && inline_datatable.attributes[:committee_id].present?
-      = f.select :user_ids, current_user.class.all, label: 'Add user(s)', required: true, ajax_url: ajax_url, hint: "Add one or more #{committee_member_label.downcase}"
-
-    - if inline_datatable? && inline_datatable.attributes[:user_id].present?
-      = f.select :committee_ids, Effective::Committee.sorted.all, label: "Add #{commitee_label}(s)", hint: "Add one or more #{commitees_label.downcase}"
-
-    - unless inline_datatable?
-      = f.select :committee_id, Effective::Committee.sorted.all
-      = f.select :user_ids, current_user.class.sorted, label: 'User(s)', required: true, ajax_url: ajax_url, hint: "Add one or more #{committee_member_label.downcase}"
-
-  - if f.object.persisted?
-    = f.static_field :committee
-    = f.static_field :user, label: committee_member_label
-
-  = f.text_field :category
-
-  .row
-    .col= f.date_field :start_on, hint: 'optional start date'
-    .col= f.date_field :end_on, hint: 'optional end date'
-
-  - if EffectiveCommittees.use_effective_roles
-    = f.checks :roles, EffectiveRoles.roles_collection(f.object, skip_disabled: true)
-
-  = f.submit
+= tabs do
+  = tab "#{committee_member_label} Details" do
+    = render 'admin/committee_members/form_committee_member', committee_member: committee_member

data/app/views/admin/committee_members/_form_committee_member.html.haml

@@ -0,0 +1,37 @@
+= effective_form_with(model: [:admin, committee_member], engine: true) do |f|
+  - f.object.user_type ||= current_user.class.name
+  - f.object.committee_type ||= Effective::Committee.name
+
+  = f.hidden_field :user_type
+  = f.hidden_field :user_id
+
+  = f.hidden_field :committee_type
+  = f.hidden_field :committee_id
+
+  - ajax_url = (effective_resources.users_effective_ajax_index_path unless Rails.env.test?)
+
+  - if f.object.new_record?
+    - if inline_datatable? && inline_datatable.attributes[:committee_id].present?
+      = f.select :user_ids, current_user.class.all, label: 'Select user(s)', required: true, ajax_url: ajax_url
+
+    - if inline_datatable? && inline_datatable.attributes[:user_id].present?
+      = f.select :committee_ids, Effective::Committee.sorted.all, label: "Select #{commitee_label}(s)"
+
+    - unless inline_datatable?
+      = f.select :committee_id, Effective::Committee.sorted.all
+      = f.select :user_ids, current_user.class.sorted, label: 'User(s)', required: true, ajax_url: ajax_url, hint: "Add one or more #{committee_member_label.downcase}"
+
+  - if f.object.persisted?
+    = f.static_field :committee
+    = f.static_field :user, label: committee_member_label
+
+  = f.text_field :category
+
+  .row
+    .col= f.date_field :start_on
+    .col= f.date_field :end_on, hint: 'End dating will remove access'
+
+  - if EffectiveCommittees.use_effective_roles
+    = f.checks :roles, EffectiveRoles.roles_collection(f.object, skip_disabled: true)
+
+  = effective_submit(f)

data/app/views/admin/committees/_fields.html.haml

@@ -2,10 +2,10 @@
 
 = acts_as_slugged_fields(f, url: (effective_committees.committee_url(f.object) rescue nil))
 
-= f.check_box :display_on_index, label: "Display on the #{committees_name_label} page"
-= f.check_box :display_on_dashboard, label: "Display to #{committee_members_label.downcase} on their dashboard"
+= f.check_box :display_on_index, label: "Show on the member-only #{link_to "Volunteers and Committees", effective_committees.volunteers_and_committees_path} page"
+= f.check_box :display_on_dashboard, label: "Show on the <a href='/committees'>My #{committee_label.pluralize}</a> page".html_safe
 
 - if defined?(EffectiveArticleEditor)
-  = f.article_editor :body, hint: "Displayed on the #{committee_label} page"
+  = f.article_editor :body, hint: "Shown on the #{committee_label} page."
 - else
-  = f.rich_text_area :body, hint: "Displayed on the #{committee_label} page"
+  = f.rich_text_area :body, hint: "Shown on the #{committee_label} page."

data/app/views/admin/committees/_form.html.haml

@@ -1,20 +1,21 @@
 = tabs do
-  = tab(committee_label) do
-    = render 'admin/committees/form_committee', committee: committee
-
   - if committee.persisted?
     = tab(Effective::CommitteeMember) do
       .text-right.mb-3
-        = clipboard_copy(committee.emails, label: "Copy all email addresses")
+        = clipboard_copy(committee.emails, label: "Copy emails")
 
       - datatable = Admin::EffectiveCommitteeMembersDatatable.new(committee: committee)
       = render_inline_datatable(datatable)
 
-    = tab 'Folders' do
+  = tab "#{committee_label} Details" do
+    = render 'admin/committees/form_committee', committee: committee
+
+  - if committee.persisted?
+    = tab "#{committee_label} Folders" do
       - datatable = Admin::EffectiveCommitteeFoldersDatatable.new(committee: committee)
       = render_inline_datatable(datatable)
 
-    = tab 'Files' do
+    = tab "#{committee_label} Files" do
       - datatable = Admin::EffectiveCommitteeFilesDatatable.new(committee: committee)
       = render_inline_datatable(datatable)
 

data/app/views/admin/committees/_form_committee.html.haml

@@ -1,6 +1,4 @@
 = effective_form_with(model: [:admin, committee], engine: true) do |f|
   = render 'admin/committees/fields', f: f
 
-  = f.submit do
-    = f.save 'Save'
-    = f.save 'Save and View', class: 'btn btn-secondary'
+  = effective_submit(f)

data/app/views/effective/committee_folders/_committee_folder.html.haml

@@ -1,36 +1,43 @@
 = render('layout') do
   %nav{'aria-label': 'breadcrumb'}
     %ol.breadcrumb
-      - if EffectiveResources.authorized?(self, :all_committees, Effective::Committee)
-        %li.breadcrumb-item= link_to("All #{committees_label}", effective_committees.committees_path)
-      - elsif EffectiveResources.authorized?(self, :my_committees, Effective::Committee)
-        %li.breadcrumb-item= link_to("My #{committees_label}", effective_committees.my_committees_path)
-      - else
-        %li.breadcrumb-item= link_to("Home", root_path)
-
+      %li.breadcrumb-item= link_to("My Dashboard", return_to_dashboard_path)
+      %li.breadcrumb-item= link_to("My #{committees_label}", effective_committees.committees_path)
       %li.breadcrumb-item= link_to(committee_folder.committee, effective_committees.committee_path(committee_folder.committee))
       %li.breadcrumb-item.active{'aria-current': 'page'}= committee_folder
 
   .effective-committee-folder
+    %h1= committee_folder
+
     - if committee_folder.rich_text_body.present?
       .mb-4= committee_folder.rich_text_body.to_s
 
-    %table.table.table-striped
-      %thead
-        %tr
-          %th File
-          %th Date Added
-          %th Description
+    .my-4
 
-      - committee_folder.committee_files.each do |file|
-        %tr
-          %td
-            - if file.file.attached?
-              = link_to(icon('download') + ' ' + file.to_s, url_for(file.file), target: '_blank')
-            - else
-              = file.to_s
+    %h3 Files
+    .card
+      .card-body
+        - if committee_folder.committee_files.present?
+          %table.table.table-sm.table-striped
+            %thead
+              %tr
+                %th
+                %th File
+                %th.d-none.d-lg-table-cell Date
+                %th.d-none.d-lg-table-cell Size
+                %th.d-none.d-lg-table-cell Note
 
-          %td= file.created_at.strftime('%F')
-          %td= file.notes
+            - committee_folder.committee_files.each_with_index do |file, index|
+              %tr
+                %td= index+1
+                %td
+                  - if file.file.attached?
+                    = link_to(file.to_s, url_for(file.file), target: '_blank')
+                  - else
+                    = file.to_s
 
-    %p Displaying #{pluralize(committee_folder.committee_files.length, 'file')}
+                %td.d-none.d-lg-table-cell= file.created_at.strftime('%F')
+                %td.d-none.d-lg-table-cell= number_to_human_size(file.file.byte_size)
+                %td.d-none.d-lg-table-cell= file.notes
+        - else
+          %p No files.

data/app/views/effective/committee_members/_form.html.haml

@@ -11,8 +11,8 @@
       = f.select :committee, { committees_label => Effective::Committee.sorted }, polymorphic: true
 
     .row
-      .col= f.date_field :start_on, hint: 'optional start date'
-      .col= f.date_field :end_on, hint: 'optional end date'
+      .col= f.date_field :start_on
+      .col= f.date_field :end_on, hint: 'End dating will remove access'
 
     - if EffectiveCommittees.use_effective_roles
       = f.checks :roles, EffectiveRoles.roles_collection(f.object, skip_disabled: true)
@@ -33,8 +33,8 @@
     = f.text_field :category
 
     .row
-      .col= f.date_field :start_on, hint: 'optional start date'
-      .col= f.date_field :end_on, hint: 'optional end date'
+      .col= f.date_field :start_on
+      .col= f.date_field :end_on, hint: 'End dating will remove access'
 
     - if EffectiveCommittees.use_effective_roles
       = f.checks :roles, EffectiveRoles.roles_collection(f.object, skip_disabled: true)
@@ -42,4 +42,4 @@
     = f.fields_for :user, f.object.user do |fu|
       = render 'effective/committee_members/user_fields', f: fu
 
-  = f.submit
+  = effective_submit(f)

data/app/views/effective/committees/_committee.html.haml

@@ -1,24 +1,34 @@
 = render('layout') do
   %nav{'aria-label': 'breadcrumb'}
     %ol.breadcrumb
-      - if EffectiveResources.authorized?(self, :all_committees, Effective::Committee)
-        %li.breadcrumb-item= link_to("All #{committees_label}", effective_committees.committees_path)
-      - elsif EffectiveResources.authorized?(self, :my_committees, Effective::Committee)
-        %li.breadcrumb-item= link_to("My #{committees_label}", effective_committees.my_committees_path)
-      - else
-        %li.breadcrumb-item= link_to("Home", root_path)
-
+      %li.breadcrumb-item= link_to("My Dashboard", return_to_dashboard_path)
+      %li.breadcrumb-item= link_to("My #{committees_label}", effective_committees.committees_path)
       %li.breadcrumb-item.active{'aria-current': 'page'}= committee
 
   .effective-committee
+    %h1= committee
+
     - if committee.rich_text_body.present?
-      .mb-4= committee.rich_text_body.to_s
+      = committee.rich_text_body.to_s
 
-    .mb-4
-      = collapse("Show #{committee_members_label.downcase}") do
-        - members = committee.committee_members.select(&:active?).sort_by(&:to_s)
+    .my-4
+
+    .row
+      .col-lg
+        %h3 Folders
+
+        .card
+          .list-group.list-group-flush
+            - if committee.committee_folders.present?
+              - committee.committee_folders.each do |folder|
+                = link_to folder.to_s, effective_committees.committee_committee_folder_path(committee, folder), class: 'list-group-item list-group-action'
+            - else
+              .list-group-item No files or folders.
 
-        %p= pluralize(members.length, committee_member_label.downcase)
+      .col-lg
+        %h3= committee_members_label
+
+        - members = committee.committee_members.select(&:active?).sort_by(&:to_s)
 
         %ul
           - members.each do |member|
@@ -27,17 +37,4 @@
               - if member.category.present?
                 = badge(member.category)
 
-    %table.table.table-striped
-      %thead
-        %tr
-          %th Folder
-          %th Files
-          %th Description
-
-      - committee.committee_folders.each do |folder|
-        %tr
-          %td= link_to(icon('folder') + ' ' + folder.to_s, effective_committees.committee_committee_folder_path(committee, folder))
-          %td= pluralize(folder.committee_files.length, 'file')
-          %td= folder.body.to_s
-
-    %p Displaying #{pluralize(committee.committee_folders.length, 'folder')}
+-# TODO add recent activity here

data/app/views/effective/committees/_dashboard.html.haml

@@ -1,20 +1,4 @@
 %h2= committees_label
+%p You can download files and view recent activity for your #{committees_label}.
 
-- if current_user.committees.present?
-  %p 
-    You have access to #{pluralize(current_user.committees.length, committee_label.downcase)}.
-
-    - if EffectiveResources.authorized?(self, :all_committees, Effective::Committee)
-      Please
-      = link_to('click here', effective_committees.committees_path)
-      to view all #{committees_label.downcase}.
-    - elsif EffectiveResources.authorized?(self, :my_committees, Effective::Committee)
-      Please
-      = link_to('click here', effective_committees.my_committees_path)
-      to view your #{committees_label.downcase}.
-
-  - datatable = EffectiveResources.best('EffectiveCommitteesDatatable').new(self, namespace: :effective)
-  = render_datatable(datatable, simple: true)
-
-- else
-  %p You aren't assigned to any #{committees_label.downcase}. When you are, we'll show them here.
+= link_to("My #{committees_label}", effective_committees.committees_path, class: "btn btn-primary")

data/app/views/effective/committees/_dashboard_activity.html.haml

@@ -1,30 +1,34 @@
-%h2 #{committees_label} Recent Activity
+%h3 Recent Activity
 
 - if current_user.committees.present?
-  - current_user.committees_recent_activity(limit: 5).each do |logs|
-    - log = logs.first
+  %ul
+    - current_user.committees_recent_activity(limit: 10).each do |logs|
+      - log = logs.first
 
-    - committee = log.changes_to
-    - link_to_committee = link_to(committee, effective_committees.committee_path(committee))
+      - committee = log.changes_to
+      - link_to_committee = link_to(committee, effective_committees.committee_path(committee))
 
-    - committee_folder = log.associated.try(:committee_folder) || log.associated
-    - link_to_committee_folder = link_to(committee_folder, effective_committees.committee_committee_folder_path(committee, committee_folder))
+      - committee_folder = log.associated.try(:committee_folder) || log.associated
+      - link_to_committee_folder = link_to(committee_folder, effective_committees.committee_committee_folder_path(committee, committee_folder))
 
-    - link_to_file = link_to(log.associated, url_for(log.associated.try(:file)))
+      -# TODO - this errors out if it isn't on the dashboard
+      -# link_to_file = link_to(log.associated, main_app.url_for(log.associated.try(:file)))
 
-    - if logs.length == 1 && log.associated_type == 'Effective::CommitteeFolder'
-      %p Folder #{link_to_committee_folder} was added to #{link_to_committee}.
+      - if logs.length == 1 && log.associated_type == 'Effective::CommitteeFolder'
+        %li Folder #{link_to_committee_folder} was added to #{link_to_committee}.
 
-    - elsif logs.length == 1 && log.associated_type == 'Effective::CommitteeFile'
-      %p File #{link_to_file} was added to #{link_to_committee} - #{link_to_committee_folder}.
+      - elsif logs.length == 1 && log.associated_type == 'Effective::CommitteeFile'
+        %li File {filename} was added to #{link_to_committee} → #{link_to_committee_folder}.
+        -# %li File #{link_to_file} was added to #{link_to_committee} → #{link_to_committee_folder}.
 
-    - elsif logs.length > 1 && logs.all? { |log| log.associated_type == 'Effective::CommitteeFile' }
-      %p #{logs.length} files were added to #{link_to_committee} - #{link_to_committee_folder}.
+      - elsif logs.length > 1 && logs.all? { |log| log.associated_type == 'Effective::CommitteeFile' }
+        %li #{logs.length} files were added to #{link_to_committee} → #{link_to_committee_folder}.
 
-    - else
-      - raise("Unexpected logs: #{logs.inspect}")
+      - else
+        - raise("Unexpected logs: #{logs.inspect}")
 
-  %p= link_to('View more activity', effective_committees.activity_committees_path)
+  -# TODO - make the index better before linking it
+  -#%p= link_to('View more activity', effective_committees.activity_committees_path)
 
 - else
   %p There's no activity to display. When there is, we'll show it here.

data/app/views/effective/committees/_form_committee.html.haml

@@ -3,7 +3,7 @@
 = effective_form_with(model: committee, url: url) do |f|
   = render 'effective/committees/fields', f: f
 
-  = f.submit
+  = effective_submit(f)
 
 - if committee.persisted?
   %h2= committee_members_label

data/app/views/effective/committees/index.html.haml

@@ -1,37 +1,34 @@
-- committees = @committees.sorted
+- committees = @committees.sorted.where(id: current_user.committees)
 
 = render('layout') do
   %nav{'aria-label': 'breadcrumb'}
     %ol.breadcrumb
-      %li.breadcrumb-item= link_to("Home", root_path)
-      %li.breadcrumb-item.active{'aria-current': 'page'}= @page_title
+      %li.breadcrumb-item= link_to("My Dashboard", return_to_dashboard_path)
+      %li.breadcrumb-item.active{'aria-current': 'page'} My #{committees_label}
 
-  %h1= @page_title
+  .effective-committees
 
-  - if committees.blank?
-    %p There are no #{committees_label.downcase} to display.
-  - else
-    %p 
-      = succeed('.') do
-        There are #{pluralize(committees.length, committee_label.downcase)} and 
-        = pluralize(Effective::CommitteeMember.pluck(:user_id).uniq.length, committee_member_label.downcase)
+    %h1 My #{committees_label}
 
-  .effective-committees
-    - committees.each do |committee|
-      %h3= committee
+    .my-4
 
-      - members = committee.committee_members.select(&:active?).sort_by(&:to_s)
-      %ul
-        - members.each do |member|
-          %li
-            = member.user.to_s
-            - if member.category.present?
-              = badge(member.category)
+    .row
+      .col-lg
+        - if committees.blank?
+          %p There are no #{committees_label.downcase} to display.
 
-        - if members.blank?
-          %li No #{committee_members_label.downcase}
+        - else
+          - committees.each do |committee|
+            .mb-5
+              %h3= link_to(committee.to_s, effective_committees.committee_path(committee), style: "text-decoration: none;")
 
-  .my-4
+              - if committee.committee_folders.present?
+                .card
+                  .list-group.list-grou-flush
+                    - committee.committee_folders.each do |folder|
+                      = link_to(folder.to_s, effective_committees.committee_committee_folder_path(committee, folder), class: 'list-group-item list-group-action')
+              - else
+                %p No files or folders.
 
-  .form-actions
-    = link_to 'Continue', return_to_dashboard_path, class: 'btn btn-primary mb-4'
+      .col-lg
+        = render 'effective/committees/dashboard_activity'

data/app/views/effective/committees/volunteers_and_committees.html.haml

@@ -0,0 +1,14 @@
+= render('layout') do
+  - @committees.each do |committee|
+    %h3= committee
+
+    - members = committee.committee_members.select(&:active?).sort_by(&:to_s)
+    %ul
+      - members.each do |member|
+        %li
+          = member.user.to_s
+          - if member.category.present?
+            = badge(member.category)
+
+      - if members.blank?
+        %li No #{committee_members_label.downcase}

data/config/locales/effective_committees.en.yml

@@ -1,6 +1,6 @@
 en:
   effective_committees:
-    name: 'Effective Committees'
+    name: 'Committees'
     acronym: 'Committees'
 
   activerecord:

data/config/routes.rb

@@ -13,8 +13,8 @@ EffectiveCommittees::Engine.routes.draw do
       resources :committee_folders, only: [:show]
     end
 
-    get 'my-committees', to: 'committees#my_committees'
-    get 'my_committees', to: 'committees#my_committees'
+    get 'volunteers-and-committees', to: 'committees#volunteers_and_committees', as: 'volunteers_and_committees'
+    get 'volunteers_and_committees', to: 'committees#volunteers_and_committees'
 
     resources :committee_members, except: [:show]
   end
@@ -27,3 +27,4 @@ EffectiveCommittees::Engine.routes.draw do
   end
 
 end
+

data/lib/effective_committees/version.rb

@@ -1,3 +1,3 @@
 module EffectiveCommittees
-  VERSION = '0.5.0'.freeze
+  VERSION = '0.5.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_committees
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-29 00:00:00.000000000 Z
+date: 2025-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -200,8 +200,11 @@ files:
 - app/models/effective/committee_folder.rb
 - app/models/effective/committee_member.rb
 - app/views/admin/committee_files/_form.html.haml
+- app/views/admin/committee_files/_form_committee_file.html.haml
 - app/views/admin/committee_folders/_form.html.haml
+- app/views/admin/committee_folders/_form_committee_folder.html.haml
 - app/views/admin/committee_members/_form.html.haml
+- app/views/admin/committee_members/_form_committee_member.html.haml
 - app/views/admin/committee_members/_user_fields.html.haml
 - app/views/admin/committees/_fields.html.haml
 - app/views/admin/committees/_form.html.haml
@@ -220,8 +223,8 @@ files:
 - app/views/effective/committees/_layout.html.haml
 - app/views/effective/committees/activity.html.haml
 - app/views/effective/committees/index.html.haml
-- app/views/effective/committees/my_committees.html.haml
 - app/views/effective/committees/show.html.haml
+- app/views/effective/committees/volunteers_and_committees.html.haml
 - config/effective_committees.rb
 - config/locales/effective_committees.en.yml
 - config/routes.rb

data/app/views/effective/committees/my_committees.html.haml

@@ -1,47 +0,0 @@
-- committees = @committees.sorted.where(id: current_user.committees)
-
-= render('layout') do
-  %nav{'aria-label': 'breadcrumb'}
-    %ol.breadcrumb
-      - if EffectiveResources.authorized?(self, :all_committees, Effective::Committee)
-        %li.breadcrumb-item= link_to("All #{committees_label}", effective_committees.committees_path)
-      - else
-        %li.breadcrumb-item= link_to("Home", root_path)
-
-      %li.breadcrumb-item.active{'aria-current': 'page'} My #{committees_label}
-
-  - if committees.blank?
-    %p There are no #{committees_label.downcase} to display.
-
-  - if committees.present?
-    %p You have access to #{pluralize(committees.length, committee_label.downcase)}: #{committees.to_sentence}
-
-  .effective-committees
-    - committees.each do |committee|
-      .card
-        .card-body
-          = link_to(icon('folder') + ' ' + committee.to_s, effective_committees.committee_path(committee))
-
-          = collapse("Show #{committee_members_label.downcase}", card_class: 'card card-body mt-4 mx-4', link_class: 'btn btn-link float-right') do
-            - members = committee.committee_members.select(&:active?).sort_by(&:to_s)
-
-            %p= pluralize(members.length, committee_member_label.downcase)
-
-            %ul
-              - members.each do |member|
-                %li
-                  = member.user.to_s
-                  - if member.category.present?
-                    = badge(member.category)
-
-          %table.table.table-striped.mt-3.ml-4
-            - committee.committee_folders.each do |folder|
-              %tr
-                %td= link_to(icon('folder') + ' ' + folder.to_s, effective_committees.committee_committee_folder_path(committee, folder))
-                %td= pluralize(folder.committee_files.length, 'file')
-                %td= folder.body
-
-  .my-4
-
-  .form-actions
-    = link_to 'Continue', return_to_dashboard_path, class: 'btn btn-primary mb-4'