Skip to content
This repository was archived by the owner on Apr 5, 2024. It is now read-only.

Feature/deps #296

Merged
merged 11 commits into from
Apr 20, 2022
Merged

Feature/deps #296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
be161f5
Update dependency sass to v1.49.8 (#295)
renovate[bot] Feb 19, 2022
34e7368
Update dependency axios to v0.26.0 (#293)
renovate[bot] Feb 19, 2022
0974c16
Pin dependency webpack to 5.69.0 (#290)
renovate[bot] Feb 19, 2022
29b506e
Update dependency @testing-library/react to v12.1.3
renovate-bot Feb 19, 2022
b9bf21b
Update dependency webpack to v5.69.1
renovate-bot Feb 19, 2022
c6c41f3
Update dependency sass to v1.49.9
renovate-bot Feb 26, 2022
02d1398
Update devDependencies (patch)
renovate-bot Mar 1, 2022
62143ca
Update dependency react-router-dom to v6.2.2
renovate-bot Mar 5, 2022
bf7d793
Update devDependencies (patch)
renovate-bot Mar 5, 2022
4f76ea6
Update dependency webpack to v5.72.0 (#309)
renovate[bot] Apr 20, 2022
bb3cc9f
Fix multiple children in react element
qvalentin Apr 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,19 @@
]
},
"dependencies": {
"axios": "0.21.4",
"axios": "0.26.0",
"bootstrap": "4.6.1",
"react": "17.0.2",
"react-bootstrap": "2.1.2",
"react-dom": "17.0.2",
"react-dropzone": "11.7.1",
"react-password-strength-bar": "0.4.0",
"react-redux": "7.2.6",
"react-router-dom": "6.2.1",
"react-router-dom": "6.2.2",
"react-scripts": "5.0.0",
"redux": "4.1.2",
"redux-types": "2.0.3",
"sass": "1.45.2",
"sass": "1.49.9",
"super-tiny-icons": "0.4.0"
},
"devDependencies": {
Expand All @@ -56,25 +56,25 @@
"@storybook/preset-create-react-app": "4.0.1",
"@storybook/react": "6.4.19",
"@testing-library/jest-dom": "5.16.2",
"@testing-library/react": "12.1.2",
"@testing-library/react": "12.1.3",
"@testing-library/user-event": "13.5.0",
"@types/bootstrap": "5.0.17",
"@types/jest": "27.4.0",
"@types/jest": "27.4.1",
"@types/node": "17.0.18",
"@types/react": "17.0.39",
"@types/react-bootstrap": "0.32.29",
"@types/react-dom": "17.0.11",
"@types/react-redux": "7.1.22",
"@types/react-dom": "17.0.13",
"@types/react-redux": "7.1.23",
"@types/react-router-dom": "5.1.9",
"axios-mock-adapter": "1.20.0",
"babel-loader": "8.1.0",
"cypress": "9.5.0",
"cypress": "9.5.1",
"eslint": "^8.9.0",
"eslint-plugin-cypress": "2.12.1",
"eslint-plugin-react-hooks": "4.2.0",
"husky": "7.0.4",
"npm-check-updates": "12.3.0",
"postcss": "8.4.6",
"npm-check-updates": "12.0.5",
"postcss": "8.4.7",
"prettier": "2.5.1",
"rc-util": "5.16.1",
"react-is": "17.0.2",
Expand All @@ -86,6 +86,6 @@
"typedoc-plugin-rename-defaults": "^0.5.1",
"typedoc-theme-hierarchy": "^1.1.1",
"typescript": "4.3.5",
"webpack": "5"
"webpack": "5.72.0"
}
}
42 changes: 22 additions & 20 deletions src/components/basicElements/topArea/Header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,27 +102,29 @@ function Header(props: PropsFromRedux): ReactElement {
<Navbar.Collapse id="basic-navbar-nav">
{props.username && (
<Nav className="navbar-collapse justify-content-end">
{final}
<NavDropdown
title={props.username}
id="basic-nav-dropdown"
className="text-center"
>
<NavDropdown.Item
onClick={() => {
navigate("/profile")
}}
<>
{final}
<NavDropdown
title={props.username}
id="basic-nav-dropdown"
className="text-center"
>
Profile
</NavDropdown.Item>
<NavDropdown.Item
onClick={() => {
logout()
}}
>
Logout
</NavDropdown.Item>
</NavDropdown>
<NavDropdown.Item
onClick={() => {
navigate("/profile")
}}
>
Profile
</NavDropdown.Item>
<NavDropdown.Item
onClick={() => {
logout()
}}
>
Logout
</NavDropdown.Item>
</NavDropdown>
</>
</Nav>
)}
</Navbar.Collapse>
Expand Down
Loading