diff --git a/src/lib/routes/types.ts b/src/lib/routes/types.ts index c315a8341..6d97a6928 100644 --- a/src/lib/routes/types.ts +++ b/src/lib/routes/types.ts @@ -1,9 +1,9 @@ -import {type NavigationState, type PartialState} from '@react-navigation/native' -import {type NativeStackNavigationProp} from '@react-navigation/native-stack' +import { type NavigationState, type PartialState } from '@react-navigation/native' +import { type NativeStackNavigationProp } from '@react-navigation/native-stack' -import {type VideoFeedSourceContext} from '#/screens/VideoFeed/types' +import { type VideoFeedSourceContext } from '#/screens/VideoFeed/types' -export type {NativeStackScreenProps} from '@react-navigation/native-stack' +export type { NativeStackScreenProps } from '@react-navigation/native-stack' export type CommonNavigatorParams = { NotFound: undefined @@ -15,23 +15,23 @@ export type CommonNavigatorParams = { ModerationInteractionSettings: undefined ModerationVerificationSettings: undefined Settings: undefined - Profile: {name: string; hideBackButton?: boolean} - ProfileFollowers: {name: string} - ProfileFollows: {name: string} - ProfileKnownFollowers: {name: string} - ProfileSearch: {name: string; q?: string} - ProfileList: {name: string; rkey: string} - PostThread: {name: string; rkey: string} - PostLikedBy: {name: string; rkey: string} - PostRepostedBy: {name: string; rkey: string} - PostQuotes: {name: string; rkey: string} + Profile: { name: string; hideBackButton?: boolean } + ProfileFollowers: { name: string } + ProfileFollows: { name: string } + ProfileKnownFollowers: { name: string } + ProfileSearch: { name: string; q?: string } + ProfileList: { name: string; rkey: string } + PostThread: { name: string; rkey: string } + PostLikedBy: { name: string; rkey: string } + PostRepostedBy: { name: string; rkey: string } + PostQuotes: { name: string; rkey: string } ProfileFeed: { name: string rkey: string feedCacheKey?: 'discover' | 'explore' | undefined } - ProfileFeedLikedBy: {name: string; rkey: string} - ProfileLabelerLikedBy: {name: string} + ProfileFeedLikedBy: { name: string; rkey: string } + ProfileLabelerLikedBy: { name: string } Debug: undefined DebugMod: undefined SharedPreferencesTester: undefined @@ -41,6 +41,7 @@ export type CommonNavigatorParams = { TermsOfService: undefined CommunityGuidelines: undefined CopyrightPolicy: undefined + License: undefined LanguageSettings: undefined AppPasswords: undefined SavedFeeds: undefined @@ -67,24 +68,24 @@ export type CommonNavigatorParams = { InterestsSettings: undefined AboutSettings: undefined AppIconSettings: undefined - Search: {q?: string; tab?: 'user' | 'profile' | 'feed'} - Hashtag: {tag: string; author?: string} - Topic: {topic: string} - MessagesConversation: {conversation: string; embed?: string; accept?: true} + Search: { q?: string; tab?: 'user' | 'profile' | 'feed' } + Hashtag: { tag: string; author?: string } + Topic: { topic: string } + MessagesConversation: { conversation: string; embed?: string; accept?: true } MessagesSettings: undefined MessagesInbox: undefined - NotificationsActivityList: {posts: string} + NotificationsActivityList: { posts: string } LegacyNotificationSettings: undefined Feeds: undefined - Start: {name: string; rkey: string} - StarterPack: {name: string; rkey: string; new?: boolean} - StarterPackShort: {code: string} + Start: { name: string; rkey: string } + StarterPack: { name: string; rkey: string; new?: boolean } + StarterPackShort: { code: string } StarterPackWizard: { fromDialog?: boolean targetDid?: string onSuccess?: () => void } - StarterPackEdit: {rkey?: string} + StarterPackEdit: { rkey?: string } VideoFeed: VideoFeedSourceContext Bookmarks: undefined } @@ -102,7 +103,7 @@ export type HomeTabNavigatorParams = CommonNavigatorParams & { } export type SearchTabNavigatorParams = CommonNavigatorParams & { - Search: {q?: string; tab?: 'user' | 'profile' | 'feed'} + Search: { q?: string; tab?: 'user' | 'profile' | 'feed' } } export type NotificationsTabNavigatorParams = CommonNavigatorParams & { @@ -110,32 +111,32 @@ export type NotificationsTabNavigatorParams = CommonNavigatorParams & { } export type MyProfileTabNavigatorParams = CommonNavigatorParams & { - MyProfile: {name: 'me'; hideBackButton: true} + MyProfile: { name: 'me'; hideBackButton: true } } export type MessagesTabNavigatorParams = CommonNavigatorParams & { - Messages: {pushToConversation?: string; animation?: 'push' | 'pop'} + Messages: { pushToConversation?: string; animation?: 'push' | 'pop' } } export type FlatNavigatorParams = CommonNavigatorParams & { Home: undefined - Search: {q?: string; tab?: 'user' | 'profile' | 'feed'} + Search: { q?: string; tab?: 'user' | 'profile' | 'feed' } Feeds: undefined Notifications: undefined - Messages: {pushToConversation?: string; animation?: 'push' | 'pop'} + Messages: { pushToConversation?: string; animation?: 'push' | 'pop' } } export type AllNavigatorParams = CommonNavigatorParams & { HomeTab: undefined Home: undefined SearchTab: undefined - Search: {q?: string; tab?: 'user' | 'profile' | 'feed'} + Search: { q?: string; tab?: 'user' | 'profile' | 'feed' } Feeds: undefined NotificationsTab: undefined Notifications: undefined MyProfileTab: undefined MessagesTab: undefined - Messages: {animation?: 'push' | 'pop'} + Messages: { animation?: 'push' | 'pop' } } // NOTE @@ -149,7 +150,7 @@ export type State = | Omit, 'stale'> export type RouteParams = Record -export type MatchResult = {params: RouteParams} +export type MatchResult = { params: RouteParams } export type Route = { match: (path: string) => MatchResult | undefined build: (params?: Record) => string diff --git a/src/routes.ts b/src/routes.ts index 77ea6deca..b57955ed2 100644 --- a/src/routes.ts +++ b/src/routes.ts @@ -1,5 +1,5 @@ -import {Router} from '#/lib/routes/router' -import {type FlatNavigatorParams} from './lib/routes/types' +import { Router } from '#/lib/routes/router' +import { type FlatNavigatorParams } from './lib/routes/types' type AllNavigatableRoutes = Omit< FlatNavigatorParams, @@ -71,8 +71,9 @@ export const router = new Router({ MiscellaneousNotificationSettings: '/settings/notifications/miscellaneous', // support Support: '/support', - PrivacyPolicy: 'https://syu.is/about/support/privacy-policy', - TermsOfService: 'https://syu.is/about/support/tos', + PrivacyPolicy: '/support/privacy', + TermsOfService: '/support/tos', + License: '/support/license', CommunityGuidelines: '/support/community-guidelines', CopyrightPolicy: '/support/copyright', // hashtags