From 84e5925135ed79cc607c8b65f4debf69c1fcbed5 Mon Sep 17 00:00:00 2001 From: Jonathan Cremin Date: Sun, 9 Aug 2015 10:55:10 +0100 Subject: [PATCH] Fix email templates path, signup message. --- web/lib/auth.js | 6 +++--- web/views/signup.ejs | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/web/lib/auth.js b/web/lib/auth.js index 4f8e547..59e8db6 100644 --- a/web/lib/auth.js +++ b/web/lib/auth.js @@ -2,7 +2,7 @@ import crypto from 'crypto'; import passwords from 'passwords'; import uuid from 'node-uuid'; import views from 'co-views'; -const render = views('views', { default: 'ejs'}); +const render = views(__dirname + '/../views', { default: 'ejs'}); import debugname from 'debug'; const debug = debugname('hostr-web:auth'); import { Mandrill } from 'mandrill-api/mandrill'; @@ -131,9 +131,9 @@ export function* sendResetToken(ctx, email) { 'token': token, 'created': Math.round(new Date().getTime() / 1000) }); - const html = yield this.render('email/inlined/forgot', {forgotUrl: this.locals.baseUrl + '/forgot/' + token}); + const html = yield render('email/inlined/forgot', {forgotUrl: process.env.BASE_URL + '/forgot/' + token}); const text = `It seems you've forgotten your password :( -Visit ${ctx.locals.baseUrl + '/forgot/' + token} to set a new one. +Visit ${process.env.BASE_URL + '/forgot/' + token} to set a new one. `; mandrill.messages.send({message: { html: html, diff --git a/web/views/signup.ejs b/web/views/signup.ejs index 826b678..16f327a 100644 --- a/web/views/signup.ejs +++ b/web/views/signup.ejs @@ -18,6 +18,11 @@

Sign up to Hostr.

+ <% if(typeof message !== 'undefined') { %> + + <% } %>
<% if(typeof error !== 'undefined') { %>