Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 21 additions & 15 deletions guard_app/package-lock.json

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

5 changes: 4 additions & 1 deletion guard_app/src/navigation/AppNavigator.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import ShiftDetailsScreen from '../screen/ShiftDetailsScreen';
import SignupScreen from '../screen/signupscreen';
import SplashScreen from '../screen/SplashScreen';
import DocumentsScreen from '../screen/DocumentsScreen';

Check warning on line 12 in guard_app/src/navigation/AppNavigator.tsx

View workflow job for this annotation

GitHub Actions / ESLint & Prettier

`../screen/DocumentsScreen` import should occur before import of `../screen/EditProfileScreen`

Check warning on line 12 in guard_app/src/navigation/AppNavigator.tsx

View workflow job for this annotation

GitHub Actions / ESLint & Prettier

`../screen/DocumentsScreen` import should occur before import of `../screen/EditProfileScreen`

export type RootStackParamList = {
AppTabs: undefined;
Expand All @@ -20,18 +21,20 @@
Messages: undefined;

Notifications: undefined;
Documents: { docType?: string } | undefined;
ShiftDetails: { shift: any; refresh?: () => void };

Check warning on line 25 in guard_app/src/navigation/AppNavigator.tsx

View workflow job for this annotation

GitHub Actions / ESLint & Prettier

Unexpected any. Specify a different type

Check warning on line 25 in guard_app/src/navigation/AppNavigator.tsx

View workflow job for this annotation

GitHub Actions / ESLint & Prettier

Unexpected any. Specify a different type
};

const Stack = createNativeStackNavigator<RootStackParamList>();

export default function AppNavigator() {
return (
<Stack.Navigator initialRouteName="Splash" screenOptions={{ headerShown: false }}>
<Stack.Navigator initialRouteName="AppTabs" screenOptions={{ headerShown: false }}>
<Stack.Screen name="AppTabs" component={AppTabs} />
<Stack.Screen name="Splash" component={SplashScreen} />
<Stack.Screen name="Login" component={LoginScreen} />
<Stack.Screen name="Signup" component={SignupScreen} />
<Stack.Screen name="Documents" component={DocumentsScreen} />
<Stack.Screen
name="Settings"
component={SettingsScreen}
Expand Down
11 changes: 8 additions & 3 deletions guard_app/src/screen/ProfileScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {
SafeAreaView,
ScrollView,
TouchableOpacity,
Pressable,
Image,
} from 'react-native';

Expand Down Expand Up @@ -197,10 +198,14 @@ export default function ProfileScreen({ navigation, route }: any) {
<View style={styles.card}>
<Text style={styles.cardTitle}>Certifications</Text>
<View style={styles.badgesRow}>
{['Security License', 'CPR', 'First Aid'].map((badge, index) => (
<View key={index} style={styles.badge}>
{['Security License', 'CPR', 'First Aid'].map((badge) => (
<Pressable
key={badge}
style={({ pressed }) => [styles.badge, pressed && { opacity: 0.7 }]}
onPress={() => navigation.navigate('Documents', { docType: badge })}
>
<Text style={styles.badgeText}>{badge}</Text>
</View>
</Pressable>
))}
</View>
</View>
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

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

Loading