From 9944f1b68563cd9873259fdee7ac939857839130 Mon Sep 17 00:00:00 2001 From: Michael Q Larson Date: Mon, 2 Feb 2015 15:27:12 -0800 Subject: [PATCH 1/2] start adding new favicons and make the seed task run with each push to heroku --- package.json | 13 ++--------- public/favicon.ico | Bin 0 -> 7406 bytes seed_data/bonfires.json | 2 +- views/layout.jade | 1 - views/partials/meta.jade | 48 +++++++++++++++++++++++---------------- 5 files changed, 32 insertions(+), 32 deletions(-) create mode 100644 public/favicon.ico diff --git a/package.json b/package.json index 0f57729220..0c40e74a12 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,8 @@ }, "scripts": { "start": "node app.js", - "test": "mocha" + "test": "mocha", + "prepublish": "node seed_data/seed.js" }, "dependencies": { "async": "^0.9.0", @@ -32,12 +33,9 @@ "express-flash": "^0.0.2", "express-session": "^1.9.2", "express-validator": "^2.8.0", - "fbgraph": "^0.3.0", "github-api": "^0.7.0", "helmet": "^0.5.3", - "instagram-node": "^0.5.1", "jade": "^1.8.0", - "lastfm": "^0.9.2", "less": "^1.7.5", "lodash": "^2.4.1", "lusca": "^1.0.2", @@ -47,25 +45,18 @@ "morgan": "^1.5.0", "newrelic": "^1.13.3", "node": "0.0.0", - "node-foursquare": "^0.2.1", - "node-linkedin": "^0.3.4", "node-rest-client": "^1.4.3", "nodemailer": "^1.3.0", "passport": "^0.2.1", "passport-facebook": "^1.0.3", "passport-github": "^0.1.5", "passport-google-oauth": "^0.1.5", - "passport-instagram": "^0.1.2", "passport-linkedin-oauth2": "^1.2.1", "passport-local": "^1.0.0", "passport-oauth": "^1.0.0", "passport-twitter": "^1.0.2", "request": "^2.49.0", "sitemap": "^0.7.4", - "stripe": "^3.0.2", - "tumblr.js": "^0.0.4", - "twilio": "^1.9.0", - "twit": "^1.1.18", "uglify-js": "^2.4.15", "validator": "^3.22.1", "yui": "^3.18.1" diff --git a/public/favicon.ico b/public/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..3ec62dd50c2c8d41f224547395abfc9d7b1831e6 GIT binary patch literal 7406 zcmeHLOQ;?-6h1RaCYem;k<2U=E*7e^3boo|kzy6Rmm*@7yC{NfMSP*Oq97=R3L?@) z1zl7q;^MmSv9${kicl03D+)dqDiw4g!u7E#Zp!r}nM~%t_rJXh7cJ!v%;cPW-+AQZ zpZu8tNPs}o0QLf&U;sM-U~bOq?+JjnactYRUatV=@wx#yXaY!ccGy`VwqCyGmVMCO zxEJo(|0F#3((ADQ(dS{u!a-R6>mS&(eF3Vuop9#t=U}!hz>yb^!y`wIL3{lk*mC=Q z@Wof(!W(bB3ooBI1!mJOxbC*a=zk{7Dln_S6<>kGx6<@&m1?Xm2h^Z0ArY=|Ym&%T zGgV+yN;$nyWl9yLDc4Mxq;0q`s^X~-X(5bc+L)?N(}o)>I-TcvT~}5tCGw4+Sxyp3 zixR^X%9L%bFi^uJ>KIQl1yU-7s?7)RhC*w#QFG`>pDO;}1+x3>9A10yviq}Z)OYUQ z@3Yt5bQhfa`a3xM!mDt{zQ^G7$7kW^Uw(sEUOVOX*aJ@;g^L$2!q(l3@X4oN!t$Sg z!_xa7Lc4V@>^txb%?Xf4`dOJ% zUxVridXteI=?M*Jj8p6OOh<~W(cCDpe5V4aM-+p#`suxVtFuJ(TPtG_IwJ*VI+ zA{@eNIH%;Ogw~%^R#sNr`{0R_OK{=BzwT_ZdDs1L7~lQuJK)j>r{UP~lQ4JlJpBI0 zGTeIigYeV&U*XON9*1u8ZaDPxQCNKVS@`J8XK?PD@7=Q{S5=O zalu^-$LCei#uR0qDoibpvy^QS6wl8f9lX_|bYK?iNYf#_&qsg`e42rA4@@mu)=#t6 zAbQd9aY7+pCymGO;0L*PQe(c}hhJaL$}*%+RRK1ix?;Ky#1pQ{FhA>`t2kZD2cxJa zX$qxHh$CTeSO@;_jLR06xJBnJ20}j4Bj3>{{CCtHY8p+fnRN7l;OWjhl%nex1|XTS zKO|9G@94iGcD_9w2Mie&yrT^PQbK76(Vm`gw?2{1<9gT$y01bxD^lm&-t78BdWh$j z#8w+K(v4ujy(&sJqT}Z-L&5^vlraE)ehc&j!>1GUgg4=tuyl?kGLrY+F*<&{3ra{4 zp9#AJt{~`-WCMXS1Nor!e0&~B7U)$$;#4^kV20F!dkk8V%$HlHLMPE-3T+j&Xn^}k sRHDT2bK(@b{gJSNH5S;~WIQ|+WXwiCQ@u}eX4=(K0lN*%+U2Xje*{S6K>z>% literal 0 HcmV?d00001 diff --git a/seed_data/bonfires.json b/seed_data/bonfires.json index 369ee60fd6..0b0eff3b17 100644 --- a/seed_data/bonfires.json +++ b/seed_data/bonfires.json @@ -1,7 +1,7 @@ [ { "_id" : "ad7123c8c441eddfaeb5bdef", - "name": "Meet Bonfire", + "name": "Meet Bonfire!", "difficulty": "0", "description": [ "Click the button below for further instructions.", diff --git a/views/layout.jade b/views/layout.jade index 83ef4770e8..9e3cd24e03 100644 --- a/views/layout.jade +++ b/views/layout.jade @@ -4,7 +4,6 @@ html(ng-app='profileValidation', lang='en') script(src="//ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js") script(src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.11/angular.min.js") script(src="//cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/0.12.0/ui-bootstrap-tpls.min.js") - link(rel='shortcut icon', href='//s3.amazonaws.com/freecodecamp/favicon.ico') link(rel='stylesheet', href='//maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css') link(rel='stylesheet', href='//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css') link(rel='stylesheet', href='//code.ionicframework.com/ionicons/2.0.0/css/ionicons.min.css') diff --git a/views/partials/meta.jade b/views/partials/meta.jade index 08b6c1cc1f..c0620d17ca 100644 --- a/views/partials/meta.jade +++ b/views/partials/meta.jade @@ -4,24 +4,34 @@ meta(http-equiv='X-UA-Compatible', content='IE=edge') meta(name='viewport', content='width=device-width, initial-scale=1.0') meta(name='csrf-token', content=_csrf) meta(name='keywords', content='learn to code, learn how to code, code, coding, software engineer, software developer, mean stack, pair programming, node.js, angular.js, express.js, mongoDB, coding bootcamp') -meta(content="Free Code Camp is a community of busy people who learn to code by collaborating on projects for nonprofits. Build your full stack JavaScript Portfolio today.", property="og:title") -meta(content="FreeCodeCamp", property="og:site_name") +meta(property="og:title", content="Free Code Camp is a community of busy people who learn to code by collaborating on projects for nonprofits. Build your full stack JavaScript Portfolio today.") +meta(property="og:site_name", content="FreeCodeCamp") meta(name='twitter:widgets:csp', content='on') meta(name='p:domain_verify', content='d0bc047a482c03c24f1168004c2a216a') -meta(content="http://www.freecodecamp.com", property="og:url") -meta(content="Free Code Camp is a community of busy people who learn to code by collaborating on projects for nonprofits. Build your full stack JavaScript Portfolio today.", property="og:description") -meta(content="https://pbs.twimg.com/profile_images/522961310212833280/XE6vGAaO.jpeg", property="og:image") -meta(content="article", property="og:type") -meta(content="https://www.facebook.com/freecodecamp", property="article:publisher") -meta(content="Responsive", property="article:section") -link(href="https://plus.google.com/+Freecodecamp", rel="publisher") -link(href="https://plus.google.com/+Freecodecamp", rel="author") -meta(content="Free Code Camp is a community of busy people who learn to code by collaborating on projects for nonprofits. Build your full stack JavaScript Portfolio today.", name="description") -meta(content="@freecodecamp", name="twitter:creator") -meta(content="http://www.freecodecamp.com", name="twitter:url") -meta(content="@freecodecamp", name="twitter:site") -meta(content="summary_large_image", name="twitter:card") -meta(content="https://s3.amazonaws.com/freecodecamp/challenges.png", name="twitter:image:src") -meta(content="Free Code Camp: a community of busy people learning to code", name="twitter:title") -meta(content="We're a community of busy people learning to code by collaborating on projects for nonprofits. Learn Full-stack JavaScript, build a portfolio, and get great references with our online coding bootcamp.", name="twitter:description") -meta(content="a40ee5d5dba3bb091ad783ebd2b1383f", name="p:domain_verify") \ No newline at end of file +meta(property="og:url", content="http://www.freecodecamp.com") +meta(property="og:description", content="Free Code Camp is a community of busy people who learn to code by collaborating on projects for nonprofits. Build your full stack JavaScript Portfolio today.") +meta(property="og:image", content="https://pbs.twimg.com/profile_images/522961310212833280/XE6vGAaO.jpeg") +meta(property="og:type", content="article") +meta(property="article:publisher", content="https://www.facebook.com/freecodecamp") +meta(property="article:section", content="Responsive") +link(rel="publisher", href="https://plus.google.com/+Freecodecamp") +link(rel="author", href="https://plus.google.com/+Freecodecamp") +meta(name="description", content="Free Code Camp is a community of busy people who learn to code by collaborating on projects for nonprofits. Build your full stack JavaScript Portfolio today.") +meta(name="twitter:creator", content="@freecodecamp") +meta(name="twitter:url", content="http://www.freecodecamp.com") +meta(name="twitter:site", content="@freecodecamp") +meta(name="twitter:card", content="summary_large_image") +meta(name="twitter:image:src", content="https://s3.amazonaws.com/freecodecamp/challenges.png") +meta(name="twitter:title", content="Free Code Camp: a community of busy people learning to code") +meta(name="twitter:description", content="We're a community of busy people learning to code by collaborating on projects for nonprofits. Learn Full-stack JavaScript, build a portfolio, and get great references with our online coding bootcamp.") +meta(content="a40ee5d5dba3bb091ad783ebd2b1383f", name="p:domain_verify") +meta(name="msapplication-TileColor", content="#FFFFFF") +meta(name="msapplication-TileImage", content="/") +link(rel="apple-touch-icon-precomposed", href="path/to/favicon-152.png") +link(rel="apple-touch-icon-precomposed", sizes="152x152" href="/path/to/favicon-152.png") +link(rel="apple-touch-icon-precomposed", sizes="144x144" href="/path/to/favicon-144.png") +link(rel="apple-touch-icon-precomposed", sizes="120x120" href="/path/to/favicon-120.png") +link(rel="apple-touch-icon-precomposed", sizes="114x114" href="/path/to/favicon-114.png") +link(rel="apple-touch-icon-precomposed", sizes="72x72" href="/path/to/favicon-72.png") +link(rel="apple-touch-icon-precomposed", href="/path/to/favicon-57.png") +link(rel='shortcut icon', href='//s3.amazonaws.com/freecodecamp/favicons/favicon.ico') \ No newline at end of file From 36bcc5fea7549d548ec7da4702b0c8f8035573ce Mon Sep 17 00:00:00 2001 From: Michael Q Larson Date: Mon, 2 Feb 2015 16:23:24 -0800 Subject: [PATCH 2/2] update the favicons and add recommended items to public folder --- public/browserconfig.xml | 12 ++++++++++++ public/favicons.html | 17 +++++++++++++++++ views/partials/meta.jade | 34 +++++++++++++++++++++++++++------- 3 files changed, 56 insertions(+), 7 deletions(-) create mode 100644 public/browserconfig.xml create mode 100644 public/favicons.html diff --git a/public/browserconfig.xml b/public/browserconfig.xml new file mode 100644 index 0000000000..761c736987 --- /dev/null +++ b/public/browserconfig.xml @@ -0,0 +1,12 @@ + + + + + + + + + #492c14 + + + diff --git a/public/favicons.html b/public/favicons.html new file mode 100644 index 0000000000..ba348ed7db --- /dev/null +++ b/public/favicons.html @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/views/partials/meta.jade b/views/partials/meta.jade index c0620d17ca..31a92ee4dc 100644 --- a/views/partials/meta.jade +++ b/views/partials/meta.jade @@ -27,11 +27,31 @@ meta(name="twitter:description", content="We're a community of busy people learn meta(content="a40ee5d5dba3bb091ad783ebd2b1383f", name="p:domain_verify") meta(name="msapplication-TileColor", content="#FFFFFF") meta(name="msapplication-TileImage", content="/") -link(rel="apple-touch-icon-precomposed", href="path/to/favicon-152.png") -link(rel="apple-touch-icon-precomposed", sizes="152x152" href="/path/to/favicon-152.png") -link(rel="apple-touch-icon-precomposed", sizes="144x144" href="/path/to/favicon-144.png") -link(rel="apple-touch-icon-precomposed", sizes="120x120" href="/path/to/favicon-120.png") -link(rel="apple-touch-icon-precomposed", sizes="114x114" href="/path/to/favicon-114.png") -link(rel="apple-touch-icon-precomposed", sizes="72x72" href="/path/to/favicon-72.png") -link(rel="apple-touch-icon-precomposed", href="/path/to/favicon-57.png") +link(rel="android-chrome", sizes="144x144" href="https://s3.amazonaws.com/freecodecamp/favicons/android-chrome-144x144.png") +link(rel="android-chrome", sizes="192x192" href="https://s3.amazonaws.com/freecodecamp/favicons/android-chrome-192x192.png") +link(rel="android-chrome", sizes="36x36" href="https://s3.amazonaws.com/freecodecamp/favicons/android-chrome-36x36.png") +link(rel="android-chrome", sizes="48x48" href="https://s3.amazonaws.com/freecodecamp/favicons/android-chrome-48x48.png") +link(rel="android-chrome", sizes="72x72" href="https://s3.amazonaws.com/freecodecamp/favicons/android-chrome-72x72.png") +link(rel="android-chrome", sizes="96x96" href="https://s3.amazonaws.com/freecodecamp/favicons/android-chrome-96x96.png") +link(rel="android-chrome-manifest", href="https://s3.amazonaws.com/freecodecamp/favicons/android-chrome-manifest.json") +link(rel="apple-touch-icon", sizes="114x114", href="https://s3.amazonaws.com/freecodecamp/favicons/apple-touch-icon-114x114.png") +link(rel="apple-touch-icon", sizes="120x120", href="https://s3.amazonaws.com/freecodecamp/favicons/apple-touch-icon-120x120.png") +link(rel="apple-touch-icon", sizes="144x144", href="https://s3.amazonaws.com/freecodecamp/favicons/apple-touch-icon-144x144.png") +link(rel="apple-touch-icon", sizes="152x152", href="https://s3.amazonaws.com/freecodecamp/favicons/apple-touch-icon-152x152.png") +link(rel="apple-touch-icon", sizes="180x180", href="https://s3.amazonaws.com/freecodecamp/favicons/apple-touch-icon-180x180.png") +link(rel="apple-touch-icon", sizes="57x57", href="https://s3.amazonaws.com/freecodecamp/favicons/apple-touch-icon-57x57.png") +link(rel="apple-touch-icon", sizes="60x60", href="https://s3.amazonaws.com/freecodecamp/favicons/apple-touch-icon-60x60.png") +link(rel="apple-touch-icon", sizes="72x72", href="https://s3.amazonaws.com/freecodecamp/favicons/apple-touch-icon-72x72.png") +link(rel="apple-touch-icon", sizes="76x76", href="https://s3.amazonaws.com/freecodecamp/favicons/apple-touch-icon-76x76.png") +link(rel="apple-touch-icon-precomposed", href="https://s3.amazonaws.com/freecodecamp/favicons/apple-touch-icon-precomposed.png") +link(rel="apple-touch-icon", href="https://s3.amazonaws.com/freecodecamp/favicons/apple-touch-icon.png") +link(rel="favicon", sizes="16x16", href="https://s3.amazonaws.com/freecodecamp/favicons/favicon-16x16.png") +link(rel="favicon", sizes="32x32", href="https://s3.amazonaws.com/freecodecamp/favicons/favicon-32x32.png") +link(rel="favicon", sizes="96x96", href="https://s3.amazonaws.com/freecodecamp/favicons/favicon-96x96.png") +link(rel="mstile", sizes="144x144", href="https://s3.amazonaws.com/freecodecamp/favicons/mstile-144x144.png") +link(rel="mstile", sizes="150x150", href="https://s3.amazonaws.com/freecodecamp/favicons/mstile-150x150.png") +link(rel="mstile", sizes="310x310", href="https://s3.amazonaws.com/freecodecamp/favicons/mstile-310x310.png") +link(rel="mstile", sizes="310x150", href="https://s3.amazonaws.com/freecodecamp/favicons/mstile-310x150.png") +link(rel="mstile", sizes="70x70", href="https://s3.amazonaws.com/freecodecamp/favicons/mstile-70x70.png") +link(rel="favicon", href="https://s3.amazonaws.com/freecodecamp/favicons/favicon.ico") link(rel='shortcut icon', href='//s3.amazonaws.com/freecodecamp/favicons/favicon.ico') \ No newline at end of file