Fix routes for logged out users

This commit is contained in:
2024-01-06 12:19:24 +01:00
committed by Clément Le Bihan
parent 038918c212
commit a3f4703dae
2 changed files with 7 additions and 9 deletions

View File

@@ -35,16 +35,14 @@ import DiscoveryView from './views/V2/DiscoveryView';
import MusicView from './views/MusicView'; import MusicView from './views/MusicView';
import Leaderboardiew from './views/LeaderboardView'; import Leaderboardiew from './views/LeaderboardView';
import { LinearGradient } from 'expo-linear-gradient'; import { LinearGradient } from 'expo-linear-gradient';
import ScaffoldMobileCC from './components/UI/ScaffoldMobileCC'; import ScaffoldMobileCC from './components/UI/ScaffoldMobileCC';
const Stack = createNativeStackNavigator<AppRouteParams & { Loading: never; Oops: never }>(); const Stack = createNativeStackNavigator<AppRouteParams & { Loading: never; Oops: never }>();
const Tab = createBottomTabNavigator<AppRouteParams & { Loading: never; Oops: never }>(); const Tab = createBottomTabNavigator<AppRouteParams & { Loading: never; Oops: never }>();
const Tabs = () => { const Tabs = () => {
return ( return (
<Tab.Navigator <Tab.Navigator tabBar={ScaffoldMobileCC}>
tabBar={ScaffoldMobileCC}
>
{Object.entries(tabRoutes).map(([name, route], routeIndex) => ( {Object.entries(tabRoutes).map(([name, route], routeIndex) => (
<Tab.Screen <Tab.Screen
key={'route-' + routeIndex} key={'route-' + routeIndex}
@@ -292,11 +290,10 @@ export const Router = () => {
return <LoadingView />; return <LoadingView />;
} }
const routes = authStatus == 'authed' ? { ...protectedRoutes } : publicRoutes;
return ( return (
<NavigationContainer <NavigationContainer
linking={routesToLinkingConfig( linking={routesToLinkingConfig(routes)}
authStatus == 'authed' ? { ...protectedRoutes } : publicRoutes
)}
fallback={<LoadingView />} fallback={<LoadingView />}
theme={colorScheme == 'light' ? DefaultTheme : DarkTheme} theme={colorScheme == 'light' ? DefaultTheme : DarkTheme}
> >
@@ -312,7 +309,7 @@ export const Router = () => {
{routesToScreens(publicRoutes)} {routesToScreens(publicRoutes)}
</> </>
) : ( ) : (
routesToScreens(protectedRoutes) routesToScreens(routes)
)} )}
</Stack.Navigator> </Stack.Navigator>
</NavigationContainer> </NavigationContainer>

View File

@@ -5,8 +5,9 @@ pkgs.mkShell {
nodePackages.prisma nodePackages.prisma
nodePackages."@nestjs/cli" nodePackages."@nestjs/cli"
nodePackages.npm nodePackages.npm
nodePackages.eas-cli
eslint_d eslint_d
nodejs_16 nodejs_18
yarn yarn
(python3.withPackages (ps: with ps; [requests mido])) (python3.withPackages (ps: with ps; [requests mido]))
pkg-config pkg-config