Merge branch '10-user-confirm-email-when-creating-new-password'

app/config/conf.app.yml

@@ -4,6 +4,7 @@ application:
   modelsDir      : ../app/models/
   migrationsDir  : ../app/migrations/
   viewsDir       : ../app/views/
+  templateDir    : ../app/templates/
   listenersDir   : ../app/listeners/
   libraryDir     : ../app/library/
   formsDir	     : ../app/forms/

app/config/conf.local.sample.yml

@@ -11,6 +11,9 @@ database:
   dbname:     httpcb
   charset:    utf8
 
+#sendgrid
+  #key: value
+
 # OAuth
 #oauth:
   #providers:

app/config/services.php

@@ -134,6 +134,11 @@ $di->setShared('router', function() {
         'action' => 'settings',
     ))->setName('user-settings');
 
+    $router->add('/act/{link}', array(
+        'controller' => 'user',
+        'action' => 'activationlink',
+    ))->setName('activation-link');
+
     return $router;
 });
 
@@ -176,6 +181,25 @@ $di->setShared('view', function () use ($di, $config) {
     return $view;
 });
 
+$di->set('template', function() use ($config) {
+    $view = new Phalcon\Mvc\View\Simple();
+    $view->setViewsDir($config->application->templateDir);
+    $view->registerEngines([
+        '.volt' => function ($view, $di) use ($config) {
+            $volt = new VoltEngine($view, $di);
+
+            $volt->setOptions(array(
+                'compiledPath' => $config->application->viewCacheDir,
+                'compiledSeparator' => '_',
+            ));
+
+            return $volt;
+        },
+        '.phtml' => 'Phalcon\Mvc\View\Engine\Php'
+    ]);
+    return $view;
+});
+
 $di->setShared('assets', function () {
 
     $manager = new AssetsManager();
@@ -222,6 +246,10 @@ $di->setShared('db', function () use ($di, $config) {
     return $db;
 });
 
+$di->setShared('sendgrid', function() use ($config) {
+    return new SendGrid($config->sendgrid->key);
+});
+
 $di->setShared('eventsManager', function () {
 
     $activityLog = new ActivityLog();