diff --git a/README.md b/README.md index baa91ef3..f727196f 100755 --- a/README.md +++ b/README.md @@ -90,13 +90,15 @@ Edit the 'env' config in gruntfile.js to make sure your .env file is being used. To run development version: -```$ grunt default``` +Set ```NODE_ENV=development``` in .env file +```$ grunt```` To run production version: -```$ grunt production``` +Set ```NODE_ENV=development``` in .env file +```$ grunt```` -Your application should run on port 3000, so in your browser just go to [http://localhost:3000](http://localhost:3000) +Your application should run on port 3000 or the port you specified in your .env file, so in your browser just go to [http://localhost:3000](http://localhost:3000) ## Testing Your Application @@ -149,3 +151,16 @@ After you've generated the key and certificate, place them in the *config/sslcer ## Credits Inspired/built off the great work of the [MeanJS team](https://github.com/mean/). +## Mentions on the Web + +[t3n.de](http://t3n.de/news/open-source-alternative-typeform-tellform-707295/) + +[BootCSS Expo](http://expo.bootcss.com/) + +[Product Hunt](https://www.producthunt.com/tech/tellform) + +[Hacker News Post](https://news.ycombinator.com/item?id=11711095) + +[Reddit Posts](https://www.reddit.com/domain/tellform.com/) + + diff --git a/app/controllers/forms.server.controller.js b/app/controllers/forms.server.controller.js index fc52cbb1..a117a3dc 100644 --- a/app/controllers/forms.server.controller.js +++ b/app/controllers/forms.server.controller.js @@ -362,13 +362,11 @@ exports.list = function(req, res) { * Form middleware */ exports.formByID = function(req, res, next, id) { - if (!mongoose.Types.ObjectId.isValid(id)) { return res.status(400).send({ message: 'Form is invalid' }); - } - else { + } else { Form.findById(id).populate('admin').exec(function(err, form) { if (err) { return next(err); diff --git a/app/routes/forms.server.routes.js b/app/routes/forms.server.routes.js index d515338c..4ba1ab4d 100644 --- a/app/routes/forms.server.routes.js +++ b/app/routes/forms.server.routes.js @@ -29,10 +29,14 @@ module.exports = function(app) { app.route('/upload/pdf') .post(users.requiresLogin, upload.single('file'), forms.uploadPDF); - //TODO: Need to finish this + //TODO: Need to finish this for file upload field //app.route('/forms/:formId([a-zA-Z0-9]+)/upload') // .post(forms.uploadSubmissionFile); + app.route('/forms') + .get(users.requiresLogin, forms.list) + .post(users.requiresLogin, forms.create); + app.route('/forms/:formId([a-zA-Z0-9]+)') .get(forms.read) .post(forms.createSubmission) diff --git a/app/routes/users.server.routes.js b/app/routes/users.server.routes.js index b8b0eed2..631f75c8 100755 --- a/app/routes/users.server.routes.js +++ b/app/routes/users.server.routes.js @@ -27,6 +27,7 @@ module.exports = function(app) { // Setting up the users authentication api if(!config.signupDisabled) { + console.log('signupDisabled'); app.route('/auth/signup').post(users.signup); } app.route('/auth/signin').post(users.signin); diff --git a/app/views/layout.server.view.html b/app/views/layout.server.view.html index eb4691ba..f90b12b5 100755 --- a/app/views/layout.server.view.html +++ b/app/views/layout.server.view.html @@ -100,16 +100,10 @@ {% endif %} + +
-
-
-
- - -
-
+ +
+
+ +
+ + +
+ +
-
- +
-
- -press ENTER - -
+
+ {{form_fields_count - (myform | formValidity)}} answer(s) need completing +
+ + + + + +
-
- -
- Forgot your password? + Forgot your password?
  or  - Sign upSign up
diff --git a/public/modules/users/views/authentication/signup-success.client.view.html b/public/modules/users/views/authentication/signup-success.client.view.html index 63827fef..badc64af 100755 --- a/public/modules/users/views/authentication/signup-success.client.view.html +++ b/public/modules/users/views/authentication/signup-success.client.view.html @@ -26,11 +26,11 @@

-

Before you continue, make sure to check your email for our verification. If you don't receive it within 24h drop us a line at hi@TellForm.com

+

Before you continue, make sure to check your email for our verification. If you don't receive it within 24h drop us a line at polydaic@gmail.com

- \ No newline at end of file + diff --git a/public/modules/users/views/verify/resend-verify-email.client.view.html b/public/modules/users/views/verify/resend-verify-email.client.view.html index 427276e2..584f04ca 100644 --- a/public/modules/users/views/verify/resend-verify-email.client.view.html +++ b/public/modules/users/views/verify/resend-verify-email.client.view.html @@ -30,7 +30,7 @@

A verification email has been sent to {{username}}.
But your account is still not activated yet

-

Check your email and click on the activation link to activate your account. If you have any questions drop us a line at hi@TellForm.com

+

Check your email and click on the activation link to activate your account. If you have any questions drop us a line at polydaic@gmail.com

- \ No newline at end of file +