merged branches

zlg/ionic.config.json

   "integrations": {
     "cordova": {}
   },
-<<<<<<< HEAD
   "type": "ionic-angular"
-}
-=======
-  "type": "ionic-angular",
-  "app_id": ""
-}
->>>>>>> dave
+}

zlg/package-lock.json

         "write-file-atomic": "^2.3.0"
       },
       "dependencies": {
+        "@types/node": {
+          "version": "6.0.116",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.116.tgz",
+          "integrity": "sha512-vToa8YEeulfyYg1gSOeHjvvIRqrokng62VMSj2hoZrwZNcYrp2h3AWo6KeBVuymIklQUaY5zgVJvVsC4KiiLkQ=="
+        },
         "ansi-escapes": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz",
       "resolved": "https://registry.npmjs.org/@types/localforage/-/localforage-0.0.30.tgz",
       "integrity": "sha1-PWCmv23aOOP4pGlhFZg3nx9klQk="
     },
-<<<<<<< HEAD
     "@types/lodash": {
-      "version": "4.14.113",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.113.tgz",
-      "integrity": "sha512-CINMgfKUnif7fWBqPuGUsZrkER8jGU+ufyhD7FuotPqC1rRViHOJVgPuanN2Y8Vv1TqRnHDKlMnyEQLNq9eMjA=="
+      "version": "4.14.116",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.116.tgz",
+      "integrity": "sha512-lRnAtKnxMXcYYXqOiotTmJd74uawNWuPnsnPrrO7HiFuE3npE2iQhfABatbYDyxTNqZNuXzcKGhw37R7RjBFLg=="
     },
     "@types/make-dir": {
       "version": "1.0.3",
       }
     },
     "@types/node": {
-      "version": "6.0.114",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.114.tgz",
-      "integrity": "sha512-5ViC9dwf1VIAtrOFTvOuN04lJgw28eKjuy0Vg2Bd/fSlxKP2feCSkIw04ZgOENL2ywdWrtbkthp1XVLEjJmouw=="
+      "version": "10.5.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-10.5.5.tgz",
+      "integrity": "sha512-6Qnb1gXbp3g1JX9QVJj3A6ORzc9XCyhokxUKaoonHgNXcQhmk8adhotxfkeK8El9TnFeUuH72yI6jQ5nDJKS6w=="
     },
     "@types/rimraf": {
       "version": "2.0.2",
       "requires": {
         "@types/rx-lite": "*"
       }
-=======
-    "@types/node": {
-      "version": "10.5.5",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-10.5.5.tgz",
-      "integrity": "sha512-6Qnb1gXbp3g1JX9QVJj3A6ORzc9XCyhokxUKaoonHgNXcQhmk8adhotxfkeK8El9TnFeUuH72yI6jQ5nDJKS6w=="
->>>>>>> dave
     },
     "@types/socket.io-client": {
       "version": "1.4.32",
       "resolved": "https://registry.npmjs.org/@types/socket.io-client/-/socket.io-client-1.4.32.tgz",
       "integrity": "sha512-Vs55Kq8F+OWvy1RLA31rT+cAyemzgm0EWNeax6BWF8H7QiiOYMJIdcwSDdm5LVgfEkoepsWkS+40+WNb7BUMbg=="
     },
-<<<<<<< HEAD
+    "@types/sockjs-client": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@types/sockjs-client/-/sockjs-client-1.1.0.tgz",
+      "integrity": "sha512-F3gD7AakaPGzzdTmvN8HYxlNL+vTnMykYSUoukRTRGUntH4lwjxG5wx3ZwdYBTA3sTo4duxHY+rRZMbIEBxhRQ=="
+    },
+    "@types/stompjs": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/@types/stompjs/-/stompjs-2.3.3.tgz",
+      "integrity": "sha512-p6+AQ+YS9P0bIYgfyDxKBIoDTFnFPpARSyDdHX+bbpNnBsgg3/fKwK6jwROur4CHiyjgAvl5wcIxz2rOvOl7rQ==",
+      "requires": {
+        "@types/node": "*"
+      }
+    },
     "@types/string-width": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/@types/string-width/-/string-width-2.0.0.tgz",
       "version": "0.0.29",
       "resolved": "https://registry.npmjs.org/@types/through/-/through-0.0.29.tgz",
       "integrity": "sha512-9a7C5VHh+1BKblaYiq+7Tfc+EOmjMdZaD1MYtkQjSoxgB69tBjW98ry6SKsi4zEIWztLOMRuL87A3bdT/Fc/4w==",
-=======
-    "@types/sockjs-client": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@types/sockjs-client/-/sockjs-client-1.1.0.tgz",
-      "integrity": "sha512-F3gD7AakaPGzzdTmvN8HYxlNL+vTnMykYSUoukRTRGUntH4lwjxG5wx3ZwdYBTA3sTo4duxHY+rRZMbIEBxhRQ=="
-    },
-    "@types/stompjs": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/@types/stompjs/-/stompjs-2.3.3.tgz",
-      "integrity": "sha512-p6+AQ+YS9P0bIYgfyDxKBIoDTFnFPpARSyDdHX+bbpNnBsgg3/fKwK6jwROur4CHiyjgAvl5wcIxz2rOvOl7rQ==",
->>>>>>> dave
       "requires": {
         "@types/node": "*"
       }
     },
-<<<<<<< HEAD
     "@types/untildify": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/@types/untildify/-/untildify-3.0.0.tgz",
         "through": ">=2.2.7 <3"
       }
     },
-=======
->>>>>>> dave
     "abbrev": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",

zlg/src/app/app.module.ts

 import { Signup } from '../pages/signup/signup'
 import { HomePage } from '../pages/home/home';
 import { WebsocketProvider } from '../providers/websocket/websocket';
-import { UserProvider } from '../providers/user/user';
+import { UserProvider} from '../providers/user/UserProvider';
 import { PostServiceProvider } from '../providers/post-service/post-service';
 import { HttpClient } from '@angular/common/http';
 import { HttpClientModule } from '@angular/common/http';
     HomePage,
     Welcome,
     Login,
-    Signup
+    Signup,
   ],
   imports: [
     BrowserModule,
     {provide: ErrorHandler, useClass: IonicErrorHandler},
     WebsocketProvider,
     UserProvider,
-    PostServiceProvider
+    PostServiceProvider,
   ]
 })
 export class AppModule {}

zlg/src/pages/home/home.ts

 })
 export class HomePage implements OnInit{
 
-<<<<<<< HEAD
-  constructor(public navCtrl: NavController, public menu: MenuController) {
-    this.menu.enable(true);
-=======
+  // constructor(public navCtrl: NavController, public menu: MenuController) {
+  //   this.menu.enable(true);
   constructor(public navCtrl: NavController, private postProvider: PostServiceProvider) {
     this.getPosts();
->>>>>>> dave
   }
 
   private stompClient ;
     this.getPosts();
     this.connect();  
   }
-  connect() {
-    const socket = new SockJS('https://fast-headland-39537.herokuapp.com/vault-socket');
-    this.stompClient = Stomp.over(socket);
-
-    this.stompClient.connect({}, (frame) => {
-      console.log('Connected: ' + frame);
-<<<<<<< HEAD
-      this.stompClient.subscribe('/topic/posts', (post) => {
-        this.posts.unshift(JSON.parse(post.body));
-=======
-      _this.stompClient.subscribe('/topic/posts', (post) => {
-        _this.posts.unshift(JSON.parse(post.body));
->>>>>>> dave
-     });
-    });
-  }
+
+//   connect() {
+//     const socket = new SockJS('https://fast-headland-39537.herokuapp.com/vault-socket');
+//     this.stompClient = Stomp.over(socket);
+
+//     this.stompClient.connect({}, (frame) => {
+//       console.log('Connected: ' + frame);
+//       this.stompClient.subscribe('/topic/posts', (post) => {
+//         this.posts.unshift(JSON.parse(post.body)));
+//       _this.stompClient.subscribe('/topic/posts', (post) => {
+//         _this.posts.unshift(JSON.parse(post.body));
+//      });
+//     }
+//   }
+//   );
+  
+// }
+
+connect() {
+  const socket = new SockJS('https://fast-headland-39537.herokuapp.com/vault-socket');
+  this.stompClient = Stomp.over(socket);
+
+  const _this = this; //i hope i am not expected to understand this
+  this.stompClient.connect({}, function (frame) {
+    console.log('Connected: ' + frame);
+    _this.stompClient.subscribe('/topic/posts', (post) => {
+      _this.posts.unshift(JSON.parse(post.body));
+   });
+  });
+}
 
   getPosts() {
     this.postProvider.getAllPosts(this.page)
          
 
   goToUsersFeed(post) {
+    console.log(post.id);
     let params = {id: post.userId};
-    //this.navCtrl.push('UsersFeed', params);
+    this.navCtrl.push('UserfeedPage', params);
   }
 
 
     this.postInput = "";
   }
 
-
+  
 
 }

zlg/src/pages/userfeed/userfeed.ts

 import { Component } from '@angular/core';
 import { IonicPage, NavController, NavParams } from 'ionic-angular';
-import { UserService } from '../../providers/userProvider';
+import { UserProvider } from '../../providers/user/UserProvider';
 
 /**
  * Generated class for the UserfeedPage page.
   postArr: Array<any>;
 
   constructor(public navCtrl: NavController, public navParams: NavParams,
-              public userService: UserService) {
+              public UserProvider: UserProvider) {
     //this.user.name = this.navParams.get('name');
     this.userid = this.navParams.get('id');
   }
   }
 
   getAllPostsByUserId(){
-    return this.userService.getAllPostsByUserId(this.userid).subscribe(response => {
+    return this.UserProvider.getAllPostsByUserId(this.userid).subscribe(response => {
       console.log("response: " + response);
       this.postArr = response;
       console.log("postarr: " + this.postArr);

zlg/src/providers/user/user.ts

-import { HttpClient } from '@angular/common/http';
-import { Injectable } from '@angular/core';
-
-/*
-  Generated class for the UserProvider provider.
-
-  See https://angular.io/guide/dependency-injection for more info on providers
-  and Angular DI.
-*/
-@Injectable()
-export class UserProvider {
-
-  constructor(public http: HttpClient) {
-    console.log('Hello UserProvider Provider');
-  }
-
-  
-
-}

zlg/src/providers/userProvider.ts → zlg/src/providers/user/userProvider.ts

 import {Injectable} from "@angular/core";
 
 @Injectable()
-export class UserService{
+export class UserProvider{
 
 
   public API = "https://fast-headland-39537.herokuapp.com";