Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/wkylin/pro-react-admin into…
Browse files Browse the repository at this point in the history 
… main
  • Loading branch information
@wkylin
wkylin committed Jun 24, 2023
2 parents 3e50996 + 2d1974a commit c64f96f
Show file tree
Hide file tree
Showing 4 changed files with 140 additions and 52 deletions.
2 changes: 1 addition & 1 deletion api/package-lock.json
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion api/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"body-parser": "^1.20.2",
"cors": "^2.8.5",
"express": "^4.18.2",
"mongoose": "^7.2.1"
"mongoose": "^7.2.2"
},
"devDependencies": {
"nodemon": "^2.0.22"
Expand Down
182 changes: 135 additions & 47 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,10 +223,10 @@
"@reduxjs/toolkit": "^1.9.5",
"@sentry/cli": "^2.18.1",
"@sentry/react": "^7.53.0",
"@sentry/tracing": "^7.53.0",
"@sentry/tracing": "^7.54.0",
"@types/three": "^0.152.1",
"@welldone-software/why-did-you-render": "^7.0.1",
"antd": "^5.5.1",
"antd": "^5.5.2",
"axios": "^1.4.0",
"blueimp-md5": "^2.19.0",
"cookies-js": "^1.2.3",
Expand All @@ -252,7 +252,7 @@
"react": "^18.2.0",
"react-css-theme-switcher": "^0.3.0",
"react-dom": "^18.2.0",
"react-error-boundary": "^4.0.4",
"react-error-boundary": "^4.0.9",
"react-icons": "^4.9.0",
"react-loading-skeleton": "^3.3.1",
"react-player": "^2.12.0",
Expand Down

1 comment on commit c64f96f

@vercel
Copy link

@vercel vercel bot commented on c64f96f Jun 24, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

pro-react-admin – ./

pro-react-admin.vercel.app
pro-react-admin-git-main-wkylin.vercel.app
pro-react-admin-wkylin.vercel.app

Please sign in to comment.