File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -6,6 +6,7 @@ const GreyDiv = styled.div`
66 width: 100vw;
77 background: rgba(0, 0, 0, 0.4);
88 position: absolute;
9+ z-index: 99;
910` ;
1011
1112const ModalDiv = styled . div `
@@ -17,6 +18,10 @@ const ModalDiv = styled.div`
1718 background-color: white;
1819 transform: translate(-50%, -25%);
1920 opacity: 100%;
21+ padding: 20px;
22+ display: flex;
23+ flex-direction: column;
24+ align-items: center;
2025` ;
2126
2227export default function Modal ( { children, setShowing } ) {
Original file line number Diff line number Diff line change @@ -5,6 +5,7 @@ import Icon from '../Icon';
55import Input from '../input' ;
66import { COLOR , ASSESSMENT_COLOR } from '../../constants' ;
77import { Title5 } from '../Typography' ;
8+ import ExportModal from '../Assessment/ExportModal' ;
89
910const Container = styled . div `
1011 height: 60%;
@@ -78,6 +79,7 @@ export default function HackerList({
7879 // State for search and filter icons
7980 const [ searchActive , setSearchActive ] = useState ( false ) ;
8081 const [ filterActive , setFilterActive ] = useState ( false ) ;
82+ const [ showExportModal , setShowExportModal ] = useState ( false ) ;
8183
8284 // debounce search
8385 useEffect ( ( ) => {
@@ -143,6 +145,10 @@ export default function HackerList({
143145 color = { ! filterActive && COLOR . GREY_500 }
144146 onClick = { ( ) => setFilterActive ( ! filterActive ) }
145147 />
148+ < StyledIcon
149+ icon = "file-arrow-down"
150+ onClick = { ( ) => setShowExportModal ( true ) }
151+ />
146152 </ ButtonContainer >
147153 </ >
148154 ) }
@@ -168,6 +174,8 @@ export default function HackerList({
168174 />
169175 ) ) }
170176 </ ListContainer >
177+
178+ { showExportModal && < ExportModal setShowing = { setShowExportModal } /> }
171179 </ Container >
172180 ) ;
173181}
Original file line number Diff line number Diff line change @@ -624,7 +624,7 @@ export const getApplicantsToAccept = async (score) => {
624624 return applicants . docs
625625 . filter ( ( app ) => {
626626 const appStatus = app . data ( ) . status . applicationStatus ;
627- const newHacker = app . data ( ) . basicInfo . hackathonsAttended === 0 ;
627+ const newHacker = app . data ( ) . skills . hackathonsAttended === 0 ;
628628 if ( appStatus !== APPLICATION_STATUS . scored . text ) return false ;
629629 if ( newHacker ) return true ;
630630 return app . data ( ) . score . totalScore >= score ;
@@ -650,12 +650,11 @@ export const getCSVData = async () => {
650650 school,
651651 location,
652652 major,
653- hackathonsAttended,
654653 } ,
655654 status : { applicationStatus } ,
655+ skills : { hackathonsAttended } ,
656656 } = doc . data ( ) ;
657657 const totalScore = doc . data ( ) . score ?. totalScore ?? '?' ;
658- const firstTimeHacker = hackathonsAttended === 0 ;
659658 return [
660659 firstName ,
661660 lastName ,
@@ -668,7 +667,6 @@ export const getCSVData = async () => {
668667 applicationStatus ,
669668 major ,
670669 hackathonsAttended ,
671- firstTimeHacker ,
672670 ] ;
673671 } ) ;
674672 CSV . unshift ( [
@@ -682,7 +680,6 @@ export const getCSVData = async () => {
682680 'Total Score' ,
683681 'Application Status' ,
684682 'Major' ,
685- '# of hackathons attended' ,
686683 'First time hacker?' ,
687684 ] ) ;
688685 return CSV ;
You can’t perform that action at this time.
0 commit comments