Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
ecommerce-maven
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Ascend
ecommerce-maven
Commits
94a569bb
Commit
94a569bb
authored
May 12, 2021
by
Xiyang Lu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
AFP 80 fixed header nav links bug
parent
52bccd92
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
47 additions
and
20459 deletions
+47
-20459
package-lock.json
ecom-web/package-lock.json
+32
-20454
package.json
ecom-web/package.json
+1
-0
header-cart.jsx
ecom-web/src/components/Header/header-cart.jsx
+4
-2
header.js
ecom-web/src/components/Header/header.js
+10
-3
No files found.
ecom-web/package-lock.json
View file @
94a569bb
This diff is collapsed.
Click to expand it.
ecom-web/package.json
View file @
94a569bb
...
@@ -16,6 +16,7 @@
...
@@ -16,6 +16,7 @@
"react-google-login"
:
"^5.2.2"
,
"react-google-login"
:
"^5.2.2"
,
"react-modal"
:
"^3.13.1"
,
"react-modal"
:
"^3.13.1"
,
"react-redux"
:
"^7.2.4"
,
"react-redux"
:
"^7.2.4"
,
"react-router-bootstrap"
:
"^0.25.0"
,
"react-router-dom"
:
"^5.2.0"
,
"react-router-dom"
:
"^5.2.0"
,
"react-scripts"
:
"4.0.3"
,
"react-scripts"
:
"4.0.3"
,
"redux"
:
"^4.1.0"
,
"redux"
:
"^4.1.0"
,
...
...
ecom-web/src/components/Header/header-cart.jsx
View file @
94a569bb
import
React
,
{
Component
}
from
'react'
import
React
,
{
Component
}
from
'react'
import
'./header.css'
;
import
'./header.css'
;
import
{
NavLink
}
from
"react-router-dom"
import
Nav
from
"react-bootstrap/Nav"
export
default
class
HeaderCart
extends
Component
{
export
default
class
HeaderCart
extends
Component
{
constructor
(
props
)
{
constructor
(
props
)
{
super
(
props
)
super
(
props
)
this
.
state
=
{}
this
.
state
=
{}
}
}
render
()
{
render
()
{
return
(
return
(
<
div
>
<
div
>
Cart
<
Nav
.
Link
href=
"/cart"
>
Cart
</
Nav
.
Link
>
</
div
>
</
div
>
)
)
}
}
...
...
ecom-web/src/components/Header/header.js
View file @
94a569bb
...
@@ -2,6 +2,7 @@ import React, { Component } from 'react'
...
@@ -2,6 +2,7 @@ import React, { Component } from 'react'
import
Nav
from
'react-bootstrap/Nav'
import
Nav
from
'react-bootstrap/Nav'
import
Navbar
from
'react-bootstrap/Navbar'
import
Navbar
from
'react-bootstrap/Navbar'
import
NavDropdown
from
'react-bootstrap/NavDropdown'
import
NavDropdown
from
'react-bootstrap/NavDropdown'
import
{
LinkContainer
}
from
'react-router-bootstrap'
import
{
NavLink
}
from
'react-router-dom'
import
{
NavLink
}
from
'react-router-dom'
import
Session
from
'../session/session-container'
import
Session
from
'../session/session-container'
import
HeaderCart
from
'./header-cart-container'
import
HeaderCart
from
'./header-cart-container'
...
@@ -29,14 +30,20 @@ export default class Header extends Component {
...
@@ -29,14 +30,20 @@ export default class Header extends Component {
<
Navbar
.
Toggle
aria
-
controls
=
"responsive-navbar-nav"
/>
<
Navbar
.
Toggle
aria
-
controls
=
"responsive-navbar-nav"
/>
<
Navbar
.
Collapse
id
=
"responsive-navbar-nav"
>
<
Navbar
.
Collapse
id
=
"responsive-navbar-nav"
>
<
Nav
className
=
"mr-auto"
>
<
Nav
className
=
"mr-auto"
>
<
Nav
.
Link
to
=
"/product-market"
id
=
"nav-home-link"
>
Home
<
/Nav.Link
>
<
LinkContainer
to
=
"/product-market"
>
<
Nav
.
Link
to
=
"/product-market"
>
Products
<
/Nav.Link
>
<
Nav
.
Link
id
=
"nav-home-link"
>
Home
<
/Nav.Link
>
<
/LinkContainer
>
<
LinkContainer
to
=
"/product-market"
>
<
Nav
.
Link
id
=
"nav-home-link"
>
Products
<
/Nav.Link
>
<
/LinkContainer
>
<
/Nav
>
<
/Nav
>
<
Nav
className
=
"ms-auto"
>
<
Nav
className
=
"ms-auto"
>
{
!
this
.
props
.
user
?.
currentUser
?
{
!
this
.
props
.
user
?.
currentUser
?
<
Navbar
.
Text
className
=
"nav-bar-text"
>
Hello
Guest
<
/Navbar.Text>
:
<
Navbar
.
Text
className
=
"nav-bar-text"
>
Hello
Guest
<
/Navbar.Text>
:
<
NavDropdown
className
=
"nav-bar-text"
title
=
{
"Hello "
+
userName
}
id
=
"collasible-nav-dropdown"
>
<
NavDropdown
className
=
"nav-bar-text"
title
=
{
"Hello "
+
userName
}
id
=
"collasible-nav-dropdown"
>
<
NavDropdown
.
Item
><
NavLink
to
=
"/orders"
>
Order
History
<
/NavLink></
NavDropdown
.
Item
>
<
LinkContainer
to
=
"/orders"
>
<
NavDropdown
.
Item
>
Order
History
<
/NavDropdown.Item
>
<
/LinkContainer
>
<
/NavDropdown
>
<
/NavDropdown
>
}
}
<
Session
className
=
"nav-bar-text"
/>
<
Session
className
=
"nav-bar-text"
/>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment