Merge branch 'styles-and-js-elements'

2025-07-27 14:13:36 +03:00
parent 434b5b184e c97c766c7c
commit e469963a2f
10 changed files with 174 additions and 4 deletions
@@ -20,6 +20,7 @@ Style/StringLiterals:
    # Mostly because of auto-generated files
    - Gemfile 
    - config/application.rb
+    - config/importmap.rb

 Bundler/OrderedGems:
  Enabled: false
@@ -1,5 +1,18 @@
+# frozen_string_literal: true
+
 class ApplicationController < ActionController::Base
  include Authentication
  # Only allow modern browsers supporting webp images, web push, badges, import maps, CSS nesting, and CSS :has.
  allow_browser versions: :modern
+
+  helper_method :all_projects, :current_project
+
+  private
+
+  # Needed in projects selector (and can be used anywhere else)
+  def all_projects
+    Project.order(:name)
+  end
+
+  attr_accessor :current_project
 end
@@ -38,6 +38,7 @@ class ProjectsController < ApplicationController

  def fetch_project!
    @project = Project.find_by!(code: params[:id])
+    self.current_project = @project
  end

  def project_params
@@ -4,9 +4,9 @@ class TasksController < ApplicationController
  before_action :fetch_task, only: %w[show edit update delete]

  def index
-    @project = fetch_project
-    @tasks = if @project
-               @project.tasks
+    self.current_project = fetch_project
+    @tasks = if current_project
+               current_project.tasks
             else
               Task.all
             end
@@ -58,5 +58,6 @@ class TasksController < ApplicationController

  def fetch_task
    @task = Task.includes(:project).find_by_full_number_or_id!(params[:id])
+    self.current_project = @task.project
  end
 end
@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 module ApplicationHelper
 end
@@ -0,0 +1,14 @@
+import { Controller } from '@hotwired/stimulus'
+
+class ProjectsSelectorController extends Controller {
+    static values = {
+        frame: String
+    }
+
+    changeProject(event) {
+        const href = event.target.value
+        Turbo.visit(href, {action: 'advance', frame: this.frameValue})
+    }
+}
+
+export default ProjectsSelectorController
@@ -0,0 +1,9 @@
+<% if current_project %>
+    <section data-controller="projects-selector">
+        <select data-action="projects-selector#changeProject">
+            <% all_projects.each do |project| %>
+                <%= tag.option(project.name, value: project_path(project), selected: current_project == project) %>
+            <% end %>
+        </select>
+    </section>
+<% end %>
@@ -23,6 +23,11 @@
  </head>

  <body>
-    <%= yield %>
+      <aside>
+          <%= render partial: 'projects_selector' %>
+      </aside>
+      <main>
+          <%= yield %>
+      </main>
  </body>
 </html>
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Pin npm packages by running ./bin/importmap

 pin "application"
@@ -5,5 +7,7 @@ pin "@hotwired/turbo-rails", to: "turbo.min.js"
 pin "@hotwired/stimulus", to: "stimulus.min.js"
 pin "@hotwired/stimulus-loading", to: "stimulus-loading.js"
 pin_all_from "app/javascript/controllers", under: "controllers"
+pin_all_from 'app/javascript/elements', under: 'elements'
 pin "trix"
 pin "@rails/actiontext", to: "actiontext.esm.js"
+pin 'lit', to: 'lit-all-3.3.1.min.js'