Skip to content

Commit c2c9ab6

Browse files
authored
Merge pull request #9 from fluturecode/eae-20-feature-log-out-navigation
#20-feature(log-out): navigation
2 parents 908dd48 + 902599e commit c2c9ab6

File tree

2 files changed

+35
-31
lines changed

2 files changed

+35
-31
lines changed

application/src/components/nav/nav.js

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,25 @@ import { Link } from "react-router-dom";
33
import "./nav.css";
44

55
const Nav = (props) => {
6-
return (
7-
<div className="nav-strip">
8-
<Link to={"/order"} className="nav-link">
9-
<div className="nav-link-style">
10-
<label className="nav-label">Order Form</label>
11-
</div>
12-
</Link>
13-
<Link to={"/view-orders"} className="nav-link" id="middle-link">
14-
<div className="nav-link-style">
15-
<label className="nav-label">View Orders</label>
16-
</div>
17-
</Link>
18-
<Link to={"/login"} className="nav-link">
19-
<div className="nav-link-style">
20-
<label className="nav-label">Log Out</label>
21-
</div>
22-
</Link>
23-
</div>
24-
);
25-
}
6+
return (
7+
<div className="nav-strip">
8+
<Link to={"/order"} className="nav-link">
9+
<div className="nav-link-style">
10+
<label className="nav-label">Order Form</label>
11+
</div>
12+
</Link>
13+
<Link to={"/view-orders"} className="nav-link" id="middle-link">
14+
<div className="nav-link-style">
15+
<label className="nav-label">View Orders</label>
16+
</div>
17+
</Link>
18+
<Link to={"/"} className="nav-link">
19+
<div className="nav-link-style">
20+
<label className="nav-label">Log Out</label>
21+
</div>
22+
</Link>
23+
</div>
24+
);
25+
};
2626

27-
export default Nav;
27+
export default Nav;
Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
1-
import { LOGIN, LOGOUT } from '../actions/types'
1+
import { LOGIN, LOGOUT } from "../actions/types";
22

33
const INITIAL_STATE = { email: null, token: null };
44

55
export default (state = INITIAL_STATE, action) => {
6-
switch (action.type) {
7-
case LOGIN:
8-
return { ...state, email: action.payload.login, token: action.payload.token }
9-
case LOGOUT:
10-
return { ...state, ...INITIAL_STATE }
11-
default:
12-
return state;
13-
}
14-
}
6+
switch (action.type) {
7+
case LOGIN:
8+
return {
9+
...state,
10+
email: action.payload.login,
11+
token: action.payload.token,
12+
};
13+
case LOGOUT:
14+
return {};
15+
default:
16+
return state;
17+
}
18+
};

0 commit comments

Comments
 (0)