Skip to content

Commit

Permalink
Merge branch 'develop-postgres' into OrgDashboard-jest-to-vitest
Browse files Browse the repository at this point in the history
  • Loading branch information
varshith257 authored Dec 20, 2024
2 parents ed81c5a + 371327e commit 5b77244
Show file tree
Hide file tree
Showing 19 changed files with 458 additions and 864 deletions.
2 changes: 1 addition & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export default {
'<rootDir>/src',
],
moduleNameMapper: {
'\\.(css|less)$': 'identity-obj-proxy',
'\\.(css|scss|sass|less)$': 'identity-obj-proxy',
'^react-native$': 'react-native-web',
'^@dicebear/core$': '<rootDir>/scripts/__mocks__/@dicebear/core.ts',
'^@dicebear/collection$':
Expand Down
112 changes: 66 additions & 46 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/GraphQl/Mutations/ActionItemCategoryMutations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export const CREATE_ACTION_ITEM_CATEGORY_MUTATION = gql`
*
* @param id - The id of the ActionItemCategory to be updated.
* @param name - Updated name of the ActionItemCategory.
* @param isDisabled - Updated disabled status of the ActionItemCategory.
* @param isDisabled - Updated disabled status of the ActionItemCategory.
*/

export const UPDATE_ACTION_ITEM_CATEGORY_MUTATION = gql`
Expand Down
7 changes: 0 additions & 7 deletions src/components/ContriStats/ContriStats.module.css

This file was deleted.

19 changes: 13 additions & 6 deletions src/components/ContriStats/ContriStats.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import { useTranslation } from 'react-i18next';

import styles from './ContriStats.module.css';
import styles from '../../style/app.module.css';

interface InterfaceContriStatsProps {
id: string;
Expand All @@ -13,27 +13,34 @@ interface InterfaceContriStatsProps {
/**
* A component that displays contribution statistics.
*
* @param props - The properties passed to the component, including `recentAmount`, `highestAmount`, and `totalAmount`.
* @param recentAmount - The most recent contribution amount.
* @param highestAmount - The highest contribution amount.
* @param totalAmount - The total contribution amount.
*
* @returns JSX.Element - The rendered component displaying the contribution stats.
*/
function ContriStats(props: InterfaceContriStatsProps): JSX.Element {
function ContriStats({
recentAmount,
highestAmount,
totalAmount,
}: InterfaceContriStatsProps): JSX.Element {
const { t } = useTranslation('translation', {
keyPrefix: 'contriStats',
});

return (
<>
<p className={styles.fonts}>
{t('recentContribution')}: $&nbsp;<span>{props.recentAmount}</span>
{t('recentContribution')}: $&nbsp;<span>{recentAmount}</span>
</p>
<p className={styles.fonts}>
{t('highestContribution')}: $&nbsp;<span>{props.highestAmount}</span>
{t('highestContribution')}: $&nbsp;<span>{highestAmount}</span>
</p>
<p className={styles.fonts}>
{t('totalContribution')}: $&nbsp;<span>{props.totalAmount}</span>
{t('totalContribution')}: $&nbsp;<span>{totalAmount}</span>
</p>
</>
);
}

export default ContriStats;
Loading

0 comments on commit 5b77244

Please sign in to comment.