Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added expired jobs screen to admin settings tab #96

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft
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
8 changes: 4 additions & 4 deletions src/components/Header/styles.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { StyleSheet } from 'react-native';

export default StyleSheet.create({
container: {
width: '100%',
width: '100%',
flexDirection: 'row',
alignItems: 'center',
},
Expand All @@ -12,9 +12,9 @@ export default StyleSheet.create({
fontFamily: 'DMSans_700Bold',
},
headerStyle: {
backgroundColor: 'white',
height: 125,
backgroundColor: 'white',
height: 125,
borderBottomColor: 'black',
borderBottomWidth: StyleSheet.hairlineWidth,
}
},
});
29 changes: 22 additions & 7 deletions src/navigation/stacks/AdminSettingsStackNavigator.tsx
Original file line number Diff line number Diff line change
@@ -1,20 +1,35 @@
import { createNativeStackNavigator } from '@react-navigation/native-stack';
import React from 'react';
import Header from '../../components/Header/Header';
import styles from '../../components/Header/styles';
import AccessScreen from '../../screens/AdminSettings/Access/AccessScreen';
import AdminSettingsScreen from '../../screens/AdminSettings/AdminSettings/AdminSettingsScreen';
import ExpiredJobsScreen from '../../screens/AdminSettings/ExpiredJobs/ExpiredJobs';
import { AdminSettingsStackParamList } from '../../types/navigation';

const AdminSettingsStack = createNativeStackNavigator<AdminSettingsStackParamList>();
const AdminSettingsStack =
createNativeStackNavigator<AdminSettingsStackParamList>();

function ExpiredJobsHeader() {
return <Header title="Expired Jobs" />;
}

export default function AdminSettingsStackNavigator() {
return (
<AdminSettingsStack.Navigator
screenOptions={{
headerShown: false,
}}
>
<AdminSettingsStack.Screen name="AdminSettingsScreen" component={AdminSettingsScreen} />
<AdminSettingsStack.Navigator>
<AdminSettingsStack.Screen
name="AdminSettingsScreen"
component={AdminSettingsScreen}
/>
<AdminSettingsStack.Screen name="AccessScreen" component={AccessScreen} />
<AdminSettingsStack.Screen
name="ExpiredJobsScreen"
component={ExpiredJobsScreen}
options={{
headerTitle: ExpiredJobsHeader,
headerStyle: styles.headerStyle,
}}
/>
</AdminSettingsStack.Navigator>
);
}
10 changes: 9 additions & 1 deletion src/screens/AdminSettings/AdminSettings/AdminSettingsScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ import { signUserOut } from '../../../firebase/auth';
import { AdminSettingsStackScreenProps } from '../../../types/navigation';
import styles from './styles';

function AdminSettingsScreen({navigation}: AdminSettingsStackScreenProps<'AdminSettingsScreen'>): ReactElement {
function AdminSettingsScreen({
navigation,
}: AdminSettingsStackScreenProps<'AdminSettingsScreen'>): ReactElement {
const { dispatch } = useContext(AuthContext);

return (
Expand All @@ -29,6 +31,12 @@ function AdminSettingsScreen({navigation}: AdminSettingsStackScreenProps<'AdminS
buttonStyle={{ width: '45%', height: '5%' }}
textStyle={{}}
/>
<StyledButton
text="Expired Jobs"
onPress={() => navigation.navigate('ExpiredJobsScreen')}
buttonStyle={{ width: '45%', height: '5%' }}
textStyle={{}}
/>
</View>
);
}
Expand Down
44 changes: 44 additions & 0 deletions src/screens/AdminSettings/ExpiredJobs/ExpiredJobs.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
import React from 'react';
import useFirestoreListener from 'react-firestore-listener';
import { SafeAreaView, ScrollView, Text } from 'react-native';
import JobCard from '../../../components/JobCard/JobCard';
import { AdminSettingsStackScreenProps } from '../../../types/navigation';
import { Job } from '../../../types/types';
import styles from './styles';

function ExpiredJobsScreen({
navigation,
}: AdminSettingsStackScreenProps<'ExpiredJobsScreen'>) {
const expiredJobs = useFirestoreListener<Job>({
collection: 'expiredJobs',
});

return (
<SafeAreaView style={styles.container}>
<ScrollView
contentContainerStyle={{
flexGrow: 1,
alignItems: 'center',
width: '100%',
}}
>
{expiredJobs.map(job => (
<JobCard
job={job}
key={job.id}
pending
bookmarkedJobs={null}
setBookmarkedJobs={null}
/>
))}
{expiredJobs.length === 0 && (
<Text style={{ marginTop: '10%' }}>
No expired jobs currently!
</Text>
)}
</ScrollView>
</SafeAreaView>
);
}

export default ExpiredJobsScreen;
35 changes: 35 additions & 0 deletions src/screens/AdminSettings/ExpiredJobs/styles.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
import { StyleSheet } from 'react-native';

export default StyleSheet.create({
container: {
height: '100%',
width: '100%',
flex: 1,
backgroundColor: '#fff',
flexDirection: 'column',
},

feedHeader: {
height: '20%',
width: '100%',
backgroundColor: 'white',
alignItems: 'center',
justifyContent: 'space-around',
flexDirection: 'row',
},
feedTitle: {
color: '#49260C',
fontSize: 28,
fontFamily: 'DMSans_700Bold',
},
redSquare: {
height: '50%',
width: '20%',
backgroundColor: 'red',
borderRadius: 3,
},
footer: {
height: '5%',
width: '100%',
},
});
14 changes: 10 additions & 4 deletions src/types/navigation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,16 @@ import { MaterialBottomTabNavigationProp } from '@react-navigation/material-bott
import { NativeStackScreenProps } from '@react-navigation/native-stack';

export type AuthStackParamList = {
EmailPasswordRegisterScreen: { phoneNumber: string, userType: string };
EmailPasswordRegisterScreen: { phoneNumber: string; userType: string };
EmployerRegisterScreen: { phoneNumber: string };
AdminSigninScreen: undefined;
PhoneNumberScreen: { userType: string };
SigninScreen: undefined;
VerificationScreen: { verificationId: string; phoneNumber: string, userType: string };
VerificationScreen: {
verificationId: string;
phoneNumber: string;
userType: string;
};
UserTypeScreen: undefined;
WelcomeScreen: undefined;
};
Expand Down Expand Up @@ -41,10 +45,12 @@ export type AdminSettingsStackParamList = {
AdminSettingsScreen: undefined;
AccessScreen: undefined;
EmployerApprovalScreen: undefined;
ExpiredJobsScreen: undefined;
};

export type AdminSettingsStackScreenProps<T extends keyof AdminSettingsStackParamList> =
NativeStackScreenProps<AdminSettingsStackParamList, T>;
export type AdminSettingsStackScreenProps<
T extends keyof AdminSettingsStackParamList,
> = NativeStackScreenProps<AdminSettingsStackParamList, T>;

export type BookmarksStackParamList = {
BookmarksScreen: undefined;
Expand Down