Merge pull request #69 from Human-Connection/develop

update master

Author: appinteractive

config/default.json

@@ -5,9 +5,10 @@
   "frontURL": "http://localhost:3000",
   "public": "../public/",
   "debug": true,
+  "logLevel": "log",
   "paginate": {
     "default": 10,
-    "max": 50
+    "max": 100
   },
   "thumbor": {
     "url": "",

config/production.json

@@ -5,6 +5,7 @@
   "frontURL": "WEBAPP_BASE_URL",
   "mongodb": "MONGO_DB",
   "debug": true,
+  "logLevel": "warn",
   "smtpConfig": {
     "host": "SMTP_HOST",
     "port": 587,

package.json

@@ -39,7 +39,8 @@
     "start": "concurrently 'mongod' 'wait-on tcp:27017 && NODE_ENV=production node server/'",
     "start:win": "concurrently \"mongod\" \"wait-on tcp:27017 &&SET NODE_ENV=production&& node server/\"",
     "dev:debug": "npm run clear && concurrently '$npm_package_config_mongoDev' 'wait-on tcp:27017 && NODE_ENV=development nodemon --inspect server/'",
-    "dev": "npm run clear && concurrently '$npm_package_config_mongoDev' 'wait-on tcp:27017 && NODE_ENV=development DEBUG=feathers nodemon server/'",
+    "dev": "npm run clear && concurrently '$npm_package_config_mongoDev' 'wait-on tcp:27017 && NODE_ENV=development nodemon server/'",
+    "dev:local": "sh scripts/run-local.sh",
     "dev:noseed": "concurrently 'mongod --dbpath data' 'wait-on tcp:27017 && NODE_ENV=development DEBUG=feathers nodemon server/'",
     "dev:win": "npm run clear && concurrently \"mongod --dbpath /data/db\" \"wait-on tcp:27017&&cross-env NODE_ENV=development&&cross-env DEBUG=feathers&& nodemon --inspect server/\"",
     "mocha": "npm run clear && $npm_package_config_concurrently '$npm_package_config_mongoDev &>/dev/null' 'wait-on tcp:27017 && NODE_ENV=test $npm_package_config_mocha'",
@@ -111,7 +112,6 @@
     "istanbul": "1.1.0-alpha.1",
     "mocha": "~5.2.0",
     "nodemon": "~1.17.4",
-    "shx": "^0.2.2",
     "wait-on": "~2.1.0"
   }
 }

public/img/badges/fundraisingbox_de_baloon.svg renamed to public/img/badges/fundraisingbox_de_balloon.svg

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+# start app on the local network
+LOCAL_IP=$(ifconfig | grep -Eo 'inet (addr:)?([0-9]*\.){3}[0-9]*' | grep -Eo '([0-9]*\.){3}[0-9]*' | grep -v '127.0.0.1');
+env API_HOST=$LOCAL_IP env WEBAPP_BASE_URL=http://$LOCAL_IP:3000 env API_BASE_URL=http://$LOCAL_IP:3030 env THUMBOR_URL=http://$LOCAL_IP:8888 yarn dev

scripts/run-local.sh

@@ -100,7 +100,7 @@ module.exports = {
         city: faker.address.city(),
         zipCode: faker.address.zipCode(),
         street: faker.address.streetAddress(),
-        country: faker.address.country(),
+        country: faker.address.countryCode(),
         lat: 54.032726 - (Math.random() * 10),
         lng: 6.558838 + (Math.random() * 10)
       });

server/helper/seed-helpers.js

@@ -4,35 +4,53 @@
 
 const sanitizeHtml = require('sanitize-html');
 const trunc = require('trunc-html');
+const { getByDot, setByDot } = require('feathers-hooks-common');
+const { isEmpty } = require('lodash');
 
 const sanitizeOptions = {
-  allowedTags: [ 'br' ]
+  allowedTags: ['p', 'br', 'a', 'span', 'blockquote'],
+  allowedAttributes: {
+    a: ['href', 'class', 'target', 'data-*' , 'contenteditable'],
+    span: ['contenteditable', 'class', 'data-*']
+  },
 };
 
 module.exports = function (options = {}) { // eslint-disable-line no-unused-vars
   return function (hook) {
 
     options = Object.assign({ length: 120, field: 'content' }, options);
 
-    if(!hook.data || !hook.data[options.field]) {
+    let content = getByDot(hook.data, options.field);
+
+    if(!hook.data || isEmpty(content)) {
       return hook;
     }
 
     try {
       /* eslint no-use-before-define: 0 */  // --> OFF
-      const content = sanitizeHtml(hook.data[options.field], sanitizeOptions)
+      let contentSanitized = sanitizeHtml(content, sanitizeOptions)
       .replace(/\<br\s*\>|\<br\s*\/\>/ig, "\n")
       .replace(/(\ ){2,}/ig, ' ')
       .trim();
-      hook.data[`${options.field}Excerpt`] = trunc(content, options.length, {
-        ignoreTags: ['img', 'script', 'iframe']
-      }).html;
+
+      contentBefore = trunc(content, 9999999999);
+      const contentTruncated = trunc(contentSanitized, options.length);
+      hook.app.debug('contentBefore');
+      hook.app.debug(contentBefore.text.length);
+      hook.app.debug('contentTruncated');
+      hook.app.debug(contentTruncated.text.length);
+
+      const hasMore = contentBefore.text.length > (contentTruncated.text.length + 20);
+      setByDot(hook.data, 'hasMore', hasMore);
+
+      // set excerpt
+      setByDot(hook.data, `${options.field}Excerpt`, hasMore ? contentTruncated.html : content.replace(/(\ ){2,}/ig, ' '))
     } catch (err) {
-      throw new Error('Text content needed!');
+      throw new Error(err);
     }
-    hook.data[options.field] = hook.data[options.field]
-      .replace(/(\ ){2,}/ig, ' ')
+    // trim content
+    setByDot(hook.data, options.field, content.replace(/(\ ){2,}/ig, ' '));
 
-    return Promise.resolve(hook);
+    return hook;
   };
 };

server/hooks/create-excerpt.js

@@ -3,8 +3,10 @@ const slug = require('slug');
 const getUniqueSlug = require('../helper/get-unique-slug');
 const { isEmpty } = require('lodash');
 
-module.exports = function (options = { field: null, overwrite: false, unique: true }) {
+module.exports = function (options = {}) {
   return function (hook) {
+    options = Object.assign({ field: null, overwrite: false, unique: true }, options);
+
     if (!options.field || !hook.data[options.field]) return hook;
 
     // do not overwrite existing slug

server/hooks/create-slug.js

@@ -15,7 +15,7 @@ module.exports = function (upsertQuery) {
     }
 
     params.mongoose = Object.assign({}, params.mongoose, { upsert: true });
-    params.query = upsertQuery(context); // { address: '123' }
+    params.query = upsertQuery(context);
 
     return service.patch(null, data, params)
       .then(result => {

server/hooks/map-create-to-upsert.js

@@ -2,10 +2,11 @@ const { createLogger, format, transports } = require('winston');
 const env = process.env.NODE_ENV;
 
 const logger = createLogger({
-  level: 'warn',
+  level: env !== 'production' ? 'warn' : 'debug',
   format: format.json(),
   transports: [
     new transports.File({ filename: './data/error.log', level: 'error' }),
+    new transports.File({ filename: './data/debug.log', level: 'debug' }),
     new transports.File({ filename: './data/combined.log' })
   ]
 });
@@ -22,6 +23,6 @@ logger.add(new transports.Console({
       return `${levelColors[info.level]}${date.toLocaleTimeString()} | ${info.level}: ${JSON.stringify(info.message)}\u001b[39m`;
     })
   ),
-  level: env === 'development' || 'test' ? 'debug' : 'warn'
+  level: env === 'development' ? 'debug' : 'warn'
 }));
 module.exports = logger;