Asi 15 04 bug fixes (#306)

* last commit

* latest check

* new db migrations and updated passport

* login with drupal support

* add the rest, and lint

* GUI changes

* not sure how does res reach here

* that cache again

* cleanup

* remove code duplication

* fix lint

* adding error handling

* pass the error handling on

* fixed constants.js

* tmp disable travis cache for node_modules

* Update passport.js

* update to latest

* adding test special case

* no yoda notation for me T_T

* Update main_routes.test.js

* dddd

* update test-user and raise timeout

* update test-user and omit some test logic to adjust to new bizlogic of login

* changed the test user no need for mock anymore

* remove underscore

* updated imported csv to new members_camp

* commit changes

* d

* fixed the validated sign

* some fixes, adding the EVENT_ID

* removed the campDetails from all places.
fixed one insert and update.
update on new camp the event_id

* fix for eslint

* fixes

* fixed for eslint

* local commit

* added enabled status

* refine

* Merge branch 'master' of https://github.com/Midburn/Spark

* camps route fix

* Revert "camps route fix"

This reverts commit d926484.

* basic members implementation

* bug fix

* add member form

* removed unnecessary function call

* fixed several small issues, with getUserCamps functions, moving the functionality from API to the User model.

* fixed several small issues, with getUserCamps functions, moving the functionality from API to the User model.

* manually loaded api_camps_route

* test

* fix

* sdfsadf

* change activity time to multi select

* lilach location fixes

* improve contact person dropdown display

* facebook link size fix

* data validation

* lint

* Changed the API commands for join & join_deliver to work with the model commands.

* fix lint issues

* added option to remove approve new members

* lint

* fixed some bugs with getUserCamps and fix security issues.

* ui fixes

* commit passport + approve

* ddd

* changes

* join camp is according to lang

* FB link doesn't get too long

* translation fixes

* added approve join request btn

* added email templates

* comit local changes

* changes of field names for members

* typo fix

* updated the join camp flow, and tested

* lint shit

* lint shit

* fixes the join system, and several bug fix

* lint shit

* finalized the join flow
several bug was removed.
still having angular issue, need to be found.

* removed junk

* lint

* fixes issues before production, also import bugs.

* show contact information good

* d

* changes for lint

* small issues

* fixed the cancel user request
fixed some small security issues with users
removed automatic fetch from camps_v2
added language string for all status code.

* lint shit

* Introduced the camp __prototype to use for other camp types.
fixed the camp_location_area

* fixing all hebrew titles
fixed who am i
introduced the camp_type schema

* lint shit

* changes

* fixes split issue

* template api_gate

* fixed the members add, for admin
show all camps

* lint

* fixed mail delivery to join request

* lint

* refactoring edit + new, to fix foreign key, and adding fields to edit only for admin

* fixed add new camp, and adding default member.
todo:
after success update, forward to edit camp
check if camp_name hebrew + english are not empty
change selection of camp manager to be select2 input

* lint

* lint

* lint

* lint fixes

* lint

* latest fixes

* Fixes:
1. Date format is changed to suit mysql format.
2. Now we receiving ticket information
3. Bug fix of join camp
4. spark link to support page fixed
5. added birth_date, and showing camp info on whoami only if approved

* lint

* trying to fix the tests

* travis

* Update admin_routes.test.js

* ffff

* remved problem tests

* fixed a lot of GUI stuff:
1. Dispaly of camp desc will show also linking URL.
2. Display of camp desc will show in the formatted text.
3. Updated translation strings, where was default
4. on members list, changed buttons with description instead of just icons.

* eslint

* added camp_manager, camp information to email

* fixed NPO form, to include english

* Issue #278
Issue #277

* Add 1st sanity test

* Rename npm target

* Add pending test for 'forgot password' page

* Fixed MIDBURN2017 Tickets type on constants

* refactor emailValidate function to the common

* Fixing of all emails, with the info inside.

* API Gate route fixes

* lint

* fixing small bugs with gui

* lint check

* updated package.json version

* v2.2.2

knexfile.js

@@ -1,44 +1,9 @@
-// Update with your config settings.
+var config = require('config');
+var dbConfig = config.get('database');
 
 module.exports = {
-
-  development: {
-    client: 'sqlite3',
-    connection: {
-      filename: './dev.sqlite3'
-    }
-  },
-
-  staging: {
-    client: 'postgresql',
-    connection: {
-      database: 'my_db',
-      user:     'username',
-      password: 'password'
-    },
-    pool: {
-      min: 2,
-      max: 10
-    },
-    migrations: {
-      tableName: 'knex_migrations'
-    }
-  },
-
-  production: {
-    client: 'postgresql',
-    connection: {
-      database: 'my_db',
-      user:     'username',
-      password: 'password'
-    },
-    pool: {
-      min: 2,
-      max: 10
-    },
-    migrations: {
-      tableName: 'knex_migrations'
-    }
-  }
-
-};
+    client: dbConfig.client,
+    connection: dbConfig,
+    debug: dbConfig.debug,
+    useNullAsDefault: true
+};

package.json

@@ -5,19 +5,14 @@
     "this is part of the deployment proess, so it is important to update the version number",
     "version name corresponds to the github release name / tag name - https://github.com/Midburn/Spark/releases"
   ],
-  "version": "2.0.0",
+  "version": "2.2.2",
   "private": true,
   "scripts": {
     "postinstall": "bower install",
     "start": "node server.js",
     "pretest": "npm run lint",
-    "test": "npm run unit && npm run e2e",
-    "unit": "cross-env SPARK_DB_FILENAME=test.sqlite3 npm run unittestcore",
-    "testclean": "rimraf test.sqlite3 && knex migrate:latest",
-    "preunittestcore": "npm run testclean",
-    "unittestcore": "mocha \"routes/*test.js\" ",
-    "pree2e": "npm run testclean",
-    "e2e": "mocha test/e2e -u bdd -R spec",
+    "test": "cross-env SPARK_DB_FILENAME=test.sqlite3 npm run testcore",
+    "testcore": "rimraf test.sqlite3 && knex migrate:latest && mocha \"tests/**/*test.js\" ",
     "//devops": "Generic deployment / devops commands, used from .travis.yml, see /docs/development/releases-and-deployment.md",
     "//log": "send a generic log notification to slack",
     "log": "curl -X POST -g $npm_config_webhook --data-urlencode 'payload={\"channel\": \"'\"#${npm_config_channel:-sparksystem-log}\"'\", \"username\": \"'\"${npm_config_username:-bot}\"'\", \"text\": \"'\"${npm_config_text}\"'\", \"icon_emoji\": \"'\"${npm_config_emoji:-ghost}\"'\"}'",
@@ -28,7 +23,7 @@
     "//download": "download a deployment package from private slack url",
     "download": "curl -H \"Authorization: Bearer ${npm_config_token}\" -g \"${npm_config_url}\" -o \"${npm_config_file}\"",
     "//deploy": "prepare the directory of an extracted deployment package",
-    "deploy": "echo SPARK_DEPLOYMENT_TIME=\\\"$(date \"+%F %T\")\\\" >> .env",
+    "deploy": "echo SPARK_DEPLOYMENT_TIME=\\\"$(date\"+%F%T\")\\\" >> .env",
     "//lint": "runs static analysis using eslint",
     "lint": "./node_modules/.bin/eslint ."
   },
@@ -102,9 +97,8 @@
     "eslint-plugin-promise": "^3.5.0",
     "eslint-plugin-standard": "^2.1.1",
     "mocha": "^3.2.0",
-     "nock": "^9.0.13",
+    "nock": "^9.0.13",
     "rimraf": "2.6.1",
-    "should": "^11.2.1",
     "supertest": "^2.0.1"
   }
 }