diff --git a/clients/web/src/pages/about/index.tsx b/clients/web/src/archive/pages/about/index.tsx similarity index 100% rename from clients/web/src/pages/about/index.tsx rename to clients/web/src/archive/pages/about/index.tsx diff --git a/clients/web/src/pages/account/index.js b/clients/web/src/archive/pages/account/index.js similarity index 100% rename from clients/web/src/pages/account/index.js rename to clients/web/src/archive/pages/account/index.js diff --git a/clients/web/src/pages/api/import.ts b/clients/web/src/archive/pages/api/import.ts similarity index 100% rename from clients/web/src/pages/api/import.ts rename to clients/web/src/archive/pages/api/import.ts diff --git a/clients/web/src/pages/api/placards.ts b/clients/web/src/archive/pages/api/placards.ts similarity index 100% rename from clients/web/src/pages/api/placards.ts rename to clients/web/src/archive/pages/api/placards.ts diff --git a/clients/web/src/pages/api/revalidate.ts b/clients/web/src/archive/pages/api/revalidate.ts similarity index 100% rename from clients/web/src/pages/api/revalidate.ts rename to clients/web/src/archive/pages/api/revalidate.ts diff --git a/clients/web/src/pages/api/user.ts b/clients/web/src/archive/pages/api/user.ts similarity index 100% rename from clients/web/src/pages/api/user.ts rename to clients/web/src/archive/pages/api/user.ts diff --git a/clients/web/src/pages/contact-info/index.tsx b/clients/web/src/archive/pages/contact-info/index.tsx similarity index 100% rename from clients/web/src/pages/contact-info/index.tsx rename to clients/web/src/archive/pages/contact-info/index.tsx diff --git a/clients/web/src/pages/explore/pocket-hits-signup/index.js b/clients/web/src/archive/pages/explore/pocket-hits-signup/index.js similarity index 100% rename from clients/web/src/pages/explore/pocket-hits-signup/index.js rename to clients/web/src/archive/pages/explore/pocket-hits-signup/index.js diff --git a/clients/web/src/pages/farewell/index.js b/clients/web/src/archive/pages/farewell/index.js similarity index 100% rename from clients/web/src/pages/farewell/index.js rename to clients/web/src/archive/pages/farewell/index.js diff --git a/clients/web/src/pages/feedback/index.js b/clients/web/src/archive/pages/feedback/index.js similarity index 100% rename from clients/web/src/pages/feedback/index.js rename to clients/web/src/archive/pages/feedback/index.js diff --git a/clients/web/src/pages/learn-more/index.tsx b/clients/web/src/archive/pages/learn-more/index.tsx similarity index 100% rename from clients/web/src/pages/learn-more/index.tsx rename to clients/web/src/archive/pages/learn-more/index.tsx diff --git a/clients/web/src/pages/lists/[slug].js b/clients/web/src/archive/pages/lists/[slug].js similarity index 100% rename from clients/web/src/pages/lists/[slug].js rename to clients/web/src/archive/pages/lists/[slug].js diff --git a/clients/web/src/pages/lists/index.js b/clients/web/src/archive/pages/lists/index.js similarity index 100% rename from clients/web/src/pages/lists/index.js rename to clients/web/src/archive/pages/lists/index.js diff --git a/clients/web/src/pages/read/[slug].ts b/clients/web/src/archive/pages/read/[slug].ts similarity index 100% rename from clients/web/src/pages/read/[slug].ts rename to clients/web/src/archive/pages/read/[slug].ts diff --git a/clients/web/src/pages/saves/archive/index.js b/clients/web/src/archive/pages/saves/archive/index.js similarity index 100% rename from clients/web/src/pages/saves/archive/index.js rename to clients/web/src/archive/pages/saves/archive/index.js diff --git a/clients/web/src/pages/saves/articles/archive.js b/clients/web/src/archive/pages/saves/articles/archive.js similarity index 100% rename from clients/web/src/pages/saves/articles/archive.js rename to clients/web/src/archive/pages/saves/articles/archive.js diff --git a/clients/web/src/pages/saves/articles/favorites.js b/clients/web/src/archive/pages/saves/articles/favorites.js similarity index 100% rename from clients/web/src/pages/saves/articles/favorites.js rename to clients/web/src/archive/pages/saves/articles/favorites.js diff --git a/clients/web/src/pages/saves/articles/index.js b/clients/web/src/archive/pages/saves/articles/index.js similarity index 100% rename from clients/web/src/pages/saves/articles/index.js rename to clients/web/src/archive/pages/saves/articles/index.js diff --git a/clients/web/src/pages/saves/articles/unread.js b/clients/web/src/archive/pages/saves/articles/unread.js similarity index 100% rename from clients/web/src/pages/saves/articles/unread.js rename to clients/web/src/archive/pages/saves/articles/unread.js diff --git a/clients/web/src/pages/saves/favorites/archive.js b/clients/web/src/archive/pages/saves/favorites/archive.js similarity index 100% rename from clients/web/src/pages/saves/favorites/archive.js rename to clients/web/src/archive/pages/saves/favorites/archive.js diff --git a/clients/web/src/pages/saves/favorites/index.js b/clients/web/src/archive/pages/saves/favorites/index.js similarity index 100% rename from clients/web/src/pages/saves/favorites/index.js rename to clients/web/src/archive/pages/saves/favorites/index.js diff --git a/clients/web/src/pages/saves/favorites/unread.js b/clients/web/src/archive/pages/saves/favorites/unread.js similarity index 100% rename from clients/web/src/pages/saves/favorites/unread.js rename to clients/web/src/archive/pages/saves/favorites/unread.js diff --git a/clients/web/src/pages/saves/highlights/archive.js b/clients/web/src/archive/pages/saves/highlights/archive.js similarity index 100% rename from clients/web/src/pages/saves/highlights/archive.js rename to clients/web/src/archive/pages/saves/highlights/archive.js diff --git a/clients/web/src/pages/saves/highlights/favorites.js b/clients/web/src/archive/pages/saves/highlights/favorites.js similarity index 100% rename from clients/web/src/pages/saves/highlights/favorites.js rename to clients/web/src/archive/pages/saves/highlights/favorites.js diff --git a/clients/web/src/pages/saves/highlights/index.js b/clients/web/src/archive/pages/saves/highlights/index.js similarity index 100% rename from clients/web/src/pages/saves/highlights/index.js rename to clients/web/src/archive/pages/saves/highlights/index.js diff --git a/clients/web/src/pages/saves/highlights/unread.js b/clients/web/src/archive/pages/saves/highlights/unread.js similarity index 100% rename from clients/web/src/pages/saves/highlights/unread.js rename to clients/web/src/archive/pages/saves/highlights/unread.js diff --git a/clients/web/src/pages/saves/index.js b/clients/web/src/archive/pages/saves/index.js similarity index 100% rename from clients/web/src/pages/saves/index.js rename to clients/web/src/archive/pages/saves/index.js diff --git a/clients/web/src/pages/saves/search/archive.js b/clients/web/src/archive/pages/saves/search/archive.js similarity index 100% rename from clients/web/src/pages/saves/search/archive.js rename to clients/web/src/archive/pages/saves/search/archive.js diff --git a/clients/web/src/pages/saves/search/favorites.js b/clients/web/src/archive/pages/saves/search/favorites.js similarity index 100% rename from clients/web/src/pages/saves/search/favorites.js rename to clients/web/src/archive/pages/saves/search/favorites.js diff --git a/clients/web/src/pages/saves/search/index.js b/clients/web/src/archive/pages/saves/search/index.js similarity index 100% rename from clients/web/src/pages/saves/search/index.js rename to clients/web/src/archive/pages/saves/search/index.js diff --git a/clients/web/src/pages/saves/search/unread.js b/clients/web/src/archive/pages/saves/search/unread.js similarity index 100% rename from clients/web/src/pages/saves/search/unread.js rename to clients/web/src/archive/pages/saves/search/unread.js diff --git a/clients/web/src/pages/saves/tags/[tag]/[filter].js b/clients/web/src/archive/pages/saves/tags/[tag]/[filter].js similarity index 100% rename from clients/web/src/pages/saves/tags/[tag]/[filter].js rename to clients/web/src/archive/pages/saves/tags/[tag]/[filter].js diff --git a/clients/web/src/pages/saves/tags/[tag]/index.js b/clients/web/src/archive/pages/saves/tags/[tag]/index.js similarity index 100% rename from clients/web/src/pages/saves/tags/[tag]/index.js rename to clients/web/src/archive/pages/saves/tags/[tag]/index.js diff --git a/clients/web/src/pages/saves/tags/index.js b/clients/web/src/archive/pages/saves/tags/index.js similarity index 100% rename from clients/web/src/pages/saves/tags/index.js rename to clients/web/src/archive/pages/saves/tags/index.js diff --git a/clients/web/src/pages/saves/videos/archive.js b/clients/web/src/archive/pages/saves/videos/archive.js similarity index 100% rename from clients/web/src/pages/saves/videos/archive.js rename to clients/web/src/archive/pages/saves/videos/archive.js diff --git a/clients/web/src/pages/saves/videos/favorites.js b/clients/web/src/archive/pages/saves/videos/favorites.js similarity index 100% rename from clients/web/src/pages/saves/videos/favorites.js rename to clients/web/src/archive/pages/saves/videos/favorites.js diff --git a/clients/web/src/pages/saves/videos/index.js b/clients/web/src/archive/pages/saves/videos/index.js similarity index 100% rename from clients/web/src/pages/saves/videos/index.js rename to clients/web/src/archive/pages/saves/videos/index.js diff --git a/clients/web/src/pages/saves/videos/unread.js b/clients/web/src/archive/pages/saves/videos/unread.js similarity index 100% rename from clients/web/src/pages/saves/videos/unread.js rename to clients/web/src/archive/pages/saves/videos/unread.js diff --git a/clients/web/src/pages/search/index.ts b/clients/web/src/archive/pages/search/index.ts similarity index 100% rename from clients/web/src/pages/search/index.ts rename to clients/web/src/archive/pages/search/index.ts diff --git a/clients/web/src/pages/settings/notifications.tsx b/clients/web/src/archive/pages/settings/notifications.tsx similarity index 100% rename from clients/web/src/pages/settings/notifications.tsx rename to clients/web/src/archive/pages/settings/notifications.tsx diff --git a/clients/web/src/pages/share/[slug].ts b/clients/web/src/archive/pages/share/[slug].ts similarity index 100% rename from clients/web/src/pages/share/[slug].ts rename to clients/web/src/archive/pages/share/[slug].ts diff --git a/clients/web/src/pages/sharedlists/[listId]/[slug].js b/clients/web/src/archive/pages/sharedlists/[listId]/[slug].js similarity index 100% rename from clients/web/src/pages/sharedlists/[listId]/[slug].js rename to clients/web/src/archive/pages/sharedlists/[listId]/[slug].js diff --git a/clients/web/src/pages/_app.js b/clients/web/src/pages/_app.js index ce6b31d49..3da03fd4d 100644 --- a/clients/web/src/pages/_app.js +++ b/clients/web/src/pages/_app.js @@ -1,38 +1,37 @@ import '@ui/styles/legacy/global.css' -import { LOGIN_URL } from 'common/constants' +// import { LOGIN_URL } from 'common/constants' import createCache from '@emotion/cache' import { CacheProvider } from '@emotion/react' import { ViewportProvider } from 'components/viewport-provider/viewport-provider' import { appWithTranslation } from 'next-i18next' -import { useRouter } from 'next/router' +// import { useRouter } from 'next/router' import { useEffect } from 'react' import { wrapper } from 'store' -import { Provider, useDispatch, useSelector } from 'react-redux' -import { parseCookies } from 'nookies' +import { Provider } from 'react-redux' +// import { parseCookies } from 'nookies' -import { setUser } from 'containers/account/account.state' -import { getSessGuid, sessGuidHydrate } from 'containers/account/account.state' +// import { setUser } from 'containers/account/account.state' +// import { getSessGuid, sessGuidHydrate } from 'containers/account/account.state' -import { fetchUnleashData } from 'connectors/feature-flags/feature-flags.state' -import { featuresHydrate } from 'connectors/feature-flags/feature-flags.state' +// import { fetchUnleashData } from 'connectors/feature-flags/feature-flags.state' +// import { featuresHydrate } from 'connectors/feature-flags/feature-flags.state' -import { checkListsPilotStatus } from 'containers/lists/lists.state' +// import { checkListsPilotStatus } from 'containers/lists/lists.state' -import { appSetPreferences } from 'connectors/app/app.state' -import { hydrateSettings } from 'connectors/settings/settings.state' -import { featureFlagActive } from 'connectors/feature-flags/feature-flags' +// import { appSetPreferences } from 'connectors/app/app.state' +// import { hydrateSettings } from 'connectors/settings/settings.state' +// import { featureFlagActive } from 'connectors/feature-flags/feature-flags' -import { ConfirmItemsImport } from 'connectors/confirm/items-import' +// import { ConfirmItemsImport } from 'connectors/confirm/items-import' /** Setup Files --------------------------------------------------------------- */ -import { loadPolyfills } from 'common/setup/polyfills' - -import { Shortcuts } from 'connectors/shortcuts/shortcuts' -import { DevTools } from 'connectors/dev-tools/dev-tools' +// import { loadPolyfills } from 'common/setup/polyfills' +// import { Shortcuts } from 'connectors/shortcuts/shortcuts' +// import { DevTools } from 'connectors/dev-tools/dev-tools' /** App --------------------------------------------------------------- */ @@ -40,19 +39,19 @@ const cache = createCache({ key: 'next' }) function PocketWebClient({ Component, pageProps, err }) { // Initialize app once per page load - const dispatch = useDispatch() + // const dispatch = useDispatch() - const router = useRouter() - const location = router.pathname + // const router = useRouter() + // const location = router.pathname - const { user_status, user_id, sess_guid, birth, isFXA} = useSelector((state) => state.user) //prettier-ignore - const featureState = useSelector((state) => state.features) - const { flagsReady } = useSelector((state) => state.features) - const { authRequired } = pageProps + // const { user_status, user_id, sess_guid, birth, isFXA} = useSelector((state) => state.user) //prettier-ignore + // const featureState = useSelector((state) => state.features) + // const { flagsReady } = useSelector((state) => state.features) + // const { authRequired } = pageProps - const fxaFlag = featureFlagActive({ flag: 'fxa', featureState }) - const forceFxaRedirect = featureFlagActive({ flag: 'forceFxaRedirect', featureState }) - const restrictedLink = authRequired && location !== '/learn-more' && (!isFXA || forceFxaRedirect) + // const fxaFlag = featureFlagActive({ flag: 'fxa', featureState }) + // const forceFxaRedirect = featureFlagActive({ flag: 'forceFxaRedirect', featureState }) + // const restrictedLink = authRequired && location !== '/learn-more' && (!isFXA || forceFxaRedirect) useEffect(() => { // Log out version for quick scan. Can also help support get a read on @@ -61,110 +60,110 @@ function PocketWebClient({ Component, pageProps, err }) { console.info(`Pocket Web Client: ${RELEASE_VERSION}`) // Load any relevant polyfills - loadPolyfills() + // loadPolyfills() }, []) // Check user status with cookies - useEffect(() => { - if (user_status !== 'pending') return () => {} - - const cookies = parseCookies() - const { sess_guid } = cookies - - /** - * First time user - * We don't have a sess_guid for this users so we are gonna - * assume they are a logged out user and treat them as such - * -------------------------------------------------------------- - */ - const initializeUser = async () => { - const sess_guid = await getSessGuid() - if (!sess_guid) { - // The reason we wouldn't get a sessGuid is because of a cors error (AKA on a non-pocket) - // so we want to invalidate the user at this point ex: https://getpocket.com/v3/guid - dispatch(setUser(true)) - return - } - dispatch(sessGuidHydrate(sess_guid)) - dispatch(setUser(false)) - } - - /** - * User awaiting validation - * This will only happen when we are using an cookies auth flow - * -------------------------------------------------------------- - */ - const validateUser = () => { - dispatch(sessGuidHydrate(sess_guid)) - dispatch(setUser()) - } - - if (!sess_guid) initializeUser() - if (sess_guid) validateUser() - }, [user_status, dispatch]) + // useEffect(() => { + // if (user_status !== 'pending') return () => {} + + // const cookies = parseCookies() + // const { sess_guid } = cookies + + // /** + // * First time user + // * We don't have a sess_guid for this users so we are gonna + // * assume they are a logged out user and treat them as such + // * -------------------------------------------------------------- + // */ + // const initializeUser = async () => { + // const sess_guid = await getSessGuid() + // if (!sess_guid) { + // // The reason we wouldn't get a sessGuid is because of a cors error (AKA on a non-pocket) + // // so we want to invalidate the user at this point ex: https://getpocket.com/v3/guid + // dispatch(setUser(true)) + // return + // } + // dispatch(sessGuidHydrate(sess_guid)) + // dispatch(setUser(false)) + // } + + // /** + // * User awaiting validation + // * This will only happen when we are using an cookies auth flow + // * -------------------------------------------------------------- + // */ + // const validateUser = () => { + // dispatch(sessGuidHydrate(sess_guid)) + // dispatch(setUser()) + // } + + // if (!sess_guid) initializeUser() + // if (sess_guid) validateUser() + // }, [user_status, dispatch]) // Hydrate user features/settings - useEffect(() => { - // Sets up feature flags for this user - const hydrateFeatures = async () => { - try { - const locale = navigator.languages - ? navigator.languages[0] - : navigator.language || navigator.userLanguage - - const response = await fetchUnleashData(user_id, sess_guid, birth, locale) - const features = response ? response : {} - if (features) dispatch(featuresHydrate(features)) - } catch { - dispatch(featuresHydrate({})) - } - } - - const requestListsPilotStatus = async () => { - dispatch(checkListsPilotStatus()) - } - - if (user_status === 'pending' || flagsReady) return () => {} - if (user_status === 'invalid') { - hydrateFeatures() - dispatch(hydrateSettings()) - return () => {} - } - - // Set up defaults/user pref in state - dispatch(appSetPreferences()) - dispatch(hydrateSettings()) - - hydrateFeatures() - requestListsPilotStatus() - }, [user_status, sess_guid, user_id, birth, dispatch, flagsReady]) + // useEffect(() => { + // Sets up feature flags for this user + // const hydrateFeatures = async () => { + // try { + // const locale = navigator.languages + // ? navigator.languages[0] + // : navigator.language || navigator.userLanguage + + // const response = await fetchUnleashData(user_id, sess_guid, birth, locale) + // const features = response ? response : {} + // if (features) dispatch(featuresHydrate(features)) + // } catch { + // dispatch(featuresHydrate({})) + // } + // } + + // const requestListsPilotStatus = async () => { + // dispatch(checkListsPilotStatus()) + // } + + // if (user_status === 'pending' || flagsReady) return () => {} + // if (user_status === 'invalid') { + // hydrateFeatures() + // dispatch(hydrateSettings()) + // return () => {} + // } + + // Set up defaults/user pref in state + // dispatch(appSetPreferences()) + // dispatch(hydrateSettings()) + + // hydrateFeatures() + // requestListsPilotStatus() + // }, [user_status, sess_guid, user_id, birth, dispatch, flagsReady]) // Check auth conditions - useEffect(() => { - // Adding flagsready here may slow non auth pages - if (!authRequired || user_status === 'pending') return () => {} + // useEffect(() => { + // // Adding flagsready here may slow non auth pages + // if (!authRequired || user_status === 'pending') return () => {} - // User is not logged in - if (user_status === 'invalid') { - window.location = `${LOGIN_URL}?src=web-auth&utm_source=${window.location.href}` - } + // // User is not logged in + // if (user_status === 'invalid') { + // window.location = `${LOGIN_URL}?src=web-auth&utm_source=${window.location.href}` + // } - // User is logged in but not via FXA - if (flagsReady && fxaFlag && restrictedLink) { - router.replace('/learn-more') - } - }, [authRequired, user_status, restrictedLink, router, flagsReady, fxaFlag]) + // // User is logged in but not via FXA + // if (flagsReady && fxaFlag && restrictedLink) { + // router.replace('/learn-more') + // } + // }, [authRequired, user_status, restrictedLink, router, flagsReady, fxaFlag]) - const shouldRender = authRequired - ? user_status !== 'pending' && user_status !== 'invalid' && flagsReady - : true + // const shouldRender = authRequired + // ? user_status !== 'pending' && user_status !== 'invalid' && flagsReady + // : true return ( - - + {/* */} + {/* */} - {shouldRender ? : null} + ) @@ -175,7 +174,7 @@ function AppWithStore({ Component, ...rest }) { return ( - + {/* */} ) } diff --git a/clients/web/src/pages/waypoint.js b/clients/web/src/pages/waypoint.js index a64b05998..959f865af 100644 --- a/clients/web/src/pages/waypoint.js +++ b/clients/web/src/pages/waypoint.js @@ -15,9 +15,9 @@ export async function getServerSideProps({ req, locale, query, defaultLocale, lo const supportedLocale = locales.includes(lang) const langPrefix = lang !== defaultLocale && supportedLocale ? `/${lang}` : '' // const isSignUp = query['type'] === 'signup' - const nonEnglish = locale !== defaultLocale || (lang !== defaultLocale && supportedLocale) - const isGerman = ['de', 'de-DE'].includes(locale) || ['de', 'de-DE'].includes(lang) - const homeEligible = isGerman || !nonEnglish + // const nonEnglish = locale !== defaultLocale || (lang !== defaultLocale && supportedLocale) + // const isGerman = ['de', 'de-DE'].includes(locale) || ['de', 'de-DE'].includes(lang) + // const homeEligible = isGerman || !nonEnglish // query parameters returned after auth that are currently not used. // remove from the list of query parameters @@ -31,9 +31,9 @@ export async function getServerSideProps({ req, locale, query, defaultLocale, lo ] unusedQueryParams.forEach((param) => delete query[param]) - const savesLink = queryString.stringifyUrl({ url: `${langPrefix}/saves`, query }) + // const savesLink = queryString.stringifyUrl({ url: `${langPrefix}/saves`, query }) const homeLink = queryString.stringifyUrl({ url: `${langPrefix}/home`, query }) - const destination = homeEligible ? homeLink : savesLink + const destination = homeLink return { redirect: {