From f54c7ea5cf265e90e63fc1b0b74dcaa5d4902e10 Mon Sep 17 00:00:00 2001
From: Mo Bitar <me@bitar.io>
Date: Wed, 1 Mar 2017 18:31:59 -0600
Subject: [PATCH] remove ui-router dependancy

---
 Gruntfile.js                                  |  1 -
 app/assets/javascripts/app/app.frontend.js    |  4 +-
 .../app/frontend/controllers/home.js          | 16 +++++--
 app/assets/javascripts/app/frontend/routes.js | 45 +++++--------------
 app/views/application/frontend.html.erb       |  2 +-
 bower.json                                    |  1 -
 6 files changed, 25 insertions(+), 44 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index aa8abae4c..30aa5714f 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -83,7 +83,6 @@ module.exports = function(grunt) {
        lib: {
          src: [
            'vendor/assets/bower_components/angular/angular.js',
-           'vendor/assets/bower_components/angular-ui-router/release/angular-ui-router.js',
            'vendor/assets/bower_components/lodash/dist/lodash.min.js',
            'vendor/assets/javascripts/crypto/*.js'
          ],
diff --git a/app/assets/javascripts/app/app.frontend.js b/app/assets/javascripts/app/app.frontend.js
index 701704207..b4d657e94 100644
--- a/app/assets/javascripts/app/app.frontend.js
+++ b/app/assets/javascripts/app/app.frontend.js
@@ -13,6 +13,4 @@ if(!IEOrEdge && (window.crypto && window.crypto.subtle)) {
   Neeto.crypto = new SNCryptoJS();
 }
 
-angular.module('app.frontend', [
-  'ui.router'
-])
+angular.module('app.frontend', [])
diff --git a/app/assets/javascripts/app/frontend/controllers/home.js b/app/assets/javascripts/app/frontend/controllers/home.js
index df1f9307f..5aa625a9a 100644
--- a/app/assets/javascripts/app/frontend/controllers/home.js
+++ b/app/assets/javascripts/app/frontend/controllers/home.js
@@ -1,10 +1,18 @@
 angular.module('app.frontend')
-.controller('HomeCtrl', function ($scope, $stateParams, $rootScope, $timeout, modelManager, syncManager, authManager) {
+.controller('HomeCtrl', function ($scope, $location, $rootScope, $timeout, modelManager, syncManager, authManager) {
+
+    function urlParam(key) {
+      return $location.search()[key];
+    }
 
     function autoSignInFromParams() {
+      var server = urlParam("server");
+      var email = urlParam("email");
+      var pw = urlParam("pw");
+
       if(!authManager.offline()) {
         // check if current account
-        if(syncManager.serverURL == $stateParams.server && authManager.user.email == $stateParams.email) {
+        if(syncManager.serverURL === server && authManager.user.email === email) {
           // already signed in, return
           return;
         } else {
@@ -14,13 +22,13 @@ angular.module('app.frontend')
           })
         }
       } else {
-        authManager.login($stateParams.server, $stateParams.email, $stateParams.pw, function(response){
+        authManager.login(server, email, pw, function(response){
           window.location.reload();
         })
       }
     }
 
-    if($stateParams.server && $stateParams.email) {
+    if(urlParam("server")) {
       autoSignInFromParams();
     }
 
diff --git a/app/assets/javascripts/app/frontend/routes.js b/app/assets/javascripts/app/frontend/routes.js
index 687d4cab9..f02c9bbfd 100644
--- a/app/assets/javascripts/app/frontend/routes.js
+++ b/app/assets/javascripts/app/frontend/routes.js
@@ -1,39 +1,16 @@
 angular.module('app.frontend')
-  .config(function ($stateProvider, $urlRouterProvider, $locationProvider) {
+  .config(function ($locationProvider) {
 
-    $stateProvider
-      .state('base', {
-        abstract: true,
-      })
-
-      .state('home', {
-        url: '/?server&email&pw',
-        parent: 'base',
-        views: {
-          'content@' : {
-            templateUrl: 'frontend/home.html',
-            controller: 'HomeCtrl'
-          }
-        }
-      })
-
-      // Default fall back route
-      $urlRouterProvider.otherwise(function($injector, $location){
-         var state = $injector.get('$state');
-         state.go('home');
-         return $location.path();
-      });
-
-      var runningInElectron = window && window.process && window.process.type && window.process.versions["electron"];
-      if(!runningInElectron) {
-        if (window.history && window.history.pushState) {
-          $locationProvider.html5Mode({
-            enabled: true,
-            requireBase: false
-          });
-        }
-      } else {
-        $locationProvider.html5Mode(false);
+    var runningInElectron = window && window.process && window.process.type && window.process.versions["electron"];
+    if(!runningInElectron) {
+      if (window.history && window.history.pushState) {
+        $locationProvider.html5Mode({
+          enabled: true,
+          requireBase: false
+        });
       }
+    } else {
+      $locationProvider.html5Mode(false);
+    }
 
   });
diff --git a/app/views/application/frontend.html.erb b/app/views/application/frontend.html.erb
index e60481af3..48066778e 100644
--- a/app/views/application/frontend.html.erb
+++ b/app/views/application/frontend.html.erb
@@ -38,7 +38,7 @@
   </head>
 
   <body>
-    <div ui-view="content"></div>
+    <div ng-controller="HomeCtrl" ng-include="'frontend/home.html'"></div>
   </body>
 
 </html>
diff --git a/bower.json b/bower.json
index 22dfd09a5..f19b5ef68 100644
--- a/bower.json
+++ b/bower.json
@@ -8,7 +8,6 @@
     "name": "bower-rails generated vendor assets",
     "dependencies": {
       "angular": "1.6.1",
-      "angular-ui-router": "^0.3.2",
       "lodash" : "^4.17.4"
     },
     "resolutions": {