Skip to content

Commit

Permalink
Bump deps 09 2024 (#170)
Browse files Browse the repository at this point in the history 
* bump deps

* bump deps

* wip

* fix

* fix

* wip
  • Loading branch information
@rodlukas
rodlukas authored Sep 30, 2024
1 parent 50f5a67 commit 0a62d11
Show file tree
Hide file tree
Showing 9 changed files with 3,142 additions and 3,303 deletions.
2 changes: 1 addition & 1 deletion Pipfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ types-requests = "~=2.28.11.8"
python_version = "3.11"

[pipenv]
allow_prereleases = true
allow_prereleases = false
6,239 changes: 3,034 additions & 3,205 deletions frontend/package-lock.json
View file

Large diffs are not rendered by default.

70 changes: 35 additions & 35 deletions frontend/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,81 +23,81 @@
"jest:debug": "npm run jest"
},
"devDependencies": {
"@babel/core": "^7.23.6",
"@babel/core": "^7.25.2",
"@babel/plugin-proposal-class-properties": "^7.18.6",
"@babel/plugin-transform-runtime": "^7.23.6",
"@babel/preset-env": "^7.23.6",
"@babel/preset-react": "^7.23.3",
"@babel/preset-typescript": "^7.23.3",
"@babel/plugin-transform-runtime": "^7.25.4",
"@babel/preset-env": "^7.25.4",
"@babel/preset-react": "^7.24.7",
"@babel/preset-typescript": "^7.24.7",
"@testing-library/jest-dom": "^5.17.0",
"@testing-library/react": "^12.1.5",
"@types/chroma-js": "^2.4.3",
"@types/eslint": "^8.44.9",
"@types/chroma-js": "^2.4.4",
"@types/eslint": "^8.56.12",
"@types/history": "^4.7.11",
"@types/jest": "^27.5.2",
"@types/react": "^17.0.73",
"@types/react-color": "^3.0.10",
"@types/react": "^17.0.83",
"@types/react-color": "^3.0.12",
"@types/react-dom": "^17.0.25",
"@types/react-router-dom": "^5.3.3",
"@types/react-select": "^3.1.2",
"@typescript-eslint/eslint-plugin": "^6.14.0",
"@typescript-eslint/parser": "^6.14.0",
"@typescript-eslint/eslint-plugin": "^6.21.0",
"@typescript-eslint/parser": "^6.21.0",
"audit-ci": "^6.6.1",
"babel-jest": "^27.5.1",
"babel-loader": "^9.1.3",
"babel-loader": "^9.2.1",
"confusing-browser-globals": "^1.0.11",
"cross-env": "^7.0.3",
"css-loader": "^6.8.1",
"css-loader": "^6.11.0",
"css-minimizer-webpack-plugin": "^4.2.2",
"cssnano": "^5.1.15",
"csstype": "^3.1.3",
"eslint": "^8.56.0",
"eslint": "^8.57.1",
"eslint-config-prettier": "^9.1.0",
"eslint-import-resolver-typescript": "^3.6.1",
"eslint-plugin-import": "^2.29.1",
"eslint-import-resolver-typescript": "^3.6.3",
"eslint-plugin-import": "^2.30.0",
"eslint-plugin-jest-dom": "^4.0.3",
"eslint-plugin-jsx-a11y": "^6.8.0",
"eslint-plugin-prettier": "^5.0.1",
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-jsx-a11y": "^6.10.0",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-react": "^7.37.0",
"eslint-plugin-react-hooks": "^4.6.2",
"eslint-plugin-testing-library": "^5.11.1",
"html-webpack-harddisk-plugin": "^2.0.0",
"html-webpack-plugin": "^5.5.4",
"html-webpack-plugin": "^5.6.0",
"jest": "^27.5.1",
"mini-css-extract-plugin": "^2.7.6",
"mini-css-extract-plugin": "^2.9.1",
"msw": "^0.36.8",
"postcss-loader": "^7.3.3",
"postcss-loader": "^7.3.4",
"postcss-preset-env": "^7.8.3",
"prettier": "^3.0.3",
"style-loader": "^3.3.3",
"prettier": "^3.3.3",
"style-loader": "^3.3.4",
"stylelint": "^15.11.0",
"stylelint-config-standard": "^34.0.0",
"stylelint-order": "^6.0.4",
"stylelint-prettier": "^4.1.0",
"stylelint-webpack-plugin": "^4.1.1",
"terser-webpack-plugin": "^5.3.9",
"typescript": "^5.3.3",
"webpack": "^5.94.0",
"webpack-bundle-analyzer": "^4.10.1",
"terser-webpack-plugin": "^5.3.10",
"typescript": "^5.6.2",
"webpack": "^5.95.0",
"webpack-bundle-analyzer": "^4.10.2",
"webpack-cli": "^4.10.0",
"webpack-dev-server": "^4.15.1"
"webpack-dev-server": "^4.15.2"
},
"dependencies": {
"@babel/runtime": "^7.23.6",
"@babel/runtime": "^7.25.6",
"@fortawesome/fontawesome-svg-core": "~1.2.36",
"@fortawesome/free-brands-svg-icons": "~5.15.4",
"@fortawesome/react-fontawesome": "~0.1.19",
"@hot-loader/react-dom": "^17.0.2",
"@rodlukas/fontawesome-pro-solid-svg-icons": "^5.15.2",
"@sentry/browser": "^6.19.7",
"axios": "^0.28.0",
"axios": "^0.28.1",
"bootstrap": "^4.6.2",
"chroma-js": "^2.4.2",
"eslint-webpack-plugin": "^4.0.1",
"chroma-js": "2.4.2",
"eslint-webpack-plugin": "^4.2.0",
"fuse.js": "^6.6.2",
"history": "^4.10.1",
"jwt-decode": "^3.1.2",
"postcss": "^8.4.32",
"postcss": "^8.4.47",
"react": "^17.0.2",
"react-color": "^2.19.3",
"react-dom": "^17.0.2",
Expand Down
25 changes: 13 additions & 12 deletions frontend/src/forms/FormLectures.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,8 @@ class FormLectures extends React.Component<Props, State> {
members: ClientType[] = this.isClient(this.props.object)
? [this.props.object]
: this.isLecture(this.props.lecture)
? this.getMembers(this.props.lecture.attendances)
: this.getMembers(this.props.object.memberships)
? this.getMembers(this.props.lecture.attendances)
: this.getMembers(this.props.object.memberships)

getAttendanceStatesData = (): AttendanceStateType[] =>
this.props.attendanceStatesContext.attendancestates
Expand All @@ -164,22 +164,23 @@ class FormLectures extends React.Component<Props, State> {
date: this.isLectureWithDate(this.props.lecture)
? toISODate(new Date(this.props.lecture.start))
: this.props.date !== ""
? this.props.date
: this.props.defaultValuesForLecture && this.props.defaultValuesForLecture.start !== ""
? toISODate(this.props.defaultValuesForLecture.start)
: "",
? this.props.date
: this.props.defaultValuesForLecture &&
this.props.defaultValuesForLecture.start !== ""
? toISODate(this.props.defaultValuesForLecture.start)
: "",
time: this.isLectureWithDate(this.props.lecture)
? toISOTime(new Date(this.props.lecture.start))
: this.props.defaultValuesForLecture && this.props.defaultValuesForLecture.start !== ""
? toISOTime(this.props.defaultValuesForLecture.start)
: "",
? toISOTime(this.props.defaultValuesForLecture.start)
: "",
course: this.isLecture(this.props.lecture)
? this.props.lecture.course
: this.isClient(this.props.object) && this.props.defaultValuesForLecture
? this.props.defaultValuesForLecture.course
: !this.isClient(this.props.object)
? this.props.object.course
: null,
? this.props.defaultValuesForLecture.course
: !this.isClient(this.props.object)
? this.props.object.course
: null,
duration: this.isLecture(this.props.lecture)
? this.props.lecture.duration
: this.computeDuration(),
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/forms/ModalLecturesWizard.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,8 @@ class ModalLecturesWizard extends React.Component<Props, State> {
{this.state.isClient
? "klienta"
: this.state.isClient !== undefined
? "skupiny"
: ""}
? "skupiny"
: ""}
</ModalHeader>
<ModalBody>
{this.state.isClient !== undefined && (
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/forms/ModalSettings.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ const ModalSettings: React.FC<Props> = ({ currentObject, TYPE, refresh }) => {
currentObject
? currentObject
: TYPE === EDIT_TYPE.COURSE
? DummyCourse
: DummyAttendanceState
? DummyCourse
: DummyAttendanceState
}
funcClose={toggleModal}
funcForceClose={toggleModalForce}
Expand Down
8 changes: 4 additions & 4 deletions frontend/src/global/funcEnvironments.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ export function getEnvName(): string {
return isEnvTesting()
? "testing"
: isEnvDemo()
? "demo"
: process.env.NODE_ENV
? process.env.NODE_ENV
: "local"
? "demo"
: process.env.NODE_ENV
? process.env.NODE_ENV
: "local"
}

/** Zjistí, jestli aktuální aplikace běží na development prostředí. */
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/pages/Applications.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,8 @@ class Applications extends React.Component<Props, State> {
{cnt === 1
? "e"
: cnt > 1 && cnt < 5
? "i"
: "ů"}
? "i"
: "ů"}
</Badge>
</h4>
</ListGroupItem>
Expand Down
89 changes: 49 additions & 40 deletions package-lock.json
View file

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

0 comments on commit 0a62d11

Please sign in to comment.