From 0fd818eeba3d97ab78652601de91e808bf94084f Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Wed, 8 Jun 2016 17:05:58 -0700 Subject: [PATCH 01/13] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 8405b998..baf5b889 100755 --- a/README.md +++ b/README.md @@ -27,6 +27,7 @@ TellForm is an *opensource alternative to TypeForm* built ontop of nodejs that c ###Currently following features are implemented: -User login system to manage forms + -Multi-Language Support -User CRUD -Form CRUD -11 possible types of form fields @@ -38,7 +39,7 @@ TellForm is an *opensource alternative to TypeForm* built ontop of nodejs that c -Drag and drop functionality to editing form field order -Viewable form submissions -Google Analytics Support - -In-app Analytics (dropoff rate of fields, conversion rate, etc) + -In-app Form Submission Analytics (dropoff rate of fields, conversion rate, etc) ###TODO: -Implement encryption for all form data From b5f13354b5f855f9cbb796a237eb0bc6d1a1abc1 Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Wed, 8 Jun 2016 17:07:57 -0700 Subject: [PATCH 02/13] fixed npm install for testing --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 3fbf0bbd..a987a018 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,8 @@ "scripts": { "start": "grunt", "test": "grunt test && grunt coveralls", - "postinstall": "bower install --config.interactive=false; grunt build; node scripts/setup.js;" + "setup": "node scripts/setup.js;", + "postinstall": "bower install --config.interactive=false; grunt build;" }, "dependencies": { "async": "^1.4.2", From 4e0bef6a92c449f1a4bceb7cddc546027aae1d98 Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Wed, 8 Jun 2016 21:19:18 -0700 Subject: [PATCH 03/13] finished translation --- public/modules/forms/base/config/i18n/english.js | 2 +- public/modules/forms/base/config/i18n/french.js | 2 +- public/modules/forms/base/config/i18n/german.js | 10 +++++----- public/modules/forms/base/config/i18n/italian.js | 10 +++++----- public/modules/forms/base/config/i18n/spanish.js | 8 ++++---- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/public/modules/forms/base/config/i18n/english.js b/public/modules/forms/base/config/i18n/english.js index d7fd4cc5..928b476f 100644 --- a/public/modules/forms/base/config/i18n/english.js +++ b/public/modules/forms/base/config/i18n/english.js @@ -27,7 +27,7 @@ angular.module('forms').config(['$translateProvider', function ($translateProvid DELETE: 'Delete', CANCEL: 'Cancel', SUBMIT: 'Submit', - UPLOAD_FILE: 'Upload your File', + UPLOAD_FILE: 'Upload your File' }); $translateProvider.preferredLanguage('english') diff --git a/public/modules/forms/base/config/i18n/french.js b/public/modules/forms/base/config/i18n/french.js index 60b2242b..3ec32b2e 100644 --- a/public/modules/forms/base/config/i18n/french.js +++ b/public/modules/forms/base/config/i18n/french.js @@ -29,7 +29,7 @@ angular.module('forms').config(['$translateProvider', function ($translateProvid SUBMIT: 'Enregistrer', UPLOAD_FILE: 'Envoyer un fichier', Y: 'O', - N: 'N', + N: 'N' }); }]); diff --git a/public/modules/forms/base/config/i18n/german.js b/public/modules/forms/base/config/i18n/german.js index c9f5c33f..7c54157f 100644 --- a/public/modules/forms/base/config/i18n/german.js +++ b/public/modules/forms/base/config/i18n/german.js @@ -6,8 +6,8 @@ angular.module('forms').config(['$translateProvider', function ($translateProvid FORM_SUCCESS: 'Ihre Angaben wurden gespeichert.', REVIEW: 'Unvollständig', BACK_TO_FORM: 'Zurück zum Formular', - EDIT_FORM: '', - CREATE_FORM: '', + EDIT_FORM: 'Bearbeiten Sie diese TellForm', + CREATE_FORM: 'Erstellen Sie eine TellForm', ADVANCEMENT: '{{done}} von {{total}} beantwortet', CONTINUE_FORM: 'Zum Formular', REQUIRED: 'verpflichtend', @@ -22,14 +22,14 @@ angular.module('forms').config(['$translateProvider', function ($translateProvid NO: 'Nein', NEWLINE: 'Für eine neue Zeile SHIFT+ENTER drücken', CONTINUE: 'Weiter', - LEGAL_ACCEPT: 'I accept', - LEGAL_NO_ACCEPT: 'I don’t accept', + LEGAL_ACCEPT: 'Ich akzeptiere', + LEGAL_NO_ACCEPT: 'Ich akzeptiere nicht', DELETE: 'Entfernen', CANCEL: 'Canceln', SUBMIT: 'Speichern', UPLOAD_FILE: 'Datei versenden', Y: 'J', - N: 'N', + N: 'N' }); }]); diff --git a/public/modules/forms/base/config/i18n/italian.js b/public/modules/forms/base/config/i18n/italian.js index 4cf28622..17b6f7fc 100644 --- a/public/modules/forms/base/config/i18n/italian.js +++ b/public/modules/forms/base/config/i18n/italian.js @@ -6,8 +6,8 @@ angular.module('forms').config(['$translateProvider', function ($translateProvid FORM_SUCCESS: 'Il formulario è stato inviato con successo!', REVIEW: 'Incompleto', BACK_TO_FORM: 'Ritorna al formulario', - EDIT_FORM: '', - CREATE_FORM: '', + EDIT_FORM: 'Modifica questo Tellform', + CREATE_FORM: 'Creare un TellForm', ADVANCEMENT: '{{done}} su {{total}} completate', CONTINUE_FORM: 'Vai al formulario', REQUIRED: 'obbligatorio', @@ -22,14 +22,14 @@ angular.module('forms').config(['$translateProvider', function ($translateProvid NO: 'No', NEWLINE: 'premere SHIFT+INVIO per creare una nuova linea', CONTINUE: 'Continua', - LEGAL_ACCEPT: 'I accept', - LEGAL_NO_ACCEPT: 'I don’t accept', + LEGAL_ACCEPT: 'Accetto', + LEGAL_NO_ACCEPT: 'Non accetto', DELETE: 'Cancella', CANCEL: 'Reset', SUBMIT: 'Registra', UPLOAD_FILE: 'Invia un file', Y: 'S', - N: 'N', + N: 'N' }); }]); diff --git a/public/modules/forms/base/config/i18n/spanish.js b/public/modules/forms/base/config/i18n/spanish.js index 76e928ca..ae29d774 100644 --- a/public/modules/forms/base/config/i18n/spanish.js +++ b/public/modules/forms/base/config/i18n/spanish.js @@ -6,8 +6,8 @@ angular.module('forms').config(['$translateProvider', function ($translateProvid FORM_SUCCESS: '¡El formulario ha sido enviado con éxito!', REVIEW: 'Revisar', BACK_TO_FORM: 'Regresar al formulario', - EDIT_FORM: '', - CREATE_FORM: '', + EDIT_FORM: 'Crear un TellForm', + CREATE_FORM: 'Editar este TellForm', ADVANCEMENT: '{{done}} de {{total}} contestadas', CONTINUE_FORM: 'Continuar al formulario', REQUIRED: 'Información requerida', @@ -22,8 +22,8 @@ angular.module('forms').config(['$translateProvider', function ($translateProvid NO: 'No', NEWLINE: 'presione SHIFT+INTRO para crear una nueva línea', CONTINUE: 'Continuar', - LEGAL_ACCEPT: 'I accept', - LEGAL_NO_ACCEPT: 'I don’t accept', + LEGAL_ACCEPT: 'Acepto', + LEGAL_NO_ACCEPT: 'No acepto', DELETE: 'Eliminar', CANCEL: 'Cancelar', SUBMIT: 'Registrar', From e8a1d464088bb5da8d2e00ae926260c414ec0c0e Mon Sep 17 00:00:00 2001 From: Adrian Portabales Date: Sat, 11 Jun 2016 13:56:26 +0200 Subject: [PATCH 04/13] Edit setup.js with exit when already exist .env --- scripts/setup.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/setup.js b/scripts/setup.js index b70ebe32..51a4ea3a 100644 --- a/scripts/setup.js +++ b/scripts/setup.js @@ -219,4 +219,7 @@ if(!fs.existsSync('./\.env')) { console.log(chalk.green('Have fun using TellForm!')); } }); +}else{ + console.log(chalk.red('You already have a .env file')); + process.exit(1); } From b939715496d8acf1a31366fff07542130189ac44 Mon Sep 17 00:00:00 2001 From: Adrian Portabales Date: Sat, 11 Jun 2016 13:57:41 +0200 Subject: [PATCH 05/13] Edit setup.js with exit when already exist .env --- scripts/setup.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/setup.js b/scripts/setup.js index 51a4ea3a..73af6049 100644 --- a/scripts/setup.js +++ b/scripts/setup.js @@ -219,7 +219,7 @@ if(!fs.existsSync('./\.env')) { console.log(chalk.green('Have fun using TellForm!')); } }); -}else{ +}else{ console.log(chalk.red('You already have a .env file')); process.exit(1); } From a28e0ef0f13cf6da26e0ee45fdf6c168e41d8908 Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Wed, 15 Jun 2016 15:05:56 -0700 Subject: [PATCH 06/13] fixed generateTempUserModel --- .../users/users.authentication.server.controller.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/controllers/users/users.authentication.server.controller.js b/app/controllers/users/users.authentication.server.controller.js index 8a89a8d5..5e1ca1ee 100755 --- a/app/controllers/users/users.authentication.server.controller.js +++ b/app/controllers/users/users.authentication.server.controller.js @@ -53,7 +53,9 @@ var config_nev = function () { if(err) throw err; }); - nev.generateTempUserModel(User); + nev.generateTempUserModel(User, function(err){ + if(err) throw err; + }); }; config_nev(); From 38f9aba54c17beae1f13fb435c6ebb65fbd821c0 Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Wed, 15 Jun 2016 15:28:27 -0700 Subject: [PATCH 07/13] fixed navbar toggle button css --- public/modules/core/css/core.css | 3 +++ .../core/views/header.client.view.html | 4 +-- .../forms/base/config/forms.client.config.js | 27 ------------------- 3 files changed, 4 insertions(+), 30 deletions(-) diff --git a/public/modules/core/css/core.css b/public/modules/core/css/core.css index 12f6b6b9..55fbded2 100755 --- a/public/modules/core/css/core.css +++ b/public/modules/core/css/core.css @@ -42,6 +42,9 @@ body { background-color: #ddd; border:none; } +.navbar-inverse .navbar-toggle:hover, .navbar-inverse .navbar-toggle:focus { + color: white; +} .navbar-inverse .navbar-collapse{ border: none; } diff --git a/public/modules/core/views/header.client.view.html b/public/modules/core/views/header.client.view.html index c1a1505b..1164dee2 100755 --- a/public/modules/core/views/header.client.view.html +++ b/public/modules/core/views/header.client.view.html @@ -3,9 +3,7 @@