+
+
+
-
\ No newline at end of file
diff --git a/RaftPackAngular/src/app/dashboard/dashboard.component.ts b/RaftPackAngular/src/app/dashboard/dashboard.component.ts
index d18e3f6..3bde1ff 100644
--- a/RaftPackAngular/src/app/dashboard/dashboard.component.ts
+++ b/RaftPackAngular/src/app/dashboard/dashboard.component.ts
@@ -1,5 +1,11 @@
import { Component, OnInit } from '@angular/core';
+import { Socket } from 'ng-socket-io';
+import { Observable } from 'rxjs/Observable';
+import 'rxjs/add/observable/of';
+import 'rxjs/add/operator/timeout';
+import { defer as _defer } from 'lodash';
+import { NotificationsService } from 'angular2-notifications';
@Component({
selector: 'app-dashboard',
templateUrl: './dashboard.component.html',
@@ -7,7 +13,16 @@ import { Component, OnInit } from '@angular/core';
})
export class DashboardComponent implements OnInit {
- constructor() { }
+ constructor(private socket: Socket, private notificationsService: NotificationsService) {
+ socket.on('new notification', function (data) {
+ notificationsService.info('', data, {
+ timeOut: 3000,
+ pauseOnHover: true,
+ clickToClose: true
+ });
+ // alert(data);
+ });
+ }
ngOnInit() {
}
diff --git a/RaftPackAngular/src/app/feed/feed.component.html b/RaftPackAngular/src/app/feed/feed.component.html
index 33f6dc6..daca4c9 100644
--- a/RaftPackAngular/src/app/feed/feed.component.html
+++ b/RaftPackAngular/src/app/feed/feed.component.html
@@ -1,7 +1,15 @@
--
-
-
-
-Post:
-
-
-
-Bottom Dashboard +
+
+
+
+-
Feed:
-
-Bottom Dashboard +
- {{post.message}} {{post.user.first_name}}
- {{post.user.last_name}} {{post.date}}
-
-
-
-
+
+
+
diff --git a/RaftPackAngular/src/app/feed/feed.component.ts b/RaftPackAngular/src/app/feed/feed.component.ts
index 6005250..5677dd3 100644
--- a/RaftPackAngular/src/app/feed/feed.component.ts
+++ b/RaftPackAngular/src/app/feed/feed.component.ts
@@ -10,6 +10,7 @@ import { Post } from '../models/post.model';
})
export class FeedComponent implements OnInit {
public posts: Post[] = [];
+ public uId = parseInt(document.cookie, 10);
constructor(private postService: PostService) { }
viewFeed(): void {
this.postService.getAllPosts().subscribe(posts => this.posts = posts);
diff --git a/RaftPackAngular/src/app/form-data-upload/form-data-upload.component.css b/RaftPackAngular/src/app/form-data-upload/form-data-upload.component.css
new file mode 100644
index 0000000..f2f3064
--- /dev/null
+++ b/RaftPackAngular/src/app/form-data-upload/form-data-upload.component.css
@@ -0,0 +1,3 @@
+div{
+ color: white;
+}
\ No newline at end of file
diff --git a/RaftPackAngular/src/app/form-data-upload/form-data-upload.component.html b/RaftPackAngular/src/app/form-data-upload/form-data-upload.component.html
new file mode 100644
index 0000000..881912b
--- /dev/null
+++ b/RaftPackAngular/src/app/form-data-upload/form-data-upload.component.html
@@ -0,0 +1,14 @@
+-
+
+
+
+ {{post.date}} {{post.user.first_name}} {{post.user.last_name}}
+
+ {{post.date}} {{post.user.first_name}} {{post.user.last_name}}
+
+ 
{{post.message}}
+
{{post.numOfLikes}} +
+
+ {{post.numOfLikes}} +
+
+
+
diff --git a/RaftPackAngular/src/app/form-data-upload/form-data-upload.component.ts b/RaftPackAngular/src/app/form-data-upload/form-data-upload.component.ts
new file mode 100644
index 0000000..45ec712
--- /dev/null
+++ b/RaftPackAngular/src/app/form-data-upload/form-data-upload.component.ts
@@ -0,0 +1,102 @@
+import { Component, ElementRef, ViewChild } from '@angular/core';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { UploadFileService } from './../services/upload.service';
+import { PostService } from '../services/post.service';
+import { Post } from '../models/post.model';
+import { ProfileService } from './../services/profile.service';
+import { User } from '../models/user.model';
+import { PostComponent } from './../post/post.component';
+import { Socket } from 'ng-socket-io';
+import { Router } from '@angular/router';
+
+@Component({
+ selector: 'app-form-data-upload',
+ templateUrl: './form-data-upload.component.html'
+})
+export class FormdataUploadComponent {
+ form: FormGroup;
+ loading = false;
+ file: any;
+ uid: any;
+ post = new Post(0, '', '', 0, null, null);
+ user = new User(0, '', '', '', '', '', '', '', '');
+ @ViewChild('fileInput') fileInput: ElementRef;
+
+ constructor(private fb: FormBuilder, private uploadFileService: UploadFileService, private postService: PostService,
+ private profileService: ProfileService, private postComponent: PostComponent, private socket: Socket, private router: Router) {
+ this.createForm();
+ }
+
+ createForm() {
+ this.form = this.fb.group({
+ message: ['', Validators.required],
+ image: null
+ });
+ }
+
+ onFileChange(event) {
+ if (event.target.files.length > 0) {
+ this.file = event.target.files[0];
+ this.form.get('image').setValue(this.file);
+ }
+ }
+
+ private prepareSave(): any {
+ const input = new FormData();
+ input.append('message', this.form.get('message').value);
+ if (this.form.get('image') != null) {
+ input.append('image', this.form.get('image').value);
+ } else { input.append('image', null); }
+
+ return input;
+ }
+
+ onSubmit() {
+ const formModel = this.prepareSave();
+ this.loading = true;
+ if (this.form.get('image').value != null) {
+ this.uploadFileService.uploadfile(this.file).subscribe(image => {
+ this.post.image = image;
+ this.profileService.getProfile(parseInt(document.cookie, 10)).subscribe(user => {
+ this.post.user = user;
+ console.log(this.post);
+ this.post.message = this.form.get('message').value;
+ console.log(this.post);
+ this.postComponent.createPost(this.post.message, this.post.image);
+ console.log(this.post);
+ setTimeout(() => {
+ alert('done!');
+ this.loading = false;
+ }, 1000);
+ this.sendNotification(user, this.post.message);
+ this.router.navigate(['/dashboard']);
+ });
+ });
+ } else {
+ this.profileService.getProfile(parseInt(document.cookie, 10)).subscribe(user => {
+ this.post.user = user;
+ console.log(this.post);
+ this.post.message = this.form.get('message').value;
+ console.log(this.post);
+ this.postComponent.createPost(this.post.message, null);
+ console.log(this.post);
+ setTimeout(() => {
+ alert('done!');
+ this.loading = false;
+ }, 1000);
+ this.sendNotification(user, this.post.message);
+ this.router.navigate(['/dashboard']);
+ });
+ }
+
+ }
+ sendNotification(user: User, message: string) {
+ this.socket.emit('create notification', user.first_name + user.last_name + ': ' + message );
+ }
+
+ clearFile() {
+ this.form.get('image').setValue(null);
+ this.fileInput.nativeElement.value = '';
+ }
+
+}
diff --git a/RaftPackAngular/src/app/friend-profile/friend-profile.component.css b/RaftPackAngular/src/app/friend-profile/friend-profile.component.css
new file mode 100644
index 0000000..e69de29
diff --git a/RaftPackAngular/src/app/friend-profile/friend-profile.component.html b/RaftPackAngular/src/app/friend-profile/friend-profile.component.html
new file mode 100644
index 0000000..781ec62
--- /dev/null
+++ b/RaftPackAngular/src/app/friend-profile/friend-profile.component.html
@@ -0,0 +1,16 @@
+
+ 
+
+
+
+ Name: {{user.first_name}} {{user.last_name}}
+
+ Gender: {{user.gender}} +
+ Birthday: {{user.date_of_birth}}
+ Email: {{user.user_email}}
+ Bio: {{user.biography}}
+ Gender: {{user.gender}} +
+ Birthday: {{user.date_of_birth}}
+ Email: {{user.user_email}}
+ Bio: {{user.biography}}
+ +
+
diff --git a/RaftPackAngular/src/app/friend-profile/friend-profile.component.spec.ts b/RaftPackAngular/src/app/friend-profile/friend-profile.component.spec.ts
new file mode 100644
index 0000000..d17e858
--- /dev/null
+++ b/RaftPackAngular/src/app/friend-profile/friend-profile.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { FriendProfileComponent } from './friend-profile.component';
+
+describe('FriendProfileComponent', () => {
+ let component: FriendProfileComponent;
+ let fixture: ComponentFixture
+
+
+
+
\ No newline at end of file
diff --git a/RaftPackAngular/src/app/login/login.component.ts b/RaftPackAngular/src/app/login/login.component.ts
index eddd7dd..69ed81a 100644
--- a/RaftPackAngular/src/app/login/login.component.ts
+++ b/RaftPackAngular/src/app/login/login.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, Input } from '@angular/core';
import { NgModule } from '@angular/core';
import { LoginService } from '../services/login.service';
@@ -6,6 +6,7 @@ import { LoginService } from '../services/login.service';
import { User } from '../models/user.model';
import { Message } from '../models/message.model';
import { Router } from '@angular/router';
+
@Component({
selector: 'app-login',
templateUrl: './login.component.html',
@@ -41,6 +42,7 @@ export class LoginComponent implements OnInit {
}
ngOnInit() {
+ document.cookie = null;
}
}
diff --git a/RaftPackAngular/src/app/modify-user-info/modify-user-info.component.html b/RaftPackAngular/src/app/modify-user-info/modify-user-info.component.html
index 0172d59..1988da3 100644
--- a/RaftPackAngular/src/app/modify-user-info/modify-user-info.component.html
+++ b/RaftPackAngular/src/app/modify-user-info/modify-user-info.component.html
@@ -1,23 +1,16 @@
+
+
+
+
+
-
-
-
-
-
-
+
+ 
Edit Profile
-
-
-
-
-
-
-
-
-
Edit Profile
-
-
-
-
-
-
diff --git a/RaftPackAngular/src/app/modify-user-info/modify-user-info.component.ts b/RaftPackAngular/src/app/modify-user-info/modify-user-info.component.ts
index 40ffa59..3639b48 100644
--- a/RaftPackAngular/src/app/modify-user-info/modify-user-info.component.ts
+++ b/RaftPackAngular/src/app/modify-user-info/modify-user-info.component.ts
@@ -13,6 +13,7 @@ import {ProfileComponent} from '../profile/profile.component';
})
export class ModifyUserInfoComponent implements OnInit {
+ @Input() exists: boolean;
user: User;
edit = false;
message: Message;
diff --git a/RaftPackAngular/src/app/navbar/navbar.component.css b/RaftPackAngular/src/app/navbar/navbar.component.css
index e69de29..25c318e 100644
--- a/RaftPackAngular/src/app/navbar/navbar.component.css
+++ b/RaftPackAngular/src/app/navbar/navbar.component.css
@@ -0,0 +1,43 @@
+ #nav {
+ /*position: fixed;*/
+ }
+
+ .search-result li {
+ border-bottom: 1px solid gray;
+ border-left: 1px solid gray;
+ border-right: 1px solid gray;
+ width: 200px;
+ height: 30px;
+ padding: 5px;
+ background-color: white;
+ cursor: pointer;
+ list-style-type: none;
+ position: relative;
+ }
+
+ .search-result li:hover {
+ background-color: #607D8B;
+ }
+
+ .search-result li a {
+ color: #888;
+ display: block;
+ text-decoration: none;
+ }
+
+ .search-result li a:hover {
+ color: white;
+ }
+ .search-result li a:active {
+ color: white;
+ }
+ #search-box {
+ width: 200px;
+ }
+
+
+ ul.search-result {
+ margin-top: 0;
+ padding-left: 0;
+ position: absolute;
+ }
\ No newline at end of file
diff --git a/RaftPackAngular/src/app/navbar/navbar.component.html b/RaftPackAngular/src/app/navbar/navbar.component.html
index 4c88d09..34f3ca7 100644
--- a/RaftPackAngular/src/app/navbar/navbar.component.html
+++ b/RaftPackAngular/src/app/navbar/navbar.component.html
@@ -1,4 +1,4 @@
-Upload a different photo...
- - -
-
+
+
+
+
+
+ Upload a different photo...
+ +
+
@@ -41,4 +34,7 @@
-
@@ -28,7 +21,7 @@
-
+
Upload a different photo...
Upload a different photo...
-
\ No newline at end of file
+