Skip to content

Commit 9a1ef55

Browse files
committed
Merge branch 'haoyue-job-posting-age-bar-chart' of https://github.com/OneCommunityGlobal/HighestGoodNetworkApp into haoyue-job-posting-age-bar-chart
2 parents c53c185 + 1460cc1 commit 9a1ef55

399 files changed

Lines changed: 19157 additions & 6786 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.eslintignore

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,26 @@
1-
*.png
2-
*.svg
3-
*.test.js
4-
*.test.jsx
5-
src/actions/**
6-
src/App.css
7-
src/config.json
8-
9-
src/__tests__/**
1+
# =======================================================================
2+
# ⚠️ DO NOT ADD NEW ENTRIES ⚠️
3+
# Only the files and folders listed below are allowed to be ignored.
4+
# This .gitignore is locked down to maintain consistency across the team.
5+
# To propose changes, please open a discussion or PR with justification.
6+
# =======================================================================
107

8+
# Ignore build folders
9+
/node_modules/
1110
/public/
1211
/build/
13-
/node_modules/
12+
13+
# Ignore test files inside /src/components
14+
src/components/BMDashboard/_tests_/BMDashboard.test.jsx
15+
src/components/Reports/PeopleReport/components/PeopleTasksPieChart.test.jsx
16+
17+
# Ignore folders in /src
1418
src/components/Badge/**
15-
src/components/common/**
19+
src/components/Dashboard/**
1620
src/components/Projects/**
1721
src/components/SummaryManagement/**
1822
src/components/TaskEditSuggestions/**
1923
src/components/TeamMemberTasks/**
20-
src/components/Timelog/**
24+
src/components/Teams/TeamMembersPopup.jsx
2125
src/components/UserManagement/**
22-
src/components/UserProfile/**
23-
src/components/EmailSubscribeForm/**
24-
src/components/Dashboard/**
25-
src/components/Teams/TeamMembersPopup.jsx
26+
src/components/UserProfile/**

package-lock.json

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

package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@
3232
"joi": "^14.0.6",
3333
"jwt-decode": "^2.2.0",
3434
"leaflet": "1.7.1",
35+
"leaflet.heat": "^0.2.0",
3536
"lodash": "^4.17.21",
37+
"lucide-react": "^0.484.0",
3638
"lz-string": "^1.5.0",
3739
"moment": "^2.29.2",
3840
"moment-timezone": "^0.5.33",
@@ -45,7 +47,7 @@
4547
"react-chartjs-2": "^5.2.0",
4648
"react-circular-progressbar": "^2.1.0",
4749
"react-collapsible": "^2.10.0",
48-
"react-datepicker": "^3.7.0",
50+
"react-datepicker": "^3.8.0",
4951
"react-day-picker": "^7.4.8",
5052
"react-dom": "^16.13.1",
5153
"react-html-parser": "^2.0.2",

src/App.css

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ button {
116116

117117
/* .bg-space-cadet:hover{
118118
background-color: #1C2541 !important;
119-
color:black;
119+
color:black;
120120
} */
121121

122122
.bg-yinmn-blue {
@@ -261,3 +261,10 @@ input[type='checkbox']:not([disabled]):hover {
261261
.pdrl-1 {
262262
padding: 0 1em !important;
263263
}
264+
.user-card-container {
265+
display: flex;
266+
flex-wrap: wrap;
267+
justify-content: center;
268+
gap: 24px;
269+
padding: 20px;
270+
}

src/__tests__/CountdownTimer.test.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// eslint-disable-next-line no-unused-vars
12
import React from 'react';
23
import moment from 'moment';
34
import { render, screen, waitFor } from '@testing-library/react';
Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,25 @@
11
// This is needed to remove a warning related to popper.js when testing reactstrap tooltips.
22
// More on this bug: https://github.com/react-bootstrap/react-bootstrap/issues/4997
3-
3+
/* eslint-disable import/no-extraneous-dependencies */
4+
/* eslint-env jest */
45
import PopperJs from 'popper.js';
56

6-
export default class Popper {
7-
static placements = PopperJs.placements;
7+
// export default class Popper {
8+
// static placements = PopperJs.placements;
89

9-
constructor() {
10+
function Popper() {
1011
return {
1112
destroy: () => {},
1213
scheduleUpdate: () => {},
1314
};
1415
}
15-
}
16+
// To mimic static property
17+
Popper.placements = PopperJs.placements;
18+
export default Popper;
19+
1620

17-
describe('Stop Error', () => {
18-
it('should not error out due to no tests (popper.js.js)', () => {
19-
return;
21+
describe('Stop Error', () => {
22+
it('should not error out due to no tests (popper.js.js)', () => {
23+
2024
});
2125
});
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* eslint-env jest */
12
test('it should pass', () => {
23
expect(true).toBe(true);
34
});
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* eslint-env jest */
12
test('it should pass', () => {
23
expect(true).toBe(true);
34
});

src/__tests__/mockAdminState.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
let dt = new Date();
1+
const dt = new Date();
22
dt.setDate(dt.getDate() + 1);
33

44
export default {
@@ -1810,6 +1810,8 @@ export default {
18101810
}
18111811
};
18121812

1813+
// eslint-disable-next-line no-undef
18131814
describe('Stop Error', () => {
1815+
// eslint-disable-next-line no-undef
18141816
it('should not error out due to no tests (mockAdminState.js)', () => {});
18151817
});

src/__tests__/mockStates.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { getAllPermissionKeys } from '../components/PermissionsManagement/PermissionsConst.js';
1+
import { getAllPermissionKeys } from '../components/PermissionsManagement/PermissionsConst';
22

33
export const allTeamsMock = {
44
fetching: false,
@@ -1302,7 +1302,9 @@ export const rolesMock = {
13021302
}
13031303
}
13041304

1305+
// eslint-disable-next-line no-undef
13051306
describe('Stop Error', () => {
1307+
// eslint-disable-next-line no-undef
13061308
it('should not error out due to no tests (mockStates.js)', () => { });
13071309
});
13081310

@@ -1313,7 +1315,7 @@ const allPermissionsExcept = (permissions) => {
13131315

13141316
// takes a list of relevant permissions and returns two auth objects, one with the permissions and the other with all permissions not listed
13151317
export const createAuthMocks = (permissions) => {
1316-
var authTemplate = {
1318+
const authTemplate = {
13171319
// isAdmin: true,
13181320
user: {
13191321
userid: '5edf141c78f1380017b829a6',

0 commit comments

Comments
 (0)