From 4abcafbedbb7b6d3eb2fea3c5aca0c15ceff1368 Mon Sep 17 00:00:00 2001 From: chtelmko Date: Mon, 3 Oct 2022 15:05:47 -0400 Subject: [PATCH 1/2] Fix next meeting time from GMT to Eastern Co-authored-by: Alex Nahas --- app/mailers/application_mailer.rb | 1 - app/views/pages/index.html.erb | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb index 0dae535..ead50cd 100644 --- a/app/mailers/application_mailer.rb +++ b/app/mailers/application_mailer.rb @@ -1,3 +1,2 @@ class ApplicationMailer < ActionMailer::Base end - diff --git a/app/views/pages/index.html.erb b/app/views/pages/index.html.erb index 6812d6e..6a37f74 100644 --- a/app/views/pages/index.html.erb +++ b/app/views/pages/index.html.erb @@ -39,7 +39,7 @@ <%= Time.at(meeting['time']/1000).strftime('%b %-d') %>
- <%= Time.at(meeting['time']/1000).strftime('%l:%M %P') %> + <%= Time.at(meeting['time']/1000, in: '+09:00').strftime('%l:%M %P') %>
<%- end %> From a9b7c9de764dd29e451e12e743ae7032f7c0f743 Mon Sep 17 00:00:00 2001 From: chtelmko Date: Mon, 3 Oct 2022 15:26:51 -0400 Subject: [PATCH 2/2] really fix the time, this time --- app/views/pages/index.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/pages/index.html.erb b/app/views/pages/index.html.erb index 6a37f74..d78b423 100644 --- a/app/views/pages/index.html.erb +++ b/app/views/pages/index.html.erb @@ -39,7 +39,7 @@ <%= Time.at(meeting['time']/1000).strftime('%b %-d') %>
- <%= Time.at(meeting['time']/1000, in: '+09:00').strftime('%l:%M %P') %> + <%= Time.at(meeting['time']/1000).in_time_zone('EST').strftime('%l:%M %P') %>
<%- end %> @@ -56,7 +56,7 @@ <%= form_for Contact.new, url: "/contact_us", :remote => true do |f| %>
<%= f.text_field :name, :placeholder => "Name" %> - <%= f.text_field :email, :placeholder => "Email Address" %> + <%= f.text_field :email, :placeholder => "EmailAddress" %> <%= f.text_field :subject, :placeholder => "Subject" %> <%= f.text_area :message, :placeholder => "Message", :rows => 5, :class => "message" %>