Add Hotwire Stimulus and begin replacing custom js modules

Gemfile

@@ -18,6 +18,7 @@ gem 'jsbundling-rails'
 gem 'railties', '~> 7.0.4.3'
 gem 'sprockets'
 gem 'sprockets-rails'
+gem 'stimulus-rails'
 
 # Gems used in production
 gem 'acts_as_follower', git: 'https://github.com/AgileVentures/acts_as_follower.git'

Gemfile.lock

@@ -704,6 +704,8 @@ GEM
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
+    stimulus-rails (1.2.1)
+      railties (>= 6.0.0)
     stripe (5.55.0)
     stripe-ruby-mock (3.1.0.rc3)
       dante (>= 0.2.0)
@@ -886,6 +888,7 @@ DEPENDENCIES
   spinjs-rails
   sprockets
   sprockets-rails
+  stimulus-rails
   stripe
   stripe-ruby-mock (~> 3.1.0.rc2)
   sucker_punch

app/assets/javascripts/application.js

@@ -13,7 +13,8 @@ import './documents';
 import './projects';
 import './events';
 import './users';
-import LocalTime from "local-time"
+import LocalTime from "local-time";
+import './controllers/*.js';
 
 LocalTime.start()
 

app/assets/javascripts/controllers/application.js

@@ -0,0 +1,9 @@
+import { Application } from "@hotwired/stimulus"
+
+const application = Application.start()
+
+// Configure Stimulus development experience
+application.debug = false
+window.Stimulus   = application
+
+export { application }

app/assets/javascripts/controllers/index.js

@@ -0,0 +1,11 @@
+// This file is auto-generated by ./bin/rails stimulus:manifest:update
+// Run that command whenever you add a new controller or create them with
+// ./bin/rails generate stimulus controllerName
+
+import { application } from "./application"
+
+import ProjectsController from "./projects_controller"
+application.register("projects", ProjectsController)
+
+import ProjectsLanguagesController from "./projects_languages_controller"
+application.register("projects-languages", ProjectsLanguagesController)

app/assets/javascripts/controllers/projects_controller.js

@@ -0,0 +1,9 @@
+import { Controller } from "@hotwired/stimulus"
+
+export default class extends Controller {
+  show_hidden() {
+    $('a').css({ display: "" });
+    $('i.fa').css({ display: "" });
+    $('div.a').css({ display: "" });
+  }
+}

app/assets/javascripts/controllers/projects_languages_controller.js

@@ -0,0 +1,7 @@
+import { Controller } from "@hotwired/stimulus"
+
+export default class extends Controller {
+  language() {
+    this.element.requestSubmit();
+  }
+}

app/assets/javascripts/projects.js

@@ -51,25 +51,3 @@ $(document).ready(function () {
   var params = "&infinite=true"
   //infiniteScroll(params);
 });
-
-var ProjectListFilter = {
-  filter_inactive: function() {
-    if ($(this).is(':checked')) {
-      $('a.inactive').css({ display: "none" });
-      $('i.inacive').css({ display: "none" });
-      $('li.inacive').css({ display: "none" });
-    } else {
-      $('a').css({ display: "" });
-      $('i.fa').css({ display: "" });
-      $('div.a').css({ display: "" });
-    }
-  },
-  setup: function() {
-    var labelAndCheckbox =
-    $('<form class="checkbox-inline"><input type="checkbox" id="activefilter" checked=true>' +
-      '<label for="activeFilter">Show Active Only</label></form>');
-    labelAndCheckbox.insertAfter('#project-filters');
-    $('#activefilter').on("click", ProjectListFilter.filter_inactive);
-  }
-}
-$(ProjectListFilter.setup);

app/assets/stylesheets/global/projects.scss

@@ -113,6 +113,10 @@ $avatar-size: 32px;
   margin-bottom: 15px;
 }
 
+.show-projects-btn {
+  margin-bottom: 15px;
+}
+
 .language-search-btn {
   margin-top: 28px;
   margin-left: 15px;

app/controllers/projects_controller.rb

@@ -105,10 +105,10 @@ def query_projects(order)
     @projects = if status == 'pending'
                   Project.where(status: status)
                          .order(order)
-                         .includes(:user)
+                         .includes(:documents)
                 else
                   Project.order(order)
-                         .includes(:user)
+                         .includes(:documents)
                 end
     @projects_languages_array = Language.pluck(:name)
     @projects = @projects.search_by_language(@language) if @language.presence

app/helpers/documents_helper.rb

@@ -2,7 +2,7 @@
 
 module DocumentsHelper
   def documents
-    @documents = Document.where('project_id = ?', @project.id).order(:created_at).includes(:user)
+    @documents = Document.where('project_id = ?', @project.id).order(:created_at).includes([:user, :children])
   end
 
   def metadata

app/views/projects/index.html.erb

@@ -1,4 +1,5 @@
 <% provide :title, 'Projects' %>
+<div data-controller="projects">
   <div class="row">
     <div class="col-xs-9">
       <h1 id="projects-header">Projects By Recent Activity</h1>
@@ -11,24 +12,24 @@
       <% end %>
     </div>
   </div>
-
   <% if @projects.empty? %>
     <p>We have no projects right now&#8230;</p>
   <% else %>
-    <div class="col-sm-12 well">
+  <div class="col-sm-12 well">
+    <div class="row">
+      <div class="col-sm-4 show-projects-btn">
+        <button data-action="click->projects#show_hidden">Show non-active projects</button>
+      </div>
+    </div>
     <p>Filter projects by</p>
-    <%= form_tag(projects_path, method: "get", class: "form-inline text-left") do %>
+    <%= form_tag(projects_path, method: "get", class: "form-inline text-left",  'data-controller': "projects-languages") do %>
         <div class="row">
           <div class="col-xs-12 col-sm-4">
-            <%= select_tag :language, options_for_select(@projects_languages_array, params[:language]), {prompt: 'Language...', class: 'form-control'} %>
-          </div>
-          <div class="col-xs-12 col-sm-4">
-            <%= submit_tag 'Search', class: 'btn btn-default' %>
-          </div>
-          <div id="project-filters">
+            <%= select_tag :language, options_for_select(@projects_languages_array, params[:language]), {prompt: 'Language...', class: 'form-control', 'data-action': 'change->projects-languages#language'} %>
           </div>
         </div>
-    </div>
+    <% end %>
+  </div>
     <p>
       To get involved in any of the projects, join one of the
       <%= link_to 'scrums', events_path %>
@@ -92,7 +93,5 @@
   <% end %>
 </ul>
 </nav>
-
-
-  <% end %>
+</div>
 <% end %>

package.json

@@ -24,6 +24,7 @@
   },
   "homepage": "https://github.com/AgileVentures/WebsiteOne#readme",
   "dependencies": {
+    "@hotwired/stimulus": "^3.2.1",
     "@nathanvda/cocoon": "^1.2.14",
     "@popperjs/core": "^2.11.6",
     "@rails/actiontext": "^7.0.4-3",

yarn.lock

@@ -112,6 +112,11 @@
   resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.17.16.tgz#260f19b0a3300d22c3a3f52722c671dc561edaa3"
   integrity sha512-xJ7OH/nanouJO9pf03YsL9NAFQBHd8AqfrQd7Pf5laGyyTt/gToul6QYOA/i5i/q8y9iaM5DQFNTgpi995VkOg==
 
+"@hotwired/stimulus@^3.2.1":
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/@hotwired/stimulus/-/stimulus-3.2.1.tgz#e3de23623b0c52c247aba4cd5d530d257008676b"
+  integrity sha512-HGlzDcf9vv/EQrMJ5ZG6VWNs8Z/xMN+1o2OhV1gKiSG6CqZt5MCBB1gRg5ILiN3U0jEAxuDTNPRfBcnZBDmupQ==
+
 "@nathanvda/cocoon@^1.2.14":
   version "1.2.14"
   resolved "https://registry.yarnpkg.com/@nathanvda/cocoon/-/cocoon-1.2.14.tgz#aaea910e4b9c0d28d5bdcb7f3743617db46b09af"
@@ -982,7 +987,7 @@ debug@^3.1.0:
   dependencies:
     ms "^2.1.1"
 
-debuglog@*, debuglog@^1.0.1:
+debuglog@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
   integrity sha512-syBZ+rnAK3EgMsH2aYEOLUW7mZSY9Gb+0wUMCFsZvcmiz+HigA0LOcq/HoQqVuGG+EKykunc7QG2bzrponfaSw==
@@ -1831,7 +1836,7 @@ import-lazy@^2.1.0:
   resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43"
   integrity sha512-m7ZEHgtw69qOGw+jwxXkHlrlIPdTGkyh66zXZ1ajZbxkDBNjSY/LGbmjc7h0s2ELsUDTAhFr55TrPSSqJGPG0A==
 
-imurmurhash@*, imurmurhash@^0.1.4:
+imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
   integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==
@@ -2179,11 +2184,6 @@ lockfile@~1.0.3:
   dependencies:
     signal-exit "^3.0.2"
 
-lodash._baseindexof@*:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz#fe52b53a1c6761e42618d654e4a25789ed61822c"
-  integrity sha512-bSYo8Pc/f0qAkr8fPJydpJjtrHiSynYfYBjtANIgXv5xEf1WlTC63dIDlgu0s9dmTvzRu1+JJTxcIAHe+sH0FQ==
-
 lodash._baseuniq@~4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz#0ebb44e456814af7905c6212fa2c9b2d51b841e8"
@@ -2192,33 +2192,11 @@ lodash._baseuniq@~4.6.0:
     lodash._createset "~4.0.0"
     lodash._root "~3.0.0"
 
-lodash._bindcallback@*:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e"
-  integrity sha512-2wlI0JRAGX8WEf4Gm1p/mv/SZ+jLijpj0jyaE/AXeuQphzCgD8ZQW4oSpoN8JAopujOFGU3KMuq7qfHBWlGpjQ==
-
-lodash._cacheindexof@*:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz#3dc69ac82498d2ee5e3ce56091bafd2adc7bde92"
-  integrity sha512-S8dUjWr7SUT/X6TBIQ/OYoCHo1Stu1ZRy6uMUSKqzFnZp5G5RyQizSm6kvxD2Ewyy6AVfMg4AToeZzKfF99T5w==
-
-lodash._createcache@*:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/lodash._createcache/-/lodash._createcache-3.1.2.tgz#56d6a064017625e79ebca6b8018e17440bdcf093"
-  integrity sha512-ev5SP+iFpZOugyab/DEUQxUeZP5qyciVTlgQ1f4Vlw7VUcCD8fVnyIqVUEIaoFH9zjAqdgi69KiofzvVmda/ZQ==
-  dependencies:
-    lodash._getnative "^3.0.0"
-
 lodash._createset@~4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/lodash._createset/-/lodash._createset-4.0.3.tgz#0f4659fbb09d75194fa9e2b88a6644d363c9fe26"
   integrity sha512-GTkC6YMprrJZCYU3zcqZj+jkXkrXzq3IPBcF/fIPpNEAB4hZEtXU8zp/RwKOvZl43NUmwDbyRk3+ZTbeRdEBXA==
 
-lodash._getnative@*, lodash._getnative@^3.0.0:
-  version "3.9.1"
-  resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
-  integrity sha512-RrL9VxMEPyDMHOd9uFbvMe8X55X16/cGM5IgOKgRElQZutpX89iS6vwl64duTV1/16w5JY7tuFNXqoekmh1EmA==
-
 lodash._root@~3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692"
@@ -2229,11 +2207,6 @@ lodash.clonedeep@~4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
   integrity sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==
 
-lodash.restparam@*:
-  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
-  integrity sha512-L4/arjjuq4noiUJpt3yS6KIKDtJwNe2fIYgMqyYYKoeIfV1iEqvPwhCx23o+R9dzouGihDAPN1dTIRWa7zk8tw==
-
 lodash.union@~4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.union/-/lodash.union-4.6.0.tgz#48bb5088409f16f1821666641c44dd1aaae3cd88"
@@ -3247,7 +3220,7 @@ readable-stream@~1.1.10:
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-readdir-scoped-modules@*, readdir-scoped-modules@^1.0.0:
+readdir-scoped-modules@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz#8d45407b4f870a0dcaebc0e28670d18e74514309"
   integrity sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw==
@@ -4035,7 +4008,7 @@ uuid@~3.1.0:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04"
   integrity sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==
 
-validate-npm-package-license@*, validate-npm-package-license@^3.0.1:
+validate-npm-package-license@^3.0.1:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
   integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==