Skip to content

Commit a81f45c

Browse files
author
Webdesignwill
committed
Application header and push states dev server properly implemented
1 parent 5cc140d commit a81f45c

File tree

12 files changed

+45
-10
lines changed

12 files changed

+45
-10
lines changed

public/assets/css/styles.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/assets/img/baas-logo.png

2.37 KB
Loading

server.js

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ var server = new WebpackDevServer(compiler, {
1313
filename: 'app.bundle.js',
1414
hot: true,
1515
quiet: true,
16+
historyApiFallback: true,
1617
stats: {
1718
colors: true
1819
}

src/sass/_base.scss

+8
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ body {
1414
}
1515

1616
.table-container {
17+
padding-top:15px;
1718
position:relative;
1819
padding-left: $sidebarWidth;
1920
}
@@ -23,3 +24,10 @@ body {
2324
width: 100%;
2425
margin: 0;
2526
}
27+
28+
.empty-message {
29+
font-size: 5rem;
30+
color: lightgrey;
31+
margin-top: 40%;
32+
text-align: center;
33+
}

src/sass/components/_campaigns.scss

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11

22
.campaign-list {
3-
padding-top: 15px;
43
margin: 0;
54
p.lead {
65
padding-bottom:20px;

src/sass/components/_sidebar.scss

+5
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@
1515
margin-bottom: 0;
1616
}
1717

18+
.sidebar-logo {
19+
padding: 5px 0 5px;
20+
background-color: #1c2a41;
21+
}
22+
1823
.sidebar-header {
1924
padding: 10px 0 0 15px;
2025
margin-bottom:10px;
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
import React, { Component, PropTypes } from 'react'
2+
3+
export default class ApplicationHeader extends Component {
4+
5+
static propTypes = {}
6+
7+
render () {
8+
return (
9+
<div className="primary-header">
10+
<img src="/assets/img/baas-logo.png" />
11+
</div>
12+
)
13+
}
14+
}

src/scripts/components/Sidebar.js

+3
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ export default class Sidebar extends Component {
5656

5757
return (
5858
<aside className="sidebar">
59+
<div className="sidebar-logo">
60+
<img src="/assets/img/baas-logo.png" />
61+
</div>
5962
<CustomerDropdown params={this.props.params} />
6063
<div className="sidebar-group">
6164
<div className="sidebar-header">

src/scripts/containers/dashboards/mediaspecialist/Campaign.js

-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ function mapStateToProps(store, props) {
2424
return campaign
2525
}
2626
})
27-
} else {
28-
campaigns = customer.campaigns
2927
}
3028
}
3129

src/scripts/dashboards/mediaspecialist/Campaign.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ export default class Campaign extends Component {
1010
<div className="row campaign-list">
1111
{this.props.campaigns.length ? this.props.campaigns.map(campaign =>
1212
<div className="col-sm-12 clearfix" key={campaign.id}>
13-
<p className="lead">{campaign.meta.name} <a className="pull-right text-size-sm" href="#"><i className="fa fa-link" aria-hidden="true"></i> Campaign Highlights</a></p>
13+
<p className="lead">{campaign.meta.name} <a className="pull-right text-size-sm" href="#"><i className="fa fa-link" aria-hidden="true"></i> Campaign Insights</a></p>
1414
<MediaChannels campaignid={campaign.id} mediachannels={campaign.media_channels} />
1515
</div>
16-
) : null}
16+
) : <div className="empty-message"><p>Select a campaign</p></div>}
1717
</div>
1818
)
1919
}

src/scripts/dashboards/mediaspecialist/CustomerDropdown.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ export default class CustomerDropdown extends Component {
3434
return (
3535
<div className="sidebar-group">
3636
<div className="sidebar-header">Customers</div>
37-
<div className={`list-group sidebar-dropdown ${expandedClass}`}>
38-
<div className="list-group-item clearfix" onClick={this.clickHandler}>
37+
<div className={`list-group sidebar-dropdown ${expandedClass}`} onClick={this.clickHandler}>
38+
<div className="list-group-item clearfix">
3939
<p className="lead select selected">{selectedText} <i className={`fa fa-caret-${caret}`} aria-hidden="true"></i></p>
4040
</div>
4141
{this.props.customers ? this.props.customers.map(customer =>

src/scripts/pages/Mediaspecialist.js

+9-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import React, { Component, PropTypes } from 'react'
22
import { fetchData } from '../actions/dashboards/mediaspecialist'
33
import Sidebar from '../containers/Sidebar'
4+
import ApplicationHeader from '../components/ApplicationHeader'
45

56
export default class Mediaspecialist extends Component {
67

@@ -14,9 +15,15 @@ export default class Mediaspecialist extends Component {
1415
return (
1516
<div className="container">
1617
<Sidebar params={this.props.params} campaignids={this.props.location.query.campaignid}/>
17-
<main role="main" className="table-container">
18+
<main role="main">
1819
<a name="top"></a>
19-
{this.props.children}
20+
<div className="table-container">
21+
{this.props.children}
22+
{this.props.params.customerid === undefined ?
23+
<div className="empty-message">
24+
<p>Select a customer</p>
25+
</div> : null}
26+
</div>
2027
</main>
2128
</div>
2229
)

0 commit comments

Comments
 (0)