diff --git a/README.md b/README.md index 6fb631d1..bd3bf15c 100755 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -TellForm +[](https://digitalocean.com/) ======== [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=UY555MCBZM722) @@ -14,7 +14,7 @@ TellForm is an *opensource alternative to TypeForm* built ontop of nodejs that c [See examples here](https://tellform.com/examples) ####Sponsored by -[](https://digitalocean.com/) +[](https://digitalocean.com/) [](https://getsentry.com/) [](https://statuspage.io/) [](https://stickermule.com/) diff --git a/app/controllers/core.server.controller.js b/app/controllers/core.server.controller.js index 267d33ae..e30c1a23 100755 --- a/app/controllers/core.server.controller.js +++ b/app/controllers/core.server.controller.js @@ -13,9 +13,8 @@ exports.index = function(req, res) { }; exports.form = function(req, res) { - console.log('\n\n\nRENDERING FORM\n\n\n'); - //Allow form to be embeded - res.removeHeader('X-Frame-Options'); + //Allow form to be embedded + res.set('X-Frame-Options', 'GOFORIT'); res.render('form', { user: req.user || null, diff --git a/app/controllers/users/users.authentication.server.controller.js b/app/controllers/users/users.authentication.server.controller.js index 3cb5974e..ccdc68fa 100755 --- a/app/controllers/users/users.authentication.server.controller.js +++ b/app/controllers/users/users.authentication.server.controller.js @@ -20,6 +20,7 @@ var config_nev = function () { var User = require('../../models/user.server.model'); + nev.configure({ persistentUserModel: User, tempUserCollection: config.tempUserCollection, @@ -30,7 +31,7 @@ var config_nev = function () { verifyMailOptions: { from: config.mailer.from, subject: 'Confirm your account', - html: '

Please verify your account by clicking this link. If you are unable to do so, copy and ' + + html: '

Please verify your account by clicking this link. If you are unable to do so, copy and ' + 'paste the following link into your browser:

${URL}

', text: 'Please verify your account by clicking the following link, or by copying and pasting it into your browser: ${URL}' }, @@ -86,7 +87,6 @@ exports.resendVerificationEmail = function(req, res, next){ } if (userFound){ - console.log('hello'); res.status(200).send('Verification email successfully Re-Sent'); }else { // user hasn't been found yet diff --git a/app/models/user.server.model.js b/app/models/user.server.model.js index 1cd700ab..a39a40ab 100755 --- a/app/models/user.server.model.js +++ b/app/models/user.server.model.js @@ -46,19 +46,19 @@ var UserSchema = new Schema({ type: String, trim: true, default: '', - validate: { + /*validate: { validator: validateLocalStrategyProperty, message: 'Please fill in your first name' - } + }*/ }, lastName: { type: String, trim: true, default: '', - validate: { + /*validate: { validator: validateLocalStrategyProperty, message: 'Please fill in your last name' - } + }*/ }, email: { type: String, diff --git a/app/views/form.server.view.html b/app/views/form.server.view.html index 4233f734..2e9f9fda 100644 --- a/app/views/form.server.view.html +++ b/app/views/form.server.view.html @@ -61,11 +61,11 @@ - diff --git a/public/modules/forms/admin/views/directiveViews/form/configure-form.client.view.html b/public/modules/forms/admin/views/directiveViews/form/configure-form.client.view.html index 52f5f982..a474bfe3 100644 --- a/public/modules/forms/admin/views/directiveViews/form/configure-form.client.view.html +++ b/public/modules/forms/admin/views/directiveViews/form/configure-form.client.view.html @@ -1,22 +1,21 @@
-
- - -
-
-
- - -
-
- + + +
+
-
+
{{ 'FORM_NAME' | translate }}
-
- +
-
+
{{ 'FORM_STATUS' | translate }}
-
+
-
- -
-
-
{{ 'GA_TRACKING_CODE' | translate }}
-
- -
- -
-
-
Language
-
+
Language
+
-  {{ 'YES' | translate }} - - - -
-
- -
-
-
Display Start Page?
-
- -
- - - - - -
-
+
+
+
+
{{ 'GA_TRACKING_CODE' | translate }}
+
+ +
+ +
+
+
+
+
{{ 'DISPLAY_FOOTER' | translate }}
+
+ +
+ + + +
+
+ +
+
+
Display Start Page?
+
+ +
+ + + + + +
+
+
-
- -
-
- -
+
+ +
+
+ +
diff --git a/public/modules/forms/admin/views/directiveViews/form/edit-form.client.view.html b/public/modules/forms/admin/views/directiveViews/form/edit-form.client.view.html index 9ed68310..b4de84de 100644 --- a/public/modules/forms/admin/views/directiveViews/form/edit-form.client.view.html +++ b/public/modules/forms/admin/views/directiveViews/form/edit-form.client.view.html @@ -1,7 +1,7 @@
-
+
diff --git a/public/modules/forms/admin/views/directiveViews/form/edit-submissions-form.client.view.html b/public/modules/forms/admin/views/directiveViews/form/edit-submissions-form.client.view.html index fab05cb3..3bb972f4 100644 --- a/public/modules/forms/admin/views/directiveViews/form/edit-submissions-form.client.view.html +++ b/public/modules/forms/admin/views/directiveViews/form/edit-submissions-form.client.view.html @@ -1,8 +1,5 @@
-
- Overview Analytics -
{{ 'TOTAL_VIEWS' | translate }} @@ -37,9 +34,6 @@ {{AverageTimeElapsed | secondsToDateTime | date:'mm:ss'}}
-
- Device Analytics -
{{ 'DESKTOP_AND_LAPTOP' | translate }} @@ -210,9 +204,6 @@
-
- Field Analytics -
@@ -247,9 +238,6 @@

-
- Responses Table -
- -   or  - {{ 'SIGNUP_BTN' | translate }} - +
+
+
+ +
+
+ +
+
+ Error: +
+
+ + +
+
+ + +
+
+ +
+
+ {{ 'FORGOT_PASSWORD_LINK' | translate }} +
-
- - + + +
+ +
+
+ {{ 'SIGNUP_ACCOUNT_LINK' | translate }} +
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 3bef57f6..6dcef334 100755 --- a/public/modules/users/views/authentication/signup-success.client.view.html +++ b/public/modules/users/views/authentication/signup-success.client.view.html @@ -1,4 +1,4 @@ -
diff --git a/public/modules/users/views/password/forgot-password.client.view.html b/public/modules/users/views/password/forgot-password.client.view.html index a2dd3ca3..6814471b 100755 --- a/public/modules/users/views/password/forgot-password.client.view.html +++ b/public/modules/users/views/password/forgot-password.client.view.html @@ -1,22 +1,27 @@ -
-

{{ 'PASSWORD_RESTORE_HEADER' | translate }}

-

{{ 'ENTER_YOUR_EMAIL' | translate }}

-
- +
+
+
+
+ +
+
+
+
+
+ +
+
+ +
+
+ {{error}} +
+
+ {{success}} +
+
+
+
+
diff --git a/public/modules/users/views/settings/change-password.client.view.html b/public/modules/users/views/settings/change-password.client.view.html index a2a077b3..a6144c04 100755 --- a/public/modules/users/views/settings/change-password.client.view.html +++ b/public/modules/users/views/settings/change-password.client.view.html @@ -1,4 +1,6 @@ -
+
+ +

Change your password