From 690046d20e72274b55868a253316255b11116945 Mon Sep 17 00:00:00 2001 From: Sahat Yalkabov Date: Mon, 3 Feb 2014 19:17:11 -0500 Subject: [PATCH 1/4] Fix line breaks --- LICENSE | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/LICENSE b/LICENSE index 63ce75ce796..f9ee1a1f6ab 100644 --- a/LICENSE +++ b/LICENSE @@ -2,8 +2,19 @@ The MIT License (MIT) Copyright (c) 2014 Sahat Yalkabov -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. From a06adf0c3c5d1b245e9263b8b51bb47b94dbceab Mon Sep 17 00:00:00 2001 From: Weston Platter Date: Mon, 3 Feb 2014 18:15:47 -0700 Subject: [PATCH 2/4] fixes #36 add a table of contents --- README.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/README.md b/README.md index 9babbbaa825..d4619b6eae1 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,23 @@ Sadly, there is no step-by-step wizard to configure the boilerplate code just fo ![Alt](https://lh5.googleusercontent.com/-KmlaMLKGCqg/UuWt4MrXzeI/AAAAAAAAD6o/KUucObo33zU/w1170-h860-no/Screenshot+2014-01-26+19.52.03.png) +Table of Contents +----------------- +- [Features](#features) +- [Prerequisites](#prerequisites) +- [Getting Started](#getting-started) +- [Obtaining API Keys](#obtaining-api-keys) +- [Project Structure](#project-structure) +- [Useful Tools](#use-tools) +- [Recommended Design](#recommended-design) +- [Recommended Node.js Libraries](#recommended-nodejs-libraries) +- [Recommended Client-Side libraries](#recommended-client-side-libraries) +- [Pro Tips](#pro-tips) +- [FAQ](#faq) +- [TODO](#todo) +- [Contributing](#contributing) +- [License](#license) + Features -------- - **Local Authentication** using Email and Password From 352624e8ff9853ca4bbfd031705a8c2fac671b6d Mon Sep 17 00:00:00 2001 From: Sahat Yalkabov Date: Mon, 3 Feb 2014 20:20:10 -0500 Subject: [PATCH 3/4] Update FAQ on deployment error --- README.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 9babbbaa825..69dbd86e34d 100644 --- a/README.md +++ b/README.md @@ -307,7 +307,6 @@ without minifying or concatenating. When you deploy your app, it will run in `pr **connect-assets** will automatically serve a single concatenated + minified `application.js`. For more information see [Sprockets-style concatenation](https://github.com/adunkman/connect-assets/#sprockets-style-concatenation) - ### I am getting MongoDB Connection Error, how do I fix it? That's a custom error message defined in `app.js` to indicate that there was a connection problem to MongoDB: ``` @@ -319,6 +318,12 @@ As the message says, you need to have a MongoDB server running before launching [mongodb.org/downloads](mongodb.org/downloads), or install it via a package manager ([Homebrew](http://brew.sh/) on Mac, **apt-get** on Ubuntu, **yum** on Fedora, etc.) +### I get an error when I deploy my app, why? +Chances are you haven't changed the *Dabatase URI* in `secrets.js`. If `db` is set to `localhost`, it will only work +on your machine as long as MongoDB is running. When you deploy to Heroku, OpenShift or some other provider, you will not have MongoDB +running on `localhost`. You need to create an account with [MongoLab](http://mongolab.com) or [MongoHQ](http://mongohq.com), then create a free tier database. See **Deployment** (coming soon) section for more information on how to +setup an account and a new database step-by-step with MongoLab. + ### Why Jade and not Handlebars template engine? When I first started this project I didn't have any experience with Handlebars. Since then I have worked on Ember.js apps and got myself familiar with the Handlebars syntax. While it is true Handlebars is easier, because it looks like good old HTML, I have no regrets picking Jade over Handlebars. First off, it's the default template engine in Express, so someone who has built Express apps in the past already knows it. Secondly, I find `extends` and `block` to be indispensable, which as far as I know, Handlebars does not have out of the box. And lastly, subjectively speaking, Jade looks much cleaner and shorter than Handlebars, or any non-HAML style for that matter. From 62a5edf3d194baba8c09cf6ef701555f7dc16898 Mon Sep 17 00:00:00 2001 From: Weston Platter Date: Mon, 3 Feb 2014 19:03:09 -0700 Subject: [PATCH 4/4] fix error on PR #45x --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d4619b6eae1..21f70cbb16c 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ Table of Contents - [Getting Started](#getting-started) - [Obtaining API Keys](#obtaining-api-keys) - [Project Structure](#project-structure) -- [Useful Tools](#use-tools) +- [Useful Tools](#useful-tools) - [Recommended Design](#recommended-design) - [Recommended Node.js Libraries](#recommended-nodejs-libraries) - [Recommended Client-Side libraries](#recommended-client-side-libraries)