Skip to content

Commit

Permalink
Merge branch 'master' into prod
Browse files Browse the repository at this point in the history
  • Loading branch information
cbrianbet authored Dec 4, 2024
2 parents 5c2ba7d + c72b368 commit 6df8dfc
Show file tree
Hide file tree
Showing 3 changed files with 392 additions and 172 deletions.
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
"@testing-library/jest-dom": "^4.2.4",
"@testing-library/react": "^9.3.2",
"@testing-library/user-event": "^7.1.2",
"axios": "^0.21.2",
"axios": "1.7.7",
"bootstrap": "^4.4.1",
"chart.js": "^3.7.1",
"dotenv": "^16.0.1",
"dotenv": "^16.4.5",
"env-cmd": "^10.1.0",
"font-awesome": "^4.7.0",
"highcharts": "^8.2.2",
Expand All @@ -28,10 +28,10 @@
"moment": "^2.29.0",
"mui-datatables": "^4.3.0",
"oidc-client": "^1.10.1",
"powerbi-client": "^2.22.2",
"powerbi-client-react": "^1.3.5",
"proj4": "^2.6.3",
"prop-types": "^15.7.2",
"powerbi-client": "^2.23.1",
"powerbi-client-react": "^1.4.0",
"proj4": "^2.12.1",
"prop-types": "^15.8.1",
"react": "^16.12.0",
"react-chartjs-2": "^4.0.1",
"react-cookie": "^4.1.1",
Expand All @@ -41,9 +41,9 @@
"react-datepicker": "^3.8.0",
"react-dom": "^16.12.0",
"react-export-excel": "^0.5.3",
"react-ga": "^3.3.0",
"react-ga": "^3.3.1",
"react-loadable": "^5.5.0",
"react-query": "^3.9.8",
"react-query": "^3.39.3",
"react-redux": "^8.0.2",
"react-router-dom": "^5.1.2",
"react-scripts": "^4.0.3",
Expand Down Expand Up @@ -91,7 +91,7 @@
},
"devDependencies": {
"@semantic-ui-react/css-patch": "^1.1.2",
"prettier": "^2.2.1",
"prettier": "^3.3.3",
"react-syntax-highlighter": "^15.5.0"
},
"homepage": "."
Expand Down
2 changes: 1 addition & 1 deletion src/utils/axiosHeaders.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as axios from 'axios';
import axios from 'axios';

export function setAuthHeader(token) {
axios.defaults.headers.common['Authorization'] = token ? 'Bearer ' + token : '';
Expand Down
Loading

0 comments on commit 6df8dfc

Please sign in to comment.