Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit bbbbd04

Browse files
committed
After merges cleanup
1 parent f0bdb55 commit bbbbd04

File tree

4 files changed

+246
-41
lines changed

4 files changed

+246
-41
lines changed

‎client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"react-addons-transition-group": "^15.5.2",
2929
"react-dom": "^15.4.2",
3030
"react-redux": "^5.0.3",
31-
"react-router": "^4.1.1",
31+
"react-router": "3.0.2",
3232
"react-router-redux": "^4.0.8",
3333
"react-ultimate-pagination": "^1.0.1",
3434
"reactstrap": "^4.5.0",

‎client/src/components/App.js

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,26 +38,23 @@ export class App extends Component {
3838
</NavItem>
3939
<NavItem>
4040
<NavLink href="/#/orders">Orders</NavLink>
41-
<NavLink href="/#/customers">Customers</NavLink>
4241
</NavItem>
4342
<NavItem>
44-
{
45-
userIsAdmin && <NavLink href="/#/users">Users</NavLink>
46-
}
43+
<NavLink href="/#/customers">Customers</NavLink>
4744
</NavItem>
4845
<NavItem>
4946
<NavLink href="/#/products">Products</NavLink>
5047
</NavItem>
48+
<NavItem>
49+
{ userIsAdmin && <NavLink href="/#/users">Users</NavLink>}
50+
</NavItem>
5151
</Nav>
5252
<Nav navbar className="ml-auto">
5353
<NavDropdown isOpen={this.state.isOpen} toggle={this.toggle}>
5454
<DropdownToggle caret>
5555
{user.email}
5656
</DropdownToggle>
5757
<DropdownMenu right>
58-
<DropdownItem>
59-
<DropdownItem>Profile</DropdownItem>
60-
</DropdownItem>
6158
<DropdownItem href onClick={this.logout}> Logout </DropdownItem>
6259
</DropdownMenu>
6360
</NavDropdown>

‎client/yarn.lock

Lines changed: 13 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2738,14 +2738,13 @@ he@1.1.x:
27382738
version "1.1.1"
27392739
resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
27402740

2741-
history@^4.6.0:
2742-
version "4.6.1"
2743-
resolved "https://registry.yarnpkg.com/history/-/history-4.6.1.tgz#911cf8eb65728555a94f2b12780a0c531a14d2fd"
2741+
history@^3.0.0:
2742+
version "3.3.0"
2743+
resolved "https://registry.yarnpkg.com/history/-/history-3.3.0.tgz#fcedcce8f12975371545d735461033579a6dae9c"
27442744
dependencies:
27452745
invariant "^2.2.1"
27462746
loose-envify "^1.2.0"
2747-
resolve-pathname "^2.0.0"
2748-
value-equal "^0.2.0"
2747+
query-string "^4.2.2"
27492748
warning "^3.0.0"
27502749

27512750
hmac-drbg@^1.0.0:
@@ -4414,12 +4413,6 @@ path-to-regexp@0.1.7:
44144413
version "0.1.7"
44154414
resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
44164415

4417-
path-to-regexp@^1.5.3:
4418-
version "1.7.0"
4419-
resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.7.0.tgz#59fde0f435badacba103a84e9d3bc64e96b9937d"
4420-
dependencies:
4421-
isarray "0.0.1"
4422-
44234416
path-type@^1.0.0:
44244417
version "1.1.0"
44254418
resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
@@ -4761,13 +4754,13 @@ promise@^7.1.1:
47614754
dependencies:
47624755
asap "~2.0.3"
47634756

4764-
prop-types@15.5.8, prop-types@^15.0.0, prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.7, prop-types@~15.5.7:
4757+
prop-types@15.5.8:
47654758
version "15.5.8"
47664759
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.5.8.tgz#6b7b2e141083be38c8595aa51fc55775c7199394"
47674760
dependencies:
47684761
fbjs "^0.8.9"
47694762

4770-
prop-types@^15.5.10:
4763+
prop-types@^15.0.0, prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.7, prop-types@~15.5.7:
47714764
version "15.5.10"
47724765
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.5.10.tgz#2797dfc3126182e3a95e3dfbb2e893ddd7456154"
47734766
dependencies:
@@ -4819,7 +4812,7 @@ qs@^5.2.0:
48194812
version "5.2.1"
48204813
resolved "https://registry.yarnpkg.com/qs/-/qs-5.2.1.tgz#801fee030e0b9450d6385adc48a4cc55b44aedfc"
48214814

4822-
query-string@^4.1.0:
4815+
query-string@^4.1.0, query-string@^4.2.2:
48234816
version "4.3.4"
48244817
resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb"
48254818
dependencies:
@@ -4901,16 +4894,14 @@ react-router-redux@^4.0.8:
49014894
version "4.0.8"
49024895
resolved "https://registry.yarnpkg.com/react-router-redux/-/react-router-redux-4.0.8.tgz#227403596b5151e182377dab835b5d45f0f8054e"
49034896

4904-
react-router@^4.1.1:
4905-
version "4.1.1"
4906-
resolved "https://registry.yarnpkg.com/react-router/-/react-router-4.1.1.tgz#d448f3b7c1b429a6fbb03395099949c606b1fe95"
4897+
react-router@3.0.2:
4898+
version "3.0.2"
4899+
resolved "https://registry.yarnpkg.com/react-router/-/react-router-3.0.2.tgz#5a19156678810e01d81901f9c0fef63284b8a514"
49074900
dependencies:
4908-
history "^4.6.0"
4901+
history "^3.0.0"
49094902
hoist-non-react-statics "^1.2.0"
4910-
invariant "^2.2.2"
4911-
loose-envify "^1.3.1"
4912-
path-to-regexp "^1.5.3"
4913-
prop-types "^15.5.4"
4903+
invariant "^2.2.1"
4904+
loose-envify "^1.2.0"
49144905
warning "^3.0.0"
49154906

49164907
react-test-renderer@^15.5.4:
@@ -5219,10 +5210,6 @@ resolve-from@^1.0.0:
52195210
version "1.0.1"
52205211
resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
52215212

5222-
resolve-pathname@^2.0.0:
5223-
version "2.1.0"
5224-
resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-2.1.0.tgz#e8358801b86b83b17560d4e3c382d7aef2100944"
5225-
52265213
resolve@1.1.7:
52275214
version "1.1.7"
52285215
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
@@ -5915,10 +5902,6 @@ validate-npm-package-license@^3.0.1:
59155902
spdx-correct "~1.0.0"
59165903
spdx-expression-parse "~1.0.0"
59175904

5918-
value-equal@^0.2.0:
5919-
version "0.2.1"
5920-
resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-0.2.1.tgz#c220a304361fce6994dbbedaa3c7e1a1b895871d"
5921-
59225905
vary@~1.1.0:
59235906
version "1.1.1"
59245907
resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.1.tgz#67535ebb694c1d52257457984665323f587e8d37"

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /