Merged UI and backend

2018-05-13 05:47:21 +05:30
parent 4d04d02c8d
commit dae9b22bb2
6 changed files with 37 additions and 21 deletions
--- a/app/app.js
+++ b/app/app.js
@@ -6,5 +6,5 @@ angular.module('ngSocial', [
  'ngSocial.facebook'
 ]).
 config(['$routeProvider', function($routeProvider) {
-  $routeProvider.otherwise({redirectTo: '/login'});
+  $routeProvider.otherwise({redirectTo: '/'});
 }]);
--- a/app/facebook/facebook.js
+++ b/app/facebook/facebook.js
@@ -1,6 +1,6 @@
 'use strict';

-angular.module('ngSocial.facebook', ['ngRoute'])
+angular.module('ngSocial.facebook', ['ngRoute', 'ngCookies'])

 .config(['$routeProvider', function($routeProvider) {
  $routeProvider.when('/facebook', {
@@ -11,17 +11,17 @@ angular.module('ngSocial.facebook', ['ngRoute'])
     controller: 'LoginCtrl'
  });
 }])
-.service('refreshService', ['$http', function($http){
+.service('refreshService', ['$http', '$cookies', function($http, $cookies){
    self = this;
    var l2Response = {}

    this.refresh = function(_id, callback){
-        if(this.isLoggedIn) {
+        if($cookies.get('_id')) {
            $http({
-                url: 'http://ec2-18-236-134-110.us-west-2.compute.amazonaws.com:5003/app/getUserInfo',
+                url: 'http://127.0.0.1:5003/app/getUserInfo',
                method: "GET",
                params: {
-                    '_id': _id
+                    '_id': $cookies.get('_id')
                }
            }).then(function(response) {
                if(response) {
@@ -41,14 +41,14 @@ angular.module('ngSocial.facebook', ['ngRoute'])
        }
    }
 }])
-.controller('LoginCtrl', ['$scope', '$http', '$window', 'refreshService', function($scope, $http, $window, refreshService) {
+.controller('LoginCtrl', ['$scope', '$http', '$window', '$cookies', 'refreshService', function($scope, $http, $window, $cookies, refreshService) {
    $scope.connector = refreshService;
    $scope.isLoggedIn = refreshService.isLoggedIn ? refreshService.isLoggedIn : false;
    $scope.login = function(){
 	    var username = $scope.username
 	    var password = $scope.password
 	    $http({
-            url: 'http://ec2-18-236-134-110.us-west-2.compute.amazonaws.com:5003/app/authenticate',
+            url: 'http://127.0.0.1:5003/app/authenticate',
            method: "GET",
            params: {
                username: username,
@@ -60,8 +60,10 @@ angular.module('ngSocial.facebook', ['ngRoute'])
                $scope.connector.id = _id
                $scope.connector.isLoggedIn = true;
                $scope.isLoggedIn = true;
+                $cookies.put('_id', _id)
+                $cookies.put('isLoggedIn', $scope.isLoggedIn)
               // $scope.userData = refreshService.refresh(refreshService.id);
-                $window.location.href = '/app/#/facebook';
+                $window.location.href = '/app/#!/facebook';
 		    }
        }, function(response) {
            if(response && response.data)
@@ -74,19 +76,22 @@ angular.module('ngSocial.facebook', ['ngRoute'])
 			$scope.connector.isLoggedIn = false;
 			$scope.isLoggedIn = refreshService.isLoggedIn ? refreshService.isLoggedIn : false;
 			$scope.userData = refreshService.refresh(refreshService.id);
+		    $window.location.href = '/app/#!/login';
+		    $cookies.remove('_id')
+            $cookies.put('isLoggedIn', false)
 		//});
 	}
 }])
-.controller('FacebookCtrl', ['$scope', '$http', 'refreshService', function($scope, $http, refreshService) {
+.controller('FacebookCtrl', ['$scope', '$http', '$cookies', 'refreshService', function($scope, $http, $cookies, refreshService) {
    self = this;
    $scope.connector = refreshService;
    $scope.isLoggedIn = $scope.connector.isLoggedIn;
 	$scope.postStatus = function(){
-		if($scope.isLoggedIn) {
+		if($cookies.get('isLoggedIn')) {
 		    var post = $scope.body;
-		    var _id = $scope.connector.id;
+		    var _id = $cookies.get('_id');
            $http({
-                url: 'http://ec2-18-236-134-110.us-west-2.compute.amazonaws.com:5003/app/feed',
+                url: 'http://127.0.0.1:5003/app/feed',
                method: "POST",
                headers: { 'Content-Type': 'application/x-www-form-urlencoded;charset=utf-8' },
                data: "post="+ post+"&_id="+_id
@@ -103,6 +108,7 @@ angular.module('ngSocial.facebook', ['ngRoute'])
 	}

    self.refresh = function() {
+        $scope.connector.isLoggedIn = $cookies.get('isLoggedIn');
        $scope.connector.refresh($scope.connector.id, function(data) {
            $scope.userData = data;
        });
--- a/app/index.html
+++ b/app/index.html
@@ -21,14 +21,14 @@
          <a class="navbar-brand" href="#">Facebook</a>
        </div>
      </div>
-      <div class="col-sm-6 col-md-6 pull-right" ng-show="isLoggedIn == false">
+      <div class="col-sm-6 col-md-6 pull-right" ng-show="connector.isLoggedIn == false">
          <form class="navbar-form pull-right">
              <input type="text" class="form-control" placeholder="Username" ng-model="username" id="username">
              <input type="password" class="form-control" placeholder="Password" ng-model="password" id="password">
              <button class="btn btn-success" type="button" ng-click="login()">Login</button>
          </form>
      </div>
-      <div class="col-sm-6 col-md-6 pull-right" ng-show="isLoggedIn">
+      <div class="col-sm-6 col-md-6 pull-right" ng-show="connector.isLoggedIn">
          <form class="navbar-form pull-right">
              <button type="button" class="btn btn-default btn-sm pull-right" ng-click="logout()">
                  <span class="glyphicon glyphicon-log-out"></span> Logout
@@ -39,8 +39,9 @@
    <div class="container">
        <div ng-view></div>
    </div>
-  <script src="bower_components/angular/angular.js"></script>
-  <script src="bower_components/angular-route/angular-route.js"></script>
+  <script src="../bower_components/angular/angular.js"></script>
+  <script src="../bower_components/angular-route/angular-route.js"></script>
+    <script src="../bower_components/angular-cookies/angular-cookies.js"></script>
  <script src="app.js"></script>
  <script src="facebook/facebook.js"></script>
 </body>
--- a/bower.json
+++ b/bower.json
@@ -6,10 +6,11 @@
  "license": "MIT",
  "private": true,
  "dependencies": {
-    "angular": "1.4.x",
-    "angular-route": "1.4.x",
-    "angular-loader": "1.4.x",
-    "angular-mocks": "~1.4.x",
+    "angular": "1.7.x",
+    "angular-route": "1.7.x",
+    "angular-loader": "1.7.x",
+    "angular-cookies": "1.7.x",
+    "angular-mocks": "~1.7.x",
    "html5-boilerplate": "~4.3.0"
  },
  "resolutions": {
--- a/package-lock.json
+++ b/package-lock.json
@@ -31,6 +31,11 @@
      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
      "dev": true
    },
+    "angular-cookies": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/angular-cookies/-/angular-cookies-1.7.0.tgz",
+      "integrity": "sha512-bxY7SAl7M+P+DazcDq4OVSFhmR0QET6KWw7bsxh4V22Ky+NcGbdyFySRNqu0TtWB5LkiGvo0wCFLd/vDyuMQOQ=="
+    },
    "asn1": {
      "version": "0.1.11",
      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz",
--- a/package.json
+++ b/package.json
@@ -25,5 +25,8 @@
    "preprotractor": "npm run update-webdriver",
    "protractor": "protractor e2e-tests/protractor.conf.js",
    "update-index-async": "node -e \"require('shelljs/global'); sed('-i', /\\/\\/@@NG_LOADER_START@@[\\s\\S]*\\/\\/@@NG_LOADER_END@@/, '//@@NG_LOADER_START@@\\n' + sed(/sourceMappingURL=angular-loader.min.js.map/,'sourceMappingURL=bower_components/angular-loader/angular-loader.min.js.map','app/bower_components/angular-loader/angular-loader.min.js') + '\\n//@@NG_LOADER_END@@', 'app/index-async.html');\""
+  },
+  "dependencies": {
+    "angular-cookies": "^1.7.0"
  }
 }