Merge branch 'main' of github.com:dddwa/ddd-2024

dddwa · Aug 20, 2024 · 496542e · 496542e
2 parents f6686c1 + 83b20b5
commit 496542e
Show file tree

Hide file tree

Showing 4 changed files with 318 additions and 415 deletions.
diff --git a/website/app/routes/_layout.$.tsx b/website/app/routes/_layout.$.tsx
@@ -11,7 +11,6 @@ import ImportantDates from '~/components/page-components/important-dates'
 import { Button } from '~/components/ui/button'
 import getConferenceActions from '~/lib/conference-actions'
 import { ConferenceState } from '~/lib/config-types'
-import { CACHE_CONTROL } from '~/lib/http.server'
 import { css } from '../../styled-system/css'
 import { Box, Flex, Grid, styled } from '../../styled-system/jsx'
 import { conferenceConfig } from '../config/conference-config'
@@ -53,7 +52,7 @@ export async function loader({ params, request, context }: LoaderFunctionArgs) {
             post: post.code,
             conferenceState: context.conferenceState,
         },
-        { headers: { 'Cache-Control': CACHE_CONTROL.doc } },
+        // { headers: { 'Cache-Control': CACHE_CONTROL.doc } },
     )
 }
 

diff --git a/website/app/routes/_layout._index.tsx b/website/app/routes/_layout._index.tsx
@@ -1,11 +1,9 @@
-import { HeadersFunction } from '@remix-run/server-runtime'
-import { CACHE_CONTROL } from '~/lib/http.server'
 import { Hero } from '../components/hero/hero'
 import { SkipToContent } from '../components/skip-to-content'
 
-export const headers: HeadersFunction = () => {
-    return { 'Cache-Control': CACHE_CONTROL.DEFAULT }
-}
+// export const headers: HeadersFunction = () => {
+//     return { 'Cache-Control': CACHE_CONTROL.DEFAULT }
+// }
 
 export default function Index() {
     return (

diff --git a/website/app/routes/_layout.agenda.$year.talk.$sessionId.tsx b/website/app/routes/_layout.agenda.$year.talk.$sessionId.tsx
@@ -9,7 +9,6 @@ import { AppLink } from '~/components/app-link'
 import { SponsorSection } from '~/components/page-components/SponsorSection'
 import { ConferenceConfigYear, ConferenceImportantInformation, ConferenceYear, Year } from '~/lib/config-types'
 import { localeTimeFormat } from '~/lib/dates/formatting'
-import { CACHE_CONTROL } from '~/lib/http.server'
 import { conferenceConfig } from '../config/conference-config'
 import { getConfSessions, sessionsSchema } from '../lib/sessionize.server'
 
@@ -60,7 +59,7 @@ export async function loader({ params, context }: LoaderFunctionArgs) {
             sessionStart: DateTime.fromISO(session.startsAt).toLocaleString(DateTime.TIME_SIMPLE),
             sessionEnd: DateTime.fromISO(session.endsAt).toLocaleString(DateTime.TIME_SIMPLE),
         },
-        { headers: { 'Cache-Control': CACHE_CONTROL.conf } },
+        // { headers: { 'Cache-Control': CACHE_CONTROL.conf } },
     )
 }