Skip to content

Commit d3141a0

Browse files
committed
Merge branch 'development' of https://github.com/OneCommunityGlobal/HighestGoodNetworkApp into vinay-v/fix-blue-square-assignment-edit
2 parents ab1f2af + 53fc2ea commit d3141a0

356 files changed

Lines changed: 15337 additions & 4760 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.

.babelrc

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
{
2-
"presets": ["react-app"]
2+
"presets": ["react-app"],
3+
"plugins": [
4+
"@babel/plugin-proposal-optional-chaining",
5+
"@babel/plugin-proposal-nullish-coalescing-operator"
6+
]
37
}

.eslintignore

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,20 @@ src/actions/**
66
src/App.css
77
src/config.json
88

9-
src/index.js
10-
src/reducers/**
11-
src/styles.js
129
src/__tests__/**
1310

1411
/public/
1512
/build/
1613
/node_modules/
17-
src/components/App.jsx
18-
src/components/AutoReload/**
1914
src/components/Badge/**
2015
src/components/common/**
2116
src/components/Projects/**
2217
src/components/SummaryManagement/**
2318
src/components/TaskEditSuggestions/**
2419
src/components/TeamMemberTasks/**
25-
src/components/Teams/**
20+
src/components/Timelog/**
2621
src/components/UserManagement/**
2722
src/components/UserProfile/**
28-
src/components/Announcements/**
2923
src/components/EmailSubscribeForm/**
30-
src/components/Dashboard/**
24+
src/components/Dashboard/**
25+
src/components/Teams/TeamMembersPopup.jsx
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: Close PRs from Forks
2+
3+
on:
4+
pull_request_target:
5+
types:
6+
- opened
7+
- synchronize
8+
9+
jobs:
10+
check-fork:
11+
runs-on: ubuntu-latest
12+
permissions:
13+
pull-requests: write
14+
steps:
15+
- name: Check if PR is from a fork
16+
id: check
17+
run: |
18+
echo "PR head repo: ${{ github.event.pull_request.head.repo.full_name }}"
19+
echo "Base repo: ${{ github.event.repository.full_name }}"
20+
if [[ "${{ github.event.pull_request.head.repo.full_name }}" != "${{ github.event.repository.full_name }}" ]]; then
21+
echo "PR is from a fork"
22+
echo "is_fork=true" >> $GITHUB_ENV
23+
else
24+
echo "PR is not from a fork"
25+
echo "is_fork=false" >> $GITHUB_ENV
26+
fi
27+
28+
- name: Close PR and add comment
29+
if: env.is_fork == 'true'
30+
run: |
31+
PR_NUMBER=${{ github.event.pull_request.number }}
32+
GH_REPO=${{ github.repository }}
33+
echo "Closing PR #$PR_NUMBER in repository $GH_REPO"
34+
gh pr close \
35+
"$PR_NUMBER" \
36+
--repo "${{ github.repository }}" \
37+
--comment "This PR has been closed because PRs from forks are not allowed. Please create a branch directly off the origin repository and resubmit your PR."
38+
env:
39+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/pull_request_test.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ name: Pull Request Unit Test
33
on:
44
pull_request:
55
branches:
6-
- main
76
- development
87
jobs:
98
test:
@@ -17,4 +16,6 @@ jobs:
1716
- name: Install Dependencies
1817
run: npm ci
1918
- name: Run Unit Tests
20-
run: npm test
19+
run: npm test
20+
- name: Run Lint
21+
run: npm run lint

.prettierignore

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,23 @@ src/actions/**
44
src/App.css
55
src/config.json
66

7-
src/index.js
87
src/languages/**
9-
src/reducers/**
108
src/registerServiceWorker.js
119
src/routes.js
1210
src/setupTests.js
1311
src/store.js
14-
src/styles.js
12+
src/utils/**
1513
src/__tests__/**
1614

1715

18-
src/components/App.jsx
19-
src/components/AutoReload/**
16+
src/components/Header/**
2017
src/components/Inventory/**
2118
src/components/Memberships/**
2219
src/components/Projects/**
2320
src/components/Reports/**
2421
src/components/SummaryManagement/**
2522
src/components/TaskEditSuggestions/**
2623
src/components/TeamMemberTasks/**
27-
src/components/Teams/**
24+
src/components/Timelog/**
2825
src/components/UserManagement/**
2926
src/components/UserProfile/**
30-
src/components/Announcements/**

.vscode/settings.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// other settings
33
// formatting using eslint
44
// let editor format using prettier for all other files
5-
"editor.formatOnSave": true,
5+
"editor.formatOnSave": false,
66
// disable editor formatting, so eslint can handle it
77
"[javascript]": {
88
"editor.formatOnSave": true
@@ -20,4 +20,4 @@
2020
"**/.settings": true,
2121
"**/.factorypath": true
2222
}
23-
}
23+
}

package-lock.json

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

0 commit comments

Comments
 (0)