Skip to content

Commit 5f1179b

Browse files
authored
Merge branch 'develop-postgres' into bug
2 parents 22b1204 + 371327e commit 5f1179b

File tree

22 files changed

+507
-890
lines changed

22 files changed

+507
-890
lines changed

jest.config.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ export default {
1010
'!**/index.{js,ts}',
1111
'!**/*.d.ts',
1212
'!src/test/**',
13-
'!vitest.config.ts',],
13+
'!vitest.config.ts',
14+
],
1415
// setupFiles: ['react-app-polyfill/jsdom'],
1516
setupFiles: ['whatwg-fetch'],
1617
setupFilesAfterEnv: ['<rootDir>/src/setupTests.ts'],
@@ -35,13 +36,15 @@ export default {
3536
'<rootDir>/src',
3637
],
3738
moduleNameMapper: {
39+
'\\.(css|scss|sass|less)$': 'identity-obj-proxy',
3840
'^react-native$': 'react-native-web',
3941
'^@dicebear/core$': '<rootDir>/scripts/__mocks__/@dicebear/core.ts',
4042
'^@dicebear/collection$':
4143
'<rootDir>/scripts/__mocks__/@dicebear/collection.ts',
4244
'\\.svg\\?react$': '<rootDir>/scripts/__mocks__/fileMock.js',
4345
'\\.svg$': '<rootDir>/scripts/__mocks__/fileMock.js',
4446
'^@pdfme/generator$': '<rootDir>/scripts/__mocks__/@pdfme/generator.ts',
47+
'\\.(css|less|scss|sass)$': 'identity-obj-proxy',
4548
},
4649
moduleFileExtensions: [
4750
'web.js',

package-lock.json

Lines changed: 41 additions & 40 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/GraphQl/Mutations/ActionItemCategoryMutations.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export const CREATE_ACTION_ITEM_CATEGORY_MUTATION = gql`
2929
*
3030
* @param id - The id of the ActionItemCategory to be updated.
3131
* @param name - Updated name of the ActionItemCategory.
32-
* @param isDisabled - Updated disabled status of the ActionItemCategory.
32+
* @param isDisabled - Updated disabled status of the ActionItemCategory.
3333
*/
3434

3535
export const UPDATE_ACTION_ITEM_CATEGORY_MUTATION = gql`

src/components/ContriStats/ContriStats.module.css

Lines changed: 0 additions & 7 deletions
This file was deleted.
Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from 'react';
22
import { useTranslation } from 'react-i18next';
33

4-
import styles from './ContriStats.module.css';
4+
import styles from '../../style/app.module.css';
55

66
interface InterfaceContriStatsProps {
77
id: string;
@@ -13,27 +13,34 @@ interface InterfaceContriStatsProps {
1313
/**
1414
* A component that displays contribution statistics.
1515
*
16-
* @param props - The properties passed to the component, including `recentAmount`, `highestAmount`, and `totalAmount`.
16+
* @param recentAmount - The most recent contribution amount.
17+
* @param highestAmount - The highest contribution amount.
18+
* @param totalAmount - The total contribution amount.
1719
*
1820
* @returns JSX.Element - The rendered component displaying the contribution stats.
1921
*/
20-
function ContriStats(props: InterfaceContriStatsProps): JSX.Element {
22+
function ContriStats({
23+
recentAmount,
24+
highestAmount,
25+
totalAmount,
26+
}: InterfaceContriStatsProps): JSX.Element {
2127
const { t } = useTranslation('translation', {
2228
keyPrefix: 'contriStats',
2329
});
2430

2531
return (
2632
<>
2733
<p className={styles.fonts}>
28-
{t('recentContribution')}: $&nbsp;<span>{props.recentAmount}</span>
34+
{t('recentContribution')}: $&nbsp;<span>{recentAmount}</span>
2935
</p>
3036
<p className={styles.fonts}>
31-
{t('highestContribution')}: $&nbsp;<span>{props.highestAmount}</span>
37+
{t('highestContribution')}: $&nbsp;<span>{highestAmount}</span>
3238
</p>
3339
<p className={styles.fonts}>
34-
{t('totalContribution')}: $&nbsp;<span>{props.totalAmount}</span>
40+
{t('totalContribution')}: $&nbsp;<span>{totalAmount}</span>
3541
</p>
3642
</>
3743
);
3844
}
45+
3946
export default ContriStats;

0 commit comments

Comments
 (0)