Merge branch 'fix/image-upload' into feat/image-upload

app/views/components/_event_item.html.erb

@@ -1,13 +1,7 @@
 <%= link_to event_path(event.slug, event), class: "group block p-4 rounded-lg border border-slate-200 dark:border-slate-700 hover:border-purple-300 dark:hover:border-purple-600 hover:shadow-md transition-all duration-200" do %>
   <div class="flex items-center space-x-4">
     <div class="w-16 h-16 bg-slate-200 dark:bg-slate-700 rounded-lg overflow-hidden flex-shrink-0">
-      <% if event.has_image? %>
-        <% if event.image.attached? %>
-          <%= image_tag event.event_image_variant(:small), alt: event.name, class: "w-full h-full object-cover" %>
-        <% else %>
-          <%= image_tag event.image_url, alt: event.name, class: "w-full h-full object-cover" %>
-        <% end %>
-      <% end %>
+      <%= image_tag event.event_image_variant(:small), alt: event.name, class: "w-full h-full object-cover" if event.has_image? %>
     </div>
     <div class="flex-1 min-w-0">
       <h3 class="text-lg font-semibold text-slate-900 dark:text-slate-100 group-hover:text-purple-600 dark:group-hover:text-purple-400 transition-colors duration-200">

app/views/events/show.html.erb

@@ -92,12 +92,8 @@
                       %>
 
                       <% map_providers.each do |name, url| %>
-                        <%= link_to url, target: "_blank", rel: "noopener",
-                            class: "inline-flex items-center px-3 py-2 text-xs font-medium text-gray-700 bg-white border border-gray-300 rounded-lg hover:bg-gray-50 transition-colors" do %>
-                          <span class="mr-1"><%= icons[name] %></span>
-                          <%= name %>
+                          <%= link_to "#{icons[name]} #{name}".html_safe, url, target: "_blank", rel: "noopener", class: "inline-flex items-center px-3 py-2 text-xs font-medium text-gray-700 bg-white border border-gray-300 rounded-lg hover:bg-gray-50 transition-colors" %>
                         <% end %>
-                      <% end %>
                     </div>
                   </div>
                 <% end %>
@@ -135,14 +131,7 @@
 
           <!-- Right Column: Ticket Selection -->
           <div class="lg:col-span-1">
-            <%= form_with url: event_order_new_path(@event.slug, @event.id), method: :get, id: "checkout_form", local: true, data: {
-              controller: "ticket-selection",
-              ticket_selection_target: "form",
-              ticket_selection_event_slug_value: @event.slug,
-              ticket_selection_event_id_value: @event.id,
-              ticket_selection_order_new_url_value: event_order_new_path(@event.slug, @event.id),
-              ticket_selection_store_cart_url_value: api_v1_store_cart_path
-  } do |form| %>
+            <%= form_with url: event_order_new_path(@event.slug, @event.id), method: :get, id: "checkout_form", local: true, data: { controller: "ticket-selection", ticket_selection_target: "form", ticket_selection_event_slug_value: @event.slug, ticket_selection_event_id_value: @event.id, ticket_selection_order_new_url_value: event_order_new_path(@event.slug, @event.id), ticket_selection_store_cart_url_value: api_v1_store_cart_path } do |form| %>
 
               <div class="bg-gradient-to-br from-purple-50 to-indigo-50 rounded-2xl border border-purple-100 p-6 shadow-sm">
                 <div class="flex justify-center sm:justify-start mb-6">

app/views/pages/home.html.erb

@@ -90,11 +90,7 @@
                 <!-- Event Image -->
                 <div class="relative overflow-hidden aspect-[4/3]">
                   <% if event.has_image? %>
-                    <% if event.image.attached? %>
-                      <%= image_tag event.event_image_variant(:medium), alt: event.name, class: "w-full h-full object-cover group-hover:scale-105 transition-transform duration-300" %>
-                    <% else %>
-                      <%= image_tag event.image_url, alt: event.name, class: "w-full h-full object-cover group-hover:scale-105 transition-transform duration-300" %>
-                    <% end %>
+                    <%= image_tag event.event_image_variant(:medium), alt: event.name, class: "w-full h-full object-cover group-hover:scale-105 transition-transform duration-300" %>
                   <% else %>
                     <div class="w-full h-full bg-gradient-to-br from-purple-600 to-blue-600 flex items-center justify-center">
                       <i data-lucide="calendar" class="w-16 h-16 text-white"></i>

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

@@ -41,24 +41,9 @@
       <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" } %>
-            <p class="mt-1 text-sm text-gray-500">
-              <% if @event.published? %>
-                <i data-lucide="alert-triangle" class="w-4 h-4 inline text-yellow-500"></i>
-                Attention: Modifier le slug d'un événement publié peut casser les liens existants.
-              <% else %>
-                Utilisé dans l'URL de l'événement
-              <% end %>
-            </p>
-          </div>
+        <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" %>
         </div>
 
         <div class="mt-6">
@@ -88,12 +73,32 @@
           <!-- Upload tab content -->
           <div id="upload-content" class="tab-content space-y-4">
             <!-- Current image preview -->
+<<<<<<< HEAD
             <% if @event.image.attached? %>
               <div class="relative">
                 <%= image_tag @event.image.variant(resize_to_limit: [400, 225]), class: "w-full h-48 object-cover rounded-lg border border-gray-200" %>
                 <div class="absolute top-2 right-2">
                   <button type="button" onclick="document.getElementById('event_image').value = ''; document.getElementById('upload-preview').classList.add('hidden');" class="bg-red-500 text-white p-2 rounded-full hover:bg-red-600 transition-colors">
                     <i data-lucide="trash-2" class="w-4 h-4"></i>
+=======
+            <% if @event.has_image? %>
+              <div class="flex items-start space-x-4">
+                <div class="flex-shrink-0">
+                  <% if @event.event_image_variant(:small).is_a?(String) %>
+                    <!-- Old image field -->
+                    <%= image_tag @event.event_image_variant(:small), class: "w-32 h-24 object-cover rounded-lg border border-gray-200" %>
+                  <% else %>
+                    <!-- Attached image -->
+                    <%= image_tag @event.event_image_variant(:small), class: "w-32 h-24 object-cover rounded-lg border border-gray-200" %>
+                  <% end %>
+                </div>
+                <div class="flex-1 min-w-0">
+                  <p class="text-sm font-medium text-gray-900 mb-1">Image actuelle</p>
+                  <p class="text-sm text-gray-600 mb-2">Uploader une nouvelle image pour la remplacer.</p>
+                  <button type="button" onclick="this.closest('div').querySelector('input[type=file]').click()" class="bg-red-500 text-white p-2 rounded-lg hover:bg-red-600 transition-colors inline-flex items-center">
+                    <i data-lucide="trash-2" class="w-4 h-4 mr-1"></i>
+                    <span>Remplacer l'image</span>
+>>>>>>> fix/image-upload
                   </button>
                 </div>
                 <div class="absolute bottom-2 left-2 bg-black bg-opacity-50 text-white px-2 py-1 rounded text-xs">
@@ -107,7 +112,7 @@
               <%= form.file_field :image, class: "w-full px-4 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:ring-purple-500 focus:border-transparent file:mr-4 file:py-2 file:px-4 file:rounded-lg file:border-0 file:text-sm file:font-semibold file:bg-purple-50 file:text-purple-700 hover:file:bg-purple-100", accept: "image/png,image/jpeg,image/jpg,image/webp", data: { action: "change->event-form#previewImage" } %>
               <div class="mt-1 text-sm text-gray-500">
                 Formats acceptés : PNG, JPG, JPEG, WebP (max 5MB)
-                <% if @event.image.attached? %>
+                <% if @event.has_image? %>
                   <br>Laissez vide pour conserver l'image actuelle
                 <% end %>
               </div>

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

@@ -41,17 +41,14 @@
       <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 class="space-y-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" } %>
-            <p class="mt-1 text-sm text-gray-500">Utilisé dans l'URL de l'événement</p>
-          </div>
+          <!-- Hidden slug field (auto-generated) -->
+          <%= form.hidden_field :slug, data: { "event-form-target": "slug" } %>
         </div>
 
         <div class="mt-6">
@@ -81,7 +78,7 @@
           <!-- Upload tab content -->
           <div id="upload-content" class="tab-content space-y-4">
             <!-- Current image preview (for edit mode) -->
-            <% if @event.image.attached? %>
+            <% if @event.has_image? %>
               <div class="relative">
                 <%= image_tag @event.image.variant(resize_to_limit: [400, 225]), class: "w-full h-48 object-cover rounded-lg border border-gray-200" %>
                 <div class="absolute top-2 right-2">
@@ -173,7 +170,7 @@
         <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" %>
+            <%= 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", data: { "event-form-target": "venueName", action: "input->event-form#venueNameChanged" } %>
           </div>
 
           <div>