Skip to content

Commit 6d21032

Browse files
Update dependencies
1 parent 9c8e6aa commit 6d21032

File tree

4 files changed

+91
-112
lines changed

4 files changed

+91
-112
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Build
33
on:
44
push:
55
branches:
6-
- '**'
6+
- 'main'
77

88
jobs:
99
build:

package.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,13 @@
1212
"@types/react": "^17.0.0",
1313
"@types/react-dom": "^17.0.0",
1414
"@types/react-router-dom": "^5.3.2",
15-
"axios": ">=0.21.2",
16-
"@types/classnames": "^2.2.10",
15+
"axios": "~1.4.0",
16+
"@types/classnames": "^2.3.1",
1717
"bootstrap": "^5.1.3",
18-
"classnames": "^2.2.6",
18+
"classnames": "^2.3.2",
1919
"lodash": "^4.17.15",
20-
"moment": "^2.24.0",
20+
"moment": "^2.29.4",
2121
"react-transition-group": "^4.4.1",
22-
"reactstrap": "^9.0.1",
2322
"react": "^17.0.2",
2423
"react-dom": "^17.0.2",
2524
"react-router-dom": "^5.3.0",

src/components/layout/NavBar.tsx

Lines changed: 45 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,6 @@
1-
import {
2-
Collapse, DropdownItem, DropdownMenu,
3-
DropdownToggle,
4-
Nav,
5-
Navbar,
6-
NavbarBrand,
7-
NavbarToggler,
8-
NavItem,
9-
NavLink,
10-
UncontrolledDropdown
11-
} from "reactstrap";
121
import AuthService from "../../services/AuthService";
132
import React from "react";
3+
import {NavLink} from "react-router-dom";
144

155
const NavBar = () => {
166
const authService = new AuthService()
@@ -23,58 +13,59 @@ const NavBar = () => {
2313
let authenticatedLinks;
2414
const user = authService.getCurrentUser();
2515
if (user.access_token) {
26-
authenticatedLinks = (<Nav className="" navbar>
27-
<NavItem>
28-
<NavLink href="/posts/new">
16+
authenticatedLinks = (<>
17+
<li className="nav-item" >
18+
<NavLink className="nav-link" to="/posts/new" >
2919
<i className="fas fa-plus-circle"/> Add Post
3020
</NavLink>
31-
</NavItem>
32-
33-
<UncontrolledDropdown inNavbar nav>
34-
<DropdownToggle caret nav>
21+
</li>
22+
<li className="nav-item" >
23+
<button className="btn nav-link">
3524
<i className="fas fa-user"/> <span>{user.user.name}</span>
36-
</DropdownToggle>
37-
<DropdownMenu end>
38-
<DropdownItem onClick={logoutHandler}>
39-
<i className="fas fa-sign-out-alt"/> Logout
40-
</DropdownItem>
41-
</DropdownMenu>
42-
</UncontrolledDropdown>
43-
</Nav>);
25+
</button>
26+
</li>
27+
<li className="nav-item" >
28+
<button className="btn nav-link" onClick={logoutHandler}>
29+
<i className="fas fa-sign-out-alt"/> Logout
30+
</button>
31+
</li>
32+
</>);
4433
} else {
45-
authenticatedLinks = (<Nav className="" navbar>
46-
<NavItem>
47-
<NavLink href="/login">
34+
authenticatedLinks = (
35+
<>
36+
<li className="nav-item">
37+
<NavLink className="nav-link" to="/login" >
4838
Login
4939
</NavLink>
50-
</NavItem>
51-
<NavItem>
52-
<NavLink href="/registration">
53-
Register
40+
</li>
41+
<li className="nav-item">
42+
<NavLink className="nav-link" to="/registration" >
43+
Registration
5444
</NavLink>
55-
</NavItem>
56-
</Nav>);
45+
</li>
46+
</>
47+
);
5748
}
5849
return (
59-
<div>
60-
<Navbar
61-
color="primary"
62-
container="xl"
63-
dark
64-
expand="md"
65-
fixed="top"
66-
light>
67-
<NavbarBrand href="/">
68-
DevZone
69-
</NavbarBrand>
70-
<NavbarToggler onClick={function noRefCheck() {
71-
}}/>
72-
<Collapse navbar>
73-
<Nav className="me-auto"/>
74-
{authenticatedLinks}
75-
</Collapse>
76-
</Navbar>
77-
</div>);
50+
<nav className="navbar fixed-top navbar-expand-lg navbar-dark bg-primary">
51+
<div className="container">
52+
<a className="navbar-brand" href="/">DevZone</a>
53+
<button className="navbar-toggler" type="button"
54+
data-bs-toggle="collapse"
55+
data-bs-target="#navbarSupportedContent"
56+
aria-controls="navbarSupportedContent"
57+
aria-expanded="false"
58+
aria-label="Toggle navigation">
59+
<span className="navbar-toggler-icon"></span>
60+
</button>
61+
<div className="collapse navbar-collapse" id="navbarSupportedContent">
62+
<ul className="navbar-nav ms-auto">
63+
{authenticatedLinks}
64+
</ul>
65+
</div>
66+
</div>
67+
</nav>
68+
);
7869
}
7970

8071
export default NavBar;

yarn.lock

Lines changed: 41 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1545,11 +1545,6 @@
15451545
schema-utils "^2.6.5"
15461546
source-map "^0.7.3"
15471547

1548-
"@popperjs/core@^2.6.0":
1549-
version "2.11.0"
1550-
resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.0.tgz#6734f8ebc106a0860dff7f92bf90df193f0935d7"
1551-
integrity sha512-zrsUxjLOKAzdewIDRWy9nsV1GQsKBCWaGwsZQlCgr6/q+vjyZhFgqedLfFBuI9anTPEUT4APq9Mu0SZBTzIcGQ==
1552-
15531548
"@rollup/plugin-node-resolve@^7.1.1":
15541549
version "7.1.3"
15551550
resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-7.1.3.tgz#80de384edfbd7bfc9101164910f86078151a3eca"
@@ -1790,7 +1785,7 @@
17901785
dependencies:
17911786
"@babel/types" "^7.3.0"
17921787

1793-
"@types/classnames@^2.2.10":
1788+
"@types/classnames@^2.3.1":
17941789
version "2.3.1"
17951790
resolved "https://registry.yarnpkg.com/@types/classnames/-/classnames-2.3.1.tgz#3c2467aa0f1a93f1f021e3b9bcf938bd5dfdc0dd"
17961791
integrity sha512-zeOWb0JGBoVmlQoznvqXbE0tEC/HONsnoUNH19Hc96NFsTAwTXbTqb8FMYkru1F/iqp7a18Ws3nWJvtA1sHD1A==
@@ -2681,12 +2676,14 @@ axe-core@^4.3.5:
26812676
resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.3.5.tgz#78d6911ba317a8262bfee292aeafcc1e04b49cc5"
26822677
integrity sha512-WKTW1+xAzhMS5dJsxWkliixlO/PqC4VhmO9T4juNYcaTg9jzWiJsou6m5pxWYGfigWbwzJWeFY6z47a+4neRXA==
26832678

2684-
axios@>=0.21.2:
2685-
version "0.24.0"
2686-
resolved "https://registry.yarnpkg.com/axios/-/axios-0.24.0.tgz#804e6fa1e4b9c5288501dd9dff56a7a0940d20d6"
2687-
integrity sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==
2679+
axios@~1.4.0:
2680+
version "1.4.0"
2681+
resolved "https://registry.yarnpkg.com/axios/-/axios-1.4.0.tgz#38a7bf1224cd308de271146038b551d725f0be1f"
2682+
integrity sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA==
26882683
dependencies:
2689-
follow-redirects "^1.14.4"
2684+
follow-redirects "^1.15.0"
2685+
form-data "^4.0.0"
2686+
proxy-from-env "^1.1.0"
26902687

26912688
axobject-query@^2.2.0:
26922689
version "2.2.0"
@@ -3417,11 +3414,16 @@ class-utils@^0.3.5:
34173414
isobject "^3.0.0"
34183415
static-extend "^0.1.1"
34193416

3420-
classnames@*, classnames@^2.2.3, classnames@^2.2.6:
3417+
classnames@*:
34213418
version "2.3.1"
34223419
resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.1.tgz#dfcfa3891e306ec1dad105d0e88f4417b8535e8e"
34233420
integrity sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA==
34243421

3422+
classnames@^2.3.2:
3423+
version "2.3.2"
3424+
resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.2.tgz#351d813bf0137fcc6a76a16b88208d2560a0d924"
3425+
integrity sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw==
3426+
34253427
clean-css@^4.2.3:
34263428
version "4.2.4"
34273429
resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.4.tgz#733bf46eba4e607c6891ea57c24a989356831178"
@@ -5216,11 +5218,16 @@ flush-write-stream@^1.0.0:
52165218
inherits "^2.0.3"
52175219
readable-stream "^2.3.6"
52185220

5219-
follow-redirects@^1.0.0, follow-redirects@^1.14.4:
5221+
follow-redirects@^1.0.0:
52205222
version "1.14.6"
52215223
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.6.tgz#8cfb281bbc035b3c067d6cd975b0f6ade6e855cd"
52225224
integrity sha512-fhUl5EwSJbbl8AR+uYL2KQDxLkdSjZGR36xy46AO7cOMTrCMON6Sa28FmAnC2tRTDbd/Uuzz3aJBv7EBN7JH8A==
52235225

5226+
follow-redirects@^1.15.0:
5227+
version "1.15.2"
5228+
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13"
5229+
integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
5230+
52245231
for-in@^1.0.2:
52255232
version "1.0.2"
52265233
resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
@@ -5248,6 +5255,15 @@ form-data@^3.0.0:
52485255
combined-stream "^1.0.8"
52495256
mime-types "^2.1.12"
52505257

5258+
form-data@^4.0.0:
5259+
version "4.0.0"
5260+
resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
5261+
integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
5262+
dependencies:
5263+
asynckit "^0.4.0"
5264+
combined-stream "^1.0.8"
5265+
mime-types "^2.1.12"
5266+
52515267
52525268
version "0.2.0"
52535269
resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811"
@@ -7209,7 +7225,7 @@ loglevel@^1.6.8:
72097225
resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.8.0.tgz#e7ec73a57e1e7b419cb6c6ac06bf050b67356114"
72107226
integrity sha512-G6A/nJLRgWOuuwdNuA6koovfEV1YpqqAG4pRUlFaz3jj2QNZ8M4vBqnVA+HBTmU/AMNUtlOsMmSpF6NyOjztbA==
72117227

7212-
loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1, loose-envify@^1.4.0:
7228+
loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1, loose-envify@^1.4.0:
72137229
version "1.4.0"
72147230
resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
72157231
integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
@@ -7527,10 +7543,10 @@ mkdirp@^1.0.3, mkdirp@^1.0.4:
75277543
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
75287544
integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
75297545

7530-
moment@^2.24.0:
7531-
version "2.29.1"
7532-
resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
7533-
integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==
7546+
moment@^2.29.4:
7547+
version "2.29.4"
7548+
resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108"
7549+
integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==
75347550

75357551
move-concurrently@^1.0.1:
75367552
version "1.0.1"
@@ -9063,7 +9079,7 @@ prompts@^2.0.1:
90639079
kleur "^3.0.3"
90649080
sisteransi "^1.0.5"
90659081

9066-
prop-types@^15.5.8, prop-types@^15.6.2, prop-types@^15.7.2:
9082+
prop-types@^15.6.2, prop-types@^15.7.2:
90679083
version "15.7.2"
90689084
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
90699085
integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
@@ -9080,6 +9096,11 @@ proxy-addr@~2.0.5:
90809096
forwarded "0.2.0"
90819097
ipaddr.js "1.9.1"
90829098

9099+
proxy-from-env@^1.1.0:
9100+
version "1.1.0"
9101+
resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
9102+
integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
9103+
90839104
prr@~1.0.1:
90849105
version "1.0.1"
90859106
resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
@@ -9278,11 +9299,6 @@ react-error-overlay@^6.0.9:
92789299
resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.9.tgz#3c743010c9359608c375ecd6bc76f35d93995b0a"
92799300
integrity sha512-nQTTcUu+ATDbrSD1BZHr5kgSD4oF8OFjxun8uAaL8RwPBacGBNPf/yAuVVdx17N8XNzRDMrZ9XcKZHCjPW+9ew==
92809301

9281-
react-fast-compare@^3.0.1:
9282-
version "3.2.0"
9283-
resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-3.2.0.tgz#641a9da81b6a6320f270e89724fb45a0b39e43bb"
9284-
integrity sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA==
9285-
92869302
react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1:
92879303
version "16.13.1"
92889304
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
@@ -9293,14 +9309,6 @@ react-is@^17.0.1:
92939309
resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0"
92949310
integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
92959311

9296-
react-popper@^2.2.4:
9297-
version "2.2.5"
9298-
resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-2.2.5.tgz#1214ef3cec86330a171671a4fbcbeeb65ee58e96"
9299-
integrity sha512-kxGkS80eQGtLl18+uig1UIf9MKixFSyPxglsgLBxlYnyDf65BiY9B3nZSc6C9XUNDgStROB0fMQlTEz1KxGddw==
9300-
dependencies:
9301-
react-fast-compare "^3.0.1"
9302-
warning "^4.0.2"
9303-
93049312
react-refresh@^0.8.3:
93059313
version "0.8.3"
93069314
resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.8.3.tgz#721d4657672d400c5e3c75d063c4a85fb2d5d68f"
@@ -9401,7 +9409,7 @@ [email protected]:
94019409
optionalDependencies:
94029410
fsevents "^2.1.3"
94039411

9404-
react-transition-group@^4.4.1, react-transition-group@^4.4.2:
9412+
react-transition-group@^4.4.1:
94059413
version "4.4.2"
94069414
resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.2.tgz#8b59a56f09ced7b55cbd53c36768b922890d5470"
94079415
integrity sha512-/RNYfRAMlZwDSr6z4zNKV6xu53/e2BuaBbGhbyYIXTrmgu/bGHzmqOs7mJSJBHy9Ud+ApHx3QjrkKSp1pxvlFg==
@@ -9419,18 +9427,6 @@ react@^17.0.2:
94199427
loose-envify "^1.1.0"
94209428
object-assign "^4.1.1"
94219429

9422-
reactstrap@^9.0.1:
9423-
version "9.0.1"
9424-
resolved "https://registry.yarnpkg.com/reactstrap/-/reactstrap-9.0.1.tgz#a6b205861f3e83da55063bc04ba1a069e969f21d"
9425-
integrity sha512-89VOv7SRlAlpS7RwXhzOQkSWkuhBR8LBsPGfNHifNL3WhtNP9y1sBdTcTYyH1ee2QtI8zRdwD0T5I/blHiwemg==
9426-
dependencies:
9427-
"@babel/runtime" "^7.12.5"
9428-
"@popperjs/core" "^2.6.0"
9429-
classnames "^2.2.3"
9430-
prop-types "^15.5.8"
9431-
react-popper "^2.2.4"
9432-
react-transition-group "^4.4.2"
9433-
94349430
read-pkg-up@^7.0.1:
94359431
version "7.0.1"
94369432
resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507"
@@ -11239,13 +11235,6 @@ walker@^1.0.7, walker@~1.0.5:
1123911235
dependencies:
1124011236
makeerror "1.0.12"
1124111237

11242-
warning@^4.0.2:
11243-
version "4.0.3"
11244-
resolved "https://registry.yarnpkg.com/warning/-/warning-4.0.3.tgz#16e9e077eb8a86d6af7d64aa1e05fd85b4678ca3"
11245-
integrity sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==
11246-
dependencies:
11247-
loose-envify "^1.0.0"
11248-
1124911238
watchpack-chokidar2@^2.0.1:
1125011239
version "2.0.1"
1125111240
resolved "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz#38500072ee6ece66f3769936950ea1771be1c957"

0 commit comments

Comments
 (0)