release: 2023-06-30 (#645)

PR-URL: #645
Co-authored-by: Joe Karow <58997957+JoeKarow@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

apps/app/next-i18next.config.mjs

@@ -2,18 +2,16 @@
 /* eslint-disable node/no-process-env */
 // @ts-check
 /* eslint-disable import/no-unused-modules */
-import axios from 'axios'
+// import axios from 'axios'
 import ChainedBackend from 'i18next-chained-backend'
 import HttpBackend from 'i18next-http-backend'
 import intervalPlural from 'i18next-intervalplural-postprocessor'
 // import LocalStorageBackend from 'i18next-localstorage-backend'
 import MultiBackend from 'i18next-multiload-backend-adapter'
-import { z } from 'zod'
+// import { z } from 'zod'
 
 import path from 'path'
 
-import { I18nextKeysOnDemand } from '@weareinreach/i18next-keys-ondemand'
-
 export const namespaces = [
 	'attribute',
 	'common',
@@ -28,7 +26,7 @@ export const namespaces = [
 ]
 const isBrowser = typeof window !== 'undefined'
 
-const Keys = z.record(z.string())
+// const Keys = z.record(z.string())
 
 /**
  * Gets full path based on environment
@@ -44,30 +42,12 @@ const getUrl = (path) => {
 	return `http://localhost:${process.env.PORT ?? 3000}${parsedPath}` // dev SSR should use localhost
 }
 
-/** @type {import('@weareinreach/i18next-keys-ondemand').TranslationGetter} */
-const onDemandFetcher = async (keys, lang, ns, defaultValues) => {
-	console.log('fetcher called', { keys, lang, ns, defaultValues })
-	try {
-		const { data } = await axios.post(getUrl('/api/i18n/get'), { keys, lang, ns, defaultValues })
-		const translations = Keys.parse(data)
-		return translations
-	} catch (err) {
-		console.error(err)
-		return {}
-	}
-}
-
-const onDemand = new I18nextKeysOnDemand({
-	translationGetter: onDemandFetcher,
-	debounceDelay: 50,
-})
-
 // const crowdinBackend = new CrowdinOtaBackend(undefined, )
 const apiPath = '/api/i18n/load?lng={{lng}}&ns={{ns}}'
-const httpBackend = new HttpBackend(null, {
-	loadPath: getUrl(apiPath), //typeof window !== 'undefined' ? apiPath : `http://localhost:3000${apiPath}`,
-	allowMultiLoading: true,
-})
+// const httpBackend = new HttpBackend(null, {
+// 	loadPath: getUrl(apiPath), //typeof window !== 'undefined' ? apiPath : `http://localhost:3000${apiPath}`,
+// 	allowMultiLoading: true,
+// })
 
 const multi = new MultiBackend(null, {
 	backend: HttpBackend,

apps/app/nextjs-routes.d.ts

@@ -12,6 +12,8 @@ declare module "nextjs-routes" {
 
   export type Route =
     | StaticRoute<"/account">
+    | StaticRoute<"/account/reviews">
+    | StaticRoute<"/account/saved">
     | StaticRoute<"/admin/quicklink/email">
     | StaticRoute<"/admin/quicklink">
     | StaticRoute<"/admin/quicklink/phone">
@@ -29,7 +31,6 @@ declare module "nextjs-routes" {
     | DynamicRoute<"/org/[slug]", { "slug": string }>
     | DynamicRoute<"/org/[slug]/remote", { "slug": string }>
     | StaticRoute<"/profile">
-    | StaticRoute<"/saved">
     | DynamicRoute<"/search/[...params]", { "params": string[] }>
     | StaticRoute<"/search">
     | StaticRoute<"/suggest">

apps/app/package.json

@@ -71,7 +71,6 @@
 		"@weareinreach/auth": "workspace:*",
 		"@weareinreach/db": "workspace:*",
 		"@weareinreach/env": "workspace:*",
-		"@weareinreach/i18next-keys-ondemand": "0.3.2",
 		"@weareinreach/ui": "workspace:*",
 		"axios": "1.4.0",
 		"cookies-next": "2.1.2",
@@ -135,7 +134,7 @@
 		"trpc-panel": "1.3.4",
 		"trpc-playground": "1.0.4",
 		"type-fest": "3.12.0",
-		"typescript": "5.1.3"
+		"typescript": "5.1.5"
 	},
 	"ct3aMetadata": {
 		"initVersion": "5.10.1"

apps/app/src/pages/account/reviews.tsx

@@ -0,0 +1,53 @@
+import { Center, Grid, Loader, Overlay, Stack, Title } from '@mantine/core'
+import { type GetServerSideProps, InferGetServerSidePropsType } from 'next'
+import { useRouter } from 'next/router'
+import { useSession } from 'next-auth/react'
+import { useTranslation } from 'next-i18next'
+
+import { getServerSession } from '@weareinreach/auth'
+import { QuickPromotionModal } from '@weareinreach/ui/modals'
+import { getServerSideTranslations } from '~app/utils/i18n'
+
+const Reviews = () => {
+	const { t } = useTranslation('common')
+	const { data: session, status } = useSession()
+	const router = useRouter()
+	if (status === 'loading') {
+		return (
+			<Center>
+				<Loader />
+			</Center>
+		)
+	}
+	if (status === 'unauthenticated' || session === null) {
+		return (
+			<Overlay blur={2}>
+				<QuickPromotionModal autoLaunch onClose={() => router.replace('/')} />
+			</Overlay>
+		)
+	}
+
+	return (
+		<Grid.Col xs={12} sm={12}>
+			<Stack h='100vh' align='flex-start' w='100%'>
+				<Title order={2}>{t('words.reviews')}</Title>
+				<Stack spacing={0} align='center' justify='center' h='100%' w='100%'>
+					<Title order={2}>🚧</Title>
+					<Title order={2}>{t('words.coming-soon')}</Title>
+				</Stack>
+			</Stack>
+		</Grid.Col>
+	)
+}
+
+export const getServerSideProps: GetServerSideProps = async ({ locale, req, res }) => {
+	const session = await getServerSession({ req, res })
+
+	return {
+		props: {
+			session,
+			...(await getServerSideTranslations(locale, ['common'])),
+		},
+	}
+}
+export default Reviews

apps/app/src/pages/index.tsx

@@ -315,27 +315,21 @@ Home.omitGrid = true
 
 export const getStaticProps: GetStaticProps = async ({ locale }) => {
 	const ssg = await trpcServerClient({ session: null })
-	await ssg.review.getFeatured.prefetch(3)
 
+	const [i18n] = await Promise.allSettled([
+		getServerSideTranslations(locale, ['common', 'landingPage', 'attribute']),
+		ssg.review.getFeatured.prefetch(3),
+	])
+
+	// await ssg.review.getFeatured.prefetch(3)
 	return {
 		props: {
 			trpcState: ssg.dehydrate(),
-			...(await getServerSideTranslations(locale, ['common', 'landingPage', 'attribute'])),
+			// ...(await getServerSideTranslations(locale, ['common', 'landingPage', 'attribute'])),
+			...(i18n.status === 'fulfilled' ? i18n.value : {}),
 		},
 		revalidate: 60 * 60 * 24, // 24 hours
 	}
 }
-// export const getServerSideProps = async ({ locale, req, res }: GetServerSidePropsContext) => {
-// 	const session = await getServerSession({ req, res })
-// 	const ssg = await trpcServerClient({ session })
-// 	await ssg.review.getFeatured.prefetch(3)
 
-// 	return {
-// 		props: {
-// 			session,
-// 			trpcState: ssg.dehydrate(),
-// 			...(await getServerSideTranslations(locale, ['common', 'landingPage'])),
-// 		},
-// 	}
-// }
 export default Home

apps/app/src/pages/org/[slug]/[orgLocationId]/index.tsx

@@ -187,10 +187,14 @@ export const getStaticProps: GetStaticProps = async ({ locale, params }) => {
 	const { slug, orgLocationId } = urlParams.data
 
 	const ssg = await trpcServerClient({ session: null })
+
+	const orgId = await ssg.organization.getIdFromSlug.fetch({ slug })
+	if (!orgId?.id) return { notFound: true }
+
 	const [i18n] = await Promise.allSettled([
-		getServerSideTranslations(locale, ['common', 'services', 'attribute', 'phone-type', slug]),
+		getServerSideTranslations(locale, ['common', 'services', 'attribute', 'phone-type', orgId.id]),
 		ssg.organization.getBySlug.prefetch({ slug }),
-		ssg.organization.getIdFromSlug.prefetch({ slug }),
+		// ssg.organization.getIdFromSlug.prefetch({ slug }),
 		ssg.location.forLocationPage.prefetch({ id: orgLocationId }),
 		ssg.organization.forLocationPage.prefetch({ slug }),
 	])

apps/app/src/pages/org/[slug]/index.tsx

@@ -254,15 +254,18 @@ export const getStaticProps: GetStaticProps<Record<string, unknown>, RoutedQuery
 	const { slug } = params
 
 	const ssg = await trpcServerClient({ session: null })
+	const orgId = await ssg.organization.getIdFromSlug.fetch({ slug })
+	if (!orgId?.id) return { notFound: true }
 
 	const [i18n] = await Promise.allSettled([
-		getServerSideTranslations(locale, ['common', 'services', 'attribute', 'phone-type', slug]),
+		getServerSideTranslations(locale, ['common', 'services', 'attribute', 'phone-type', orgId.id]),
 		ssg.organization.forOrgPage.prefetch({ slug }),
 	])
 	// await ssg.organization.getBySlug.prefetch({ slug })
 
 	const props = {
 		trpcState: ssg.dehydrate(),
+		organizationId: orgId.id,
 		// ...(await getServerSideTranslations(locale, ['common', 'services', 'attribute', 'phone-type', slug])),
 		...(i18n.status === 'fulfilled' ? i18n.value : {}),
 	}

apps/app/src/pages/org/[slug]/remote.tsx

@@ -151,10 +151,13 @@ export const getStaticProps: GetStaticProps<
 	const { slug } = params
 
 	const ssg = await trpcServerClient({ session: null })
+	const orgId = await ssg.organization.getIdFromSlug.fetch({ slug })
+	if (!orgId?.id) return { notFound: true }
+
 	const [i18n] = await Promise.allSettled([
-		getServerSideTranslations(locale, ['common', 'services', 'attribute', 'phone-type', slug]),
+		getServerSideTranslations(locale, ['common', 'services', 'attribute', 'phone-type', orgId.id]),
 		ssg.organization.getNameFromSlug.prefetch(slug),
-		ssg.organization.getIdFromSlug.prefetch({ slug }),
+		// ssg.organization.getIdFromSlug.prefetch({ slug }),
 	])
 	const props = {
 		trpcState: ssg.dehydrate(),

apps/app/src/pages/suggest.tsx

@@ -4,7 +4,6 @@ import { useSession } from 'next-auth/react'
 import { useState } from 'react'
 
 import { trpcServerClient } from '@weareinreach/api/trpc'
-import { getServerSession } from '@weareinreach/auth'
 import { SuggestOrg } from '@weareinreach/ui/components/sections/SuggestOrg'
 import { QuickPromotionModal } from '@weareinreach/ui/modals'
 import { getServerSideTranslations } from '~app/utils/i18n'

apps/web/package.json

@@ -3,7 +3,7 @@
 	"version": "0.100.0",
 	"private": true,
 	"scripts": {
-		"build": "next build",
+		"buildx": "next build",
 		"clean:node": "rm -rf ./node_modules/ || true && rm -rf ./.next || true",
 		"dev": "next dev",
 		"preinstall": "npx only-allow pnpm",
@@ -50,6 +50,6 @@
 		"@weareinreach/config": "workspace:*",
 		"@weareinreach/eslint-config": "0.100.0",
 		"eslint": "8.43.0",
-		"typescript": "5.1.3"
+		"typescript": "5.1.5"
 	}
 }

package.json

@@ -44,14 +44,14 @@
 		"boxen": "7.1.0",
 		"dotenv": "16.3.1",
 		"husky": "8.0.3",
-		"lint-staged": "13.2.2",
+		"lint-staged": "13.2.3",
 		"prettier": "2.8.8",
 		"prettier-plugin-jsdoc": "0.4.2",
 		"prettier-plugin-packagejson": "2.4.3",
 		"prettier-plugin-prisma": "4.13.0",
 		"tsx": "3.12.7",
 		"turbo": "1.10.6",
-		"typescript": "5.1.3",
+		"typescript": "5.1.5",
 		"typesync": "0.11.1"
 	},
 	"packageManager": "pnpm@8.6.5",

packages/api/.gitignore

@@ -0,0 +1 @@
+crowdin/generated/*.json

packages/api/cache/slugToOrgId.ts

@@ -0,0 +1,30 @@
+import { kv as redis } from '@vercel/kv'
+import { Logger } from 'tslog'
+
+const log = new Logger({ name: 'Cache - Slug to OrgId' })
+
+export const readSlugCache = async (slug: string) => {
+	try {
+		if ((await redis.ping()) !== 'PONG') {
+			log.warn('Skipping cache read - Redis client not connected')
+			return null
+		}
+		const organizationId = await redis.hget<string>('slugToOrgId', slug)
+		return organizationId
+	} catch (err) {
+		log.error(err)
+		return null
+	}
+}
+
+export const writeSlugCache = async (slug: string, organizationId: string) => {
+	try {
+		if ((await redis.ping()) !== 'PONG') {
+			log.warn('Skipping cache write - Redis client not connected')
+			return
+		}
+		await redis.hset('slugToOrgId', { [slug]: organizationId })
+	} catch (err) {
+		log.error(err)
+	}
+}

packages/api/crowdin/getIdsForDb.ts

@@ -9,8 +9,8 @@ import { prisma } from '@weareinreach/db'
 import { getStringIdByKey } from '.'
 
 const queue = new PQueue({
-	concurrency: 20,
-	intervalCap: 20,
+	concurrency: 15,
+	intervalCap: 15,
 	interval: 500,
 	autoStart: false,
 	carryoverConcurrencyCount: true,
@@ -36,9 +36,9 @@ const output: { crowdinId: number; key: string; ns: string }[] = []
 // queue.on('completed', () => {
 // 	console.info(`--> Job #${qcount} finished in ${Date.now() - qtimer}ms`)
 // })
-// queue.on('error', (error) => {
-// 	console.error(error)
-// })
+queue.on('error', (error) => {
+	console.error(error)
+})
 queue.on('idle', () => {
 	// console.info(`<==> Writing data to file.`)
 	fs.writeFileSync(path.resolve(__dirname, './generated/out.json'), JSON.stringify(output))
@@ -59,7 +59,10 @@ const task = async (key: string, ns: string) => {
 }
 let recordTotal = 0
 const run = async () => {
-	const records = await prisma.translationKey.findMany({ select: { key: true, ns: true } })
+	const records = await prisma.translationKey.findMany({
+		where: { ns: 'org-data', crowdinId: null },
+		select: { key: true, ns: true },
+	})
 	recordTotal = records.length
 	for (const record of records) {
 		const { key, ns } = record