Skip to content

Fix - Partner project review page #786

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.

Sign up for GitHub

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

Merged
wickathou merged 1 commit into from
Mar 19, 2024
Merged

Fix - Partner project review page #786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 13 additions & 9 deletions backend/modules/project/controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,16 +241,20 @@ controller.getDataForPartnerReviewing = async (event, user) => {
recruiter => recruiter.recruiterId === user.sub,
)
if (challengeOrg) {
const challengeData = _.find(
event.challenges,
challenge => challenge.partner === challengeOrg.organization,
)
const projectsFilteredByChallenge = _.filter(
projectsWithExistingTeamsAndFinal,
project => _.includes(project.challenges, challengeData.slug),
)
const challengesArray = []
event.challenges.map(challenge => {
if (challenge.partner === challengeOrg.organization) {
challengesArray.push(challenge.slug)
}
})
const projectsFilteredByChallenge = []

projectsWithExistingTeamsAndFinal.map(project => {
if (_.includes(challengesArray, project.challenges[0])) {
projectsFilteredByChallenge.push(project)
}
})
data.projects = projectsFilteredByChallenge
data.challenge = challengeData
} else {
data.projects = []
}
Expand Down
3 changes: 3 additions & 0 deletions frontend/src/components/modals/ProjectReviewModal/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ const ProjectScoreModal = ({
)}
{projectScoreData?.reviewers?.length > 0 &&
projectScoreData.reviewers.map((reviewer, index) => {
if (!reviewer?.message) {
return null
}
return (
<ReviewElement
key={index}
Expand Down
18 changes: 13 additions & 5 deletions frontend/src/components/projects/ProjectsGridItem/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ const ProjectsGridItem = ({

const styling = {
punchlineMaxLength: 150,
challengeMaxLength: 30,
}

const stylingModifiers = styleRules => {
Expand Down Expand Up @@ -179,7 +180,12 @@ const ProjectsGridItem = ({
{project.challenges.map((challenge, index) => (
<Chip
key={index}
label={challenge.replaceAll('-', ' ')}
label={_.truncate(
challenge.replaceAll('-', ' '),
{
length: styling.challengeMaxLength,
},
)}
/>
))}
</div>
Expand Down Expand Up @@ -251,9 +257,11 @@ const ProjectsGridItem = ({
<Tooltip
key={index}
title={`Reviewed by ${
project.reviewers.length - 1
project?.scoreData
?.reviewers?.length - 1
} more ${
project.reviewers.length -
project?.scoreData
?.reviewers?.length -
1 >
1
? 'people'
Expand All @@ -262,8 +270,8 @@ const ProjectsGridItem = ({
>
<Avatar>
+
{project.reviewers.length -
1}
{project?.scoreData
?.reviewers?.length - 1}
</Avatar>
</Tooltip>
)
Expand Down
59 changes: 23 additions & 36 deletions frontend/src/pages/_dashboard/renderDashboard/generalPages/default/Blocks/AlertBlock.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,69 +1,56 @@
import React from 'react'
import { useSelector } from 'react-redux'
import { Grid, Typography } from '@material-ui/core'
import * as DashboardSelectors from 'redux/dashboard/selectors'
import GradientBox from 'components/generic/GradientBox'
import { Alerts } from '../../../../../../components/messaging/alerts'
import TimeLineBlock from '../Blocks/TimeLineBlock'

const makeBoxStyles = () => ({


backgroundColor: '#f7fafc',
border: `2px solid #e2e8f0`,
borderRadius: '6px',
height: '100%'
height: '100%',

//TODO: blurr the bottom

// backgroundColor: '#f8f8f8',

})

const makeTimelineStyles = () => ({



backgroundColor: '#f7fafc',
border: `2px solid #e2e8f0`,
borderRadius: '6px',
height: '100%',

overflow: 'auto',



// backgroundColor: '#f8f8f8',

})

export default ({ alerts = [] }) => {

return (
<>
<Grid
direction="column"
alignItems="stretch"
item
xs={8}
style={{ marginLeft: '20px', marginRight: '20px' }}
>
<GradientBox
style={makeBoxStyles()}
color="theme_white"
p={3}
{alerts && alerts.length > 0 && (
<Grid
direction="column"
alignItems="stretch"
item
xs={8}
style={{ marginLeft: '20px', marginRight: '20px' }}
>
<Typography variant="button" gutterBottom>
Announcements
</Typography>
<hr className="tw-h-px tw-bg-gray-500 tw-border-0 tw-dark:bg-gray-900"></hr>
<Alerts alerts={alerts} />
</GradientBox>

</Grid>
<Grid
item
xs={4}>
<GradientBox
style={makeBoxStyles()}
color="theme_white"
p={3}
>
<Typography variant="button" gutterBottom>
Announcements
</Typography>
<hr className="tw-h-px tw-bg-gray-500 tw-border-0 tw-dark:bg-gray-900"></hr>
<Alerts alerts={alerts} />
</GradientBox>
</Grid>
)}
<Grid item xs={alerts && alerts.length > 0 ? 4 : 12}>
<GradientBox
style={makeTimelineStyles()}
color="theme_white"
Expand All @@ -75,7 +62,7 @@ export default ({ alerts = [] }) => {
<hr className="tw-h-px tw-bg-gray-500 tw-border-0 tw-dark:bg-gray-900"></hr>
<TimeLineBlock />
</GradientBox>
</Grid >
</Grid>
</>
)
}
8 changes: 0 additions & 8 deletions frontend/src/pages/_dashboard/renderDashboard/generalPages/default/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,10 @@ import { EventPageScripts } from '@hackjunction/shared'
import { useSelector } from 'react-redux'
import * as DashboardSelectors from 'redux/dashboard/selectors'
// import * as AuthSelectors from 'redux/auth/selectors'
import * as UserSelectors from 'redux/user/selectors'
// import PartnerReviewingBlock from './Blocks/PartnerReviewingBlock'
export default ({ alerts }) => {
const user = useSelector(UserSelectors.userProfile)
const event = useSelector(DashboardSelectors.event)
const projects = useSelector(DashboardSelectors.projects)
// const isPartner =
// user.userId == 'google-oauth2|108766439620242776277' ||
// (useSelector(AuthSelectors.idTokenData)?.roles?.includes('Recruiter') &&
// !useSelector(AuthSelectors.idTokenData)?.roles?.includes(
// 'SuperAdmin',
// ))
return (
<Box>
<PageHeader heading="Dashboard" />
Expand Down
20 changes: 1 addition & 19 deletions frontend/src/pages/_dashboard/renderDashboard/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import React, { useEffect, useState } from 'react'

import { useRouteMatch, useLocation } from 'react-router'
import { useRouteMatch } from 'react-router'
import { useDispatch, useSelector } from 'react-redux'
import { makeStyles } from '@material-ui/core/styles'
import PageWrapper from 'components/layouts/PageWrapper'

import PartnerDashboard from './partner'
Expand All @@ -11,12 +10,10 @@ import OrganizerDashboard from './organiser'

import * as DashboardSelectors from 'redux/dashboard/selectors'
import * as DashboardActions from 'redux/dashboard/actions'
import * as OrganiserActions from 'redux/organiser/actions'
import * as AuthSelectors from 'redux/auth/selectors'
import * as UserSelectors from 'redux/user/selectors'
import * as UserActions from 'redux/user/actions'

import { useTranslation } from 'react-i18next'
import { useLazyQuery, useSubscription } from '@apollo/client'
import { ALERTS_QUERY } from 'graphql/queries/alert'
import { NEW_ALERTS_SUBSCRIPTION } from 'graphql/subscriptions/alert'
Expand All @@ -27,21 +24,6 @@ import {
} from 'graphql/queries/events'
// import { Chat } from 'components/messaging/chat'

const useStyles = makeStyles(theme => ({
sidebarTop: {
padding: theme.spacing(3),
height: '100%',
display: 'flex',
flexDirection: 'column',
alignItems: 'center',
justifyContent: 'center',
},
sidebarLogo: {
width: '100%',
objectFit: 'contain',
},
}))

export default role => {
const match = useRouteMatch()
const dispatch = useDispatch()
Expand Down
8 changes: 3 additions & 5 deletions frontend/src/pages/_dashboard/renderDashboard/partner/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useState } from 'react'
import React, { useEffect, useState } from 'react'

import { useRouteMatch, useLocation } from 'react-router'
import DashboardIcon from '@material-ui/icons/Dashboard'
Expand All @@ -23,7 +23,6 @@ import CalendarPage from './calendar'
import RecruitmentPage from './partnerrecruitment'
import MapPage from '../generalPages/map'

import { useTranslation } from 'react-i18next'
import Badge from '@material-ui/core/Badge'

import ProjectsPage from './projects'
Expand Down Expand Up @@ -54,7 +53,6 @@ export default ({
lockedPages,
}) => {
const classes = useStyles()
const { t } = useTranslation()
const match = useRouteMatch()
const location = useLocation()
const [alertCount, setAlertCount] = useState(originalAlertCount)
Expand Down Expand Up @@ -92,7 +90,7 @@ export default ({
<DashboardIcon />
</Badge>
),
label: t('Dashboard_'),
label: 'Dashboard',
component: () => {
setAlertCount(0)
if (shownPages?.experimental) {
Expand Down Expand Up @@ -129,7 +127,7 @@ export default ({
exact: true,
icon: <AmpStoriesIcon />,
hidden: !shownPages?.hackerPack,
label: t('Hackerpack_'),
label: 'Hackerpack',
component: HackerpackPage,
},
{
Expand Down
26 changes: 11 additions & 15 deletions frontend/src/pages/_dashboard/renderDashboard/partner/projects/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,19 +191,17 @@ export default ({ event }) => {
return (
<>
<div className="tw-flex tw-justify-between tw-items-end">
{inputData?.challenge?.name && (
<PageHeader
heading={inputData?.challenge.name}
subheading={`By ${inputData?.challenge.partner}`}
alignment="left"
details={`${inputData?.projects.length} project${
inputData?.projects.length > 1 ||
inputData?.projects.length < 1
? 's'
: ''
}`}
/>
)}
<PageHeader
heading="Project review"
subheading={`Available for review:`}
alignment="left"
details={`${inputData?.projects.length} project${
inputData?.projects.length > 1 ||
inputData?.projects.length < 1
? 's'
: ''
}`}
/>
</div>

<Box height={20} />
Expand Down Expand Up @@ -235,8 +233,6 @@ export default ({ event }) => {
{scoreCriteriaBase &&
scoreCriteriaBase.length > 0 && (
<EvaluationForm
event={event}
project={selected}
submit={handleSubmit}
score={projectScore}
scoreCriteria={scoreCriteriaBase}
Expand Down