Merge pull request 'develop' (#3) from develop into main

Reviewed-on: #3

app/javascript/controllers/event_duplication_controller.js

@@ -1,27 +1,23 @@
 import { Controller } from "@hotwired/stimulus"
 
 export default class extends Controller {
-  static targets = ["modal", "cloneTicketTypes"]
+  static targets = ["cloneTicketTypes"]
   static values = {
     duplicateUrl: String
   }
 
   connect() {
-    // Close modal when clicking outside
+    // Get modal element from the document
-    this.modalTarget.addEventListener('click', (event) => {
+    this.modalElement = document.querySelector('[data-event-duplication-target="modal"]')
-      if (event.target === this.modalTarget) {
-        this.close()
-      }
-    })
   }
 
   open() {
-    this.modalTarget.classList.remove('hidden')
+    this.modalElement.classList.remove('hidden')
     document.body.classList.add('overflow-hidden')
   }
 
   close() {
-    this.modalTarget.classList.add('hidden')
+    this.modalElement.classList.add('hidden')
     document.body.classList.remove('overflow-hidden')
   }
 

app/models/event.rb

@@ -111,7 +111,7 @@ class Event < ApplicationRecord
     new_event.state = :draft
     new_event.created_at = Time.current
     new_event.updated_at = Time.current
-    
+
     Event.transaction do
       if new_event.save
         # Duplicate all ticket types if requested

app/views/promoter/events/new.html.erb

@@ -40,13 +40,13 @@
       <!-- Basic Information -->
       <div class="bg-white rounded-lg border border-gray-200 p-6">
         <h3 class="text-lg font-semibold text-gray-900 mb-6">Informations générales</h3>
-        
+
         <div class="grid grid-cols-1 md:grid-cols-2 gap-6">
           <div>
             <%= form.label :name, "Nom de l'événement", class: "block text-sm font-medium text-gray-700 mb-2" %>
             <%= form.text_field :name, class: "w-full px-4 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:ring-purple-500 focus:border-transparent", placeholder: "Ex: Soirée d'ouverture", data: { "event-form-target": "name", action: "input->event-form#generateSlug" } %>
           </div>
-          
+
           <div>
             <%= form.label :slug, "Slug (URL)", class: "block text-sm font-medium text-gray-700 mb-2" %>
             <%= form.text_field :slug, class: "w-full px-4 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:ring-purple-500 focus:border-transparent", placeholder: "soiree-ouverture", data: { "event-form-target": "slug" } %>
@@ -69,13 +69,13 @@
       <!-- Date & Time -->
       <div class="bg-white rounded-lg border border-gray-200 p-6">
         <h3 class="text-lg font-semibold text-gray-900 mb-6">Date et heure</h3>
-        
+
         <div class="grid grid-cols-1 md:grid-cols-2 gap-6">
           <div>
             <%= form.label :start_time, "Date et heure de début", class: "block text-sm font-medium text-gray-700 mb-2" %>
             <%= form.datetime_local_field :start_time, class: "w-full px-4 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:ring-purple-500 focus:border-transparent" %>
           </div>
-          
+
           <div>
             <%= form.label :end_time, "Date et heure de fin", class: "block text-sm font-medium text-gray-700 mb-2" %>
             <%= form.datetime_local_field :end_time, class: "w-full px-4 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:ring-purple-500 focus:border-transparent" %>
@@ -86,55 +86,39 @@
       <!-- Venue Information -->
       <div class="bg-white rounded-lg border border-gray-200 p-6">
         <h3 class="text-lg font-semibold text-gray-900 mb-6">Lieu de l'événement</h3>
-        
+
         <!-- Geocoding Messages Container -->
         <div data-event-form-target="messagesContainer" class="space-y-3 mb-6 empty:mb-0 empty:hidden"></div>
-        
+
         <div class="space-y-6">
           <div>
             <%= form.label :venue_name, "Nom du lieu", class: "block text-sm font-medium text-gray-700 mb-2" %>
             <%= form.text_field :venue_name, class: "w-full px-4 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:ring-purple-500 focus:border-transparent", placeholder: "Ex: Le Grand Rex" %>
           </div>
-          
+
           <div>
             <%= form.label :venue_address, "Adresse complète", class: "block text-sm font-medium text-gray-700 mb-2" %>
             <div class="space-y-2">
               <div class="relative">
                 <%= form.text_field :venue_address, class: "w-full px-4 py-2 pr-12 border border-gray-300 rounded-lg focus:ring-2 focus:ring-purple-500 focus:border-transparent", placeholder: "Ex: 1 Boulevard Poissonnière, 75002 Paris", data: { "event-form-target": "address", action: "input->event-form#addressChanged" } %>
-                
+
                 <!-- Geocoding Loading Spinner -->
                 <div data-event-form-target="geocodingSpinner" class="absolute right-3 top-1/2 transform -translate-y-1/2 hidden">
                   <div class="w-5 h-5 border-2 border-purple-200 border-t-purple-600 rounded-full animate-spin"></div>
                 </div>
               </div>
-              
-              <!-- Location Actions -->
-              <div class="flex flex-wrap gap-2">
-                <button type="button" data-action="click->event-form#getCurrentLocation" data-event-form-target="getCurrentLocationBtn" class="inline-flex items-center px-3 py-2 text-xs font-medium text-white bg-green-600 rounded-lg hover:bg-green-700 transition-colors disabled:opacity-50 disabled:cursor-not-allowed">
-                  <span data-event-form-target="getCurrentLocationIcon">
-                    <i data-lucide="map-pin" class="w-3 h-3 mr-1"></i>
-                  </span>
-                  <span data-event-form-target="getCurrentLocationText">Ma position</span>
-                </button>
-                <button type="button" data-action="click->event-form#previewLocation" data-event-form-target="previewLocationBtn" class="inline-flex items-center px-3 py-2 text-xs font-medium text-purple-700 bg-purple-50 border border-purple-200 rounded-lg hover:bg-purple-100 transition-colors disabled:opacity-50 disabled:cursor-not-allowed">
-                  <span data-event-form-target="previewLocationIcon">
-                    <i data-lucide="map" class="w-3 h-3 mr-1"></i>
-                  </span>
-                  <span data-event-form-target="previewLocationText">Prévisualiser</span>
-                </button>
-              </div>
             </div>
-            
+
             <p class="mt-2 text-sm text-gray-500">
               <i data-lucide="info" class="w-4 h-4 inline mr-1"></i>
               Les coordonnées GPS seront automatiquement calculées à partir de cette adresse.
             </p>
           </div>
-          
+
           <!-- Hidden coordinate fields populated by JavaScript geocoding -->
           <%= form.hidden_field :latitude, data: { "event-form-target": "latitude" } %>
           <%= form.hidden_field :longitude, data: { "event-form-target": "longitude" } %>
-          
+
           <!-- Map Links Container (shown when address is valid) -->
           <div data-event-form-target="mapLinksContainer" class="empty:hidden bg-gray-50 rounded-lg p-3 border border-gray-200"></div>
         </div>
@@ -143,12 +127,25 @@
       <!-- Options -->
       <div class="bg-white rounded-lg border border-gray-200 p-6">
         <h3 class="text-lg font-semibold text-gray-900 mb-6">Options</h3>
-        
+
-        <div class="flex items-center">
+        <div class="space-y-4">
-          <%= form.check_box :featured, class: "h-4 w-4 text-purple-600 border-gray-300 rounded focus:ring-purple-500" %>
+          <div class="flex items-center">
-          <%= form.label :featured, "Mettre en avant sur la page d'accueil", class: "ml-2 text-sm text-gray-700" %>
+            <%= form.check_box :featured, class: "h-4 w-4 text-purple-600 border-gray-300 rounded focus:ring-purple-500" %>
+            <%= form.label :featured, "Mettre en avant sur la page d'accueil", class: "ml-2 text-sm text-gray-700" %>
+          </div>
+          <p class="text-sm text-gray-500">Les événements mis en avant apparaissent en premier sur la page d'accueil.</p>
+
+          <div class="flex items-start">
+            <%= form.check_box :allow_booking_during_event, class: "h-4 w-4 text-purple-600 border-gray-300 rounded focus:ring-purple-500 mt-1" %>
+            <div class="ml-2">
+              <%= form.label :allow_booking_during_event, "Autoriser la réservation pendant l'événement", class: "text-sm text-gray-700 font-medium" %>
+              <p class="text-sm text-gray-500 mt-1">
+                Si activé, les participants pourront acheter des billets même après le début de l'événement.
+                Si désactivé, la vente de billets s'arrêtera automatiquement à l'heure de début.
+              </p>
+            </div>
+          </div>
         </div>
-        <p class="mt-2 text-sm text-gray-500">Les événements mis en avant apparaissent en premier sur la page d'accueil.</p>
       </div>
 
       <!-- Actions -->
@@ -158,7 +155,7 @@
             Annuler
           <% end %>
         </div>
-        
+
         <div class="flex items-center space-x-3">
           <%= form.submit "Créer en brouillon", class: "inline-flex items-center px-6 py-3 bg-gray-600 text-white font-medium rounded-lg hover:bg-gray-700 transition-colors duration-200" %>
         </div>
@@ -166,4 +163,3 @@
     <% end %>
   </div>
 </div>
-

app/views/promoter/events/show.html.erb

@@ -1,52 +1,6 @@
 <% content_for(:title, @event.name) %>
 
 <div data-controller="event-duplication" data-event-duplication-duplicate-url-value="<%= duplicate_promoter_event_path(@event) %>">
-  <!-- Modal -->
-  <div data-event-duplication-target="modal" class="fixed inset-0 z-50 hidden overflow-y-auto">
-    <div class="flex items-end justify-center min-h-screen pt-4 px-4 pb-20 text-center sm:block sm:p-0">
-      <!-- Background overlay -->
-      <div class="fixed inset-0 bg-gray-500 bg-opacity-75 transition-opacity" aria-hidden="true"></div>
-
-      <!-- Modal container -->
-      <div class="inline-block align-bottom bg-white rounded-lg text-left overflow-hidden shadow-xl transform transition-all sm:my-8 sm:align-middle sm:max-w-lg sm:w-full">
-        <div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4">
-          <div class="sm:flex sm:items-start">
-            <div class="mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10">
-              <i data-lucide="copy" class="h-6 w-6 text-blue-600"></i>
-            </div>
-            <div class="mt-3 text-center sm:mt-0 sm:ml-4 sm:text-left">
-              <h3 class="text-lg leading-6 font-medium text-gray-900" id="modal-title">
-                Dupliquer l'événement
-              </h3>
-              <div class="mt-2">
-                <p class="text-sm text-gray-500">
-                  Choisissez les options de duplication pour "<%= @event.name %>".
-                </p>
-                
-                <div class="mt-4">
-                  <div class="flex items-center">
-                    <input data-event-duplication-target="cloneTicketTypes" id="cloneTicketTypes" type="checkbox" class="h-4 w-4 text-blue-600 focus:ring-blue-500 border-gray-300 rounded" checked>
-                    <label for="cloneTicketTypes" class="ml-2 block text-sm text-gray-900">
-                      Dupliquer également les types de billets (<%= @event.ticket_types.count %> type(s))
-                    </label>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-        <div class="bg-gray-50 px-4 py-3 sm:px-6 sm:flex sm:flex-row-reverse">
-          <button type="button" data-action="click->event-duplication#duplicate" class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:ml-3 sm:w-auto sm:text-sm">
-            Dupliquer
-          </button>
-          <button type="button" data-action="click->event-duplication#close" class="mt-3 w-full inline-flex justify-center rounded-md border border-gray-300 shadow-sm px-4 py-2 bg-white text-base font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 sm:mt-0 sm:ml-3 sm:w-auto sm:text-sm">
-            Annuler
-          </button>
-        </div>
-      </div>
-    </div>
-  </div>
-
   <div class="max-w-6xl mx-auto px-4 sm:px-6 lg:px-8 py-8">
 
   <!-- Breadcrumb -->
@@ -159,7 +113,7 @@
           </div>
           <div class="flex-shrink-0">
             <%= link_to event_path(@event.slug, @event), target: "_blank", class: "text-green-600 hover:text-green-800 font-medium text-sm whitespace-nowrap" do %>
-              Voir publiquement <i data-lucide="external-link" class="w-4 h-4 inline ml-1"></i>
+              Voir la fiche publique <i data-lucide="external-link" class="w-4 h-4 inline ml-1"></i>
             <% end %>
           </div>
         </div>
@@ -334,4 +288,52 @@
       </div>
     </div>
   </div>
+
+  <!-- Modal -->
+  <div data-event-duplication-target="modal" class="hidden relative z-50" aria-labelledby="modal-title" role="dialog" aria-modal="true">
+    <!-- Background backdrop, show/hide based on modal state -->
+    <div class="fixed inset-0 bg-gray-500 bg-opacity-75 transition-opacity"></div>
+
+    <div class="fixed inset-0 z-50 overflow-y-auto">
+      <div class="flex min-h-full items-end justify-center p-4 text-center sm:items-center sm:p-0">
+        <!-- Modal container -->
+        <div class="relative transform overflow-hidden rounded-lg bg-white text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-lg">
+          <div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4">
+            <div class="sm:flex sm:items-start">
+              <div class="mx-auto flex h-12 w-12 flex-shrink-0 items-center justify-center rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10">
+                <i data-lucide="copy" class="h-6 w-6 text-blue-600"></i>
+              </div>
+              <div class="mt-3 text-center sm:mt-0 sm:ml-4 sm:text-left">
+                <h3 class="text-lg font-medium leading-6 text-gray-900" id="modal-title">
+                  Dupliquer l'événement
+                </h3>
+                <div class="mt-2">
+                  <p class="text-sm text-gray-500">
+                    Choisissez les options de duplication pour "<%= @event.name %>".
+                  </p>
+
+                  <div class="mt-4">
+                    <div class="flex items-center">
+                      <input data-event-duplication-target="cloneTicketTypes" id="cloneTicketTypes" type="checkbox" class="h-4 w-4 text-blue-600 focus:ring-blue-500 border-gray-300 rounded" checked>
+                      <label for="cloneTicketTypes" class="ml-2 block text-sm text-gray-900">
+                        Dupliquer également les types de billets (<%= @event.ticket_types.count %> type(s))
+                      </label>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="bg-gray-50 px-4 py-3 sm:flex sm:flex-row-reverse sm:px-6">
+            <button type="button" data-action="click->event-duplication#duplicate" class="inline-flex w-full justify-center rounded-md border border-transparent bg-blue-600 px-4 py-2 text-base font-medium text-white shadow-sm hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:ring-offset-2 sm:ml-3 sm:w-auto sm:text-sm">
+              Dupliquer
+            </button>
+            <button type="button" data-action="click->event-duplication#close" class="mt-3 inline-flex w-full justify-center rounded-md border border-gray-300 bg-white px-4 py-2 text-base font-medium text-gray-700 shadow-sm hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 sm:mt-0 sm:ml-3 sm:w-auto sm:text-sm">
+              Annuler
+            </button>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
 </div>

app/views/promoter/ticket_types/show.html.erb

@@ -1,6 +1,15 @@
 <% content_for(:title, "#{@ticket_type.name} - #{@event.name}") %>
 
-<div class="container py-8">
+<div class="max-w-6xl mx-auto px-4 sm:px-6 lg:px-8 py-8">
+  <!-- Breadcrumb -->
+  <%= render 'components/breadcrumb', crumbs: [
+    { name: 'Dashboard', path: dashboard_path },
+    { name: 'Événements', path: promoter_events_path },
+    { name: @event.name, path: promoter_event_path(@event) },
+    { name: 'Types de billets', path: promoter_event_ticket_types_path(@event) },
+    { name: @ticket_type.name, path: nil }
+  ] %>
+
   <!-- Header with actions -->
   <div class="mb-8">
     <div class="flex flex-col sm:flex-row sm:items-center sm:justify-between gap-4">

test/controllers/promoter/events_controller_test.rb

@@ -28,7 +28,7 @@ class Promoter::EventsControllerTest < ActionDispatch::IntegrationTest
 
   test "should duplicate an event with ticket types" do
     sign_in @promoter
-    
+
     # Create ticket types for the event
     ticket_type1 = TicketType.create!(
       name: "Standard Ticket",
@@ -39,7 +39,7 @@ class Promoter::EventsControllerTest < ActionDispatch::IntegrationTest
       sale_end_at: @event.start_time - 1.hour,
       event: @event
     )
-    
+
     ticket_type2 = TicketType.create!(
       name: "VIP Ticket",
       description: "A VIP ticket for the event with special access",
@@ -49,27 +49,27 @@ class Promoter::EventsControllerTest < ActionDispatch::IntegrationTest
       sale_end_at: @event.start_time - 1.hour,
       event: @event
     )
-    
+
     # Verify that ticket types were created successfully
     assert ticket_type1.valid?
     assert ticket_type2.valid?
-    
+
     # Duplicate the event
-    assert_difference('Event.count', 1) do
+    assert_difference("Event.count", 1) do
       post duplicate_promoter_event_path(@event), params: { clone_ticket_types: "true" }
     end
-    
+
     # Check that the new event was created
     assert_redirected_to edit_promoter_event_path(Event.last)
     assert_equal "Événement dupliqué avec succès! Vous pouvez maintenant modifier les détails de l'événement copié.", flash[:notice]
-    
+
     # Check that the new event has the correct attributes
     new_event = Event.last
     assert_equal "Copie de #{@event.name}", new_event.name
     assert_equal "draft", new_event.state
     assert_equal @event.venue_name, new_event.venue_name
     assert_equal @event.venue_address, new_event.venue_address
-    
+
     # Check that ticket types were duplicated
     assert_equal 2, new_event.ticket_types.count
     assert_equal "Standard Ticket", new_event.ticket_types.find_by(name: "Standard Ticket").name
@@ -78,7 +78,7 @@ class Promoter::EventsControllerTest < ActionDispatch::IntegrationTest
 
   test "should duplicate an event without ticket types" do
     sign_in @promoter
-    
+
     # Create ticket types for the event
     ticket_type1 = TicketType.create!(
       name: "Standard Ticket",
@@ -89,7 +89,7 @@ class Promoter::EventsControllerTest < ActionDispatch::IntegrationTest
       sale_end_at: @event.start_time - 1.hour,
       event: @event
     )
-    
+
     ticket_type2 = TicketType.create!(
       name: "VIP Ticket",
       description: "A VIP ticket for the event with special access",
@@ -99,27 +99,27 @@ class Promoter::EventsControllerTest < ActionDispatch::IntegrationTest
       sale_end_at: @event.start_time - 1.hour,
       event: @event
     )
-    
+
     # Verify that ticket types were created successfully
     assert ticket_type1.valid?
     assert ticket_type2.valid?
-    
+
     # Duplicate the event without ticket types
-    assert_difference('Event.count', 1) do
+    assert_difference("Event.count", 1) do
       post duplicate_promoter_event_path(@event), params: { clone_ticket_types: "false" }
     end
-    
+
     # Check that the new event was created
     assert_redirected_to edit_promoter_event_path(Event.last)
     assert_equal "Événement dupliqué avec succès! Vous pouvez maintenant modifier les détails de l'événement copié.", flash[:notice]
-    
+
     # Check that the new event has the correct attributes
     new_event = Event.last
     assert_equal "Copie de #{@event.name}", new_event.name
     assert_equal "draft", new_event.state
     assert_equal @event.venue_name, new_event.venue_name
     assert_equal @event.venue_address, new_event.venue_address
-    
+
     # Check that ticket types were NOT duplicated
     assert_equal 0, new_event.ticket_types.count
   end

test/models/event_test.rb

@@ -275,21 +275,21 @@ class EventTest < ActiveSupport::TestCase
   test "should duplicate event with ticket types" do
     user = User.create!(email: "test@example.com", password: "password123", password_confirmation: "password123")
     event = Event.create!(name: "Original Event", slug: "original", description: "A description that is sufficiently long", venue_name: "v", venue_address: "a", user: user, latitude: 48.0, longitude: 2.0, start_time: 1.week.from_now, state: :published)
-    
+
     # Create ticket types
     ticket_type1 = TicketType.create!(name: "Standard", description: "A standard ticket for the event", price_cents: 2000, quantity: 100, sale_start_at: 1.day.ago, sale_end_at: event.start_time - 1.hour, event: event)
     ticket_type2 = TicketType.create!(name: "VIP", description: "A VIP ticket for the event", price_cents: 5000, quantity: 50, sale_start_at: 1.day.ago, sale_end_at: event.start_time - 1.hour, event: event)
-    
+
     # Duplicate the event
     duplicated_event = event.duplicate
-    
+
     # Check that duplication was successful
     assert_not_nil duplicated_event
     assert_equal "Copie de #{event.name}", duplicated_event.name
     assert_equal "draft", duplicated_event.state
     assert_equal event.venue_name, duplicated_event.venue_name
     assert_equal event.venue_address, duplicated_event.venue_address
-    
+
     # Check that ticket types were duplicated
     assert_equal 2, duplicated_event.ticket_types.count
     assert_equal "Standard", duplicated_event.ticket_types.find_by(name: "Standard").name
@@ -299,21 +299,21 @@ class EventTest < ActiveSupport::TestCase
   test "should duplicate event without ticket types" do
     user = User.create!(email: "test@example.com", password: "password123", password_confirmation: "password123")
     event = Event.create!(name: "Original Event", slug: "original", description: "A description that is sufficiently long", venue_name: "v", venue_address: "a", user: user, latitude: 48.0, longitude: 2.0, start_time: 1.week.from_now, state: :published)
-    
+
     # Create ticket types
     ticket_type1 = TicketType.create!(name: "Standard", description: "A standard ticket for the event", price_cents: 2000, quantity: 100, sale_start_at: 1.day.ago, sale_end_at: event.start_time - 1.hour, event: event)
     ticket_type2 = TicketType.create!(name: "VIP", description: "A VIP ticket for the event", price_cents: 5000, quantity: 50, sale_start_at: 1.day.ago, sale_end_at: event.start_time - 1.hour, event: event)
-    
+
     # Duplicate the event without ticket types
     duplicated_event = event.duplicate(clone_ticket_types: false)
-    
+
     # Check that duplication was successful
     assert_not_nil duplicated_event
     assert_equal "Copie de #{event.name}", duplicated_event.name
     assert_equal "draft", duplicated_event.state
     assert_equal event.venue_name, duplicated_event.venue_name
     assert_equal event.venue_address, duplicated_event.venue_address
-    
+
     # Check that ticket types were NOT duplicated
     assert_equal 0, duplicated_event.ticket_types.count
   end