diff --git a/front/Navigation.tsx b/front/Navigation.tsx index af4c388..21378a2 100644 --- a/front/Navigation.tsx +++ b/front/Navigation.tsx @@ -35,16 +35,14 @@ import DiscoveryView from './views/V2/DiscoveryView'; import MusicView from './views/MusicView'; import Leaderboardiew from './views/LeaderboardView'; import { LinearGradient } from 'expo-linear-gradient'; -import ScaffoldMobileCC from './components/UI/ScaffoldMobileCC'; +import ScaffoldMobileCC from './components/UI/ScaffoldMobileCC'; const Stack = createNativeStackNavigator(); const Tab = createBottomTabNavigator(); const Tabs = () => { return ( - + {Object.entries(tabRoutes).map(([name, route], routeIndex) => ( { return ; } + const routes = authStatus == 'authed' ? { ...protectedRoutes } : publicRoutes; return ( } theme={colorScheme == 'light' ? DefaultTheme : DarkTheme} > @@ -312,7 +309,7 @@ export const Router = () => { {routesToScreens(publicRoutes)} ) : ( - routesToScreens(protectedRoutes) + routesToScreens(routes) )} diff --git a/shell.nix b/shell.nix index 0fa4181..d13a2b0 100644 --- a/shell.nix +++ b/shell.nix @@ -5,8 +5,9 @@ pkgs.mkShell { nodePackages.prisma nodePackages."@nestjs/cli" nodePackages.npm + nodePackages.eas-cli eslint_d - nodejs_16 + nodejs_18 yarn (python3.withPackages (ps: with ps; [requests mido])) pkg-config