Skip to content

Commit c2130a0

Browse files
committed
3686-GahanPatel-added credtits
2 parents 3648f04 + 99a3c70 commit c2130a0

5 files changed

Lines changed: 61 additions & 9 deletions

File tree

src/backend/src/services/change-requests.services.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ export default class ChangeRequestsService {
178178
dateReviewed: null
179179
},
180180
{
181-
NOT: { scopeChangeRequest: null }
181+
changes: { none: {} }
182182
}
183183
];
184184

@@ -666,9 +666,7 @@ export default class ChangeRequestsService {
666666
include: {
667667
changeRequests: {
668668
where: {
669-
dateDeleted: {
670-
not: null
671-
}
669+
dateDeleted: null
672670
},
673671
include: {
674672
changes: true

src/backend/src/services/notifications.services.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,13 @@ export default class NotificationsService {
265265
type: Reimbursement_Status_Type.SABO_SUBMITTED
266266
}
267267
}
268+
},
269+
{
270+
reimbursementStatuses: {
271+
none: {
272+
type: Reimbursement_Status_Type.DENIED
273+
}
274+
}
268275
}
269276
]
270277
},

src/frontend/src/components/ChangeRequestTab.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*/
55

66
import { WbsElement } from 'shared';
7-
import { useGetUnreviewedChangeRequests } from '../hooks/change-requests.hooks';
7+
import { useGetApprovedChangeRequests, useGetUnreviewedChangeRequests } from '../hooks/change-requests.hooks';
88
import ErrorPage from '../pages/ErrorPage';
99
import LoadingIndicator from './LoadingIndicator';
1010
import ChangeRequestRow from './ChangeRequestRow';
@@ -21,7 +21,7 @@ const ChangeRequestTab = ({ wbsElement }: { wbsElement: WbsElement }) => {
2121
isError: approvedCRIsError,
2222
isLoading: approvedCRIsLoading,
2323
error: approvedCRError
24-
} = useGetUnreviewedChangeRequests(wbsElement.wbsNum);
24+
} = useGetApprovedChangeRequests(wbsElement.wbsNum);
2525

2626
if (unreviewedCRIsError) return <ErrorPage message={unreviewedCRError?.message} />;
2727
if (approvedCRIsError) return <ErrorPage message={approvedCRError?.message} />;

src/frontend/src/pages/CreditsPage/CreditsPage.tsx

Lines changed: 39 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,45 @@ const CreditsPage: React.FC = () => {
300300
}
301301
}
302302
},
303-
{ name: 'Gahan Patel', color: '#0000FF' }
303+
{ name: 'Gahan Patel', color: '#0000FF' },
304+
{ name: 'Mimo Olowu', color: 'white', sx: { px: 1, backgroundColor: '#ac59eb', borderRadius: 2 } },
305+
{ name: 'Saul Manzanares', color: '#AF34FA' },
306+
{ name: 'Richard Feng', color: '#FFFF', sx: { textShadow: '0 0 2px rgba(0,26,255), 0 0 5px rgba(255,255,255)' } },
307+
{
308+
name: 'Samuel Shrestha',
309+
color: '#be0000',
310+
sx: {
311+
textShadow: '0 0 6px rgba(190, 0, 0, 0.9), 0 0 14px rgba(190, 0, 0, 0.6)',
312+
animation: 'sam-glow 2.6s ease-in-out infinite',
313+
'@keyframes sam-glow': {
314+
'0%': { textShadow: '0 0 4px rgba(190, 0, 0, 0.7), 0 0 10px rgba(190, 0, 0, 0.4)' },
315+
'50%': { textShadow: '0 0 10px rgba(190, 0, 0, 1), 0 0 22px rgba(190, 0, 0, 0.95)' },
316+
'100%': { textShadow: '0 0 4px rgba(190, 0, 0, 0.7), 0 0 10px rgba(190, 0, 0, 0.4)' }
317+
}
318+
}
319+
},
320+
{
321+
name: 'Santiago Ordonez Merizalde',
322+
color: 'transparent',
323+
sx: {
324+
textShadow: `
325+
0 0 8px rgba(180, 0, 255, 0.8),
326+
0 0 15px rgba(140, 0, 255, 0.6),
327+
0 0 25px rgba(200, 100, 255, 0.5)
328+
`,
329+
background: 'linear-gradient(90deg, #d9a7ff, #b58eff, #7f6fff, #b58eff, #d9a7ff)',
330+
'-webkit-background-clip': 'text',
331+
backgroundSize: '300% 300%',
332+
animation: 'purpleFlow 6s ease-in-out infinite',
333+
'@keyframes purpleFlow': {
334+
'0%': { backgroundPosition: '0% 50%' },
335+
'50%': { backgroundPosition: '100% 50%' },
336+
'100%': { backgroundPosition: '0% 50%' }
337+
},
338+
filter: 'drop-shadow(0 0 4px rgba(190, 80, 255, 0.6))'
339+
}
340+
},
341+
{ name: 'Josh Len', color: '#000000ff' }
304342
];
305343

306344
const snark = ['Add your name!', "Shouldn't you do it yourself?", 'Seriously', 'go', 'do', 'it'];

src/frontend/src/pages/FinancePage/ReimbursementRequestForm/ReimbursementFormView.tsx

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -654,6 +654,9 @@ const ReimbursementRequestFormView: React.FC<ReimbursementRequestFormViewProps>
654654
'& .MuiOutlinedInput-root': {
655655
borderRadius: '20px',
656656
color: '#989898'
657+
},
658+
'& .MuiOutlinedInput-input': {
659+
color: '#ffffff'
657660
}
658661
}}
659662
onClose={() => setDatePickerOpen(false)}
@@ -665,8 +668,14 @@ const ReimbursementRequestFormView: React.FC<ReimbursementRequestFormViewProps>
665668
textField: {
666669
error: !!errors.dateOfExpense,
667670
helperText: errors.dateOfExpense?.message,
668-
onClick: () => setDatePickerOpen(true),
669-
inputProps: { readOnly: true }
671+
InputProps: {
672+
onClick: (e) => {
673+
const target = e.target as HTMLElement;
674+
if (target.closest('button')) {
675+
setDatePickerOpen(true);
676+
}
677+
}
678+
}
670679
}
671680
}}
672681
/>

0 commit comments

Comments
 (0)