diff --git a/Gemfile.lock b/Gemfile.lock index f381b25..cd8fc5c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -250,6 +250,7 @@ GEM PLATFORMS arm64-darwin-23 + arm64-darwin-24 x86_64-darwin-22 x86_64-linux diff --git a/app/assets/stylesheets/application.tailwind.css b/app/assets/stylesheets/application.tailwind.css index a25c0c8..0d900f1 100644 --- a/app/assets/stylesheets/application.tailwind.css +++ b/app/assets/stylesheets/application.tailwind.css @@ -1,25 +1,63 @@ +@import url('https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;600;700;800&display=swap'); + @tailwind base; @tailwind components; @tailwind utilities; @layer base { + body { + @apply antialiased; + } + h1 { - @apply text-2xl font-bold; + @apply text-4xl md:text-5xl font-bold tracking-tight text-charcoal; } + h2 { - @apply text-xl font-semibold; + @apply text-2xl md:text-3xl font-semibold tracking-tight text-charcoal; } + h3 { - @apply text-lg font-medium; + @apply text-xl md:text-2xl font-medium text-charcoal; + } + + p { + @apply text-gray-700 leading-relaxed; + } + + a { + @apply transition-colors duration-200; + } +} + +@layer components { + .btn-primary { + @apply inline-flex items-center px-6 py-3 border border-transparent text-base font-medium rounded-full shadow-soft text-white bg-ruby-500 hover:bg-ruby-600 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-ruby-500 transition-all duration-200 hover:shadow-lg hover:-translate-y-0.5; + } + + .btn-secondary { + @apply inline-flex items-center px-6 py-3 border border-ruby-200 text-base font-medium rounded-full text-ruby-600 bg-white hover:bg-ruby-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-ruby-500 transition-all duration-200 hover:shadow-md; + } + + .card { + @apply bg-white rounded-2xl shadow-soft hover:shadow-xl transition-all duration-300 overflow-hidden; + } + + .gradient-text { + @apply bg-gradient-to-r from-ruby-500 to-ruby-700 bg-clip-text text-transparent; } } .coc a { - @apply text-ruby underline; + @apply text-ruby-500 underline hover:text-ruby-600; } .coc p { - @apply mb-2; + @apply mb-4; +} + +a.external-link { + @apply inline-flex items-center gap-1 text-ruby-500 hover:text-ruby-600; } a.external-link::after { @@ -27,7 +65,45 @@ a.external-link::after { display: inline-block; width: 1em; height: 1em; - margin-left: 0.25em; background-size: 1em; background-image: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxNiAxNiIgZmlsbD0iI2Q2NDA0NSIgY2xhc3M9InNpemUtNCI+CiAgPHBhdGggZD0iTTYuMjIgOC43MmEuNzUuNzUgMCAwIDAgMS4wNiAxLjA2bDUuMjItNS4yMnYxLjY5YS43NS43NSAwIDAgMCAxLjUgMHYtMy41YS43NS43NSAwIDAgMC0uNzUtLjc1aC0zLjVhLjc1Ljc1IDAgMCAwIDAgMS41aDEuNjlMNi4yMiA4LjcyWiIgLz4KICA8cGF0aCBkPSJNMy41IDYuNzVjMC0uNjkuNTYtMS4yNSAxLjI1LTEuMjVIN0EuNzUuNzUgMCAwIDAgNyA0SDQuNzVBMi43NSAyLjc1IDAgMCAwIDIgNi43NXY0LjVBMi43NSAyLjc1IDAgMCAwIDQuNzUgMTRoNC41QTIuNzUgMi43NSAwIDAgMCAxMiAxMS4yNVY5YS43NS43NSAwIDAgMC0xLjUgMHYyLjI1YzAgLjY5LS41NiAxLjI1LTEuMjUgMS4yNWgtNC41Yy0uNjkgMC0xLjI1LS41Ni0xLjI1LTEuMjV2LTQuNVoiIC8+Cjwvc3ZnPgo="); + transition: transform 0.2s ease; +} + +a.external-link:hover::after { + transform: translate(2px, -2px); +} + +/* Smooth scroll behavior */ +html { + scroll-behavior: smooth; +} + +/* Custom animations */ +.animate-in { + animation: fade-in 0.5s ease-in-out; +} + +.animate-up { + animation: slide-up 0.5s ease-out; +} + +/* ConvertKit form input overrides for better visibility */ +.formkit-form[data-uid="4c3ae9b5e4"] .formkit-input { + @apply px-4 py-3 border border-gray-300 rounded-lg shadow-sm transition-colors; + border-color: rgb(209, 213, 219) !important; +} + +.formkit-form[data-uid="4c3ae9b5e4"] .formkit-input:focus { + @apply ring-1 ring-ruby-500 border-ruby-500; + border-color: rgb(214, 64, 69) !important; +} + +.formkit-form[data-uid="4c3ae9b5e4"] .formkit-submit { + @apply px-6 py-3 bg-ruby-500 hover:bg-ruby-600 rounded-full transition-all duration-200 hover:shadow-lg hover:-translate-y-0.5; + background-color: rgb(214, 64, 69) !important; +} + +.formkit-form[data-uid="4c3ae9b5e4"] .formkit-submit:hover { + background-color: rgb(185, 28, 28) !important; } diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb index 773302f..eee0b96 100644 --- a/app/controllers/events_controller.rb +++ b/app/controllers/events_controller.rb @@ -14,15 +14,8 @@ def all end end - def show - @event = Event.with_all_rich_text.find_by!(slug: params[:slug]) - rescue ActiveRecord::RecordNotFound - redirect_to all_events_path, error: 'Event not found' - end - def past @events = Event.with_all_rich_text.past - render :index end def next diff --git a/app/javascript/controllers/clipboard_controller.js b/app/javascript/controllers/clipboard_controller.js index 905c11f..10b257f 100644 --- a/app/javascript/controllers/clipboard_controller.js +++ b/app/javascript/controllers/clipboard_controller.js @@ -1,14 +1,12 @@ import { Controller } from "@hotwired/stimulus" +// Connects to data-controller="clipboard" export default class extends Controller { - static targets = ["button", "source"] + static targets = ["source", "button", "default", "success"] static values = { - successContent: String, - successDuration: { - type: Number, - default: 2000, - } + successContent: { type: String, default: "✅" }, + successDuration: { type: Number, default: 2000 } } connect() { @@ -19,23 +17,32 @@ export default class extends Controller { copy(event) { event.preventDefault() - - const text = this.sourceTarget.innerHTML || this.sourceTarget.value - - navigator.clipboard.writeText(text).then(() => this.copied()) + + const text = this.sourceTarget.value || this.sourceTarget.innerHTML + navigator.clipboard.writeText(text).then(() => { + // Show success state + if (this.hasDefaultTarget && this.hasSuccessTarget) { + this.defaultTarget.classList.add('hidden') + this.successTarget.classList.remove('hidden') + + // Reset after specified duration + setTimeout(() => { + this.defaultTarget.classList.remove('hidden') + this.successTarget.classList.add('hidden') + }, this.successDurationValue) + } else if (this.hasButtonTarget) { + // Fallback for old implementation + const originalContent = this.buttonTarget.innerHTML + this.buttonTarget.innerHTML = this.successContentValue + + setTimeout(() => { + this.buttonTarget.innerHTML = originalContent + }, this.successDurationValue) + } + }) } - copied() { - if (!this.hasButtonTarget) return - - if (this.timeout) { - clearTimeout(this.timeout) - } - - this.buttonTarget.innerHTML = this.successContentValue - - this.timeout = setTimeout(() => { - this.buttonTarget.innerHTML = this.originalContent - }, this.successDurationValue) + get successContentValue() { + return this.data.get("successContentValue") } } diff --git a/app/views/admin/events/_form.html.erb b/app/views/admin/events/_form.html.erb index b79d427..e50a6cc 100644 --- a/app/views/admin/events/_form.html.erb +++ b/app/views/admin/events/_form.html.erb @@ -1,43 +1,136 @@ <%= form_with(model: [:admin, event]) do |form| %> <% if event.errors.any? %> -
-

<%= pluralize(event.errors.count, "error") %> - prohibited this event from being saved:

- - +
+
+
+ + + +
+
+

+ <%= pluralize(event.errors.count, "error") %> prohibited this event from being saved: +

+
+
    + <% event.errors.each do |error| %> +
  • <%= error.full_message %>
    • + <% end %> +
+
+
+
<% end %> -
- <%= form.label :name %> - <%= form.text_field :name, required: true %> - <%= form.label :location %> - <%= form.rich_text_area :location, required: true %> - <%= form.label :rsvp_link %> - <%= form.text_field :rsvp_link, required: true %> - <%= form.label :description %> - <%= form.rich_text_area :description %> - <%= form.label :sponsor %> - <%= form.text_field :sponsor %> - <%= form.label :sponsor_link %> - <%= form.text_field :sponsor_link %> - <%= form.label :sponsor_logo %> - <%= form.text_field :sponsor_logo %> - <%= form.label :start_at %> - <%= form.datetime_field :start_at, - include_seconds: false, - value: - event - &.start_at - &.in_time_zone("Eastern Time (US & Canada)") - .presence || - Time.zone.now.in_time_zone("Eastern Time (US & Canada)") %> - <%= form.label :status %> - <%= form.select :status, options_for_select(Event.statuses_for_select, event.status) %> - <%= form.submit %> +
+ +
+

Basic Information

+ +
+
+ <%= form.label :name, class: "block text-sm font-medium text-gray-700 mb-1" %> + <%= form.text_field :name, required: true, class: "block w-full px-4 py-3 rounded-lg border border-gray-300 shadow-sm focus:border-ruby-500 focus:ring-1 focus:ring-ruby-500 transition-colors" %> +
+ +
+ <%= form.label :start_at, class: "block text-sm font-medium text-gray-700 mb-1" %> + <%= form.datetime_field :start_at, + include_seconds: false, + value: event&.start_at&.in_time_zone("Eastern Time (US & Canada)").presence || Time.zone.now.in_time_zone("Eastern Time (US & Canada)"), + class: "block w-full px-4 py-3 rounded-lg border border-gray-300 shadow-sm focus:border-ruby-500 focus:ring-1 focus:ring-ruby-500 transition-colors" %> +

Eastern Time (US & Canada)

+
+ +
+ <%= form.label :status, class: "block text-sm font-medium text-gray-700 mb-1" %> + <%= form.select :status, + options_for_select(Event.statuses_for_select, event.status), + {}, + class: "block w-full px-4 py-3 rounded-lg border border-gray-300 shadow-sm focus:border-ruby-500 focus:ring-1 focus:ring-ruby-500 transition-colors" %> +
+ +
+ <%= form.label :rsvp_link, "RSVP Link", class: "block text-sm font-medium text-gray-700 mb-1" %> + <%= form.text_field :rsvp_link, required: true, placeholder: "https://...", class: "block w-full px-4 py-3 rounded-lg border border-gray-300 shadow-sm focus:border-ruby-500 focus:ring-1 focus:ring-ruby-500 transition-colors placeholder-gray-400" %> +
+
+
+ + +
+

Event Details

+ +
+
+ <%= form.label :location, class: "block text-sm font-medium text-gray-700 mb-1" %> +
+ <%= form.rich_text_area :location, required: true, class: "block w-full" %> +
+
+ +
+ <%= form.label :description, "Agenda", class: "block text-sm font-medium text-gray-700 mb-1" %> +
+ <%= form.rich_text_area :description, class: "block w-full" %> +
+
+
+
+ + +
+

Sponsor Information

+

Optional: Add sponsor details if this event has a sponsor

+ +
+
+ <%= form.label :sponsor, "Sponsor Name", class: "block text-sm font-medium text-gray-700 mb-1" %> + <%= form.text_field :sponsor, class: "block w-full px-4 py-3 rounded-lg border border-gray-300 shadow-sm focus:border-ruby-500 focus:ring-1 focus:ring-ruby-500 transition-colors" %> +
+ +
+ <%= form.label :sponsor_link, "Sponsor Website", class: "block text-sm font-medium text-gray-700 mb-1" %> + <%= form.text_field :sponsor_link, placeholder: "https://...", class: "block w-full px-4 py-3 rounded-lg border border-gray-300 shadow-sm focus:border-ruby-500 focus:ring-1 focus:ring-ruby-500 transition-colors placeholder-gray-400" %> +
+ +
+ <%= form.label :sponsor_logo, "Logo Filename", class: "block text-sm font-medium text-gray-700 mb-1" %> + <%= form.text_field :sponsor_logo, placeholder: "company.png", class: "block w-full px-4 py-3 rounded-lg border border-gray-300 shadow-sm focus:border-ruby-500 focus:ring-1 focus:ring-ruby-500 transition-colors placeholder-gray-400" %> +

Logo should be placed in app/assets/images/sponsors/

+
+
+
+ + +
+ <%= link_to "Cancel", admin_events_path, class: "btn-secondary" %> + <%= form.submit class: "btn-primary" %> +
<% end %> + + diff --git a/app/views/admin/events/edit.html.erb b/app/views/admin/events/edit.html.erb index b4b560c..d7d1fe8 100644 --- a/app/views/admin/events/edit.html.erb +++ b/app/views/admin/events/edit.html.erb @@ -1,13 +1,49 @@ -

Editing event

- -<%= render "form", event: @event %> - -
- -
- <%= link_to "Back to events", admin_events_path %> +
+
+ + + + +
+

Edit Event

+

Update the event details below

+
+ + + <%= render "form", event: @event %> + + +
+
+

Quick Actions

+
+ <%= link_to "View Event", event_path(@event), class: "text-sm text-ruby-600 hover:text-ruby-700", target: "_blank" %> + <%= link_to "View in Admin", admin_event_path(@event), class: "text-sm text-ruby-600 hover:text-ruby-700" %> +
+
+
+
<% content_for :page_title do %> - Editing <%= @event.name %> + Edit <%= @event.name %> - Admin <% end %> diff --git a/app/views/admin/events/index.html.erb b/app/views/admin/events/index.html.erb index 6f6e6d7..fd14376 100644 --- a/app/views/admin/events/index.html.erb +++ b/app/views/admin/events/index.html.erb @@ -1,20 +1,106 @@ -

Event List

-<%= link_to "New Event", new_admin_event_path, class: "rounded bg-ruby px-2 py-1 text-xs text-white" %> -
-
    - <% @events.each do |event| %> -
  • - - <%= link_to event.name, admin_event_path(event) %> - - <%= link_to "Edit", edit_admin_event_path(event), class: "text-underline" %> - <%= button_to "Delete", admin_event_path(event), method: :delete, class: "rounded bg-red-600 px-2 py-1 text-xs font-semibold text-white shadow-sm hover:bg-red-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-red-600", data: {turbo_confirm: "Are you sure?"} %> -
    • - <% end %> -
+
+
+ +
+
+

Event Management

+
+
+ <%= link_to new_admin_event_path, class: "btn-primary" do %> + + + + New Event + <% end %> +
+
+ + +
+
+ <% if @events.any? %> +
+
    + <% @events.each do |event| %> +
  • +
    +
    +
    +

    + <%= link_to event.name, admin_event_path(event), class: "hover:text-ruby-600" %> +

    + <% if event.published? %> + + Published + + <% else %> + + Draft + + <% end %> +
    +
    + + + + + <%= event.start_at.strftime("%B %d, %Y at %l:%M %p") %> + + <% if event.sponsor.present? %> + + + + + Sponsored by <%= event.sponsor %> + + <% end %> +
    +
    + +
    + <%= link_to edit_admin_event_path(event), class: "p-2 text-gray-400 hover:text-ruby-600 hover:bg-gray-100 rounded-lg transition-colors" do %> + + + + <% end %> + + <%= button_to admin_event_path(event), + method: :delete, + class: "p-2 text-gray-400 hover:text-red-600 hover:bg-red-50 rounded-lg transition-colors", + data: { turbo_confirm: "Are you sure you want to delete this event?" } do %> + + + + <% end %> +
    +
    +
    • + <% end %> +
+
+ <% else %> +
+ + + +

No events

+

Get started by creating a new event.

+
+ <%= link_to new_admin_event_path, class: "btn-primary" do %> + + + + New Event + <% end %> +
+
+ <% end %> +
+
+
<% content_for :page_title do %> - Admin Home + Admin - Events <% end %> diff --git a/app/views/admin/events/new.html.erb b/app/views/admin/events/new.html.erb index bc7b9e5..dbfae73 100644 --- a/app/views/admin/events/new.html.erb +++ b/app/views/admin/events/new.html.erb @@ -1,12 +1,38 @@ -

New event

- -<%= render "form", event: @event %> - -
- -
- <%= link_to "Back to events", events_path %> +
+
+ + + + +
+

Create New Event

+

Fill in the details for the upcoming Toronto Ruby event

+
+ + + <%= render "form", event: @event %> +
+ <% content_for :page_title do %> - Create new event + Create New Event - Admin <% end %> diff --git a/app/views/admin/events/show.html.erb b/app/views/admin/events/show.html.erb index 9059494..c7bdd1f 100644 --- a/app/views/admin/events/show.html.erb +++ b/app/views/admin/events/show.html.erb @@ -1,10 +1,96 @@ -<%= content_for :event_content do %> - <%= link_to "Edit this event", edit_admin_event_path(@event) %> - <%= render partial: "events/event", locals: { event: @event } %> -<% end %> - -<%= render partial: "layouts/event_layout" %> +
+
+ + + + +
+
+
+ + + + Admin Preview +
+
+ <%= link_to edit_admin_event_path(@event), class: "btn-secondary text-sm py-2 px-4" do %> + + + + Edit Event + <% end %> + <%= link_to event_path(@event), class: "text-sm text-ruby-600 hover:text-ruby-700 font-medium", target: "_blank" do %> + View Public Page + + + + <% end %> +
+
+
+ + +
+ <%= render partial: "events/event", locals: { event: @event } %> +
+ + +
+

Event Metadata

+
+
+
Status
+
+ <% if @event.published? %> + + Published + + <% else %> + + Draft + + <% end %> +
+
+ +
+
Created
+
<%= @event.created_at.strftime("%B %d, %Y at %l:%M %p") %>
+
+ +
+
Last Updated
+
<%= @event.updated_at.strftime("%B %d, %Y at %l:%M %p") %>
+
+ +
+
Slug
+
<%= @event.slug %>
+
+
+
+
+
<% content_for :page_title do %> - <%== @event.name %> + <%= @event.name %> - Admin <% end %> diff --git a/app/views/events/_event.html.erb b/app/views/events/_event.html.erb index f7727f5..658c8d2 100644 --- a/app/views/events/_event.html.erb +++ b/app/views/events/_event.html.erb @@ -1,44 +1,92 @@ -
+
<% future = Time.zone.now < event.start_at %> -
-
-

<%= link_to event.name, event %>

-
-

<%= event.start_time %>

- <%= event.location %> -
-
- -
-

Agenda

-
-
- <%= event.description %> + +
+ +
+
+

+ <%= event.name %> +

+
+
+ + + + <%= event.start_time %> +
+ <% if future %> + + Upcoming + + <% else %> + + Past Event + + <% end %>
-
-
-
- <% if future %> -
- <%= link_to event.rsvp_link, class: "rounded-full bg-ruby px-4 py-2.5 font-semibold text-white/100 shadow-sm ring-1 ring-inset ring-ruby hover:bg-red-400" do %> + + <% if future %> + <%= link_to event.rsvp_link, class: "btn-primary", target: "_blank", rel: "noopener" do %> Join the event + + + <% end %> + <% end %> +
+ + +
+ +
+

+ + + + + Location +

+
+ <%= event.location %> +
- <% end %> + + +
+

+ + + + Agenda +

+
+
+ <%= event.description %> +
+
+
+
+ + <% if event.sponsor %> -

Sponsor

-
- <%= link_to event.sponsor_link do %> - <% if event.sponsor_logo.present? %> - <%= image_tag "sponsors/#{event.sponsor_logo}", class: "max-h-20" %> - <% else %> - <%= event.sponsor.titleize %> +
+
+

Event Sponsor

+ <%= link_to event.sponsor_link, class: "group flex items-center gap-4 hover:opacity-80 transition-opacity", target: "_blank", rel: "noopener" do %> + <% if event.sponsor_logo.present? %> + <%= image_tag "sponsors/#{event.sponsor_logo}", class: "max-h-16 max-w-[200px] object-contain", alt: event.sponsor %> + <% else %> + + <%= event.sponsor.titleize %> + + <% end %> + + + <% end %> - <% end %> +
<% end %>
diff --git a/app/views/events/index.html.erb b/app/views/events/index.html.erb index d8f5cd4..f1a126a 100644 --- a/app/views/events/index.html.erb +++ b/app/views/events/index.html.erb @@ -11,7 +11,7 @@ <%= content_for :event_content do %> <%= render partial: "event", collection: @events %> - + <% end %> <%= render partial: "layouts/event_layout" %> diff --git a/app/views/events/past.html.erb b/app/views/events/past.html.erb new file mode 100644 index 0000000..a43e318 --- /dev/null +++ b/app/views/events/past.html.erb @@ -0,0 +1,87 @@ +
+
+ +
+
+ + + +
+

Past Events

+

+ Explore our archive of previous Toronto Ruby meetups. + Each event brought our community together to learn, share, and grow. +

+
+ + +
+
+
<%= @events.count %>
+
Total Events
+
+
+
+ <%= @events.select { |e| e.start_at.year == Date.current.year }.count %> +
+
Events This Year
+
+
+
+ <%= @events.map { |e| e.start_at.year }.uniq.count %> +
+
Years Active
+
+
+ + +
+ <% if @events.any? %> + <% @events.group_by { |event| event.start_at.year }.sort.reverse.each do |year, year_events| %> +
+ +
+
+ <%= year %> +
+
+ + +
+ <% year_events.sort_by(&:start_at).reverse.each do |event| %> + <%= render partial: "events/event", locals: { event: event } %> + <% end %> +
+
+ <% end %> + <% else %> +
+ + + +

No past events

+

Check back after our first meetup!

+
+ <% end %> +
+ + +
+
+

Don't Miss Our Next Event

+

+ Join our newsletter to get notified about upcoming Toronto Ruby meetups +

+ <%= link_to "View Upcoming Events", root_path, class: "btn-primary" %> +
+
+
+
+ +<% content_for :page_title do %> + Past Events - Toronto Ruby +<% end %> + +<% content_for :page_description do %> + Browse the archive of past Toronto Ruby meetups and community events +<% end %> \ No newline at end of file diff --git a/app/views/events/show.html.erb b/app/views/events/show.html.erb deleted file mode 100644 index 30d696a..0000000 --- a/app/views/events/show.html.erb +++ /dev/null @@ -1,9 +0,0 @@ -<% content_for :page_title do %> - <%== @event.name %> -<% end %> - -<%= content_for :event_content do %> - <%= render partial: "events/event", locals: { event: @event } %> -<% end %> - -<%= render partial: "layouts/event_layout" %> diff --git a/app/views/layouts/_event_layout.html.erb b/app/views/layouts/_event_layout.html.erb index 846bcf7..4495e67 100644 --- a/app/views/layouts/_event_layout.html.erb +++ b/app/views/layouts/_event_layout.html.erb @@ -1,18 +1,42 @@ -
-
-
-

- Meetups for Toronto's Ruby community +
+ +
+
+
+ +
+ <%= image_tag "logo-transparent.png", class: "h-48 md:h-48 lg:h-64 w-auto mx-auto", alt: "Toronto Ruby" %> +
+ +

+ Meetups for Toronto's + Ruby community

- -

We're a group of Ruby developers who meet up to talk about programming, the industry, and life. We're working to strengthen the local Ruby community and provide a positive space for everyone to connect.

+

+ We're a group of Ruby developers who meet up to talk about programming, the industry, and life. + We're working to strengthen the local Ruby community and provide a positive space for everyone to connect. +

-
+
+ + +
+
<%= yield(:event_content) %>
-
- <%= render 'layouts/newsletter_form' %> + + +
+
+

Stay in the loop

+

Get notified about upcoming meetups and Ruby community news

+ <%= render 'layouts/newsletter_form' %> +
+
+ + +
+ <%= render 'layouts/supporting_companies' %>
- <%= render 'layouts/supporting_companies' %>
-

+
diff --git a/app/views/layouts/_newsletter_form.html.erb b/app/views/layouts/_newsletter_form.html.erb index 44462a5..69c6c26 100644 --- a/app/views/layouts/_newsletter_form.html.erb +++ b/app/views/layouts/_newsletter_form.html.erb @@ -2,9 +2,7 @@
-
-

Nice to meet you, let's keep in touch!

-
+
    diff --git a/app/views/layouts/_supporting_companies.html.erb b/app/views/layouts/_supporting_companies.html.erb index 7406aff..fb782c0 100644 --- a/app/views/layouts/_supporting_companies.html.erb +++ b/app/views/layouts/_supporting_companies.html.erb @@ -1,14 +1,18 @@ -
    -

    Supporting Companies

    -
    - <%= link_to 'https://clio.com' do %> - <%= image_tag "sponsors/clio.png", class: "max-h-20 px-4" %> +
    +

    Supporting Companies

    +
    + <%= link_to 'https://clio.com', class: 'group grayscale hover:grayscale-0 transition-all duration-300', target: '_blank', rel: 'noopener' do %> + <%= image_tag "sponsors/clio.png", class: "h-16 md:h-20 w-auto opacity-60 group-hover:opacity-100 transition-opacity", alt: "Clio" %> <% end %> - <%= link_to 'https://shopify.com' do %> - <%= image_tag "sponsors/shopify.png", class: "max-h-16" %> + <%= link_to 'https://shopify.com', class: 'group grayscale hover:grayscale-0 transition-all duration-300', target: '_blank', rel: 'noopener' do %> + <%= image_tag "sponsors/shopify.png", class: "h-12 md:h-16 w-auto opacity-60 group-hover:opacity-100 transition-opacity", alt: "Shopify" %> <% end %> - <%= link_to 'https://switchgrowth.com' do %> - <%= image_tag "sponsors/switch.png", class: "max-h-20" %> + <%= link_to 'https://switchgrowth.com', class: 'group grayscale hover:grayscale-0 transition-all duration-300', target: '_blank', rel: 'noopener' do %> + <%= image_tag "sponsors/switch.png", class: "h-16 md:h-20 w-auto opacity-60 group-hover:opacity-100 transition-opacity", alt: "Switch" %> <% end %>
    +

    + Interested in supporting Toronto Ruby? + <%= link_to "Get in touch", "mailto:info@toronto-ruby.com", class: "text-ruby-500 hover:text-ruby-600 font-medium" %> +

    diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index d0480d8..20a5905 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,5 +1,5 @@ - + <%= title %> @@ -13,9 +13,23 @@ <%= javascript_include_tag "application", "data-turbo-track": "reload", defer: true %> - - <%= render "layouts/common/navigation" %> - <%= render "layouts/common/flash" %> - <%= yield %> + +
    + <%= render "layouts/common/navigation" %> + <%= render "layouts/common/flash" %> +
    + <%= yield %> +
    +
    +
    +

    © <%= Date.current.year %> Toronto Ruby. Built with ❤️ in Toronto.

    +
    + <%= link_to "Code of Conduct", code_of_conduct_path, class: "hover:text-ruby-500" %> + <%= link_to "About", about_path, class: "hover:text-ruby-500" %> + <%= link_to "Contact", "mailto:info@toronto-ruby.com", class: "hover:text-ruby-500" %> +
    +
    +
    +
    diff --git a/app/views/layouts/common/_flash.html.erb b/app/views/layouts/common/_flash.html.erb index 759af5f..ddf85fc 100644 --- a/app/views/layouts/common/_flash.html.erb +++ b/app/views/layouts/common/_flash.html.erb @@ -1,13 +1,75 @@ <% if flash[:notice] %> -
    -
    -
    - +
    +
    +
    +
    + +
    +
    +

    <%= flash[:notice] %>

    +
    +
    + +
    -
    -

    <%= flash[:notice] %>

    +
    +
    + + + + +<% end %> + +<% if flash[:alert] %> +
    +
    +
    +
    + +
    +
    +

    <%= flash[:alert] %>

    +
    +
    + +
    diff --git a/app/views/layouts/common/_navigation.html.erb b/app/views/layouts/common/_navigation.html.erb index 8b7df52..4d993ae 100644 --- a/app/views/layouts/common/_navigation.html.erb +++ b/app/views/layouts/common/_navigation.html.erb @@ -1,22 +1,53 @@ -
    - <%= image_tag "logo-transparent.png", class: "mx-auto max-w-[16rem] h-auto" %> - +
    +
    +
    + +
    + <%= link_to root_path, class: "flex items-center group" do %> + <%= image_tag "logo-transparent.png", class: "h-12 w-auto transition-transform group-hover:scale-105", alt: "Toronto Ruby" %> + <% end %> +
    + + + + + +
    + +
    +
    + + + +
    diff --git a/app/views/static/about.html.erb b/app/views/static/about.html.erb index a2fe678..b28a597 100644 --- a/app/views/static/about.html.erb +++ b/app/views/static/about.html.erb @@ -1,18 +1,72 @@ -
    -
    -
    -

    - Toronto Ruby is organized by Simmon Li, Georges Gabereau and Melanie Wang. +

    +
    +
    +

    About Toronto Ruby

    +

    + We're passionate about building a thriving Ruby community in Toronto +

    +
    + +
    +

    Our Mission

    +

    + Toronto Ruby is dedicated to creating an inclusive, welcoming space for Ruby developers of all skill levels. + We believe in the power of community to help developers learn, grow, and build amazing things together. +

    +

    + Through regular meetups, workshops, and social events, we're working to strengthen connections within + Toronto's tech community and showcase the vibrant Ruby ecosystem in our city.

    -

    - Find us on Github! +

    + +
    +

    Meet the Organizers

    +
    +
    +
    + SL +
    +

    Simmon Li

    +

    Community Builder & Ruby Enthusiast

    + <%= link_to "crespire.dev", "https://crespire.dev/", class: "text-ruby-500 hover:text-ruby-600 text-sm font-medium", target: "_blank", rel: "noopener" %> +
    + +
    +
    + GG +
    +

    Georges Gabereau

    +

    Tech Lead & Open Source Contributor

    + <%= link_to "georg.es", "https://georg.es/", class: "text-ruby-500 hover:text-ruby-600 text-sm font-medium", target: "_blank", rel: "noopener" %> +
    + +
    +
    + MW +
    +

    Melanie Wang

    +

    Developer & Community Advocate

    + <%= link_to "LinkedIn", "https://www.linkedin.com/in/melanie-wang", class: "text-ruby-500 hover:text-ruby-600 text-sm font-medium", target: "_blank", rel: "noopener" %> +
    +
    +
    + +
    +

    + Want to get involved or have questions?

    +
    + <%= link_to "Join us on GitHub", "https://github.com/toronto-ruby", class: "btn-secondary", target: "_blank", rel: "noopener" %> + <%= link_to "Contact Us", "mailto:info@toronto-ruby.com", class: "btn-primary" %> +
    -
    +
    + <% content_for :page_title do %> -About + About Toronto Ruby <% end %> + <% content_for :page_description do %> -About the organizers. + Learn about the organizers and mission behind Toronto Ruby <% end %> diff --git a/app/views/static/calendar.html.erb b/app/views/static/calendar.html.erb index 56f817f..88fe288 100644 --- a/app/views/static/calendar.html.erb +++ b/app/views/static/calendar.html.erb @@ -1,32 +1,112 @@ -
    -
    -
    -

    - Icalendar Integration -

    - -

    - Add the Toronto Ruby events as a calendar subscription to your own calendar. -

    - -

    - Copy the following URL and import the calendar: +

    +
    +
    +
    + + + +
    +

    Never Miss a Meetup

    +

    + Subscribe to our calendar and get automatic updates for all Toronto Ruby events

    - -
    - - +
    + +
    +
    +

    Add to Your Calendar

    +

    + Import our events directly into your favorite calendar app. You'll automatically receive updates when new events are scheduled or existing events are modified. +

    + +
    + +
    + + +
    +
    + +
    +
    +

    + + + + Apple Calendar +

    +

    + Settings → Add Account → Other → Add Subscribed Calendar +

    +
    + +
    +

    + + + + Google Calendar +

    +

    + Other calendars → From URL → Add calendar +

    +
    +
    +
    + +
    +

    Why subscribe?

    +
      +
    • + + + + Automatic updates when events are added or changed +
      • +
    • + + + + Get reminders before each meetup +
      • +
    • + + + + See event details directly in your calendar +
      • +
    -
    +
    <% content_for :page_title do %> -Calendar + Calendar - Toronto Ruby <% end %> <% content_for :page_description do %> -Add the Toronto Ruby events as a calendar subscription to your own calendar. + Subscribe to Toronto Ruby events and never miss a meetup <% end %> diff --git a/app/views/static/chat.html.erb b/app/views/static/chat.html.erb index 169e22b..83c7c7a 100644 --- a/app/views/static/chat.html.erb +++ b/app/views/static/chat.html.erb @@ -1,19 +1,78 @@ -
    -
    -
    -

    - Chat with us on Slack! -

    - -

    - The <%= link_to "Ruby on Rails Link Slack", "https://rubyonrails.link/", class: 'underline text-ruby' %> has kindly provided us a channel to chat in, come join us in the #toronto channel! +

    +
    +
    +
    + + + +
    +

    Chat with the Community

    +

    + Connect with Ruby developers in Toronto and beyond. Share ideas, ask questions, and build lasting connections. +

    +
    + +
    +
    +
    + #toronto +
    +
    + +

    + The <%= link_to "Ruby on Rails Link Slack", "https://rubyonrails.link/", class: 'text-ruby-500 hover:text-ruby-600 font-medium' %> + community has kindly provided us with a dedicated channel. Join thousands of Ruby developers from around the world! +

    + +
    +

    What you'll find:

    +
      +
    • + + + + Local meetup announcements and discussions +
      • +
    • + + + + Job opportunities in the Toronto tech scene +
      • +
    • + + + + Technical help and code reviews +
      • +
    • + + + + Casual conversations with fellow Rubyists +
      • +
    +
    +
    + +
    + <%= link_to "https://rubyonrails.link/", class: "btn-primary", target: "_blank", rel: "noopener" do %> + Join the Slack Community + + + + <% end %> +

    + After joining, look for the #toronto channel

    -
    +
    + <% content_for :page_title do %> -Chat + Chat - Toronto Ruby <% end %> + <% content_for :page_description do %> -Join us on Slack! + Join the Toronto Ruby community on Slack and connect with local developers <% end %> diff --git a/tailwind.config.js b/tailwind.config.js index da752e4..6428daa 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -8,18 +8,49 @@ module.exports = { './app/javascript/**/*.js' ], theme: { - colors: { - beige: '#fff8ef', - ruby: '#d64045', - coffee: '#34312d', - red: colors.red, - transparent: 'transparent', - current: 'currentColor', - black: colors.black, - white: colors.white, - gray: colors.gray, - green: colors.green - } + extend: { + colors: { + beige: '#fff8ef', + ruby: { + DEFAULT: '#d64045', + 50: '#fef2f2', + 100: '#fee2e2', + 200: '#fecaca', + 300: '#fca5a5', + 400: '#f87171', + 500: '#d64045', + 600: '#dc2626', + 700: '#b91c1c', + 800: '#991b1b', + 900: '#7f1d1d', + }, + coffee: '#34312d', + cream: '#fdfbf7', + charcoal: '#1a1918', + }, + fontFamily: { + 'sans': ['Inter', 'system-ui', '-apple-system', 'sans-serif'], + 'display': ['Cal Sans', 'Inter', 'system-ui', 'sans-serif'], + }, + animation: { + 'fade-in': 'fadeIn 0.5s ease-in-out', + 'slide-up': 'slideUp 0.5s ease-out', + }, + keyframes: { + fadeIn: { + '0%': { opacity: '0' }, + '100%': { opacity: '1' }, + }, + slideUp: { + '0%': { transform: 'translateY(20px)', opacity: '0' }, + '100%': { transform: 'translateY(0)', opacity: '1' }, + }, + }, + boxShadow: { + 'soft': '0 2px 15px -3px rgba(0, 0, 0, 0.07), 0 10px 20px -2px rgba(0, 0, 0, 0.04)', + 'glow': '0 0 20px rgba(214, 64, 69, 0.1)', + }, + }, }, plugins: [ require('@tailwindcss/typography'), diff --git a/test/controllers/events_controller_test.rb b/test/controllers/events_controller_test.rb index bfd70e1..3b0a978 100644 --- a/test/controllers/events_controller_test.rb +++ b/test/controllers/events_controller_test.rb @@ -52,11 +52,4 @@ def setup assert_equal 0, events.count end - - test 'should redirect to events page if event is not found' do - get :show, params: { slug: 'nonexistent-event' } - - assert_response :found - assert_redirected_to all_events_path - end end