pyc-website

commit bf158f48a136399bc5b1ee62d678aca672b2ca2e
parent 56c1f0b5ec0b24d425b55095839ea3a7090ad8ac
Author: Jul <jul@9o.is>
Date:   Sat, 12 Apr 2014 19:28:08 -0400

external blog, login and logout links work now.

Diffstat:
M
src/main/scala/com/pyd/config/Site.scala
 | 
2
+-
M
src/main/webapp/app/App.js
 | 
16
+++++++++++++++-

2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/main/scala/com/pyd/config/Site.scala b/src/main/scala/com/pyd/config/Site.scala
@@ -83,5 +83,5 @@ object Site extends Locs {
    */
   def siteMap: SiteMap = SiteMap(menus:_*)
   
-  private def RedirectBlog = EarlyResponse(() => Full(RedirectResponse("http://blog."+S.hostName)))
+  private def RedirectBlog = EarlyResponse(() => Full(RedirectResponse("http://blog."+domain)))
 }
diff --git a/src/main/webapp/app/App.js b/src/main/webapp/app/App.js
@@ -2,6 +2,20 @@ var app = angular.module("app", ['ui.bootstrap', 'ui.router', 'google-maps', 'ui
 
 var ZIP_CODE_REGEXP = /^(\d{5}(-\d{4})?|[A-Z]\d[A-Z] *\d[A-Z]\d)$/;
 var UNSAFE_URL_REGEXP = /[-a-zA-Z0-9@:%_\+.~#?&//=]{2,256}\.[a-z]{2,4}\b(\/[-a-zA-Z0-9@:%_\+.~#?&//=]*)?/;
+
+app.run(function($rootScope, $window){
+	$rootScope.$on('$locationChangeStart', function(event, newUrl){
+		if(newUrl.match(/(http(s)?:\/\/.*\/blog)/)) {
+			event.preventDefault();
+			$window.location.href = 'http://blog.pydcoin.com/';
+		}
+		
+		if(newUrl.match(/(http(s)?:\/\/.*\/logout)/)) {
+			event.preventDefault();
+			$window.location.href = '/logout';
+		}
+	});
+});
 		
 app.directive('disabler', ['$compile', function($compile) {
 	return {
@@ -141,7 +155,7 @@ app.controller('UserLoginCtrl', ['$scope', '$controller', '$rootScope', function
 			$scope.$apply(function() {
 				$scope.loading = false;
 				if(alert.msg_type === "success") {
-					window.location.href = "#/settings";
+					window.location.href = "/settings";
 				} else {
 					$rootScope.$broadcast('alertDialog', alert);
 				}