feat: multi-role jury fix, country flags, applicant deadline banner, timeline
Some checks failed
Build and Push Docker Image / build (push) Has been cancelled
Some checks failed
Build and Push Docker Image / build (push) Has been cancelled
- Fix project list returning empty for users with both SUPER_ADMIN and JURY_MEMBER roles (jury filter now skips admins) in project, assignment, and evaluation routers - Add CountryDisplay component showing flag emoji + name everywhere country is displayed (admin, observer, jury, mentor views — 17 files) - Add countdown deadline banner on applicant dashboard for INTAKE, SUBMISSION, and MENTORING rounds with live timer - Remove quick action buttons from applicant dashboard - Fix competition timeline sidebar: green dots/connectors only up to current round, yellow dot for current round, red connector into rejected round, grey after Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -177,8 +177,11 @@ export const projectRouter = router({
|
||||
]
|
||||
}
|
||||
|
||||
// Jury members can only see assigned projects
|
||||
if (userHasRole(ctx.user, 'JURY_MEMBER')) {
|
||||
// Jury members can only see assigned projects (but not if they also have admin roles)
|
||||
if (
|
||||
userHasRole(ctx.user, 'JURY_MEMBER') &&
|
||||
!userHasRole(ctx.user, 'SUPER_ADMIN', 'PROGRAM_ADMIN')
|
||||
) {
|
||||
where.assignments = {
|
||||
...((where.assignments as Record<string, unknown>) || {}),
|
||||
some: { userId: ctx.user.id },
|
||||
@@ -506,8 +509,8 @@ export const projectRouter = router({
|
||||
// ProjectTag table may not exist yet
|
||||
}
|
||||
|
||||
// Check access for jury members
|
||||
if (userHasRole(ctx.user, 'JURY_MEMBER')) {
|
||||
// Check access for jury members (but not if they also have admin roles)
|
||||
if (userHasRole(ctx.user, 'JURY_MEMBER') && !userHasRole(ctx.user, 'SUPER_ADMIN', 'PROGRAM_ADMIN')) {
|
||||
const assignment = await ctx.prisma.assignment.findFirst({
|
||||
where: {
|
||||
projectId: input.id,
|
||||
|
||||
Reference in New Issue
Block a user