Skip to content

Commit 406cb56

Browse files
Merge development into kanishk_database_design_frontend
- Resolved yarn.lock merge conflict (accepted development branch) - Fixed duplicate isAckLoading declaration in Header.jsx
2 parents 39fc6d4 + 5f924ba commit 406cb56

178 files changed

Lines changed: 37919 additions & 3179 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.

.env.development

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Development environment settings
2+
REACT_APP_APIENDPOINT="http://localhost:4500/api"
3+
SKIP_PREFLIGHT_CHECK=true
4+
DISABLE_ESLINT_PLUGIN=true
5+
REACT_APP_DEF_PWD=123Welcome!

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,17 @@
1010

1111
# misc
1212
.DS_Store
13+
14+
# Environment files
1315
.env
1416
.env.local
17+
.env.development
1518
.env.development.local
1619
.env.test.local
1720
.env.production.local
1821

22+
23+
1924
npm-debug.log*
2025
yarn-debug.log*
2126
yarn-error.log*

eslint.config.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@ module.exports = [
2828
'node_modules/**',
2929
'public/**',
3030
'build/**',
31-
// Ignore test files inside /src/components
32-
'src/components/Reports/PeopleReport/components/PeopleTasksPieChart.test.jsx',
33-
// Ignore entire component folders
3431
],
3532
},
3633

0 commit comments

Comments
 (0)