Use constants wherever navigate is called

aureliushq · Aug 14, 2024 · cb9ef55 · cb9ef55
1 parent 14ceb16
commit cb9ef55
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 21 deletions.
diff --git a/app/lib/constants.ts b/app/lib/constants.ts
@@ -102,3 +102,10 @@ export const ARLS_OPTIONS: SqliteQueryOptions = {
 	logExplainQueryPlan: true,
 	logQueryExecutionTime: true,
 }
+
+export const ROUTES = {
+	EDITOR: {
+		BASE: '/editor',
+		NEW_POST: '/editor/posts',
+	},
+}
diff --git a/app/lib/providers/aurelius.tsx b/app/lib/providers/aurelius.tsx
@@ -4,6 +4,7 @@ import { Timer, useTimer } from 'react-use-precision-timer'
 import { useNavigate } from '@remix-run/react'
 
 import { useQuery } from '@evolu/react'
+import { ROUTES } from '~/lib/constants'
 import { useKeyboardShortcuts } from '~/lib/hooks'
 import { EditorShortcuts } from '~/lib/types'
 import { SettingsRow, settingsQuery } from '~/services/evolu/client'
@@ -69,7 +70,7 @@ const AureliusProvider = ({ children }: AureliusProviderProps) => {
 
 	const createNewPost = () => {
 		handleSplashOpen(false)
-		navigate('/editor/posts')
+		navigate(ROUTES.EDITOR.NEW_POST)
 	}
 
 	const handlePreferencesOpen = (open: boolean) => {

diff --git a/app/routes/_index.tsx b/app/routes/_index.tsx
@@ -1,10 +1,11 @@
-import { useCallback, useEffect, useState } from 'react'
+import { useCallback, useState } from 'react'
 
-import { useFetcher, useLoaderData, useNavigate } from '@remix-run/react'
+import { useLoaderData, useNavigate } from '@remix-run/react'
 
 import * as S from '@effect/schema/Schema'
 import invariant from 'tiny-invariant'
 import Editor from '~/components/common/editor'
+import { ROUTES } from '~/lib/constants'
 import { arls } from '~/services/arls'
 import { NonEmptyString100 } from '~/services/evolu/schema'
 
@@ -19,7 +20,6 @@ export const clientLoader = async () => {
 }
 
 const Index = () => {
-	const fetcher = useFetcher()
 	const { writing } = useLoaderData<typeof clientLoader>()
 	const navigate = useNavigate()
 
@@ -39,23 +39,9 @@ const Index = () => {
 	}, [])
 
 	const onReset = () => {
-		navigate(`/editor/posts`)
+		navigate(ROUTES.EDITOR.NEW_POST)
 	}
 
-	useEffect(() => {
-		if (
-			fetcher.state === 'idle' &&
-			fetcher.data &&
-			// @ts-expect-error: BS error. It's there. Check how to type fetcher.data.
-			fetcher.data.message === 'ok' &&
-			// @ts-expect-error: BS error. It's there. Check how to type fetcher.data.
-			fetcher.data.redirectTo.trim() !== ''
-		) {
-			// @ts-expect-error: BS error. It's there. Check how to type fetcher.data.
-			navigate(fetcher.data.redirectTo)
-		}
-	}, [fetcher])
-
 	return (
 		<Editor
 			data={{

diff --git a/app/routes/about.tsx b/app/routes/about.tsx
@@ -107,6 +107,35 @@ const About = () => {
 							</li>
 						</ul>
 					</div>
+					{/*<div className='flex w-full flex-col items-start gap-4 leading-loose text-white'>*/}
+					{/*	<span>*/}
+					{/*		And a special thanks to the following people for*/}
+					{/*		helping me test Aurelius and providing valuable*/}
+					{/*		feedback:*/}
+					{/*	</span>*/}
+					{/*	<ul>*/}
+					{/*		<li>*/}
+					{/*			<a*/}
+					{/*				href='https://www.instagram.com/reflex__god_/'*/}
+					{/*				target='_blank'*/}
+					{/*				rel='noreferrer'*/}
+					{/*				className='text-primary underline'*/}
+					{/*			>*/}
+					{/*				Sreenivasan*/}
+					{/*			</a>{' '}*/}
+					{/*		</li>*/}
+					{/*		<li>*/}
+					{/*			<a*/}
+					{/*				href='https://www.instagram.com/raj.rk98/'*/}
+					{/*				target='_blank'*/}
+					{/*				rel='noreferrer'*/}
+					{/*				className='text-primary underline'*/}
+					{/*			>*/}
+					{/*				Rajkumar*/}
+					{/*			</a>{' '}*/}
+					{/*		</li>*/}
+					{/*	</ul>*/}
+					{/*</div>*/}
 				</div>
 			</div>
 		</DefaultLayout>

diff --git a/app/routes/editor.$effort.$slug.tsx b/app/routes/editor.$effort.$slug.tsx
@@ -12,6 +12,7 @@ import * as S from '@effect/schema/Schema'
 import { ExtractRow, Query, String1000 } from '@evolu/common'
 import invariant from 'tiny-invariant'
 import Editor from '~/components/common/editor'
+import { ROUTES } from '~/lib/constants'
 import { EditorData } from '~/lib/types'
 import { Arls, TableQueryBuilder, arls } from '~/services/arls'
 import { EffortsTable } from '~/services/evolu/database'
@@ -111,7 +112,7 @@ const Writing = () => {
 	)
 
 	const onReset = () => {
-		navigate(`/editor/${effort.slug as string}`)
+		navigate(`${ROUTES.EDITOR.BASE}/${effort.slug as string}`)
 	}
 
 	return (

diff --git a/app/routes/editor.$effort_.tsx b/app/routes/editor.$effort_.tsx
@@ -13,6 +13,7 @@ import { String1000 } from '@evolu/common'
 import GithubSlugger from 'github-slugger'
 import invariant from 'tiny-invariant'
 import Editor from '~/components/common/editor'
+import { ROUTES } from '~/lib/constants'
 import { EditorData } from '~/lib/types'
 import { checkSlugUniqueness } from '~/lib/utils'
 import { Arls, arls } from '~/services/arls'
@@ -93,7 +94,7 @@ const NewWriting = () => {
 	)
 
 	const onReset = () => {
-		navigate(`/editor/${effort.slug as string}`)
+		navigate(`${ROUTES.EDITOR.BASE}/${effort.slug as string}`)
 	}
 
 	useEffect(() => {