Skip to content

Commit

Permalink
finished sprint
Browse files Browse the repository at this point in the history
  • Loading branch information
CharlotteLaw committed Oct 26, 2024
1 parent 5e6b3ff commit 6163fbc
Show file tree
Hide file tree
Showing 27 changed files with 928 additions and 106 deletions.
4 changes: 2 additions & 2 deletions App.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import * as React from 'react';
import { NavigationContainer } from '@react-navigation/native';
import MainTabNav from '@/navigation/BottomTabNavigator';
import NavigationBar from '@/navigation/BottomTabNavigator';

export default function App() {
return (
<NavigationContainer>
<MainTabNav />
<NavigationBar />
</NavigationContainer>
);
}
5 changes: 5 additions & 0 deletions graphics.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,8 @@ declare module '*.jpeg' {
const value: ImageSourcePropType;
export default value;
}

declare module '*.mp4' {
const source: { uri: string };
export default source;
}
111 changes: 107 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,22 @@
},
"dependencies": {
"@react-navigation/bottom-tabs": "^6.6.1",
"@react-navigation/drawer": "^6.7.2",
"@react-navigation/material-bottom-tabs": "^6.2.29",
"@react-navigation/native": "^6.1.18",
"@react-navigation/native-stack": "^6.11.0",
"@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",
"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-vector-icons": "^10.2.0"
"react-native-video": "^6.6.4",
"react-navigation": "^5.0.0"
},
"devDependencies": {
"@babel/core": "^7.20.0",
Expand Down
Binary file added src/assets/images/placeholder.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/videos/da_link.mp4
Binary file not shown.
11 changes: 8 additions & 3 deletions src/navigation/BottomTabNavigator.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,20 @@ import HomeScreen from 'src/screens/Home/';
import HealingResourcesNavigator from './stacks/HealingResourcesNavigator';
import LegalRightsNavigator from './stacks/LegalRightsNavigator';
import SeekHelpNavigator from './stacks/SeekHelpNavigator';
import { BottomTabParamList } from './types';
import { BottomTabParams } from './types';

const initialRouteName = 'Healing';

const Tab = createBottomTabNavigator<BottomTabParamList>();
const Tab = createBottomTabNavigator<BottomTabParams>();

export default function NavigationBar() {
return (
<Tab.Navigator initialRouteName={initialRouteName}>
<Tab.Navigator
initialRouteName={initialRouteName}
screenOptions={{
headerShown: false,
}}
>
<Tab.Screen
name="Home"
component={HomeScreen}
Expand Down
23 changes: 16 additions & 7 deletions src/navigation/stacks/HealingResourcesNavigator.tsx
Original file line number Diff line number Diff line change
@@ -1,18 +1,27 @@
import React from 'react';
import { createNativeStackNavigator } from '@react-navigation/native-stack';
import index from '../../screens/HealingResources/index';
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>();

export default function HealingResourcesNavigator() {
return (
<HealingStack.Navigator
screenOptions={{
headerShown: false,
}}
>
<HealingStack.Screen name="Name" component={index} />
<HealingStack.Navigator>
<HealingStack.Screen
name="HealingResources"
component={HealingResources}
/>
<HealingStack.Screen
name="HealingCatalogue"
component={HealingCatalogue}
/>
<HealingStack.Screen
name="HopeForHealingGuide"
component={HopeHealingGuide}
/>
</HealingStack.Navigator>
);
}
12 changes: 5 additions & 7 deletions src/navigation/stacks/LegalRightsNavigator.tsx
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
import React from 'react';
import { createNativeStackNavigator } from '@react-navigation/native-stack';
import index from '../../screens/LegalRights/LegalRightsScreen';
import LegalRights from '@/screens/LegalRights';
import VideoPage from '@/screens/LegalRights/VideoPage';
import { LegalStackParams } from '../types';

const LegalStack = createNativeStackNavigator<LegalStackParams>();

export default function LegalRightsNavigator() {
return (
<LegalStack.Navigator
screenOptions={{
headerShown: false,
}}
>
<LegalStack.Screen name="Name" component={index} />
<LegalStack.Navigator>
<LegalStack.Screen name="LegalRights" component={LegalRights} />
<LegalStack.Screen name="VideoPage" component={VideoPage} />
</LegalStack.Navigator>
);
}
16 changes: 7 additions & 9 deletions src/navigation/stacks/SeekHelpNavigator.tsx
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
import React from 'react';
import { createNativeStackNavigator } from '@react-navigation/native-stack';
import index from '../../screens/SeekHelp/index';
import { SeekHelpParams } from '../types';
import SeekHelp from '@/screens/SeekHelp';
import ResourceList from '@/screens/SeekHelp/ResourceList';
import { SeekHelpStackParams } from '../types';

const SeekHelpStack = createNativeStackNavigator<SeekHelpParams>();
const SeekHelpStack = createNativeStackNavigator<SeekHelpStackParams>();

export default function SeekHelpNavigator() {
return (
<SeekHelpStack.Navigator
screenOptions={{
headerShown: false,
}}
>
<SeekHelpStack.Screen name="Name" component={index} />
<SeekHelpStack.Navigator>
<SeekHelpStack.Screen name="SeekHelp" component={SeekHelp} />
<SeekHelpStack.Screen name="ResourceList" component={ResourceList} />
</SeekHelpStack.Navigator>
);
}
Loading

0 comments on commit 6163fbc

Please sign in to comment.