{s.summary}
diff --git a/src/components/Hero.jsx b/src/components/Hero.jsx index 300c40d..c8e0dd0 100644 --- a/src/components/Hero.jsx +++ b/src/components/Hero.jsx @@ -53,7 +53,7 @@ export function TextHero() {
diff --git a/src/pages/Calendar.jsx b/src/pages/Calendar.jsx
index e6db1c1..64f194b 100644
--- a/src/pages/Calendar.jsx
+++ b/src/pages/Calendar.jsx
@@ -4,15 +4,16 @@ import SEOHead from '../components/SEOHead'
import { useEvents } from '../hooks/useEvents'
function formatDateRange(dateStr, timeStr) {
- const date = new Date(dateStr)
+ const date = new Date(dateStr + 'T00:00:00')
if (Number.isNaN(date)) {
return `${dateStr}${timeStr ? ` - ${timeStr}` : ''}`
}
- return `${date.toLocaleDateString(undefined, {
+ return `${date.toLocaleDateString('en-US', {
weekday: 'long',
month: 'long',
day: 'numeric',
- })}${timeStr ? ` - ${timeStr}` : ''}`
+ timeZone: 'America/Chicago',
+ })}${timeStr ? ` - ${timeStr} CT` : ''}`
}
export default function Calendar() {
@@ -22,7 +23,7 @@ export default function Calendar() {
const today = new Date()
today.setHours(0, 0, 0, 0)
return events.filter(event => {
- const date = new Date(event.date)
+ const date = new Date(event.date + 'T00:00:00')
if (Number.isNaN(date)) return true
return date >= today
})
diff --git a/src/pages/EventDetail.jsx b/src/pages/EventDetail.jsx
index 648f238..525b13a 100644
--- a/src/pages/EventDetail.jsx
+++ b/src/pages/EventDetail.jsx
@@ -5,7 +5,7 @@ import { getEvent } from '../utils/api'
import { googleCalendarUrl, downloadICS } from '../utils/calendar'
import { track, events as ga } from '../utils/analytics'
-const apiBaseUrl = (import.meta.env.VITE_API_BASE_URL || 'http://localhost:4001').replace(/\/$/, '')
+const apiBaseUrl = (import.meta.env.VITE_API_BASE_URL || '').replace(/\/$/, '')
function parseTime(timeStr) {
if (!timeStr) return '10:00'
@@ -47,13 +47,14 @@ function getFallbackImage(event) {
}
function formatDate(dateStr) {
- const date = new Date(dateStr)
+ const date = new Date(dateStr + 'T00:00:00')
if (Number.isNaN(date.getTime())) return dateStr
- return date.toLocaleDateString(undefined, {
+ return date.toLocaleDateString('en-US', {
weekday: 'long',
month: 'long',
day: 'numeric',
year: 'numeric',
+ timeZone: 'America/Chicago',
})
}
@@ -182,7 +183,7 @@ export default function EventDetail() {
- {displayDate} • {displayTime}{event.location ? ` • ${event.location}` : ''} + {displayDate} • {displayTime} CT{event.location ? ` • ${event.location}` : ''}
{nextEvent.description || 'We would love for you to join us. Everyone is welcome!'} diff --git a/src/pages/Home.jsx b/src/pages/Home.jsx index e21d693..84e2f45 100644 --- a/src/pages/Home.jsx +++ b/src/pages/Home.jsx @@ -5,14 +5,15 @@ import { TextHero } from '../components/Hero' import { useEvents } from '../hooks/useEvents' function formatEventDate(dateStr, timeStr) { - const date = new Date(dateStr) + const date = new Date(dateStr + 'T00:00:00') if (Number.isNaN(date)) { return dateStr } - const formattedDate = date.toLocaleDateString(undefined, { + const formattedDate = date.toLocaleDateString('en-US', { weekday: 'short', month: 'short', day: 'numeric', + timeZone: 'America/Chicago', }) return timeStr ? `${formattedDate} - ${timeStr}` : formattedDate } @@ -25,7 +26,7 @@ export default function Home() { today.setHours(0, 0, 0, 0) return events .filter(event => { - const date = new Date(event.date) + const date = new Date(event.date + 'T00:00:00') if (Number.isNaN(date)) return true return date >= today }) diff --git a/src/pages/admin/AdminEventForm.jsx b/src/pages/admin/AdminEventForm.jsx index 8b2b3ea..402f24e 100644 --- a/src/pages/admin/AdminEventForm.jsx +++ b/src/pages/admin/AdminEventForm.jsx @@ -2,7 +2,7 @@ import React, { useEffect, useRef, useState } from 'react' import { useNavigate, useParams } from 'react-router-dom' import { createEvent, getAdminToken, getEvent, updateEvent, uploadImage } from '../../utils/api' -const apiBaseUrl = (import.meta.env.VITE_API_BASE_URL || 'http://localhost:4001').replace(/\/$/, '') +const apiBaseUrl = (import.meta.env.VITE_API_BASE_URL || '').replace(/\/$/, '') function resolveImageUrl(value) { if (!value) return '' diff --git a/src/utils/api.js b/src/utils/api.js index d1369d7..f5d4ffb 100644 --- a/src/utils/api.js +++ b/src/utils/api.js @@ -1,4 +1,4 @@ -const baseUrl = (import.meta.env.VITE_API_BASE_URL || 'http://localhost:4001').replace(/\/$/, '') +const baseUrl = (import.meta.env.VITE_API_BASE_URL || '').replace(/\/$/, '') async function request(path, { method = 'GET', body, token, headers = {} } = {}) { const url = `${baseUrl}${path}` diff --git a/vite.config.js b/vite.config.js index f5a5387..40e7a23 100644 --- a/vite.config.js +++ b/vite.config.js @@ -8,12 +8,12 @@ export default defineConfig({ port: 5173, proxy: { '/api': { - target: 'http://localhost:4001', + target: 'http://localhost:3070', changeOrigin: true, secure: false, }, '/uploads': { - target: 'http://localhost:4001', + target: 'http://localhost:3070', changeOrigin: true, secure: false, },