From b62a1a3bf5887516fc20801db0ac3cdd71d28ffa Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Fri, 12 Jul 2013 04:48:25 +0000 Subject: [PATCH 01/44] Updated web.js --- web.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web.js b/web.js index 0b54a06391..b40f81c93f 100644 --- a/web.js +++ b/web.js @@ -3,10 +3,10 @@ var express = require('express'); var app = express.createServer(express.logger()); app.get('/', function(request, response) { - response.send('Hello World!'); + response.send('Hello World 2!'); }); var port = process.env.PORT || 5000; app.listen(port, function() { console.log("Listening on " + port); -}); \ No newline at end of file +}); From 58e50f185f944e623250234323704b0f1783afc7 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Fri, 12 Jul 2013 06:03:43 +0000 Subject: [PATCH 02/44] Added index.html --- index.html | 1 + 1 file changed, 1 insertion(+) create mode 100644 index.html diff --git a/index.html b/index.html new file mode 100644 index 0000000000..0361081776 --- /dev/null +++ b/index.html @@ -0,0 +1 @@ +Hello World from index.html From 51784e28831ad7295e3abcaf7d878abfaa66e9d3 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Fri, 12 Jul 2013 06:08:36 +0000 Subject: [PATCH 03/44] Fixed web.js --- web.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/web.js b/web.js index b40f81c93f..c549f8f66d 100644 --- a/web.js +++ b/web.js @@ -2,8 +2,10 @@ var express = require('express'); var app = express.createServer(express.logger()); +var x = fs.readFileSync("index.html").toString(); + app.get('/', function(request, response) { - response.send('Hello World 2!'); + response.send(x); }); var port = process.env.PORT || 5000; From cc7c568039385911ad88b064d7c54bbbe7aded86 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Fri, 12 Jul 2013 06:14:33 +0000 Subject: [PATCH 04/44] Fixed web.js --- web.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web.js b/web.js index c549f8f66d..c1b518d110 100644 --- a/web.js +++ b/web.js @@ -1,3 +1,4 @@ + var express = require('express'); var app = express.createServer(express.logger()); @@ -12,3 +13,4 @@ var port = process.env.PORT || 5000; app.listen(port, function() { console.log("Listening on " + port); }); + From 24d4bf9fec01d5a7fd7d8006cff8c59dda958c17 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Fri, 12 Jul 2013 06:22:29 +0000 Subject: [PATCH 05/44] Fixed web.js --- web.js | 1 + 1 file changed, 1 insertion(+) diff --git a/web.js b/web.js index c1b518d110..af202bb1d5 100644 --- a/web.js +++ b/web.js @@ -1,3 +1,4 @@ +var fs = require('fs'); var express = require('express'); From e52b7b10eca59e4b21b796e974a28ed8a823666d Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Fri, 12 Jul 2013 23:42:52 +0000 Subject: [PATCH 06/44] Fixed index --- index.html | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index 0361081776..6774d13b38 100644 --- a/index.html +++ b/index.html @@ -1 +1,43 @@ -Hello World from index.html + + + + +My First Bitstarter + + + + +
+
+ +
Blank
+
About
+
+
+

Bitstarter Title

+
+
+

This is my first bitstarter project.

+
+
Video
+
+
Thermometer
+
Order
+
+
+
Marketing Section 1
+
+
Marketing Section 2
+
+
FAQ
+
+
Footer
From 136a742ded044b6fa9026e2695739c2b5e2fc19c Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Sat, 13 Jul 2013 00:23:51 +0000 Subject: [PATCH 07/44] Added grader and checks --- checks.json | 2 ++ grader.js | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+) create mode 100644 checks.json create mode 100755 grader.js diff --git a/checks.json b/checks.json new file mode 100644 index 0000000000..710dcfc1e8 --- /dev/null +++ b/checks.json @@ -0,0 +1,2 @@ +["h1", + ".navigation"] diff --git a/grader.js b/grader.js new file mode 100755 index 0000000000..31da2bb80d --- /dev/null +++ b/grader.js @@ -0,0 +1,75 @@ +#!/usr/bin/env node +/* + +Automatically grade files for the presence of specified HTML tags/attributes. +Uses commander.js and cheerio. Teaches command line application development +and basic DOM parsing. + +References: + + + cheerio + - https://github.com/MatthewMueller/cheerio + - http://encosia.com/cheerio-faster-windows-friendly-alternative-jsdom/ + - http://maxogden.com/scraping-with-node.html + + + commander.js + - https://github.com/visionmedia/commander.js + - http://tjholowaychuk.com/post/9103188408/commander-js-nodejs-command-line-interfaces-made-easy + + + JSON + - http://en.wikipedia.org/wiki/JSON + - https://developer.mozilla.org/en-US/docs/JSON + - https://developer.mozilla.org/en-US/docs/JSON#JSON_in_Firefox_2 +*/ + +var fs = require('fs'); +var program = require('commander'); +var cheerio = require('cheerio'); +var HTMLFILE_DEFAULT = "index.html"; +var CHECKSFILE_DEFAULT = "checks.json"; + +var assertFileExists = function(infile) { + var instr = infile.toString(); + if(!fs.existsSync(instr)) { + console.log("%s does not exist. Exiting.", instr); + process.exit(1); // http://nodejs.org/api/process.html#process_process_exit_code + } + return instr; +}; + +var cheerioHtmlFile = function(htmlfile) { + return cheerio.load(fs.readFileSync(htmlfile)); +}; + +var loadChecks = function(checksfile) { + return JSON.parse(fs.readFileSync(checksfile)); +}; + +var checkHtmlFile = function(htmlfile, checksfile) { + $ = cheerioHtmlFile(htmlfile); + var checks = loadChecks(checksfile).sort(); + var out = {}; + for(var ii in checks) { + var present = $(checks[ii]).length > 0; + out[checks[ii]] = present; + } + return out; +}; + +var clone = function(fn) { + // Workaround for commander.js issue. + // http://stackoverflow.com/a/6772648 + return fn.bind({}); +}; + +if(require.main == module) { + program + .option('-c, --checks ', 'Path to checks.json', clone(assertFileExists), CHECKSFILE_DEFAULT) + .option('-f, --file ', 'Path to index.html', clone(assertFileExists), HTMLFILE_DEFAULT) + .parse(process.argv); + var checkJson = checkHtmlFile(program.file, program.checks); + var outJson = JSON.stringify(checkJson, null, 4); + console.log(outJson); +} else { + exports.checkHtmlFile = checkHtmlFile; +} From 8e88c6e4d71ec39e0ea73f2363d1612f069c43fc Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Sat, 13 Jul 2013 01:58:53 +0000 Subject: [PATCH 08/44] Grader checks html url --- grader.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/grader.js b/grader.js index 31da2bb80d..739eb46a78 100755 --- a/grader.js +++ b/grader.js @@ -27,6 +27,7 @@ var program = require('commander'); var cheerio = require('cheerio'); var HTMLFILE_DEFAULT = "index.html"; var CHECKSFILE_DEFAULT = "checks.json"; +var rest = require('restler'); var assertFileExists = function(infile) { var instr = infile.toString(); @@ -66,7 +67,9 @@ if(require.main == module) { program .option('-c, --checks ', 'Path to checks.json', clone(assertFileExists), CHECKSFILE_DEFAULT) .option('-f, --file ', 'Path to index.html', clone(assertFileExists), HTMLFILE_DEFAULT) - .parse(process.argv); + .option('-u, --url ', 'Path to html link') + + .parse(process.argv); var checkJson = checkHtmlFile(program.file, program.checks); var outJson = JSON.stringify(checkJson, null, 4); console.log(outJson); From 74548d3b8a0ce9ef19e4c3bae931a90844ec7062 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Thu, 18 Jul 2013 06:46:07 +0000 Subject: [PATCH 09/44] Started fixing index.html --- index.html | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index 6774d13b38..4855a144d0 100644 --- a/index.html +++ b/index.html @@ -3,8 +3,20 @@ My First Bitstarter - - -body { padding-top: 20px; padding-bottom: 40px;} -.container{width:960px;} -p.lead{padding-top: 15px;} -.navigation, .pitch, .section1, .section2, .faq, .footer {padding: 10px 0px 10px 0px;} -.video, .thermometer, .order, .social { border: 1px dotted; text-align: center;} -.video{ height:124px; line-hieght:124px;} -.thermometer, .order, .social {height: 40px; line-height: 40px;} -div.row{ border: 1px solid;} - - -
-
- -
Blank
-
About
-
+/* Mobile */ +
+
+
+ + Bitstarter +
+ +
+ +/* Row Fluid */ +
+
-

Bitstarter Title

-
+

Product

+
+
+
+ +
+
+
+
+
+
+

1000

backers

+
+ +
+
+

10

days left

+
+ +
+
+
+
+
+ +
+ +
+
+ +
+
+ +
+
+

+ Random Text here. WOOOOOOOOOOOOO +

+
+ +
+
+

+ :p meow meow meow :333333333333333 +

+
+
+
+ +/* FAQ */ +
+
+

FAQ

+
+
+
+ What does FAQ stand for? +
+
+
Frequently Asked Question
+
+
+
+ What's a Frequently Asked Question?
+
+
A question which is commonly aksed by users.
+
+ +/*Licence*/ +
-

This is my first bitstarter project.

-
-
Video
-
-
Thermometer
-
Order
-
-
-
Marketing Section 1
-
-
Marketing Section 2
-
-
FAQ
-
-
Footer
+

This work is licenced under the CC By-SA 3.0, without all the cruft that would otherwise ne put at the bottom of the page.

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 33ea84700d7baeace731f5cff416e66389fca1bb Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Sat, 20 Jul 2013 01:13:06 +0000 Subject: [PATCH 11/44] Error checking index.html --- index.html | 57 +++++++++++------------------------------------------- 1 file changed, 11 insertions(+), 46 deletions(-) diff --git a/index.html b/index.html index f92268a855..36382c9482 100644 --- a/index.html +++ b/index.html @@ -7,42 +7,42 @@ - + -/* Mobile */ +
@@ -65,7 +65,7 @@
  • About
    • -/* Row Fluid */ +
    @@ -121,7 +121,7 @@

    10

    days left

    -/* FAQ */ +

    FAQ

    @@ -140,43 +140,8 @@

    FAQ

    A question which is commonly aksed by users.
    -/*Licence*/ +

    This work is licenced under the CC By-SA 3.0, without all the cruft that would otherwise ne put at the bottom of the page.

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 85ab7ce46ca1133d722edfc17e59f65439376889 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Sat, 20 Jul 2013 01:21:48 +0000 Subject: [PATCH 12/44] Error checking index.html --- index.html | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/index.html b/index.html index 36382c9482..95fa4f2fa3 100644 --- a/index.html +++ b/index.html @@ -14,23 +14,24 @@ + .footer a { color: #ccccff; } + + @@ -62,9 +65,10 @@
    + + + + Bitstarter
      From c7ff3f6204515471ab305283f54b199587f0c288 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Sat, 20 Jul 2013 03:29:45 +0000 Subject: [PATCH 18/44] Error checking index.html --- index.html | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/index.html b/index.html index 0b1b206ed1..17ff04afff 100644 --- a/index.html +++ b/index.html @@ -140,7 +140,7 @@

      10

      days left

      :p meow meow meow :333333333333333

    -
    +
    @@ -159,11 +159,12 @@

    FAQ

    What's a Frequently Asked Question?
    -
    A question which is commonly aksed by users.
    +
    A question which is commonly asked by users.
    -

    This work is licenced under the CC By-SA 3.0, without all the cruft that would otherwise ne put at the bottom of the page.

    -
    +

    This work is licenced under the CC By-SA 3.0, without all the cruft that would otherwise be put at the bottom of the page.

    + + From 5ec4e3391a1e6c3cc236e4b1a120c310ef1459e2 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Sat, 20 Jul 2013 03:36:18 +0000 Subject: [PATCH 19/44] Error checking index.html --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 17ff04afff..b2598960cc 100644 --- a/index.html +++ b/index.html @@ -124,7 +124,7 @@

    10

    days left

    -
    +
    From f7a886f4eb911224990cb7fdc9b73fb8345776a8 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Sat, 20 Jul 2013 03:38:22 +0000 Subject: [PATCH 20/44] Error checking index.html --- index.html | 2 -- 1 file changed, 2 deletions(-) diff --git a/index.html b/index.html index b2598960cc..29f43462f6 100644 --- a/index.html +++ b/index.html @@ -16,7 +16,6 @@ /*Large Desktops*/ @media (min-width: 980px) -{ body { padding-top: 60px; } @@ -26,7 +25,6 @@ .linediv-r { border-left: 1px white solid; } -} /*Landscape phones and down*/ From 26f3be2b3b15cfccc4e282cf28e65e6516a5f654 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Sat, 20 Jul 2013 03:41:35 +0000 Subject: [PATCH 21/44] Error checking index.html --- index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index 29f43462f6..dd10986765 100644 --- a/index.html +++ b/index.html @@ -29,10 +29,10 @@ /*Landscape phones and down*/ -@media (max-width: 480px) { +@media (max-width: 480px) .copy { padding: 2.5% 10%; } .linediv-l { border-bottom: 1px white solid; } - .linediv-r { border-top: 1px white solid; } } + .linediv-r { border-top: 1px white solid; } /*All form factors Main body & headings*/ From 6154f7c660209cb9d06ec44b24552a61f2fc6617 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Sat, 20 Jul 2013 03:50:21 +0000 Subject: [PATCH 22/44] Error checking index.html --- index.html | 167 +++++------------------------------------------------ 1 file changed, 13 insertions(+), 154 deletions(-) diff --git a/index.html b/index.html index dd10986765..f55cd27f83 100644 --- a/index.html +++ b/index.html @@ -12,157 +12,16 @@ - - - - - -
    -
    -
    - - Bitstarter -
    - -
    - - -
    -
    -
    -

    Product

    -
    -
    -
    -

    One sentence description.

    -
    - -
    -
    - -
    -
    -
    -
    -
    -
    -

    1000

    backers

    -
    - -
    -
    -

    $6000

    of $10,000

    -
    - -
    -
    -

    10

    days left

    -
    - -
    -
    -
    -
    -
    - -
    - -
    -
    - -
    -
    - -
    -
    -

    - Random Text here. WOOOOOOOOOOOOO -

    -
    - -
    -
    -

    - :p meow meow meow :333333333333333 -

    -
    -
    -
    - - -
    -
    -

    FAQ

    -
    -
    -
    - What does FAQ stand for? -
    -
    -
    Frequently Asked Question
    -
    -
    -
    - What's a Frequently Asked Question?
    -
    -
    A question which is commonly asked by users.
    -
    - - -
    -
    -

    This work is licenced under the CC By-SA 3.0, without all the cruft that would otherwise be put at the bottom of the page.

    -
    - + + + + +
    +
    +
    + + Bitstarter +
    + +
    + + + + +
    +
    +
    +

    Product

    +
    +
    +
    +

    One sentence description.

    +
    + +
    +
    + +
    +
    +
    +
    +
    +
    +

    1000

    backers

    +
    + +
    +
    +

    $6000

    of $10,000

    +
    + +
    +
    +

    10

    days left

    +
    + +
    +
    +
    +
    +
    + +
    + +
    +
    + + + + + +
    +
    + +
    +
    +

    + Random Text here. WOOOOOOOOOOOOO +

    +
    + +
    +
    +

    + :p meow meow meow :333333333333333 +

    +
    +
    +
    +
    + + +
    +
    +

    FAQ

    +
    +
    +
    + What does FAQ stand for? +
    +
    +
    Frequently Asked Question
    +
    +
    +
    + What's a Frequently Asked Question?
    +
    +
    A question which is commonly aksed by users.
    +
    + + +
    +
    +

    This work is licenced under the CC By-SA 3.0, without all the cruft that would otherwise ne put at the bottom of the page.

    +
    + From 216f2b98b1a81cfde3fb65d5a56cbacedbb6e50d Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Sat, 20 Jul 2013 03:58:04 +0000 Subject: [PATCH 24/44] Error checking index.html --- index.html | 115 ----------------------------------------------------- 1 file changed, 115 deletions(-) diff --git a/index.html b/index.html index ff95b9fdbd..8ed2221ed7 100644 --- a/index.html +++ b/index.html @@ -56,118 +56,3 @@ .footer p { font-size: 11px; } .footer a { color: #ccccff; } - - -
    -
    -
    - - Bitstarter -
    - -
    - - - - -
    -
    -
    -

    Product

    -
    -
    -
    -

    One sentence description.

    -
    - -
    -
    - -
    -
    -
    -
    -
    -
    -

    1000

    backers

    -
    - -
    -
    -

    $6000

    of $10,000

    -
    - -
    -
    -

    10

    days left

    -
    - -
    -
    -
    -
    -
    - -
    - -
    -
    - - - - - -
    -
    - -
    -
    -

    - Random Text here. WOOOOOOOOOOOOO -

    -
    - -
    -
    -

    - :p meow meow meow :333333333333333 -

    -
    -
    -
    -
    - - -
    -
    -

    FAQ

    -
    -
    -
    - What does FAQ stand for? -
    -
    -
    Frequently Asked Question
    -
    -
    -
    - What's a Frequently Asked Question?
    -
    -
    A question which is commonly aksed by users.
    -
    - - -
    -
    -

    This work is licenced under the CC By-SA 3.0, without all the cruft that would otherwise ne put at the bottom of the page.

    -
    - From 6099b2acca0faf5d3bfec1015440dbb515a3da09 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Sat, 20 Jul 2013 04:00:13 +0000 Subject: [PATCH 25/44] Error checking index.html --- index.html | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/index.html b/index.html index 8ed2221ed7..c5ce57a894 100644 --- a/index.html +++ b/index.html @@ -55,4 +55,24 @@ .footer { color: #cccccc; text-align: center; } .footer p { font-size: 11px; } .footer a { color: #ccccff; } + + + + + +
    +
    +
    + + Bitstarter +
    + +
    + From dd2a25de967f1845e215e9b6c9c1554b14affb9c Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Sat, 20 Jul 2013 04:03:48 +0000 Subject: [PATCH 26/44] Error checking index.html --- index.html | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/index.html b/index.html index c5ce57a894..2e243aff73 100644 --- a/index.html +++ b/index.html @@ -13,8 +13,8 @@ - - -
    From 657ddad0e0ff52b3752ddbc084113b5a13faef1a Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Sat, 20 Jul 2013 04:21:38 +0000 Subject: [PATCH 27/44] Error checking index.html --- index.html | 343 +++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 283 insertions(+), 60 deletions(-) diff --git a/index.html b/index.html index 2e243aff73..1b27dd03f2 100644 --- a/index.html +++ b/index.html @@ -1,72 +1,295 @@ - - - - My First Bitstarter - - - - - - - - + + + + My First Bitstarter + + + + + + + + + - + /* Marketing Copy and Footer */ + .copy { + padding-top: 2.5%; + padding-bottom: 2.5%; + text-align: justify; + } + .asset { + padding: 2.5% 0%; + } + .footer { + color: #cccccc; + text-align: center; + } + .footer p { + font-size: 11px; + } + .footer a { + color: #ccccff; + } + + - -
    -
    + + + +
    +
    - - Bitstarter -
    - -
    - + + Bitstarter +
    + +
    +
    +
    +
    + + + + +
    + + + +
    +
    +

    Product

    +
    +
    +
    +
    + + +

    One sentence description.

    +
    +
    +
    +
    + +
    + + +
    +
    +
    +
    + +
    +

    1000

    backers

    +
    +
    +
    +
    +

    $6000

    of $10,000

    +
    +
    +
    +
    +

    10

    days left

    +
    +
    +
    +
    +
    + + +
    +
    +
    +
    +
    +
    + + + +
    + +
    +
    + + + + + +
    +
    + +
    +
    +

    + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec + porta, dui sagittis hendrerit rutrum, nunc leo tempus nisl, eu + mollis justo velit at nunc. Fusce nec egestas sem. Donec + fringilla ante lectus, a pellentesque lacus dignissim ac. Sed + volutpat lorem ut congue malesuada. In facilisis scelerisque + turpis sed lacinia. Donec in orci lectus. Donec auctor semper + quam, eget rhoncus purus fringilla id. Phasellus id nibh eu + risus ultrices adipiscing. Lorem ipsum dolor sit amet, + consectetur adipiscing elit. Donec porta, dui sagittis hendrerit + rutrum, nunc leo tempus nisl, eu mollis justo velit at + nunc. Fusce nec egestas sem. Donec fringilla. +

    +
    +
    + +
    +
    +

    + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec + porta, dui sagittis hendrerit rutrum, nunc leo tempus nisl, eu + mollis justo velit at nunc. Fusce nec egestas sem. Donec + fringilla ante lectus, a pellentesque lacus dignissim ac. Sed + volutpat lorem ut congue malesuada. In facilisis scelerisque + turpis sed lacinia. Donec in orci lectus. Donec auctor semper + quam, eget rhoncus purus fringilla id. Phasellus id nibh eu + risus ultrices adipiscing. Lorem ipsum dolor sit amet, + consectetur adipiscing elit. Donec porta, dui sagittis hendrerit + rutrum, nunc leo tempus nisl, eu mollis justo velit at + nunc. Fusce nec egestas sem. Donec fringilla. +

    +
    +
    + +
    +
    + + + + +
    +
    +

    FAQ

    +
    +
    +
    + + What does FAQ stand for? + +
    +
    +
    + Frequently Asked Question. +
    +
    +
    +
    +
    + + What's a Frequently Asked Question? + +
    +
    +
    + A question which is commonly asked by users. +
    +
    +
    +
    +
    + +
    + + + +
    +
    +

    This work is licensed under + the CC + By-SA 3.0 + , without all the cruft that would otherwise be + put at the bottom of the page.

    +
    +
    +
    + + + From e99879409314d0ee3153e4fe678fedacfe419a5b Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Sat, 20 Jul 2013 04:29:37 +0000 Subject: [PATCH 28/44] Error checking index.html --- index.html | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/index.html b/index.html index 1b27dd03f2..e5ad0a9987 100644 --- a/index.html +++ b/index.html @@ -222,17 +222,7 @@

    10

    days left

    - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec - porta, dui sagittis hendrerit rutrum, nunc leo tempus nisl, eu - mollis justo velit at nunc. Fusce nec egestas sem. Donec - fringilla ante lectus, a pellentesque lacus dignissim ac. Sed - volutpat lorem ut congue malesuada. In facilisis scelerisque - turpis sed lacinia. Donec in orci lectus. Donec auctor semper - quam, eget rhoncus purus fringilla id. Phasellus id nibh eu - risus ultrices adipiscing. Lorem ipsum dolor sit amet, - consectetur adipiscing elit. Donec porta, dui sagittis hendrerit - rutrum, nunc leo tempus nisl, eu mollis justo velit at - nunc. Fusce nec egestas sem. Donec fringilla. + Random Text box #2

    @@ -240,9 +230,7 @@

    10

    days left

    - - - +

    FAQ

    @@ -278,8 +266,7 @@

    FAQ

    - - +

    This work is licensed under From 7b4ec26ba6e682bfaf333ca576790f47f479803c Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Sat, 20 Jul 2013 04:34:42 +0000 Subject: [PATCH 29/44] Error checking index.html --- index.html | 45 ++++++++++----------------------------------- 1 file changed, 10 insertions(+), 35 deletions(-) diff --git a/index.html b/index.html index e5ad0a9987..2952dcf766 100644 --- a/index.html +++ b/index.html @@ -101,8 +101,7 @@ - - +

    @@ -119,18 +118,13 @@
  • About
  • Contact
    • -
    +
    - - -
    - - - +

    Product

    @@ -138,8 +132,7 @@

    Product

    - - +

    One sentence description.

    @@ -148,14 +141,11 @@

    Product

    -
    - +

    1000

    backers

    @@ -174,47 +164,32 @@

    10

    days left

    - +
    - - +
    - - - - +

    - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec - porta, dui sagittis hendrerit rutrum, nunc leo tempus nisl, eu - mollis justo velit at nunc. Fusce nec egestas sem. Donec - fringilla ante lectus, a pellentesque lacus dignissim ac. Sed - volutpat lorem ut congue malesuada. In facilisis scelerisque - turpis sed lacinia. Donec in orci lectus. Donec auctor semper - quam, eget rhoncus purus fringilla id. Phasellus id nibh eu - risus ultrices adipiscing. Lorem ipsum dolor sit amet, - consectetur adipiscing elit. Donec porta, dui sagittis hendrerit - rutrum, nunc leo tempus nisl, eu mollis justo velit at - nunc. Fusce nec egestas sem. Donec fringilla. + Random Text Box #1

    From 404c20506b1aac71a7d8531c92cc853f8b432b99 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Sat, 20 Jul 2013 04:54:17 +0000 Subject: [PATCH 30/44] Finally fixed index.html --- checks.json | 16 +++++++++++++++- web.js | 2 +- 2 files changed, 16 insertions(+), 2 deletions(-) mode change 100644 => 100755 web.js diff --git a/checks.json b/checks.json index 710dcfc1e8..38306bf04a 100644 --- a/checks.json +++ b/checks.json @@ -1,2 +1,16 @@ ["h1", - ".navigation"] + ".navigation", + ".logo", + ".blank", + ".about", + ".heading", + ".subheading", + ".pitch", + ".video", + ".thermometer", + ".order", + ".social", + ".section1", + ".section2", + ".faq", + ".footer"] diff --git a/web.js b/web.js old mode 100644 new mode 100755 index af202bb1d5..c77123aa00 --- a/web.js +++ b/web.js @@ -10,7 +10,7 @@ app.get('/', function(request, response) { response.send(x); }); -var port = process.env.PORT || 5000; +var port = process.env.PORT || 8080; app.listen(port, function() { console.log("Listening on " + port); }); From 357dcc34544161b81ca8f3c05dbdcfd27952d487 Mon Sep 17 00:00:00 2001 From: chawl002 Date: Fri, 19 Jul 2013 22:07:58 -0700 Subject: [PATCH 31/44] Finally finished! --- index.html | 295 +++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 254 insertions(+), 41 deletions(-) diff --git a/index.html b/index.html index 6774d13b38..cbc9bd8168 100644 --- a/index.html +++ b/index.html @@ -1,43 +1,256 @@ - - -My First Bitstarter - - - - -
    -
    - -
    Blank
    -
    About
    -
    -
    -

    Bitstarter Title

    -
    -
    -

    This is my first bitstarter project.

    -
    -
    Video
    -
    -
    Thermometer
    -
    Order
    -
    -
    -
    Marketing Section 1
    -
    -
    Marketing Section 2
    -
    -
    FAQ
    -
    -
    Footer
    + + + My First Bitstarter + + + + + + + + + + + + + +
    +
    +
    + + Bitstarter +
    + +
    +
    +
    +
    + +
    + +
    +
    +

    Product

    +
    +
    +
    +
    + +

    One sentence description.

    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    + +
    +

    1000

    backers

    +
    +
    +
    +
    +

    $6000

    of $10,000

    +
    +
    +
    +
    +

    10

    days left

    +
    +
    +
    +
    +
    + + +
    +
    +
    +
    +
    +
    + + +
    + +
    +
    + + +
    +
    + +
    +
    +

    + Random Text Box #1 +

    +
    +
    + +
    +
    +

    + Random Text box #2 +

    +
    +
    + +
    +
    + + +
    +
    +

    FAQ

    +
    +
    +
    + + What does FAQ stand for? + +
    +
    +
    + Frequently Asked Question. +
    +
    +
    +
    +
    + + What's a Frequently Asked Question? + +
    +
    +
    + A question which is commonly asked by users. +
    +
    +
    +
    +
    + +
    + + +
    +
    +

    This work is licensed under + the CC + By-SA 3.0 + , without all the cruft that would otherwise be + put at the bottom of the page.

    +
    +
    +
    + + From 7cbb452e16ec690f30c3383786c8c876d5835deb Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Mon, 22 Jul 2013 03:48:55 +0000 Subject: [PATCH 32/44] revert index.html from master --- index.html | 256 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 256 insertions(+) create mode 100644 index.html diff --git a/index.html b/index.html new file mode 100644 index 0000000000..cbc9bd8168 --- /dev/null +++ b/index.html @@ -0,0 +1,256 @@ + + + + + My First Bitstarter + + + + + + + + + + + + + +
    +
    +
    + + Bitstarter +
    + +
    +
    +
    +
    + +
    + +
    +
    +

    Product

    +
    +
    +
    +
    + +

    One sentence description.

    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    + +
    +

    1000

    backers

    +
    +
    +
    +
    +

    $6000

    of $10,000

    +
    +
    +
    +
    +

    10

    days left

    +
    +
    +
    +
    +
    + + +
    +
    +
    +
    +
    +
    + + +
    + +
    +
    + + +
    +
    + +
    +
    +

    + Random Text Box #1 +

    +
    +
    + +
    +
    +

    + Random Text box #2 +

    +
    +
    + +
    +
    + + +
    +
    +

    FAQ

    +
    +
    +
    + + What does FAQ stand for? + +
    +
    +
    + Frequently Asked Question. +
    +
    +
    +
    +
    + + What's a Frequently Asked Question? + +
    +
    +
    + A question which is commonly asked by users. +
    +
    +
    +
    +
    + +
    + + +
    +
    +

    This work is licensed under + the CC + By-SA 3.0 + , without all the cruft that would otherwise be + put at the bottom of the page.

    +
    +
    +
    + + From 366aeccf182464f29fa703b7ed5ab179e621f210 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Tue, 23 Jul 2013 02:28:31 +0000 Subject: [PATCH 33/44] product updating --- index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index cbc9bd8168..10c4e366ac 100644 --- a/index.html +++ b/index.html @@ -2,7 +2,7 @@ - My First Bitstarter + Vocaloid 4.0 @@ -138,7 +138,7 @@

    Product

    - +
    From d854a06acba6b6efa195fc7666304831d1e12628 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Tue, 23 Jul 2013 03:19:51 +0000 Subject: [PATCH 34/44] product updating --- index.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/index.html b/index.html index 10c4e366ac..ef30f079a1 100644 --- a/index.html +++ b/index.html @@ -127,13 +127,13 @@
    -

    Product

    +

    Vocaloid 4.0

    -

    One sentence description.

    +

    Better Speaking English Vocaloids

    @@ -185,11 +185,11 @@

    10

    days left

    - +

    - Random Text Box #1 + Vocaloids are being wildly popular over the internet these days. What is a vocaloid? Its a computer program that can sing a song when given the lyrics and pitch. However they have a huge problem: The English speaking ones are lacking proper pronouciation skills, not to mention the mechanical unlife-like voice! Its time to change that -- and you can help! With a small donation, we can help pay for higher quality recording studios, singers, audio technitions, and more!

    From 65eecdd3b13d650911a67d1b8632026eab3c3ea6 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Tue, 23 Jul 2013 03:41:04 +0000 Subject: [PATCH 35/44] product updating --- index.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/index.html b/index.html index ef30f079a1..93096ec94c 100644 --- a/index.html +++ b/index.html @@ -197,11 +197,11 @@

    10

    days left

    - Random Text box #2 + Why is promoting Vocaloids important?

    - +
    @@ -214,12 +214,12 @@

    FAQ

    - What does FAQ stand for? + Will I be given anything for my donation?
    - Frequently Asked Question. + Yes, donators will be given a copy of the finished product and a poster of the character.
    From 6a170627c9ebdc11117f1233af83073f4b227b95 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Tue, 23 Jul 2013 05:31:45 +0000 Subject: [PATCH 36/44] Possibly finished? --- index.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/index.html b/index.html index 93096ec94c..2cea73fc6c 100644 --- a/index.html +++ b/index.html @@ -189,7 +189,7 @@

    10

    days left

    - Vocaloids are being wildly popular over the internet these days. What is a vocaloid? Its a computer program that can sing a song when given the lyrics and pitch. However they have a huge problem: The English speaking ones are lacking proper pronouciation skills, not to mention the mechanical unlife-like voice! Its time to change that -- and you can help! With a small donation, we can help pay for higher quality recording studios, singers, audio technitions, and more! + Vocaloids are being wildly popular over the internet these days. Most of us know them from their character faces, but thats not exactly all a vocaloid has to offer. So what exactly is a vocaloid? Its actually a computer program that can sing a song when given the lyrics and pitch. Then its given a face and a name to helps fans associate the voice. However they have a huge problem: The English speaking ones are lacking proper pronouciation skills, not to mention the mechanical unlife-like voice! The Japanese are way ahead of the game, and have already integrated Vocaloids as part of their everchanging culture. Its time to change that -- and you can help! With a small donation, we can help pay for higher quality recording studios, singers, audio technitions, and artists, to help promote American Vocaloids and the Music industry.

    @@ -197,7 +197,7 @@

    10

    days left

    - Why is promoting Vocaloids important? + Why is promoting Vocaloids important? Because they are already super popular! Vocaloids hold huge fan-bases in Japan, United States, Canada, and Korea. Since the computer program is easy to use, it helps novice and professional song writers gain attention with their work without requiring much of the tools needed with a human singer. Popular Vocaloid characters are even turned into holograms with their own live concerts! This market hasnt reached its full potentioal yet, and the United States needs to pick up the pace.

    @@ -219,7 +219,7 @@

    FAQ

    - Yes, donators will be given a copy of the finished product and a poster of the character. + Yes, donators will be given a copy of the Vocaloid program including the voicebank and a poster of the associated character.
    @@ -227,12 +227,12 @@

    FAQ

    - What's a Frequently Asked Question? + Where can I find out more about Vocaloids?
    - A question which is commonly asked by users. + Suprisingly, just by browsing YouTube! There are thousands of songs in Japanese, English, and Korean. You can also browse www.vocaloid.com/en or checking out this informational video: http://www.youtube.com/watch?v=CF0A0I6cqmI (warning: its slightly outdated, but gets the point across.)
    From e9b05a65319dbdb16fdb5bccdb784dec90933138 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Tue, 23 Jul 2013 05:34:05 +0000 Subject: [PATCH 37/44] Possibly finished? --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 2cea73fc6c..e758fcb9a1 100644 --- a/index.html +++ b/index.html @@ -152,7 +152,7 @@

    1000

    backers

    -

    $6000

    of $10,000

    +

    $33,000

    of $55,000

    From 89422d43c21136031a9bde15796844d09cfbad1b Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Tue, 23 Jul 2013 05:45:58 +0000 Subject: [PATCH 38/44] Finished --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index e758fcb9a1..bf71dc98c5 100644 --- a/index.html +++ b/index.html @@ -111,7 +111,7 @@ - Bitstarter + Vocaloids 4.0
    • Home
      • From 3f0449feee4deae11d5821b0999458405eea6f94 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Thu, 8 Aug 2013 00:43:30 +0000 Subject: [PATCH 39/44] fixing row-fluid bug --- index.html | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/index.html b/index.html index bf71dc98c5..16d18008cc 100644 --- a/index.html +++ b/index.html @@ -138,12 +138,12 @@

      Vocaloid 4.0

    - + Placeholder
    -
    +
    @@ -162,6 +162,7 @@

    10

    days left

    +
    @@ -170,10 +171,14 @@

    10

    days left

    +
    +
    +
    +
    - +
    - + Placeholder

    @@ -201,7 +206,7 @@

    10

    days left

    - + Placeholder
    From de1d478e81ed40a1c4792c7a52d52e96a2ac3380 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Thu, 8 Aug 2013 01:35:42 +0000 Subject: [PATCH 40/44] Added new buttons~ --- index.html | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index 16d18008cc..057a4401dd 100644 --- a/index.html +++ b/index.html @@ -97,6 +97,11 @@ .footer a { color: #ccccff; } + /* http://support.addthis.com/customer/portal/questions/1136093-share-buttons-in-center-position */ + div.addthis_toolbox { + width:180px; + margin: 0 auto; + } @@ -181,8 +186,18 @@

    10

    days left

    From e8fd09906f3349848ba162a8122100300b3a3edc Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Thu, 8 Aug 2013 01:38:00 +0000 Subject: [PATCH 41/44] Removed two buttons --- index.html | 2 -- 1 file changed, 2 deletions(-) diff --git a/index.html b/index.html index 057a4401dd..7137466b01 100644 --- a/index.html +++ b/index.html @@ -190,8 +190,6 @@

    10

    days left

    - -
    From e1d8d181f4234b6dcbcd944994662b144637889a Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Thu, 8 Aug 2013 02:11:21 +0000 Subject: [PATCH 42/44] Removed two buttons --- index.html | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/index.html b/index.html index 7137466b01..b477fa76ed 100644 --- a/index.html +++ b/index.html @@ -102,6 +102,20 @@ width:180px; margin: 0 auto; } + /*GA CODE*/ + @@ -270,5 +284,16 @@

    FAQ

    + + From 7601f614a3ab7cf406f0d31df36bc86178089c09 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Thu, 8 Aug 2013 03:01:47 +0000 Subject: [PATCH 43/44] Bitcoin button added --- index.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index b477fa76ed..927eb0a9d4 100644 --- a/index.html +++ b/index.html @@ -194,7 +194,8 @@

    10

    days left

    - + + Donate Bitcoins
    From 7ec959d3a21c497ac73dafd4736c586127a98344 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Thu, 8 Aug 2013 03:12:42 +0000 Subject: [PATCH 44/44] Notice putup --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 927eb0a9d4..4b627c53e2 100644 --- a/index.html +++ b/index.html @@ -222,7 +222,7 @@

    10

    days left

    - Vocaloids are being wildly popular over the internet these days. Most of us know them from their character faces, but thats not exactly all a vocaloid has to offer. So what exactly is a vocaloid? Its actually a computer program that can sing a song when given the lyrics and pitch. Then its given a face and a name to helps fans associate the voice. However they have a huge problem: The English speaking ones are lacking proper pronouciation skills, not to mention the mechanical unlife-like voice! The Japanese are way ahead of the game, and have already integrated Vocaloids as part of their everchanging culture. Its time to change that -- and you can help! With a small donation, we can help pay for higher quality recording studios, singers, audio technitions, and artists, to help promote American Vocaloids and the Music industry. + *THIS IS FOR A CLASS - I DO NOT INTEND TO ACTUALLY DO THIS.Vocaloids are being wildly popular over the internet these days. Most of us know them from their character faces, but thats not exactly all a vocaloid has to offer. So what exactly is a vocaloid? Its actually a computer program that can sing a song when given the lyrics and pitch. Then its given a face and a name to helps fans associate the voice. However they have a huge problem: The English speaking ones are lacking proper pronouciation skills, not to mention the mechanical unlife-like voice! The Japanese are way ahead of the game, and have already integrated Vocaloids as part of their everchanging culture. Its time to change that -- and you can help! With a small donation, we can help pay for higher quality recording studios, singers, audio technitions, and artists, to help promote American Vocaloids and the Music industry.