From 552f4d8396289ffd73ad2e4a08ac4e29a8146d21 Mon Sep 17 00:00:00 2001 From: David Baldwynn <1160417+whitef0x0@users.noreply.github.com> Date: Mon, 6 Nov 2017 14:29:43 -0800 Subject: [PATCH 1/5] Update gitter.im links --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ce50b078..8039a69f 100755 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ TellForm 2.1.0 [![Build Status](https://travis-ci.org/tellform/tellform.svg?branch=master)](https://travis-ci.org/tellform/tellform) ![Project Status](https://img.shields.io/badge/status-2.1.0-green.svg) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/3491e86eb7194308b8fc80711d736ede)](https://www.codacy.com/app/david-baldwin/tellform?utm_source=github.com&utm_medium=referral&utm_content=tellform/tellform&utm_campaign=Badge_Grade) -[![Gitter](https://badges.gitter.im/tellform/tellform.svg)](https://gitter.im/tellform/tellform?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) +[![Gitter](https://badges.gitter.im/tellform/Lobby.svg)](https://gitter.im/tellform/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) > An *opensource alternative to TypeForm* that can create [stunning mobile-ready forms](https://tellform.com/examples) , surveys and questionnaires. @@ -201,7 +201,7 @@ TellForm's configuration is done with environment variables. To set an option fo ## Where to get help -[Gitter Chat](https://gitter.im/tellform/tellform) +[Gitter Chat](https://gitter.im/tellform/Lobby) [Official Twitter](https://twitter.com/tellform_real) From ed815f68e56efbd93be6febab2d720ecb374f8cd Mon Sep 17 00:00:00 2001 From: David Baldwynn <1160417+whitef0x0@users.noreply.github.com> Date: Mon, 6 Nov 2017 14:35:29 -0800 Subject: [PATCH 2/5] Update README.md --- README.md | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/README.md b/README.md index 8039a69f..4f5a35ce 100755 --- a/README.md +++ b/README.md @@ -119,14 +119,7 @@ Your application should run on port 3000 or the port you specified in your .env To deploy with docker, first install docker [here](https://docs.docker.com/engine/installation/). -Then run these commands - -``` -$ docker run -p 27017:27017 -d --name some-mongo mongo -$ docker run -p 127.0.0.1:6379:6379 -d --name some-redis redis -$ docker run --rm -p 3000:3000 --link some-redis:redis-db --link some-mongo:db -e "SUBDOMAINS_DISABLED=TRUE" -e "DISABLE_CLUSTER_MODE=TRUE" -e "MAILER_EMAIL_ID=" -e "MAILER_FROM=" -e "MAILER_SERVICE_PROVIDER=" -e "MAILER_PASSWORD=" -e "BASE_URL=localhost" -p 80:80 tellform/development -``` - +Then see this page [here](https://tellform.com/install_docker) for commands on how to deploy your own local TellForm instance. ## Testing Your Application You can run the full test suite included with TellForm with the test task: From 15398461219569091b8b84f0ac2eedda95a123eb Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Mon, 6 Nov 2017 17:55:43 -0500 Subject: [PATCH 3/5] fixed google analytics --- app/views/layout.server.view.pug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layout.server.view.pug b/app/views/layout.server.view.pug index 39ba97d5..44bf1b9d 100644 --- a/app/views/layout.server.view.pug +++ b/app/views/layout.server.view.pug @@ -52,7 +52,7 @@ html(lang='en', xmlns='http://www.w3.org/1999/xhtml') block content - script window.ga=function(){ga.q.push(arguments)};ga.q=[];ga.l=+new Date;ga('create','{{google_analytics_id}}','auto');ga('send','pageview') + script window.ga=function(){ga.q.push(arguments)};ga.q=[];ga.l=+new Date;ga('create','#{google_analytics_id}','auto');ga('send','pageview') script(src='https://www.google-analytics.com/analytics.js', async='', defer='') From 24cffeee3793cd36cf11bf93d821683aec6035be Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Wed, 8 Nov 2017 11:31:46 -0800 Subject: [PATCH 4/5] fixed problem with production assets --- config/env/production.js | 8 ++--- package-lock.json | 65 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 4 deletions(-) diff --git a/config/env/production.js b/config/env/production.js index 6519fd73..1091e91e 100755 --- a/config/env/production.js +++ b/config/env/production.js @@ -28,9 +28,9 @@ module.exports = { domain: process.env.BASE_URL || '.tellform.com' }, assets: { - bower_js: 'public/dist/vendor.min.js', - css: 'public/dist/application.min.css', - js: 'public/dist/application.min.js', - form_js: 'public/dist/form-application.min.js' + bower_js: ['public/dist/vendor.min.js'], + css: ['public/dist/application.min.css'], + js: ['public/dist/application.min.js', 'public/dist/populate_template_cache.js'], + form_js: ['public/dist/form-application.min.js', 'public/dist/form_populate_template_cache.js'] } }; diff --git a/package-lock.json b/package-lock.json index 413892bd..fcb91c18 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6261,6 +6261,14 @@ "jade": "1.11.0" } }, + "grunt-i18nlint": { + "version": "github:jwarby/grunt-i18nlint#6b398f775c8ca881a16f45a3cb94c5b79ee11e20", + "dev": true, + "requires": { + "chalk": "1.1.3", + "i18n-lint": "git://github.com/jwarby/i18n-lint.git#0a06373c0d880047ad680239c103d60ed414efc1" + } + }, "grunt-karma": { "version": "0.12.2", "resolved": "https://registry.npmjs.org/grunt-karma/-/grunt-karma-0.12.2.tgz", @@ -6881,6 +6889,48 @@ "sprintf-js": "1.1.1" } }, + "i18n-lint": { + "version": "git://github.com/jwarby/i18n-lint.git#0a06373c0d880047ad680239c103d60ed414efc1", + "dev": true, + "requires": { + "chalk": "1.1.3", + "commander": "2.8.1", + "glob": "5.0.15", + "htmlparser2": "3.8.3", + "lodash": "3.10.1", + "node.extend": "1.1.6" + }, + "dependencies": { + "glob": { + "version": "5.0.15", + "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", + "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=", + "dev": true, + "requires": { + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, + "lodash": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", + "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=", + "dev": true + }, + "minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "dev": true, + "requires": { + "brace-expansion": "1.1.8" + } + } + } + }, "iconv-lite": { "version": "0.2.11", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz", @@ -7065,6 +7115,12 @@ "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.0.5.tgz", "integrity": "sha1-X6eM8wG4JceKvDBC2BJyMEnqI8c=" }, + "is": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/is/-/is-3.2.1.tgz", + "integrity": "sha1-0Kwq1V63sL7JJqUmb2xmKqqD3KU=", + "dev": true + }, "is-arrayish": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", @@ -9174,6 +9230,15 @@ "resolved": "https://registry.npmjs.org/nocache/-/nocache-2.0.0.tgz", "integrity": "sha1-ICtIAhoMTL3i34DeFaF0Q8i0OYA=" }, + "node.extend": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/node.extend/-/node.extend-1.1.6.tgz", + "integrity": "sha1-p7iCyC1sk6SGOlUEvV3o7IYli5Y=", + "dev": true, + "requires": { + "is": "3.2.1" + } + }, "nodemailer": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-4.0.1.tgz", From 084a8005fd038ea537402ae917541068541454fb Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Sat, 11 Nov 2017 19:56:41 -0800 Subject: [PATCH 5/5] fixed form vendor files --- .gitignore | 5 +---- config/env/production.js | 3 +-- gruntfile.js | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 32e21df3..01fc19d8 100755 --- a/.gitignore +++ b/.gitignore @@ -1,14 +1,10 @@ dist .vagrant npm-debug.* -docs/Oscar_Credentials.md scripts/test_oscarhost.js -scripts/oscarhost/private/ coverage/ e2e_coverage/ -uploads/ app/e2e_tests/screeshots/* -tmp # iOS / Apple # =========== @@ -25,6 +21,7 @@ Oscar_Credentials.* npm-debug.log node_modules/ public/lib/ +public/dist app/tests/coverage/ .bower-*/ .idea/ diff --git a/config/env/production.js b/config/env/production.js index 1091e91e..0f8a72a5 100755 --- a/config/env/production.js +++ b/config/env/production.js @@ -28,9 +28,8 @@ module.exports = { domain: process.env.BASE_URL || '.tellform.com' }, assets: { - bower_js: ['public/dist/vendor.min.js'], css: ['public/dist/application.min.css'], js: ['public/dist/application.min.js', 'public/dist/populate_template_cache.js'], - form_js: ['public/dist/form-application.min.js', 'public/dist/form_populate_template_cache.js'] + form_js: ['public/dist/form-application.min.js', 'public/dist/form_populate_template_cache.js', 'public/dist/form-vendor.min.js'] } }; diff --git a/gruntfile.js b/gruntfile.js index 5fc30add..82f510f9 100755 --- a/gruntfile.js +++ b/gruntfile.js @@ -123,7 +123,7 @@ module.exports = function(grunt) { compress: true }, files: { - 'public/dist/vendor.min.js': bowerArray + 'public/dist/form-vendor.min.js': bowerArray } } },