Merge branch 'fix/image-upload' into feat/image-upload
This commit is contained in:
2
Gemfile
2
Gemfile
@@ -40,7 +40,7 @@ gem "kamal", require: false
|
|||||||
gem "thruster", require: false
|
gem "thruster", require: false
|
||||||
|
|
||||||
# Use Active Storage variants [https://guides.rubyonrails.org/active_storage_overview.html#transforming-images]
|
# Use Active Storage variants [https://guides.rubyonrails.org/active_storage_overview.html#transforming-images]
|
||||||
# gem "image_processing", "~> 1.2"
|
gem "image_processing", "~> 1.2"
|
||||||
|
|
||||||
group :development, :test do
|
group :development, :test do
|
||||||
# See https://guides.rubyonrails.org/debugging_rails_applications.html#debugging-with-the-debug-gem
|
# See https://guides.rubyonrails.org/debugging_rails_applications.html#debugging-with-the-debug-gem
|
||||||
|
|||||||
16
Gemfile.lock
16
Gemfile.lock
@@ -122,6 +122,13 @@ GEM
|
|||||||
erubi (1.13.1)
|
erubi (1.13.1)
|
||||||
et-orbi (1.3.0)
|
et-orbi (1.3.0)
|
||||||
tzinfo
|
tzinfo
|
||||||
|
ffi (1.17.2-aarch64-linux-gnu)
|
||||||
|
ffi (1.17.2-aarch64-linux-musl)
|
||||||
|
ffi (1.17.2-arm-linux-gnu)
|
||||||
|
ffi (1.17.2-arm-linux-musl)
|
||||||
|
ffi (1.17.2-x86_64-darwin)
|
||||||
|
ffi (1.17.2-x86_64-linux-gnu)
|
||||||
|
ffi (1.17.2-x86_64-linux-musl)
|
||||||
fugit (1.11.2)
|
fugit (1.11.2)
|
||||||
et-orbi (~> 1, >= 1.2.11)
|
et-orbi (~> 1, >= 1.2.11)
|
||||||
raabro (~> 1.4)
|
raabro (~> 1.4)
|
||||||
@@ -129,6 +136,9 @@ GEM
|
|||||||
activesupport (>= 6.1)
|
activesupport (>= 6.1)
|
||||||
i18n (1.14.7)
|
i18n (1.14.7)
|
||||||
concurrent-ruby (~> 1.0)
|
concurrent-ruby (~> 1.0)
|
||||||
|
image_processing (1.14.0)
|
||||||
|
mini_magick (>= 4.9.5, < 6)
|
||||||
|
ruby-vips (>= 2.0.17, < 3)
|
||||||
io-console (0.8.1)
|
io-console (0.8.1)
|
||||||
irb (1.15.2)
|
irb (1.15.2)
|
||||||
pp (>= 0.6.0)
|
pp (>= 0.6.0)
|
||||||
@@ -177,6 +187,8 @@ GEM
|
|||||||
net-smtp
|
net-smtp
|
||||||
marcel (1.0.4)
|
marcel (1.0.4)
|
||||||
matrix (0.4.3)
|
matrix (0.4.3)
|
||||||
|
mini_magick (5.3.1)
|
||||||
|
logger
|
||||||
mini_mime (1.1.5)
|
mini_mime (1.1.5)
|
||||||
minitest (5.25.5)
|
minitest (5.25.5)
|
||||||
minitest-reporters (1.7.1)
|
minitest-reporters (1.7.1)
|
||||||
@@ -333,6 +345,9 @@ GEM
|
|||||||
rubocop-performance (>= 1.24)
|
rubocop-performance (>= 1.24)
|
||||||
rubocop-rails (>= 2.30)
|
rubocop-rails (>= 2.30)
|
||||||
ruby-progressbar (1.13.0)
|
ruby-progressbar (1.13.0)
|
||||||
|
ruby-vips (2.2.5)
|
||||||
|
ffi (~> 1.12)
|
||||||
|
logger
|
||||||
ruby2_keywords (0.0.5)
|
ruby2_keywords (0.0.5)
|
||||||
rubyzip (3.0.2)
|
rubyzip (3.0.2)
|
||||||
securerandom (0.4.1)
|
securerandom (0.4.1)
|
||||||
@@ -429,6 +444,7 @@ DEPENDENCIES
|
|||||||
debug
|
debug
|
||||||
devise (~> 4.9)
|
devise (~> 4.9)
|
||||||
dotenv-rails
|
dotenv-rails
|
||||||
|
image_processing (~> 1.2)
|
||||||
jbuilder
|
jbuilder
|
||||||
jsbundling-rails
|
jsbundling-rails
|
||||||
kamal
|
kamal
|
||||||
|
|||||||
@@ -73,6 +73,33 @@ module Api
|
|||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
|
# Helper method to serialize event data safely
|
||||||
|
def event_json(event)
|
||||||
|
{
|
||||||
|
id: event.id,
|
||||||
|
name: event.name,
|
||||||
|
slug: event.slug,
|
||||||
|
description: event.description,
|
||||||
|
state: event.state,
|
||||||
|
venue_name: event.venue_name,
|
||||||
|
venue_address: event.venue_address,
|
||||||
|
start_time: event.start_time,
|
||||||
|
end_time: event.end_time,
|
||||||
|
latitude: event.latitude,
|
||||||
|
longitude: event.longitude,
|
||||||
|
featured: event.featured,
|
||||||
|
image_url: event.display_image_url,
|
||||||
|
created_at: event.created_at,
|
||||||
|
updated_at: event.updated_at,
|
||||||
|
user: {
|
||||||
|
id: event.user.id,
|
||||||
|
email: event.user.email,
|
||||||
|
first_name: event.user.first_name,
|
||||||
|
last_name: event.user.last_name
|
||||||
|
}
|
||||||
|
}
|
||||||
|
end
|
||||||
|
|
||||||
# Finds an event by its ID or returns 404 Not Found
|
# Finds an event by its ID or returns 404 Not Found
|
||||||
# Used as before_action for the show, update, and destroy actions
|
# Used as before_action for the show, update, and destroy actions
|
||||||
def set_event
|
def set_event
|
||||||
|
|||||||
@@ -45,6 +45,8 @@ class Promoter::EventsController < ApplicationController
|
|||||||
if @event.update(event_params)
|
if @event.update(event_params)
|
||||||
redirect_to promoter_event_path(@event), notice: "Event mis à jour avec succès!"
|
redirect_to promoter_event_path(@event), notice: "Event mis à jour avec succès!"
|
||||||
else
|
else
|
||||||
|
# If validation fails and a new image was attached, purge it
|
||||||
|
@event.image.purge if @event.image.attached? && @event.changed.include?('image')
|
||||||
render :edit, status: :unprocessable_entity
|
render :edit, status: :unprocessable_entity
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -132,10 +134,18 @@ class Promoter::EventsController < ApplicationController
|
|||||||
end
|
end
|
||||||
|
|
||||||
def event_params
|
def event_params
|
||||||
|
if action_name == 'create'
|
||||||
params.require(:event).permit(
|
params.require(:event).permit(
|
||||||
:name, :slug, :description, :image,
|
:name, :slug, :description, :image,
|
||||||
:venue_name, :venue_address, :latitude, :longitude,
|
:venue_name, :venue_address, :latitude, :longitude,
|
||||||
:start_time, :end_time, :featured, :allow_booking_during_event
|
:start_time, :end_time, :featured, :allow_booking_during_event
|
||||||
)
|
)
|
||||||
|
else
|
||||||
|
params.require(:event).permit(
|
||||||
|
:name, :description, :image,
|
||||||
|
:venue_name, :venue_address, :latitude, :longitude,
|
||||||
|
:start_time, :end_time, :featured, :allow_booking_during_event
|
||||||
|
)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,8 +1,11 @@
|
|||||||
import { Controller } from "@hotwired/stimulus"
|
import { Controller } from "@hotwired/stimulus"
|
||||||
import slug from 'slug'
|
import slug from 'slug'
|
||||||
|
|
||||||
|
// Configure slug to match Rails parameterize behavior
|
||||||
|
slug.defaults.mode = 'rfc3986'
|
||||||
|
|
||||||
export default class extends Controller {
|
export default class extends Controller {
|
||||||
static targets = ["name", "slug", "latitude", "longitude", "address", "mapLinksContainer", "geocodingSpinner", "getCurrentLocationBtn", "getCurrentLocationIcon", "getCurrentLocationText", "previewLocationBtn", "previewLocationIcon", "previewLocationText", "messagesContainer"]
|
static targets = ["name", "slug", "latitude", "longitude", "address", "mapLinksContainer", "geocodingSpinner", "getCurrentLocationBtn", "getCurrentLocationIcon", "getCurrentLocationText", "previewLocationBtn", "previewLocationIcon", "previewLocationText", "messagesContainer", "venueName"]
|
||||||
static values = {
|
static values = {
|
||||||
geocodeDelay: { type: Number, default: 1500 } // Delay before auto-geocoding
|
geocodeDelay: { type: Number, default: 1500 } // Delay before auto-geocoding
|
||||||
}
|
}
|
||||||
@@ -27,15 +30,65 @@ export default class extends Controller {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Generate slug from name
|
// Generate slug from name, venue name, and city for better SEO
|
||||||
generateSlug() {
|
generateSlug() {
|
||||||
const name = this.nameTarget.value
|
const name = this.nameTarget.value
|
||||||
|
const venueName = this.hasVenueNameTarget ? this.venueNameTarget.value : ""
|
||||||
|
const address = this.hasAddressTarget ? this.addressTarget.value : ""
|
||||||
|
|
||||||
this.slugTarget.value = slug(name)
|
// Extract city from address
|
||||||
|
const city = this.extractCity(address)
|
||||||
|
|
||||||
|
// Build SEO-friendly slug: name-venue-city
|
||||||
|
let slugParts = []
|
||||||
|
|
||||||
|
if (name) slugParts.push(name)
|
||||||
|
if (venueName) slugParts.push(venueName)
|
||||||
|
if (city) slugParts.push(city)
|
||||||
|
|
||||||
|
let slugValue = slugParts.join('-')
|
||||||
|
|
||||||
|
// If no slug parts, generate a fallback slug
|
||||||
|
if (!slugValue) {
|
||||||
|
slugValue = `event-${Date.now()}`
|
||||||
|
}
|
||||||
|
|
||||||
|
// Generate slug with proper character handling (matches Rails parameterize)
|
||||||
|
this.slugTarget.value = slug(slugValue, { lower: true })
|
||||||
|
}
|
||||||
|
|
||||||
|
// Extract city from address
|
||||||
|
extractCity(address) {
|
||||||
|
if (!address) return ""
|
||||||
|
|
||||||
|
// Look for French postal code pattern (5 digits) + city
|
||||||
|
const match = address.match(/(\d{5})\s+([^,]+)/)
|
||||||
|
if (match) {
|
||||||
|
return match[2].trim()
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fallback: extract last part after comma (assume it's city)
|
||||||
|
const parts = address.split(',')
|
||||||
|
if (parts.length > 1) {
|
||||||
|
return parts[parts.length - 1].trim()
|
||||||
|
}
|
||||||
|
|
||||||
|
// Another fallback: look for common French city indicators
|
||||||
|
const cityIndicators = ["Paris", "Lyon", "Marseille", "Toulouse", "Nice", "Nantes", "Strasbourg", "Montpellier", "Bordeaux", "Lille"]
|
||||||
|
for (const city of cityIndicators) {
|
||||||
|
if (address.toLowerCase().includes(city.toLowerCase())) {
|
||||||
|
return city
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return ""
|
||||||
}
|
}
|
||||||
|
|
||||||
// Handle address changes with debounced geocoding
|
// Handle address changes with debounced geocoding
|
||||||
addressChanged() {
|
addressChanged() {
|
||||||
|
// Regenerate slug when address changes
|
||||||
|
this.generateSlug()
|
||||||
|
|
||||||
// Clear any existing timeout
|
// Clear any existing timeout
|
||||||
if (this.geocodeTimeout) {
|
if (this.geocodeTimeout) {
|
||||||
clearTimeout(this.geocodeTimeout)
|
clearTimeout(this.geocodeTimeout)
|
||||||
@@ -68,6 +121,11 @@ export default class extends Controller {
|
|||||||
}, this.geocodeDelayValue)
|
}, this.geocodeDelayValue)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Handle venue name changes to regenerate slug
|
||||||
|
venueNameChanged() {
|
||||||
|
this.generateSlug()
|
||||||
|
}
|
||||||
|
|
||||||
// Get user's current location and reverse geocode to address
|
// Get user's current location and reverse geocode to address
|
||||||
async getCurrentLocation() {
|
async getCurrentLocation() {
|
||||||
if (!navigator.geolocation) {
|
if (!navigator.geolocation) {
|
||||||
@@ -516,14 +574,16 @@ export default class extends Controller {
|
|||||||
showLocationSuccess(message) {
|
showLocationSuccess(message) {
|
||||||
this.hideAllLocationMessages()
|
this.hideAllLocationMessages()
|
||||||
this.showMessage("location-success", message, "success")
|
this.showMessage("location-success", message, "success")
|
||||||
setTimeout(() => this.hideMessage("location-success"), 4000)
|
// Keep notification visible indefinitely
|
||||||
|
// setTimeout(() => this.hideMessage("location-success"), 4000)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Show error message
|
// Show error message
|
||||||
showLocationError(message) {
|
showLocationError(message) {
|
||||||
this.hideAllLocationMessages()
|
this.hideAllLocationMessages()
|
||||||
this.showMessage("location-error", message, "error")
|
this.showMessage("location-error", message, "error")
|
||||||
setTimeout(() => this.hideMessage("location-error"), 6000)
|
// Keep notification visible indefinitely
|
||||||
|
// setTimeout(() => this.hideMessage("location-error"), 6000)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Show geocoding warning (less intrusive than error)
|
// Show geocoding warning (less intrusive than error)
|
||||||
@@ -531,7 +591,8 @@ export default class extends Controller {
|
|||||||
this.hideMessage("geocoding-warning")
|
this.hideMessage("geocoding-warning")
|
||||||
const message = "Les coordonnées n'ont pas pu être déterminées automatiquement. L'événement utilisera une localisation approximative."
|
const message = "Les coordonnées n'ont pas pu être déterminées automatiquement. L'événement utilisera une localisation approximative."
|
||||||
this.showMessage("geocoding-warning", message, "warning")
|
this.showMessage("geocoding-warning", message, "warning")
|
||||||
setTimeout(() => this.hideMessage("geocoding-warning"), 8000)
|
// Keep notification visible indefinitely
|
||||||
|
// setTimeout(() => this.hideMessage("geocoding-warning"), 8000)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Show info about approximate location
|
// Show info about approximate location
|
||||||
@@ -539,7 +600,8 @@ export default class extends Controller {
|
|||||||
this.hideMessage("approximate-location-info")
|
this.hideMessage("approximate-location-info")
|
||||||
const message = `Localisation approximative trouvée: ${foundLocation}`
|
const message = `Localisation approximative trouvée: ${foundLocation}`
|
||||||
this.showMessage("approximate-location-info", message, "info")
|
this.showMessage("approximate-location-info", message, "info")
|
||||||
setTimeout(() => this.hideMessage("approximate-location-info"), 6000)
|
// Keep notification visible indefinitely
|
||||||
|
// setTimeout(() => this.hideMessage("approximate-location-info"), 6000)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Show geocoding success with location details
|
// Show geocoding success with location details
|
||||||
@@ -547,7 +609,8 @@ export default class extends Controller {
|
|||||||
this.hideMessage("geocoding-success")
|
this.hideMessage("geocoding-success")
|
||||||
const message = `${title}<br><small class="opacity-75">${location}</small>`
|
const message = `${title}<br><small class="opacity-75">${location}</small>`
|
||||||
this.showMessage("geocoding-success", message, "success")
|
this.showMessage("geocoding-success", message, "success")
|
||||||
setTimeout(() => this.hideMessage("geocoding-success"), 5000)
|
// Keep notification visible indefinitely
|
||||||
|
// setTimeout(() => this.hideMessage("geocoding-success"), 5000)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Show geocoding progress with strategy info
|
// Show geocoding progress with strategy info
|
||||||
|
|||||||
@@ -29,7 +29,9 @@ class Event < ApplicationRecord
|
|||||||
|
|
||||||
|
|
||||||
# === Callbacks ===
|
# === Callbacks ===
|
||||||
|
before_validation :generate_slug, if: :should_generate_slug?
|
||||||
before_validation :geocode_address, if: :should_geocode_address?
|
before_validation :geocode_address, if: :should_geocode_address?
|
||||||
|
before_update :handle_image_replacement, if: :image_attached?
|
||||||
|
|
||||||
# Validations for Event attributes
|
# Validations for Event attributes
|
||||||
# Basic information
|
# Basic information
|
||||||
@@ -67,9 +69,91 @@ class Event < ApplicationRecord
|
|||||||
|
|
||||||
# === Instance Methods ===
|
# === Instance Methods ===
|
||||||
|
|
||||||
# Get image for display - handles both uploaded files and URLs
|
# Generate SEO-friendly slug from name, venue name, and city
|
||||||
|
def generate_slug
|
||||||
|
return if name.blank? && venue_name.blank? && venue_address.blank?
|
||||||
|
|
||||||
|
# Extract city from venue address
|
||||||
|
city = extract_city_from_address(venue_address)
|
||||||
|
|
||||||
|
# Build slug parts
|
||||||
|
slug_parts = []
|
||||||
|
slug_parts << name if name.present?
|
||||||
|
slug_parts << venue_name if venue_name.present?
|
||||||
|
slug_parts << city if city.present?
|
||||||
|
|
||||||
|
# Generate slug using Rails' parameterize
|
||||||
|
slug_value = slug_parts.join("-").parameterize
|
||||||
|
|
||||||
|
# Ensure minimum length
|
||||||
|
if slug_value.length < 3
|
||||||
|
slug_value = "event-#{Time.current.to_i}".parameterize
|
||||||
|
end
|
||||||
|
|
||||||
|
# Make sure slug is unique
|
||||||
|
base_slug = slug_value
|
||||||
|
counter = 1
|
||||||
|
while Event.where.not(id: id).where(slug: slug_value).exists?
|
||||||
|
slug_value = "#{base_slug}-#{counter}".parameterize
|
||||||
|
counter += 1
|
||||||
|
end
|
||||||
|
|
||||||
|
self.slug = slug_value
|
||||||
|
end
|
||||||
|
|
||||||
|
# Check if slug should be generated
|
||||||
|
def should_generate_slug?
|
||||||
|
# Generate slug if it's blank or if it's a new record
|
||||||
|
slug.blank? || new_record?
|
||||||
|
end
|
||||||
|
|
||||||
|
# Extract city from address
|
||||||
|
def extract_city_from_address(address)
|
||||||
|
return "" if address.blank?
|
||||||
|
|
||||||
|
# Look for French postal code pattern (5 digits) + city
|
||||||
|
match = address.match(/(\d{5})\s+([^,]+)/)
|
||||||
|
if match
|
||||||
|
return match[2].strip
|
||||||
|
end
|
||||||
|
|
||||||
|
# Fallback: extract last part after comma (assume it's city)
|
||||||
|
parts = address.split(",")
|
||||||
|
if parts.length > 1
|
||||||
|
return parts[parts.length - 1].strip
|
||||||
|
end
|
||||||
|
|
||||||
|
# Another fallback: look for common French city indicators
|
||||||
|
city_indicators = [ "Paris", "Lyon", "Marseille", "Toulouse", "Nice", "Nantes", "Strasbourg", "Montpellier", "Bordeaux", "Lille" ]
|
||||||
|
for city in city_indicators
|
||||||
|
if address.downcase.include?(city.downcase)
|
||||||
|
return city
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
""
|
||||||
|
end
|
||||||
|
|
||||||
|
# Get image URL prioritizing old image field if it exists
|
||||||
|
def display_image_url
|
||||||
|
# First check if old image field exists and has a value
|
||||||
|
return self[:image] if self[:image].present?
|
||||||
|
|
||||||
|
# Fall back to attached image
|
||||||
|
return nil unless image.attached?
|
||||||
|
|
||||||
|
# Return the URL for the attached image
|
||||||
|
Rails.application.routes.url_helpers.rails_blob_url(image, only_path: true)
|
||||||
|
end
|
||||||
|
|
||||||
|
# Get image variants for different display sizes
|
||||||
def event_image_variant(size = :medium)
|
def event_image_variant(size = :medium)
|
||||||
if image.attached?
|
# For old image field, return the URL directly
|
||||||
|
return self[:image] if self[:image].present?
|
||||||
|
|
||||||
|
# For attached images, process variants
|
||||||
|
return nil unless image.attached?
|
||||||
|
|
||||||
case size
|
case size
|
||||||
when :large
|
when :large
|
||||||
image.variant(resize_to_limit: [ 1200, 630 ])
|
image.variant(resize_to_limit: [ 1200, 630 ])
|
||||||
@@ -77,9 +161,6 @@ class Event < ApplicationRecord
|
|||||||
image.variant(resize_to_limit: [ 800, 450 ])
|
image.variant(resize_to_limit: [ 800, 450 ])
|
||||||
when :small
|
when :small
|
||||||
image.variant(resize_to_limit: [ 400, 225 ])
|
image.variant(resize_to_limit: [ 400, 225 ])
|
||||||
else
|
|
||||||
image
|
|
||||||
end
|
|
||||||
else
|
else
|
||||||
# Fallback to URL-based image
|
# Fallback to URL-based image
|
||||||
image_url.presence
|
image_url.presence
|
||||||
@@ -100,6 +181,11 @@ class Event < ApplicationRecord
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# Check if event has any image (old field or attached)
|
||||||
|
def has_image?
|
||||||
|
self[:image].present? || image.attached?
|
||||||
|
end
|
||||||
|
|
||||||
# Check if coordinates were successfully geocoded or are fallback coordinates
|
# Check if coordinates were successfully geocoded or are fallback coordinates
|
||||||
def geocoding_successful?
|
def geocoding_successful?
|
||||||
coordinates_look_valid?
|
coordinates_look_valid?
|
||||||
@@ -203,6 +289,19 @@ class Event < ApplicationRecord
|
|||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
|
# Check if image is attached for the callback
|
||||||
|
def image_attached?
|
||||||
|
image.attached?
|
||||||
|
end
|
||||||
|
|
||||||
|
# Handle image replacement when a new image is uploaded
|
||||||
|
def handle_image_replacement
|
||||||
|
# Clear the old image field if a new image is being attached
|
||||||
|
if image.attached?
|
||||||
|
self[:image] = nil
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
# Determine if we should perform server-side geocoding
|
# Determine if we should perform server-side geocoding
|
||||||
def should_geocode_address?
|
def should_geocode_address?
|
||||||
# Don't geocode if address is blank
|
# Don't geocode if address is blank
|
||||||
|
|||||||
@@ -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 %>
|
<%= 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="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">
|
<div class="w-16 h-16 bg-slate-200 dark:bg-slate-700 rounded-lg overflow-hidden flex-shrink-0">
|
||||||
<% if event.has_image? %>
|
<%= image_tag event.event_image_variant(:small), alt: event.name, class: "w-full h-full object-cover" 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 %>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="flex-1 min-w-0">
|
<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">
|
<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">
|
||||||
|
|||||||
@@ -92,11 +92,7 @@
|
|||||||
%>
|
%>
|
||||||
|
|
||||||
<% map_providers.each do |name, url| %>
|
<% map_providers.each do |name, url| %>
|
||||||
<%= link_to url, target: "_blank", rel: "noopener",
|
<%= 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" %>
|
||||||
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 %>
|
|
||||||
<% end %>
|
|
||||||
<% end %>
|
<% end %>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -135,14 +131,7 @@
|
|||||||
|
|
||||||
<!-- Right Column: Ticket Selection -->
|
<!-- Right Column: Ticket Selection -->
|
||||||
<div class="lg:col-span-1">
|
<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: {
|
<%= 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| %>
|
||||||
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="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">
|
<div class="flex justify-center sm:justify-start mb-6">
|
||||||
|
|||||||
@@ -90,11 +90,7 @@
|
|||||||
<!-- Event Image -->
|
<!-- Event Image -->
|
||||||
<div class="relative overflow-hidden aspect-[4/3]">
|
<div class="relative overflow-hidden aspect-[4/3]">
|
||||||
<% if event.has_image? %>
|
<% 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" %>
|
<%= 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 %>
|
|
||||||
<% else %>
|
<% else %>
|
||||||
<div class="w-full h-full bg-gradient-to-br from-purple-600 to-blue-600 flex items-center justify-center">
|
<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>
|
<i data-lucide="calendar" class="w-16 h-16 text-white"></i>
|
||||||
|
|||||||
@@ -41,24 +41,9 @@
|
|||||||
<div class="bg-white rounded-lg border border-gray-200 p-6">
|
<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>
|
<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>
|
<div>
|
||||||
<%= form.label :name, "Nom de l'événement", class: "block text-sm font-medium text-gray-700 mb-2" %>
|
<%= 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" } %>
|
<%= 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>
|
|
||||||
<%= 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>
|
</div>
|
||||||
|
|
||||||
<div class="mt-6">
|
<div class="mt-6">
|
||||||
@@ -88,12 +73,32 @@
|
|||||||
<!-- Upload tab content -->
|
<!-- Upload tab content -->
|
||||||
<div id="upload-content" class="tab-content space-y-4">
|
<div id="upload-content" class="tab-content space-y-4">
|
||||||
<!-- Current image preview -->
|
<!-- Current image preview -->
|
||||||
|
<<<<<<< HEAD
|
||||||
<% if @event.image.attached? %>
|
<% if @event.image.attached? %>
|
||||||
<div class="relative">
|
<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" %>
|
<%= 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">
|
<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">
|
<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>
|
<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>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
<div class="absolute bottom-2 left-2 bg-black bg-opacity-50 text-white px-2 py-1 rounded text-xs">
|
<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" } %>
|
<%= 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">
|
<div class="mt-1 text-sm text-gray-500">
|
||||||
Formats acceptés : PNG, JPG, JPEG, WebP (max 5MB)
|
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
|
<br>Laissez vide pour conserver l'image actuelle
|
||||||
<% end %>
|
<% end %>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -41,17 +41,14 @@
|
|||||||
<div class="bg-white rounded-lg border border-gray-200 p-6">
|
<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>
|
<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>
|
<div>
|
||||||
<%= form.label :name, "Nom de l'événement", class: "block text-sm font-medium text-gray-700 mb-2" %>
|
<%= 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" } %>
|
<%= 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>
|
||||||
|
|
||||||
<div>
|
<!-- Hidden slug field (auto-generated) -->
|
||||||
<%= form.label :slug, "Slug (URL)", class: "block text-sm font-medium text-gray-700 mb-2" %>
|
<%= form.hidden_field :slug, data: { "event-form-target": "slug" } %>
|
||||||
<%= 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>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="mt-6">
|
<div class="mt-6">
|
||||||
@@ -81,7 +78,7 @@
|
|||||||
<!-- Upload tab content -->
|
<!-- Upload tab content -->
|
||||||
<div id="upload-content" class="tab-content space-y-4">
|
<div id="upload-content" class="tab-content space-y-4">
|
||||||
<!-- Current image preview (for edit mode) -->
|
<!-- Current image preview (for edit mode) -->
|
||||||
<% if @event.image.attached? %>
|
<% if @event.has_image? %>
|
||||||
<div class="relative">
|
<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" %>
|
<%= 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">
|
<div class="absolute top-2 right-2">
|
||||||
@@ -173,7 +170,7 @@
|
|||||||
<div class="space-y-6">
|
<div class="space-y-6">
|
||||||
<div>
|
<div>
|
||||||
<%= form.label :venue_name, "Nom du lieu", class: "block text-sm font-medium text-gray-700 mb-2" %>
|
<%= 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>
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
|
|||||||
Reference in New Issue
Block a user