Merge pull request #121 from bitholla/develop

HollaEx Kit v1.4.0

Author: kycfeel

Dockerfile

@@ -14,7 +14,7 @@ COPY ./db/models /app/db/models
 
 EXPOSE 10011
 
-RUN npm install -g nodemon && \ 
+RUN npm install -g nodemon --loglevel=error && \ 
     cd plugins && npm install --loglevel=error && \
     for d in ./*/ ; do (cd "$d" && npm install --loglevel=error); done && \
     cd /app/mail && npm install --loglevel=error

mail/templates/helpers/common.js

@@ -57,7 +57,7 @@ const RTL = 'direction: rtl;';
 
 const LOGO_TEMPLATE = ({ domain = DOMAIN, logoPath = LOGO_PATH() }) => `
   <div style="${styles.logo}">
-    <a href="${domain}"><img src="${logoPath}" height="25"/></a>
+    <a href="${domain}"><img src="${logoPath}" height="40"/></a>
   </div>
 `;
 
@@ -73,20 +73,23 @@ const HEADER_TEMPLATE = ({ title, imagePath = '' }) => `
   </div>
 `;
 
+const rtlLanguage = (lang) => (lang === 'fa' || lang === 'ar') ? RTL : '';
+
 exports.TemplateEmail = (
 	headerProps = {},
 	content = '',
 	language = DEFAULT_LANGUAGE(),
 	domain = DOMAIN
 ) => {
 	const bodyStyle = styles.body.concat('');
+
 	return `
     <div style="${bodyStyle}">
       <div style="${styles.wrapper}">
 			${LOGO_TEMPLATE(domain)}
 				<div style="${styles.box_shadow}">
 				  ${HEADER_TEMPLATE(headerProps)}
-	        <div style="${styles.container}">
+	        <div style="${styles.container}${rtlLanguage(language)}">
 	  				${content}
 	        </div>
 	        ${footerTemplate(language, domain)}

settings/secret

@@ -23,7 +23,7 @@ HOLLAEX_SECRET_PUBSUB_PASSWORD=
 
 HOLLAEX_SECRET_DB_NAME=hollaex
 HOLLAEX_SECRET_DB_USERNAME=hollaex
-HOLLAEX_SECRET_DB_PASSWORD=5ddffa64126f1b11c4da0e8d70659997
+HOLLAEX_SECRET_DB_PASSWORD=
 HOLLAEX_SECRET_DB_HOST=$ENVIRONMENT_EXCHANGE_NAME-db
 HOLLAEX_SECRET_DB_PORT=5432
 

templates/local/nginx/nginx.conf

@@ -37,7 +37,7 @@ server {
 
 server {
       listen       80;
-      server_name  <YOUR_SERVER_DOMAIN>; #Server domain
+      server_name  localhost; #Server domain
       access_log   /var/log/nginx/hollaex.access.log  main;
 
       include    /etc/nginx/conf.d/plugin*.conf;