Skip to content

Commit e4b10f1

Browse files
alebjanesalebjanes
authored
Merge pull request #1145 from DataUSA/remove-vizbuilder
removes cart, vizbuilder and maps
2 parents c992e6b + 04b9967 commit e4b10f1

File tree

7 files changed

+36
-36
lines changed

7 files changed

+36
-36
lines changed

‎app/components/Footer/index.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
width: 373px;
3434
display: flex;
3535
flex-direction: row;
36-
justify-content: space-between;
36+
justify-content: center;
3737
margin: 0 auto;
3838
@media (max-width: 768px) {
3939
display: block;

‎app/components/Footer/index.jsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ export default class Footer extends Component {
1414
<div className="footer-column">
1515
<div className="link-column"><Link to="/">Home</Link></div>
1616
<div className="link-column"><Link to="/search/">Reports</Link></div>
17-
<div className="link-column"><Link to="/visualize">VizBuilder</Link></div>
18-
<div className="link-column"><Link to="/map/">Maps</Link></div>
17+
{/* <div className="link-column"><Link to="/visualize">VizBuilder</Link></div>
18+
<div className="link-column"><Link to="/map/">Maps</Link></div> */}
1919
<div className="link-column"><Link to="/about/background">About</Link></div>
2020
</div>
2121
</div>

‎app/components/Nav/index.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
box-sizing: content-box;
4646
flex: none;
4747
height: 19px;
48-
padding: 3px 10px 7px;
48+
padding: 3px 7px;
4949
& img {
5050
height: 19px;
5151
width: 76px;

‎app/components/Nav/index.jsx‎

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -62,26 +62,26 @@ class Nav extends Component {
6262

6363
const dark = !splash;
6464

65-
const Cart = () => <div className="cart-nav-controls">
66-
<div className="title">Data Cart</div>
67-
{ cart && cart.data.length
68-
? <div>
69-
<div className="sub">
70-
{ cart.data.length } Dataset{ cart.data.length > 1 ? "s" : "" }
71-
</div>
72-
{ cart.data.map(d => <div key={d.slug} className="dataset">
73-
<div className="title">{d.title}</div>
74-
<img src="/images/viz/remove.svg" className="remove" onClick={this.onRemove.bind(this, d)} />
75-
</div>) }
76-
<a href="/cart" className="bp3-button bp3-fill bp3-icon-download">
77-
View Data
78-
</a>
79-
<div className="bp3-button bp3-fill bp3-icon-trash" onClick={this.onClear.bind(this)}>
80-
Clear Cart
81-
</div>
82-
</div>
83-
: <div className="body">Put data into your cart as you browse to merge data from multiple sources.</div> }
84-
</div>;
65+
// const Cart = () => <div className="cart-nav-controls">
66+
// <div className="title">Data Cart</div>
67+
// { cart && cart.data.length
68+
// ? <div>
69+
// <div className="sub">
70+
// { cart.data.length } Dataset{ cart.data.length > 1 ? "s" : "" }
71+
// </div>
72+
// { cart.data.map(d => <div key={d.slug} className="dataset">
73+
// <div className="title">{d.title}</div>
74+
// <img src="/images/viz/remove.svg" className="remove" onClick={this.onRemove.bind(this, d)} />
75+
// </div>) }
76+
// <a href="/cart" className="bp3-button bp3-fill bp3-icon-download">
77+
// View Data
78+
// </a>
79+
// <div className="bp3-button bp3-fill bp3-icon-trash" onClick={this.onClear.bind(this)}>
80+
// Clear Cart
81+
// </div>
82+
// </div>
83+
// : <div className="body">Put data into your cart as you browse to merge data from multiple sources.</div> }
84+
// </div>;
8585

8686
return <nav id="Nav" className={ `${background || dark ? "background" : ""} ${menu ? "menu" : ""}` }>
8787

@@ -108,17 +108,17 @@ class Nav extends Component {
108108
<li>
109109
<Link to="/search">Reports</Link>
110110
</li>
111-
<li>
111+
{/* <li>
112112
<Link to="/map">Maps</Link>
113113
</li>
114114
<li>
115115
<Link to="/visualize">Viz Builder</Link>
116-
</li>
116+
</li> */}
117117
<li>
118118
<Link to="/about">About</Link>
119119
</li>
120120
</ul>
121-
<Popover
121+
{/* <Popover
122122
hoverOpenDelay={0}
123123
hoverCloseDelay={150}
124124
interactionKind={PopoverInteractionKind.HOVER}
@@ -128,7 +128,7 @@ class Nav extends Component {
128128
{ cart && cart.data.length ? <span className="cart-size">{cart.data.length}</span> : null }
129129
<SVG src="/images/cart.svg" className={cart && cart.data.length ? "filled" : "empty"} width={20} height={19} />
130130
</a>
131-
</Popover>
131+
</Popover> */}
132132
{ search && <SearchButton /> }
133133
</div>
134134

@@ -152,15 +152,15 @@ class Nav extends Component {
152152
{/* <li>
153153
<Link to="/coronavirus">Coronavirus</Link>
154154
</li> */}
155-
<li>
155+
{/* <li>
156156
<Link to="/map">Maps</Link>
157157
</li>
158158
<li>
159159
<Link to="/visualize">Viz Builder</Link>
160160
</li>
161161
<li>
162162
<Link to="/cart">Data Cart</Link>
163-
</li>
163+
</li> */}
164164
<li>
165165
<Link to="/about">About</Link>
166166
</li>
@@ -173,7 +173,6 @@ class Nav extends Component {
173173
</Dialog>
174174
</nav>;
175175
}
176-
177176
}
178177

179178
export default connect(state => ({

‎app/components/Viz/Options.jsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ class Options extends Component {
362362
const cartSize = cart ? cart.data.length : 0;
363363
const inCart = cart ? cart.data.find(c => c.slug === cartSlug) : false;
364364

365-
const cartEnabled = data && slug && title;
365+
const cartEnabled = false;
366366
const shareEnabled = topic.slug;
367367
const baseURL = (typeof window === "undefined" ? location : window.location).href.split("#")[0].split("/").slice(0, 6).join("/");
368368
const profileURL = `${baseURL}#${topic.slug}`;

‎app/pages/Data/API.jsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ export default class API extends Component {
99
<div id="API">
1010
<h2>Introduction</h2>
1111
<p>
12-
The Data USA API allows users to explore the entire database using carefully constructed query strings, returning data as JSON results. All of the visualizations on the page have a "show data" button on their top-right that displays the API call(s) used to generate that visualization. Additionally, the new <Link to="/visualize">Viz Builder</Link> is a great way to explore what's possible. This page illustrates an example usage of exploring geographic data.
12+
The Data USA API allows users to explore the entire database using carefully constructed query strings, returning data as JSON results. All of the visualizations on the page have a "show data" button on their top-right that displays the API call(s) used to generate that visualization.
13+
{/* Additionally, the new <Link to="/visualize">Viz Builder</Link> is a great way to explore what's possible. This page illustrates an example usage of exploring geographic data. */}
1314
</p>
1415
<h2>Example: Population Data</h2>
1516
<p>

‎app/pages/Home/index.jsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ class Home extends Component {
164164
<SVG src="/icons/features/cart.svg" width={25} height="auto" />
165165
</div>
166166
<span>
167-
Merge and download data
167+
Download data
168168
</span>
169169
</div>
170170
<div className="feature-item">
@@ -203,7 +203,7 @@ class Home extends Component {
203203
</Link>
204204
</section>
205205

206-
<section className="light">
206+
{/* <section className="light">
207207
<h2>
208208
The most powerful tools
209209
<br />
@@ -255,7 +255,7 @@ class Home extends Component {
255255
}}
256256
/>
257257
</div>
258-
</section>
258+
</section> */}
259259

260260
</div>
261261
);

0 commit comments

Comments
 (0)