Merge pull request #36 from diggyk/master

Start of questCreationController
dropbox · Sep 10, 2015 · 124fd4f · 124fd4f
2 parents d7f780f + f7959f8
commit 124fd4f
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 74 deletions.
diff --git a/hermes/handlers/frontends.py b/hermes/handlers/frontends.py
@@ -6,11 +6,9 @@
 # Logging object
 log = logging.getLogger(__name__)
 
-
-class AppHandler(web.RequestHandler):
+class NgApp(web.RequestHandler):
     """Our generic handler to serve out the root of our AngularJS app."""
-    def get(self, filename):
-        logging.info("REQ: {}".format(filename))
+    def get(self):
         self.render(
-            os.path.join(os.path.dirname(__file__), "../webapp/build/{}".format(filename))
+            os.path.join(os.path.dirname(__file__), "../webapp/build/index.html")
         )
diff --git a/hermes/routes.py b/hermes/routes.py
@@ -31,8 +31,17 @@
     (r"/api/v1/extquery\/?", api.ExtQueryHandler),
 
     # Frontend Handlers
-    (r"/(.*)",
+    (
+        r"/((?:css|js|vendor|templates)/.*)",
         web.StaticFileHandler,
-        dict(path=os.path.join(os.path.dirname(__file__), "webapp/build/"),
-         default_filename="index.html"))
+        dict(
+            path=os.path.join(os.path.dirname(__file__), "webapp/build")
+        )
+    ),
+
+    # Frontend Handlers
+    (
+        r"/.*",
+        frontends.NgApp
+    )
 ]
diff --git a/hermes/webapp/src/js/controllers/fateCtrl.js b/hermes/webapp/src/js/controllers/fateCtrl.js
@@ -182,7 +182,6 @@
                 var pathStr = "M" + x1 + "," + y1
                     + " C" + (x1 + indent) + "," + y1 + "," + x1 + "," + y2 + "," + (x1 + indent) + "," + y2
                     + " L" + x2 + "," + y2;
-                console.log(pathStr);
                 paper.path(pathStr).attr({'stroke': '#000'});
 
                 addEdgeLabel(paper, settings, edge, (x1 + indent), y2);
@@ -243,6 +242,7 @@
         }
     }
 
-    angular.module('hermesApp').controller('FateCtrl', ['HermesService', FateCtrl]);
+    angular.module('hermesApp').controller('FateCtrl', FateCtrl);
+    FateCtrl.$inject = ['HermesService'];
 
 })();
diff --git a/hermes/webapp/src/js/controllers/questCreationCtrl.js b/hermes/webapp/src/js/controllers/questCreationCtrl.js
@@ -0,0 +1,7 @@
+(function() {
+    'use strict';
+
+    function QuestCreationCtrl(hermesService) {
+
+    }
+})();
diff --git a/hermes/webapp/src/js/directives/sigma.js b/hermes/webapp/src/js/directives/sigma.js
diff --git a/hermes/webapp/src/js/hermesApp.js b/hermes/webapp/src/js/hermesApp.js
@@ -8,6 +8,9 @@
         $routeProvider.when('/', {
             templateUrl: '/templates/fateViewer.html',
             reloadOnSearch: false
+        }).when('/fates', {
+            templateUrl: '/templates/fateViewer.html',
+            reloadOnSearch: false
         }).otherwise({redirectTo: '/'});
 
         // use the HTML5 History API

diff --git a/hermes/webapp/src/js/services/hermesService.js b/hermes/webapp/src/js/services/hermesService.js
@@ -146,8 +146,6 @@
              * display
              */
             function layoutGraph(baseX, node) {
-                console.log(baseX + ", " + baseY);
-
                 // update the x and y coords of this node
                 node["x"] = baseX;
                 node["y"] = baseY;
@@ -189,6 +187,8 @@
     }
 
     angular.module('hermesApp')
-        .factory('HermesService', ["$http", "$q", HermesService]);
+        .factory('HermesService',HermesService);
+
+    HermesService.$inject = ["$http", "$q"];
 
 })();