Merge branch 'valencia-mobile' into valencia-mobile-socks

getlantern · Feb 5, 2016 · f935396 · f935396
2 parents caf6480 + 4d35c5b
commit f935396
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -5,6 +5,7 @@
 - [OSX 10.8 and above](https://raw.githubusercontent.com/getlantern/lantern-binaries/master/lantern-installer-beta.dmg)
 - [Ubuntu 14.04 32 bit](https://raw.githubusercontent.com/getlantern/lantern-binaries/master/lantern-installer-beta-32-bit.deb)
 - [Ubuntu 14.04 64 bit](https://raw.githubusercontent.com/getlantern/lantern-binaries/master/lantern-installer-beta-64-bit.deb)
+- [Arch Linux](https://aur.archlinux.org/packages/lantern)
 
 **If you're looking for help, please visit below user forums:**
 

diff --git a/src/github.com/getlantern/lantern-ui/app/index.html b/src/github.com/getlantern/lantern-ui/app/index.html
@@ -35,7 +35,7 @@
     <script src="bower_components/angular-local-storage/dist/angular-local-storage.min.js"></script>
     <script src="lib/angular-ui-bootstrap-tpls.js"></script>
 
-    <script src="lib/mandrill.min.js"></script>
+    <script src="lib/mailer.js"></script>
 
     <script src="bower_components/clipboard/dist/clipboard.min.js"></script>
     <script src="bower_components/ngclipboard/src/ngclipboard.js"></script>

diff --git a/src/github.com/getlantern/lantern-ui/app/js/controllers.js b/src/github.com/getlantern/lantern-ui/app/js/controllers.js
@@ -56,18 +56,9 @@ app.controller('RootCtrl', ['$rootScope', '$scope', '$compile', '$window', '$htt
         return;
       }
 
-      var mc = new mandrill.Mandrill('fmYlUdjEpGGonI4NDx9xeA');
-
-      var message = {
-        "to": [
-          { "email": email }
-        ]
-      };
-
-      mc.messages.sendTemplate({
-        'template_name': 'lantern-mobile-message',
-        'template_content': {},
-        'message': message
+      mailer.send({
+        'to': email,
+        'template': 'lantern-mobile-message'
       });
 
       $rootScope.showMobileAd = false;

diff --git a/src/github.com/getlantern/lantern-ui/app/lib/mailer.js b/src/github.com/getlantern/lantern-ui/app/lib/mailer.js
@@ -0,0 +1,21 @@
+var mailer = function() {}
+
+mailer.url = "https://mailer.getlantern.org";
+
+mailer.send = function(data) {
+  if (typeof data.to == 'undefined') {
+    return false;
+  }
+  if (typeof data.template == 'undefined') {
+    return false;
+  };
+  $.ajax({
+    type: "POST",
+    url: mailer.url + '/send',
+    data: JSON.stringify(data),
+    error: function(xhr, s, t) {
+      console.log("error", t);
+    }
+  });
+  return true;
+};