Skip to content

Commit

Permalink
Merge branch 'main' into snyk-upgrade-2122a3031504f91bf5c7d05c0447a48f
Browse files Browse the repository at this point in the history
  • Loading branch information
JonasLang-dev authored Jun 20, 2022
2 parents a083d80 + 3c107c2 commit 865d733
Show file tree
Hide file tree
Showing 55 changed files with 1,862 additions and 1,909 deletions.
48 changes: 24 additions & 24 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,41 +12,41 @@
"dependencies": {
"@emotion/react": "^11.9.0",
"@emotion/styled": "^11.8.1",
"@hookform/resolvers": "^2.8.8",
"@hookform/resolvers": "^2.8.10",
"@mui-treasury/component-info": "^0.1.0-alpha.1",
"@mui-treasury/layout": "^5.0.0",
"@mui/icons-material": "^5.6.2",
"@mui/lab": "^5.0.0-alpha.79",
"@mui/material": "^5.6.4",
"@mui/x-data-grid": "^5.10.0",
"@reduxjs/toolkit": "^1.8.1",
"@tauri-apps/api": "^1.0.0-rc.4",
"@mui/icons-material": "^5.8.0",
"@mui/lab": "^5.0.0-alpha.83",
"@mui/material": "^5.8.4",
"@mui/x-data-grid": "^5.11.1",
"@reduxjs/toolkit": "^1.8.2",
"@tauri-apps/api": "^1.0.0-rc.6",
"axios": "^0.27.2",
"color": "^4.2.3",
"i18next": "^21.6.16",
"i18next": "^21.8.5",
"i18next-browser-languagedetector": "^6.1.4",
"i18next-http-backend": "^1.4.0",
"i18next-http-backend": "^1.4.1",
"mui-file-dropzone": "^4.0.1",
"notistack": "^2.0.4",
"plyr-react": "^3.2.1",
"notistack": "^2.0.5",
"plyr-react": "^4.0.0",
"react": "^18.1.0",
"react-dom": "^18.1.0",
"react-hook-form": "^7.30.0",
"react-i18next": "^11.16.7",
"react-material-ui-carousel": "^3.3.3",
"react-redux": "^8.0.1",
"react-hook-form": "^7.32.2",
"react-i18next": "^11.16.9",
"react-material-ui-carousel": "^3.4.1",
"react-redux": "^8.0.2",
"react-router-dom": "6.3.0",
"zod": "^3.14.4"
"zod": "^3.17.3"
},
"devDependencies": {
"@tauri-apps/cli": "^1.0.0-rc.9",
"@tauri-apps/cli": "^1.0.0",
"@types/color": "^3.0.3",
"@types/react": "^18.0.8",
"@types/react-dom": "^18.0.2",
"@vitejs/plugin-react": "^1.3.1",
"@types/react": "^18.0.9",
"@types/react-dom": "^18.0.5",
"@vitejs/plugin-react": "^1.3.2",
"diagnostic-languageserver": "^1.14.2",
"typescript": "^4.6.3",
"typescript-language-server": "^0.9.7",
"vite": "^2.9.6"
"typescript": "^4.7.4",
"typescript-language-server": "^0.10.1",
"vite": "^2.9.9"
}
}
}
4 changes: 4 additions & 0 deletions frontend/src-tauri/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Generated by Cargo
# will have compiled files and executables
/target/
WixTools
Loading

0 comments on commit 865d733

Please sign in to comment.