Revert gallery changes

lsst-epo · Jan 14, 2025 · d81bd89 · d81bd89
1 parent 2b3e5da
commit d81bd89
Show file tree

Hide file tree

Showing 82 changed files with 650 additions and 60,686 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,7 +5,6 @@
 
 # testing
 /coverage
-/cypress/screenshots
 
 # next.js
 /.next/
@@ -38,4 +37,4 @@ env files
 .vscode
 
 # storybook
-/storybook-static/*
+/storybook-static/*
diff --git a/app/[locale]/[...uriSegments]/page.tsx b/app/[locale]/[...uriSegments]/page.tsx
@@ -43,10 +43,7 @@ const pickFeaturedImage = async (
 };
 
 export async function generateMetadata(
-  {
-    params: { locale, uriSegments },
-    searchParams = {},
-  }: WithSearchParams<UriSegmentProps>,
+  { params: { locale, uriSegments }, searchParams = {} }: UriSegmentProps,
   parent: ResolvingMetadata
 ): Promise<Metadata> {
   const uri = uriSegments.join("/");
@@ -112,9 +109,10 @@ const sectionMap = {
   staffProfiles: StaffPageTemplate,
 };
 
-const UriSegmentsPage: FunctionComponent<
-  WithSearchParams<UriSegmentProps>
-> = async ({ params: { locale, uriSegments }, searchParams }) => {
+const UriSegmentsPage: FunctionComponent<UriSegmentProps> = async ({
+  params: { locale, uriSegments },
+  searchParams,
+}) => {
   const uri = uriSegments.join("/");
   let previewToken: string | undefined;
 

diff --git a/app/[locale]/gallery/[gallery]/[asset]/layout.tsx b/app/[locale]/gallery/[gallery]/[asset]/layout.tsx
diff --git a/app/[locale]/gallery/[gallery]/[asset]/page.tsx b/app/[locale]/gallery/[gallery]/[asset]/page.tsx
diff --git a/app/[locale]/gallery/[gallery]/layout.tsx b/app/[locale]/gallery/[gallery]/layout.tsx
diff --git a/app/[locale]/gallery/[gallery]/page.tsx b/app/[locale]/gallery/[gallery]/page.tsx
diff --git a/app/[locale]/layout.tsx b/app/[locale]/layout.tsx
@@ -1,6 +1,5 @@
 import { FunctionComponent, PropsWithChildren, Suspense } from "react";
 import { Metadata } from "next";
-import { notFound } from "next/navigation";
 import { GoogleOAuthProvider } from "@react-oauth/google";
 import { GlobalStyles } from "@rubin-epo/epo-react-lib/styles";
 import { getGlobalData } from "@/lib/api/globals";
@@ -11,7 +10,7 @@ import I18NextClientProvider from "@/contexts/i18next";
 import { AuthenticationContextProvider } from "@/contexts/Authentication";
 import PageWrapper from "@/components/organisms/PageWrapper";
 import RootScripts from "./scripts";
-import { HistoryProvider } from "@/contexts/History";
+import { notFound } from "next/navigation";
 
 const GOOGLE_APP_ID = process.env.NEXT_PUBLIC_GOOGLE_APP_ID || "";
 
@@ -81,16 +80,14 @@ const LocaleLayout: FunctionComponent<PropsWithChildren<LocaleProps>> = async ({
       <body className={SourceSansPro.variable}>
         <I18NextClientProvider {...{ locale }}>
           <Suspense>
-            <HistoryProvider>
-              <AuthenticationContextProvider>
-                <StyledComponentsRegistry>
-                  <GoogleOAuthProvider clientId={GOOGLE_APP_ID}>
-                    <GlobalStyles />
-                    <PageWrapper {...{ locale }}>{children}</PageWrapper>
-                  </GoogleOAuthProvider>
-                </StyledComponentsRegistry>
-              </AuthenticationContextProvider>
-            </HistoryProvider>
+            <AuthenticationContextProvider>
+              <StyledComponentsRegistry>
+                <GoogleOAuthProvider clientId={GOOGLE_APP_ID}>
+                  <GlobalStyles />
+                  <PageWrapper {...{ locale }}>{children}</PageWrapper>
+                </GoogleOAuthProvider>
+              </StyledComponentsRegistry>
+            </AuthenticationContextProvider>
           </Suspense>
         </I18NextClientProvider>
         <RootScripts {...{ locale }} />

diff --git a/app/[locale]/page.tsx b/app/[locale]/page.tsx
@@ -8,7 +8,7 @@ import HomePageTemplate from "@/templates/HomePage";
 export async function generateMetadata({
   params: { locale },
   searchParams = {},
-}: WithSearchParams<LocaleProps>): Promise<Metadata> {
+}: LocaleProps): Promise<Metadata> {
   let previewToken: string | undefined;
 
   if (draftMode().isEnabled) {
@@ -24,7 +24,7 @@ export async function generateMetadata({
   return { title, description };
 }
 
-const RootPage: FunctionComponent<WithSearchParams<LocaleProps>> = async ({
+const RootPage: FunctionComponent<LocaleProps> = async ({
   params: { locale },
   searchParams = {},
 }) => {