search

src/app/app-routing.module.ts

@@ -7,9 +7,8 @@ export const routes: Routes = [
   { path: 'feed', loadChildren: () => import('./feed/feed.module').then(m => m.FeedModule), canActivate: [CheckTokenCanActivate] },
   { path: 'user', loadChildren: () => import('./user/user.module').then(m => m.UserModule), canActivate: [CheckTokenCanActivate] },
   { path: 'new-post', loadChildren: () => import('./new-post/new-post.module').then(m => m.NewPostModule), canActivate: [CheckTokenCanActivate] },
-  { path: 'search', loadChildren: () => import('./search/search.module').then(m => m.SearchModule), canActivate: [CheckTokenCanActivate] },
+  { path: '', redirectTo: 'feed', pathMatch: 'full' },
-  { path: '', redirectTo: 'auth/login', pathMatch: 'full' },
+  { path: 'search', loadChildren: () => import('./search/search.module').then(m => m.SearchModule) },
-  { path: '**', redirectTo: 'feed', pathMatch: 'full' },
 ];
 
 @NgModule({

src/app/services/data/post.service.ts

@@ -4,7 +4,6 @@ import { AuthService } from '../auth/auth.service';
 import { AngularFirestore, Reference } from '@angular/fire/compat/firestore';
 import { User } from '../../../model/User';
 import { UserService } from './user.service';
-import { firstValueFrom } from 'rxjs';
 import { DocumentReference } from '@angular/fire/firestore';
 
 @Injectable({
@@ -54,50 +53,50 @@ export class PostService {
     });
   }
 
-  getPosts(username: String | undefined): Promise<Array<Post>> {
+  getPosts(username: String, lenght: Number, start: Number) {
-    return new Promise<Array<Post>>(async (resolve, reject) => {
+    return new Promise<Array<Post>>((resolve, reject) => {
-
+      if (this.auth.checkAllowed()) {
-      if (!this.auth.checkAllowed())
+        if (username == undefined) {
-        reject()
+          this.auth.getUser().subscribe(cred => {
-
+            // get the user by id
-      let result: Array<Post> = new Array<Post>;
+            this.afs.collection<User>('user', ref => ref.where('id', '==', cred?.uid)).valueChanges().subscribe(user => {
-
+              // get their posts
-      if (username == undefined) {
+              this.afs.collection<Post>('post', ref => ref.where('user', '==', this.afs.doc('/user/' + user[0].username).ref)).valueChanges({ idField: 'id' }).subscribe(posts => {
-        // /user -> currentUser
+                posts.forEach(post => {
-        let user = await this.usersvc.getCurrentUser();
+                  // get how many likes it has
-        let userRef = this.afs.doc('/user/' + user.username).ref;
+                  this.afs.collection('like', ref => ref.where('post', '==', this.afs.doc('/post/' + post.id).ref)).valueChanges().subscribe(likes => {
-        let posts = (await firstValueFrom(this.afs.collection<Post>('post', ref => ref.where('user', '==', userRef)).valueChanges()));
+                    // check if we liked this post
-        posts.forEach(async (post) => {
+                    post.liked = likes.filter(like => (like as any).user.id == user[0].username).length != 0;
-          let likes = await firstValueFrom(this.afs.collection('like', ref => ref.where('post', '==', this.afs.doc('/post/' + post.id).ref)).valueChanges());
+                    post.user = user[0] as User;
-          result.push({
+                    post.likes = likes.length;
-            user: user,
+                  })
-            content: post.content,
+                  resolve(posts)
-            image: post.image,
+                })
-            likes: likes.length,
+              });
-            liked: likes.filter(like => (like as any).user.id == user.username).length != 0,
+            })
-            id: post.id
+          });
-          })
+        } else {
-
+          this.usersvc.getCurrentUser()
-        })
+            .then(currentUser => {
-        resolve(result);
+              // get the user by username
+              this.afs.collection<User>('user').doc(username as string).valueChanges().subscribe(user => {
+                // get their posts
+                this.afs.collection<Post>('post', ref => ref.where('user', '==', this.afs.doc('/user/' + username).ref)).valueChanges({ idField: 'id' }).subscribe(posts => {
+                  posts.forEach(post => {
+                    // get how many likes it has
+                    this.afs.collection('like', ref => ref.where('post', '==', this.afs.doc('/post/' + post.id).ref)).valueChanges().subscribe(likes => {
+                      post.liked = likes.filter(like => (like as any).user.id == currentUser.username).length != 0;
+                      post.user = user as User;
+                      post.likes = likes.length;
+                    })
+                    resolve(posts)
+                  })
+                });
+              });
+            })
+        }
       } else {
-        // /user/name
+        reject()
-        let user = await this.usersvc.getUser(username);
-        let userRef = this.afs.doc('/user/' + user.username).ref;
-        let currentUser = await this.usersvc.getCurrentUser();
-        let posts = (await firstValueFrom(this.afs.collection<Post>('post', ref => ref.where('user', '==', userRef)).valueChanges()));
-        posts.forEach(async (post) => {
-          let likes = await firstValueFrom(this.afs.collection('like', ref => ref.where('post', '==', this.afs.doc('/post/' + post.id).ref)).valueChanges());
-          result.push({
-            user: user,
-            content: post.content,
-            image: post.image,
-            likes: likes.length,
-            liked: likes.filter(like => (like as any).user.id == currentUser.username).length != 0,
-            id: post.id
-          })
-        })
-        resolve(result);
       }
     });
   }

src/app/services/data/user.service.ts

@@ -13,7 +13,7 @@ export class UserService {
     return new Promise<User>((resolve, reject) => {
       if (this.auth.checkAllowed()) {
         if (username != undefined) {
-          this.afs.collection<User>('user').doc(username as string).valueChanges().subscribe(data => { resolve(data as User) });
+          this.afs.collection<User>('user', ref => ref.where('username', '==', username)).valueChanges().subscribe(data => { resolve(data[0] as User) });
         } else {
           this.auth.getUser().subscribe(cred => {
             this.afs.collection<User>('user', ref => ref.where('id', '==', cred?.uid)).valueChanges().subscribe(user => { resolve(user[0]) })

src/app/shared/views/post/post.component.ts

@@ -3,8 +3,8 @@ import { CommonModule } from '@angular/common';
 import { SmallUserComponent } from '../small-user/small-user.component';
 import { Post } from '../../../../model/Post';
 import { NgIf } from '@angular/common';
+import { AuthService } from '../../../services/auth/auth.service';
 import { PostService } from '../../../services/data/post.service';
-import { UserService } from '../../../services/data/user.service';
 
 @Component({
   selector: 'app-post',
@@ -19,11 +19,11 @@ export class PostComponent implements OnInit {
   isOwned: boolean = false;
   deleted: boolean = false;
 
-  constructor(private userSv: UserService, private postSv: PostService) { }
+  constructor(private auth: AuthService, private postSv: PostService) { }
 
   ngOnInit(): void {
-    this.userSv.getCurrentUser().then(user => {
+    this.auth.getUser().subscribe(user => {
-      this.isOwned = user?.username == this.post?.user.username;
+      this.isOwned = user?.email == this.post?.user.email;
     });
   }
 

src/app/user/user.component.ts

@@ -16,8 +16,13 @@ export class UserComponent implements OnInit{
 
   constructor(private postService: PostService, private userService: UserService, private route: ActivatedRoute) { }
 
-  async ngOnInit(): Promise<void> {
+  ngOnInit(): void {
-    this.user = await this.userService.getUser(this.route.snapshot.params['username']);
+    this.userService.getUser(this.route.snapshot.params['username'])
-    this.posts = await this.postService.getPosts(this.route.snapshot.params['username']);
+      .then(user => { this.user = user })
+      .catch(() => alert('failed to get user'));
+
+    this.postService.getPosts(this.route.snapshot.params['username'], 10, 0)
+      .then(posts => { this.posts = posts; })
+      .catch(()=> { alert('failed to fetch feed'); });
   }
 }