Skip to content

Commit daa2bfc

Browse files
committed
asd
1 parent 356c0be commit daa2bfc

File tree

4 files changed

+56
-4
lines changed

4 files changed

+56
-4
lines changed

dist/scripts/bundle.js

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29146,6 +29146,32 @@ module.exports = About;
2914629146
},{"react":157}],159:[function(require,module,exports){
2914729147
"use strict";
2914829148

29149+
var React = require('react');
29150+
29151+
var Header = React.createClass({displayName: "Header",
29152+
render: function(){
29153+
return (
29154+
React.createElement("nav", {className: "navbar navbar-default"},
29155+
React.createElement("div", {className: "container-fluid"},
29156+
React.createElement("a", {href: "/", className: "navbar-brand"},
29157+
React.createElement("img", {src: "images/pluralsight-logo.png"})
29158+
),
29159+
29160+
React.createElement("ul", {className: "nav nvarbar-nav"},
29161+
React.createElement("li", null, React.createElement("a", {href: "/"}, "Home")),
29162+
React.createElement("li", null, React.createElement("a", {href: "/#about"}, "About"))
29163+
)
29164+
)
29165+
)
29166+
);
29167+
}
29168+
});
29169+
29170+
module.exports = Header;
29171+
29172+
},{"react":157}],160:[function(require,module,exports){
29173+
"use strict";
29174+
2914929175
var React = require("react");
2915029176

2915129177
var Home = React.createClass({displayName: "Home",
@@ -29161,12 +29187,12 @@ var Home = React.createClass({displayName: "Home",
2916129187

2916229188
module.exports = Home;
2916329189

29164-
},{"react":157}],160:[function(require,module,exports){
29190+
},{"react":157}],161:[function(require,module,exports){
2916529191
$ = JQuery = require('jquery');
2916629192
var React = require('react');
2916729193
var Home = require('./components/homePage');
2916829194
var About = require('./components/about/aboutPage');
29169-
29195+
var Header = require('./components/common/header');
2917029196
(function(win){
2917129197
'use strict';
2917229198

@@ -29182,6 +29208,7 @@ var About = require('./components/about/aboutPage');
2918229208

2918329209
return (
2918429210
React.createElement("div", null,
29211+
React.createElement(Header, null),
2918529212
React.createElement(Child, null)
2918629213
)
2918729214
);
@@ -29200,4 +29227,4 @@ var About = require('./components/about/aboutPage');
2920029227
//React.render(<Home />, document.getElementById('app'));
2920129228
})(window)
2920229229

29203-
},{"./components/about/aboutPage":158,"./components/homePage":159,"jquery":1,"react":157}]},{},[160]);
29230+
},{"./components/about/aboutPage":158,"./components/common/header":159,"./components/homePage":160,"jquery":1,"react":157}]},{},[161]);

src/components/common/header.js

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
"use strict";
2+
3+
var React = require('react');
4+
5+
var Header = React.createClass({
6+
render: function(){
7+
return (
8+
<nav className="navbar navbar-default">
9+
<div className ="container-fluid">
10+
<a href="/" className="navbar-brand">
11+
<img src="images/pluralsight-logo.png"/>
12+
</a>
13+
14+
<ul className="nav nvarbar-nav">
15+
<li><a href="/">Home</a></li>
16+
<li><a href="/#about">About</a></li>
17+
</ul>
18+
</div>
19+
</nav>
20+
);
21+
}
22+
});
23+
24+
module.exports = Header;
2.8 KB
Loading

src/main.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ $ = JQuery = require('jquery');
22
var React = require('react');
33
var Home = require('./components/homePage');
44
var About = require('./components/about/aboutPage');
5-
5+
var Header = require('./components/common/header');
66
(function(win){
77
'use strict';
88

@@ -18,6 +18,7 @@ var About = require('./components/about/aboutPage');
1818

1919
return (
2020
<div>
21+
<Header/>
2122
<Child/>
2223
</div>
2324
);

0 commit comments

Comments
 (0)