Skip to content

Commit 5724cbb

Browse files
vabarbosavabarbosa
committed
Merge pull request #35 from ibm-cds-labs/prioritize-github
Prioritize github
2 parents 5c7ea9d + 84231e8 commit 5724cbb

File tree

4 files changed

+92
-19
lines changed

4 files changed

+92
-19
lines changed

‎views/index.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@
5353
<li class="tree-nav_item" ng-class="{'active':selectedView === 'settings'}">
5454
<a ng-class="{'current': selectedView === 'settings'}" class="tree-nav_link" href="#/settings">Settings</a>
5555
</li>
56+
<li class="tree-nav_item" ng-class="{'active':selectedView === 'ingredients'}">
57+
<a ng-class="{'current': selectedView === 'ingredients'}" class="tree-nav_link" href="#/ingredients">Ingredients</a>
58+
</li>
5659
</ul>
5760
</li>
5861
</ul>

‎views/templates/about.html

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ <h2 class="type_heading" id="toc_1"><mark class="type_mark">Is this really a ser
2323

2424
<p class="type_copy">We use the Simple Search Service to power the <a class="type_link" href="https://developer.ibm.com/clouddataservices/how-tos/#!&amp;filter=%5B%7B%22key%22%3A%22technologies%22%2C%22value%22%3A%22Cloudant%22%7D%5D">search engine in our developer center</a>, and it&#39;s also the API that powers <a class="type_link" href="https://console.ng.bluemix.net/data/discovery/fullservice/cloudant-nosql-db/resources">content discovery in Bluemix</a>. </p>
2525

26-
<p class="type_copy">If you followed those links, you probably noticed that the content is identical. That&#39;s because the content is served from the same Cloudant database, via the same API. The Preview Search and Preview API pages of this app will show you how we used this service to do just that. </p>
27-
2826
<div class="button_group">
2927
<a href="#/get" class="button_primary">Get Started</a>
3028
</div>

‎views/templates/get.html

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,34 @@
11
<section class="layout_section theme_light">
22

3-
<h1 class="type_heading" id="toc_0"><mark class="type_mark">Get Data</mark></h1>
3+
<h1 class="type_heading" id="toc_0"><mark class="type_mark">Get Data</mark></h1>
44

5-
<p class="type_copy">The Simple Search Service indexes CSVs and TSVs</p>
5+
<p class="type_copy">You have options.</p>
66

77
</section>
88

99
<section class="layout_section">
1010

11-
<p class="type_copy">If you don't have data in that format, no problem. We have some data you can use to kick the tires:</p>
11+
<h2 class="type_heading">No data?</h2>
12+
<p class="type_copy">No problem. Download one of these samples (in CSV or TSV formats):</p>
1213

13-
<ul class="list_unordered">
14-
<li><a class="type_link" href="https://github.com/ibm-cds-labs/open-data/blob/master/uk/hp.csv" target="_blank">UK Addresses</a> (CSV)</li>
15-
<li><a class="type_link" href="https://github.com/ibm-cds-labs/open-data/blob/master/movies/movies.tsv" target="_blank">Movies</a> (TSV)</li>
16-
</ul>
14+
<ul class="list_unordered">
15+
<li><a class="type_link" href="https://github.com/ibm-cds-labs/open-data/blob/master/uk/hp.csv" target="_blank">UK Addresses</a> (CSV)</li>
16+
<li><a class="type_link" href="https://github.com/ibm-cds-labs/open-data/blob/master/movies/movies.tsv" target="_blank">Movies</a> (TSV)</li>
17+
</ul>
1718

18-
<p class="type_copy">If you have some data dumps of your own, feel free to use those. If you&#39;re new to data dumps in our required formats, start with these guides for exporting CSVs and TSVs from:</p>
19+
<h2 class="type_heading">Have data, just in the wrong format?</h2>
1920

20-
<ul class="list_unordered">
21-
<li><a class="type_link" href="https://developer.ibm.com/clouddataservices/2015/09/22/export-cloudant-json-as-csv-rss-or-ical/">CouchDB / Cloudant</a></li>
22-
<li><a class="type_link" href="https://dev.mysql.com/doc/mysql-utilities/1.5/en/mysqldbexport.html">MySQL</a></li>
23-
<li><a class="type_link" href="https://www.compose.io/articles/comma-values-1-exporting-csv-from-mongodb/">MongoDB</a></li>
24-
<li><a class="type_link" href="http://stackoverflow.com/questions/6521531/how-do-you-print-the-result-of-a-postgresql-query-in-csv-or-tsv-format-from-the">PostgreSQL</a></li>
25-
</ul>
21+
<p class="type_copy">Here's how to export CSVs and TSVs from various sources.</p>
2622

27-
<p>
28-
<button type="button" class="button_primary" ng-click="goToNextPage('upload')"> Continue </button>
29-
</p>
23+
<ul class="list_unordered">
24+
<li><a class="type_link" href="https://developer.ibm.com/clouddataservices/2015/09/22/export-cloudant-json-as-csv-rss-or-ical/">CouchDB / Cloudant</a></li>
25+
<li><a class="type_link" href="https://dev.mysql.com/doc/mysql-utilities/1.5/en/mysqldbexport.html">MySQL</a></li>
26+
<li><a class="type_link" href="https://www.compose.io/articles/comma-values-1-exporting-csv-from-mongodb/">MongoDB</a></li>
27+
<li><a class="type_link" href="http://stackoverflow.com/questions/6521531/how-do-you-print-the-result-of-a-postgresql-query-in-csv-or-tsv-format-from-the">PostgreSQL</a></li>
28+
</ul>
29+
30+
<h2 class="type_heading">Ready to upload?</h2>
31+
<p>
32+
<button type="button" class="button_primary" ng-click="goToNextPage('upload')"> Continue </button>
33+
</p>
3034
</section>

‎views/templates/ingredients.html

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
<section class="layout_section theme_light">
2+
<h1 class="type_heading"><mark class="type_mark">
3+
Ingredients
4+
</mark></h1>
5+
<p>
6+
The stuff that's baked in.
7+
</p>
8+
</section>
9+
<section class="layout_section theme_dark">
10+
<p>
11+
12+
</p>
13+
14+
<dl>
15+
<dt>
16+
<mark class="type_mark">Runtime</mark>
17+
</dt>
18+
<dd>
19+
Node.js app running on IBM Bluemix. {link to the application for the signed in user on Bluemix}
20+
</dd>
21+
<dt>
22+
<mark class="type_mark">Data</mark>
23+
</dt>
24+
<dd>
25+
IBM Cloudant, running on IBM Bluemix. {link to the Cloudant dashboard and database }
26+
</dd>
27+
<dt>
28+
<mark class="type_mark">Cache (optional)</mark>
29+
</dt>
30+
<dd>
31+
IBM Compose Redis.
32+
</dd>
33+
<dt>
34+
<mark class="type_mark">Code</mark>
35+
</dt>
36+
<dd>
37+
<a href="https://github.com/ibm-cds-labs/simple-search-service/" target="_blank" class="type_link">View the app on Github</a>. Of particular note, check out the <a href="https://www.npmjs.com/package/csv-parse" target="_blank" class="type_link">csv-parse</a> and <a href="https://www.npmjs.com/package/couchimport" target="_blank" class="type_link">couchimport</a> npm modules.
38+
</dd>
39+
</dl>
40+
41+
<p>
42+
To learn more about how these things go together, check out the tutorial and the README.
43+
</p>
44+
45+
</section>
46+
47+
48+
<!--
49+
50+
===
51+
rename file ingredients
52+
===
53+
54+
Cloudant is the service.
55+
- link to cloudant database in bluemix
56+
57+
the application runs on bluemix
58+
- link to application in bluemix
59+
60+
couchimport is the data ingest.
61+
- link to github repo
62+
63+
we automatically build search indexes based on what you choose to facet
64+
- link to code in github repo
65+
66+
67+
68+
-->

0 commit comments

Comments
 (0)