Skip to content

Commit

Permalink
bug bash PR
Browse files Browse the repository at this point in the history
  • Loading branch information
CharlotteLaw committed Nov 17, 2024
2 parents 2fe5604 + 6163fbc commit fd69c3b
Show file tree
Hide file tree
Showing 8 changed files with 3,276 additions and 4,442 deletions.
7,648 changes: 3,220 additions & 4,428 deletions package-lock.json

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,17 @@
"@rneui/base": "^4.0.0-rc.7",
"@rneui/themed": "^4.0.0-rc.8",
"@supabase/supabase-js": "^2.45.6",
"expo": "~51.0.21",
"expo-av": "~14.0.7",
"expo-status-bar": "~1.12.1",
"react": "18.2.0",
"react-native": "^0.74.5",
"expo": "^52.0.5",
"expo-av": "~15.0.1",
"expo-status-bar": "~2.0.0",
"react": "18.3.1",
"react-native": "0.76.1",
"react-native-elements": "^3.4.3",
"react-native-media-controls": "^2.3.0",
"react-native-paper": "^5.12.5",
"react-native-reanimated": "^3.10.1",
"react-native-safe-area-context": "4.10.5",
"react-native-screens": "3.31.1",
"react-native-reanimated": "~3.16.1",
"react-native-safe-area-context": "4.12.0",
"react-native-screens": "~4.0.0",
"react-native-slider": "^0.11.0",
"react-native-video": "^6.6.4",
"react-native-video-controls": "^2.8.1"
Expand All @@ -42,10 +42,10 @@
"@babel/core": "^7.20.0",
"@eslint/js": "^9.9.0",
"@ianvs/prettier-plugin-sort-imports": "^4.3.1",
"@types/react": "~18.2.45",
"@types/react": "~18.3.12",
"babel-plugin-module-resolver": "^5.0.2",
"eslint": "^8.57.0",
"eslint-config-expo": "^7.0.0",
"eslint-config-expo": "~8.0.1",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.2.1",
"husky": "^9.1.5",
Expand Down
11 changes: 11 additions & 0 deletions src/navigation/MainNavigator.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import React from 'react';
import { NavigationContainer } from '@react-navigation/native';
import BottomTabNavigator from './BottomTabNavigator';

export default function AppNavigator() {
return (
<NavigationContainer>
<BottomTabNavigator />
</NavigationContainer>
);
}
21 changes: 21 additions & 0 deletions src/navigation/mainTabNav.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import * as React from 'react';
import { createBottomTabNavigator } from '@react-navigation/bottom-tabs';
import HealingResources from '@/screens/HealingResources';
import Home from '@/screens/Home';
import LegalRights from '@/screens/LegalRights/LegalRightsScreen';
import SeekHelp from '@/screens/SeekHelp';

const Tab = createBottomTabNavigator();

export default function MainTabNav() {
return (
<>
<Tab.Navigator initialRouteName="Home">
<Tab.Screen name="Home" component={Home} />
<Tab.Screen name="Legal Rights" component={LegalRights} />
<Tab.Screen name="Healing Resources" component={HealingResources} />
<Tab.Screen name="Seek Help" component={SeekHelp} />
</Tab.Navigator>
</>
);
}
2 changes: 1 addition & 1 deletion src/navigation/stacks/HealingResourcesNavigator.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import React from 'react';
import { createNativeStackNavigator } from '@react-navigation/native-stack';
import { HealingStackParams } from 'src/navigation/types';
import HealingResources from '@/screens/HealingResources';
import HealingCatalogue from '@/screens/HealingResources/HealingCatalogue';
import HopeHealingGuide from '@/screens/HealingResources/HopeHealingGuide/';
import { HealingStackParams } from '../types';

const HealingStack = createNativeStackNavigator<HealingStackParams>();

Expand Down
6 changes: 3 additions & 3 deletions src/screens/HealingResources/HopeHealingGuide/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ export default function HopeHealingGuide() {

return (
<Drawer.Navigator
initialRouteName="ChapterOne"
initialRouteName="SectionOne"
screenOptions={{
drawerType: 'front',
overlayColor: 'transparent',
Expand All @@ -76,18 +76,18 @@ export default function HopeHealingGuide() {
</TouchableOpacity>
),
}}
component={ChapterOne}
component={SectionOne}
/>
{isChapterOneOpen && (
<>
<Drawer.Screen
name="SectionOne"
component={SectionOne}
options={{
drawerLabel: () => (
<Text style={styles.subsectionLabelText}>Subsection 1</Text>
),
}}
component={SectionOne}
/>
<Drawer.Screen
name="SectionTwo"
Expand Down
5 changes: 5 additions & 0 deletions src/screens/HealingResources/ThemedHealing/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { Text } from 'react-native';

export default function ThemedHealingScreen() {
return <Text>themed healing screen!</Text>;
}
5 changes: 5 additions & 0 deletions src/screens/LegalRights/LegalRightsScreen.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { Text } from 'react-native';

export default function HealingResources() {
return <Text>HELLO this is legal rights</Text>;
}

0 comments on commit fd69c3b

Please sign in to comment.