Merge pull request #152 from TreinaDev/feat/lateral-menu

Melhorias na navegabilidade da página detalhes de um evento

Author: Fabio-k

app/assets/images/announcement-disable.svg

@@ -4,7 +4,7 @@
 
 @layer components {
   .site-header {
-    @apply sticky z-10 top-0 flex justify-between items-center py-4 px-32 bg-primary p-5 drop-shadow-[5px_5px_20px_rgba(51,102,40,0.4)] min-h-20;
+    @apply fixed z-10 top-0 w-screen flex justify-between items-center py-4 px-32 bg-primary p-5 drop-shadow-[5px_5px_20px_rgba(51,102,40,0.4)] min-h-20;
   }
 
   .site-main {
@@ -56,7 +56,7 @@
   }
 
   .notice {
-    @apply p-5 bg-success text-textPrimary rounded-3xl font-bold absolute top-[90px] right-32 left-32;
+    @apply p-5 bg-success text-textPrimary rounded-3xl font-bold mx-32;
   }
 
   .alert {
@@ -114,4 +114,12 @@
   .filter_button {
     @apply bg-primary text-white;
   }
+
+  .sidebar-item-div {
+    @apply flex relative justify-center items-center p-2 min-h-[50px];
+  }
+
+  .sidebar-tooltip {
+    @apply absolute px-4 py-2 rounded-full left-24 bg-[#C2CFDE] hidden;
+  }
 }

app/assets/images/announcement.svg

@@ -1,5 +1,5 @@
 class AnnouncementsController < ApplicationController
-  layout "dashboard"
+  layout "dashboard_with_sidebar"
   before_action :authenticate_user!
   before_action :set_event
   before_action :check_if_published
@@ -24,9 +24,9 @@ def create
     @announcement.user = current_user
     @announcement.event = @event
     if @announcement.save
-      redirect_to event_announcements_path(@event), notice: t(".success")
+      redirect_to event_announcements_path(@event)
     else
-      @announcements = @event.announcements
+      @announcements = @event.announcements.order(created_at: :desc)
       flash.now[:alert] = t(".failure")
       render :index, status: :unprocessable_entity
     end

app/assets/images/close.svg

@@ -4,11 +4,18 @@ class ApplicationController < ActionController::Base
   # Only allow modern browsers supporting webp images, web push, badges, import maps, CSS nesting, and CSS :has.
   allow_browser versions: :modern
 
+  helper_method :current_event
+
   def after_sign_in_path_for(resource)
     dashboard_path
   end
 
   protected
+
+  def current_event
+    @event ||= Event.find_by(id: params[:event_id]) || Event.find_by(id: params[:id])
+  end
+
   def configure_permitted_parameters
     devise_parameter_sanitizer.permit(:sign_up, keys: [ :name, :family_name, :registration_number ])
   end

app/assets/images/details.svg

@@ -1,5 +1,5 @@
 class EventsController < ApplicationController
-  layout "dashboard"
+  layout :determine_layout
   before_action :authenticate_user!
   before_action :check_if_admin, only: [ :history ]
   before_action :authorize_event_access, only: [ :show, :publish, :destroy, :edit, :update ]
@@ -76,6 +76,14 @@ def history
 
   private
 
+  def determine_layout
+    if [ "index", "new", "create", "history" ].include?(action_name)
+      "dashboard"
+    else
+      "dashboard_with_sidebar"
+    end
+  end
+
   def event_params
     params.require(:event).permit(:name, :address, :event_type, :participants_limit, :url, :logo, :banner, :description, :start_date, :end_date, category_ids: [])
   end