diff --git a/.env.local.sample b/.env.local.sample index 99c5675c..2daa9b84 100644 --- a/.env.local.sample +++ b/.env.local.sample @@ -13,4 +13,3 @@ NEXT_PUBLIC_DEBUG_LOGGING= NEXT_PUBLIC_RELEASE_URL= NEXT_PUBLIC_EFD_URL= NEXT_PUBLIC_HASURA_SECRET= -NEXT_PUBLIC_SURVEY_SPARROW= diff --git a/.github/workflows/dev-pull-request.yaml b/.github/workflows/dev-pull-request.yaml index f1c5c923..7388bdd0 100644 --- a/.github/workflows/dev-pull-request.yaml +++ b/.github/workflows/dev-pull-request.yaml @@ -45,7 +45,6 @@ jobs: --build-arg NEXT_PUBLIC_EFD_URL=https://hasura-e3g4rcii3q-uc.a.run.app/v1/graphql \ --build-arg NEXT_PUBLIC_HASURA_SECRET=_qfq_tMbyR4brJ@KHCzuJRU7 \ --build-arg NEXT_PUBLIC_RELEASE_URL=`https://noirlab.edu/public/api/v2/releases/{{ID}}/?lang={{SITE}}&translation_mode=fallback` \ - --build-arg NEXT_PUBLIC_SURVEY_SPARROW=true \ . - name: Configure Docker Auth diff --git a/.github/workflows/dev-push.yaml b/.github/workflows/dev-push.yaml index ea07650a..dca62ef0 100644 --- a/.github/workflows/dev-push.yaml +++ b/.github/workflows/dev-push.yaml @@ -39,7 +39,6 @@ jobs: --build-arg NEXT_PUBLIC_EFD_URL=https://hasura-e3g4rcii3q-uc.a.run.app/v1/graphql \ --build-arg NEXT_PUBLIC_HASURA_SECRET=_qfq_tMbyR4brJ@KHCzuJRU7 \ --build-arg NEXT_PUBLIC_RELEASE_URL=`https://noirlab.edu/public/api/v2/releases/{{ID}}/?lang={{SITE}}&translation_mode=fallback` \ - --build-arg NEXT_PUBLIC_SURVEY_SPARROW=true \ . - name: Configure Docker Auth diff --git a/.github/workflows/master-pr.yaml b/.github/workflows/master-pr.yaml index 28754090..dc3777cb 100644 --- a/.github/workflows/master-pr.yaml +++ b/.github/workflows/master-pr.yaml @@ -45,7 +45,6 @@ jobs: --build-arg NEXT_PUBLIC_EFD_URL=https://hasura-e3g4rcii3q-uc.a.run.app/v1/graphql \ --build-arg NEXT_PUBLIC_HASURA_SECRET=_qfq_tMbyR4brJ@KHCzuJRU7 \ --build-arg NEXT_PUBLIC_RELEASE_URL=`https://noirlab.edu/public/api/v2/releases/{{ID}}/?lang={{SITE}}&translation_mode=fallback` \ - --build-arg NEXT_PUBLIC_SURVEY_SPARROW=true \ . - name: Configure Docker Auth diff --git a/.github/workflows/master-push.yaml b/.github/workflows/master-push.yaml index c847e266..f9839403 100644 --- a/.github/workflows/master-push.yaml +++ b/.github/workflows/master-push.yaml @@ -39,7 +39,6 @@ jobs: --build-arg NEXT_PUBLIC_EFD_URL=https://hasura-e3g4rcii3q-uc.a.run.app/v1/graphql \ --build-arg NEXT_PUBLIC_HASURA_SECRET=_qfq_tMbyR4brJ@KHCzuJRU7 \ --build-arg NEXT_PUBLIC_RELEASE_URL=`https://noirlab.edu/public/api/v2/releases/{{ID}}/?lang={{SITE}}&translation_mode=fallback` \ - --build-arg NEXT_PUBLIC_SURVEY_SPARROW=true \ . - name: Configure Docker Auth diff --git a/.github/workflows/prod-push.yaml b/.github/workflows/prod-push.yaml index 9c79cc69..f1eaa181 100644 --- a/.github/workflows/prod-push.yaml +++ b/.github/workflows/prod-push.yaml @@ -45,7 +45,6 @@ jobs: --build-arg NEXT_PUBLIC_EFD_URL=https://hasura-e3g4rcii3q-uc.a.run.app/v1/graphql \ --build-arg NEXT_PUBLIC_HASURA_SECRET=_qfq_tMbyR4brJ@KHCzuJRU7 \ --build-arg NEXT_PUBLIC_RELEASE_URL=`https://noirlab.edu/public/api/v2/releases/{{ID}}/?lang={{SITE}}&translation_mode=fallback` \ - --build-arg NEXT_PUBLIC_SURVEY_SPARROW=true \ . - name: Configure Docker Auth run: gcloud --quiet auth configure-docker diff --git a/Dockerfile b/Dockerfile index 41f04ead..d4e090a0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,7 +32,6 @@ ARG CLOUD_ENV=PROD ARG NEXT_PUBLIC_EFD_URL=https://hasura-e3g4rcii3q-uc.a.run.app/v1/graphql ARG NEXT_PUBLIC_HASURA_SECRET=_qfq_tMbyR4brJ@KHCzuJRU7 ARG NEXT_PUBLIC_RELEASE_URL=`https://noirlab.edu/public/api/v2/releases/{{ID}}/?lang={{SITE}}&translation_mode=fallback` -ARG NEXT_PUBLIC_SURVEY_SPARROW=true ENV NEXT_PUBLIC_API_URL=$NEXT_PUBLIC_API_URL ENV EDC_LOGGER_API_URL=$EDC_LOGGER_API_URL diff --git a/components/modal/RegisterModal/JoinForm/index.js b/components/modal/RegisterModal/JoinForm/index.js index a19cef54..18600b1e 100644 --- a/components/modal/RegisterModal/JoinForm/index.js +++ b/components/modal/RegisterModal/JoinForm/index.js @@ -50,13 +50,13 @@ export default function JoinForm({ onEmailSignup }) { {t("join.continue_with_google")} - {t("join.continue_with_facebook")} - + */} {t("join.sign_up_with_email")} diff --git a/components/modal/SignInModal/index.js b/components/modal/SignInModal/index.js index c7a15a2b..0a4a5082 100644 --- a/components/modal/SignInModal/index.js +++ b/components/modal/SignInModal/index.js @@ -121,9 +121,9 @@ export default function SignInModal() { {t("sign_in.continue_with_google")} - + {/* {t("sign_in.continue_with_facebook")} - + */} diff --git a/hooks/useAuthentication.js b/hooks/useAuthentication.js index 5f95e4a2..29f4790c 100644 --- a/hooks/useAuthentication.js +++ b/hooks/useAuthentication.js @@ -90,9 +90,15 @@ export default function useAuthentication(data) { push(ssoModalUrl, undefined, { shallow: true, }); + // eslint-disable-next-line no-console + console.log("onSuccess", response, "onSuccess"); authenticateWithGoogle({ idToken: response.tokenId }); }, - onFailure: (error) => console.error(error), + onFailure: (error) => { + // eslint-disable-next-line no-console + console.log("onFailure", error, "onFailure"); + console.error(error); + }, }); useEffect(() => { diff --git a/lib/api/fragments/image.js b/lib/api/fragments/image.js index 0ae71545..f499d98d 100644 --- a/lib/api/fragments/image.js +++ b/lib/api/fragments/image.js @@ -38,4 +38,7 @@ cantoAssetSingle { CaptionES Credit } + fileInfo: metadata { + fileType: FileTypeExtension + } }`; diff --git a/lib/utils.js b/lib/utils.js index f19f8bd1..a488ad24 100644 --- a/lib/utils.js +++ b/lib/utils.js @@ -418,7 +418,13 @@ export const imageShaper = (site, data, className) => { const key = localeKeys[site]; - const { metadata, url, width, height } = data; + const { + metadata, + url, + width, + height, + fileInfo: { fileType }, + } = data; const { directUrlPreview = "", directUrlOriginal = "", preview = "" } = url; const urlWithoutConstraint = directUrlPreview.slice(0, -3); @@ -427,10 +433,15 @@ export const imageShaper = (site, data, className) => { const altText = metadata[`AltText${key}`]; const caption = metadata[`Caption${key}`]; const credit = metadata.Credit; + const useOriginal = fileType === "gif"; return { - url: `${urlWithoutConstraint}${Math.floor(constraint / 3)}`, - url2x: `${urlWithoutConstraint}${Math.floor(constraint / 2)}`, + url: useOriginal + ? directUrlOriginal + : `${urlWithoutConstraint}${Math.floor(constraint / 3)}`, + url2x: useOriginal + ? directUrlOriginal + : `${urlWithoutConstraint}${Math.floor(constraint / 2)}`, url3x: directUrlOriginal, thumb: preview, width: Number(width), diff --git a/pages/_app.js b/pages/_app.js index 9c35e57e..f563171c 100644 --- a/pages/_app.js +++ b/pages/_app.js @@ -11,7 +11,7 @@ import GlobalStyles from "@/styles/globalStyles"; import styles from "@/styles/styles.scss"; const PLAUSIBLE_DOMAIN = process.env.NEXT_PUBLIC_PLAUSIBLE_DOMAIN; -const SURVEY_SPARROW = process.env.NEXT_PUBLIC_SURVEY_SPARROW; +// const SURVEY_SPARROW = process.env.NEXT_PUBLIC_SURVEY_SPARROW; function Client({ Component, pageProps }) { const lang = pageProps?.data?.language || "en-US"; @@ -33,7 +33,7 @@ function Client({ Component, pageProps }) { strategy="afterInteractive" /> )} - {SURVEY_SPARROW && ( + {/* {SURVEY_SPARROW && ( <>