changed to rest api

Author: Lukecsharpwalker

src/app/reader/_services/reader-api.service.ts

@@ -84,36 +84,20 @@ export class ReaderApiService {
     return this.http.get<Post[]>(this.baseUrl, { headers, params });
   }
 
-  // async getPosts(): Promise<Post[] | null> {
-  //   const { data: posts } = await this.supabaseService.getClient
-  //     .from('posts')
-  //     .select(
-  //       `
-  //       *,
-  //       author:profiles ( id, username, avatar_url ),
-  //       post_tags (
-  //         tags ( id, name, color, icon )
-  //       )
-  //     `,
-  //     )
-  //     .eq('is_draft', false)
-  //     .order('created_at', { ascending: false });
-  //
-  //   return posts;
-  // }
-
   async getProfiles(): Promise<Profile[] | null> {
     const { data: profiles, error } = await this.supabaseService.getClient
       .from('profiles')
       .select('*');
     return error ? null : profiles;
   }
 
-  async getTags(): Promise<Tag[] | null> {
-    const { data: tags, error } = await this.supabaseService.getClient
-      .from('tags')
-      .select('*');
-    return error ? null : tags;
+  getTags(): Observable<Tag[] | null> {
+    const headers = new HttpHeaders({
+      apikey: this.apiKey,
+      Authorization: `Bearer ${this.apiKey}`,
+      Accept: 'application/json',
+    });
+    return this.http.get<Tag[]>(this.baseUrl, { headers });
   }
 
   async getPostTags(postId: string): Promise<PostTag[] | null> {

src/app/reader/post-list.resolver.ts

@@ -2,8 +2,6 @@ import { Routes } from '@angular/router';
 import { MainPageComponent } from './_components/main-page/main-page.component';
 import { PostComponent } from './_components/main-page/post/post.component';
 import { PostsListComponent } from './_components/main-page/posts-list/posts-list.component';
-import { postListResolver } from './post-list.resolver';
-import { tagListResolver } from './tag-list.resolver';
 
 export const readerRoutes: Routes = [
   {
@@ -13,7 +11,6 @@ export const readerRoutes: Routes = [
       {
         path: '',
         component: PostsListComponent,
-        // resolve: [postListResolver, tagListResolver],
       },
       {
         path: 'details/:id',

src/app/reader/reader.routes.ts

@@ -1,50 +1,59 @@
-import { Tag } from '../../types/supabase';
+import { inject } from '@angular/core';
+import { tapResponse } from '@ngrx/operators';
 import {
   patchState,
   signalStore,
-  withComputed,
-  withHooks,
-  withMethods,
   withState,
+  withMethods,
+  withHooks,
+  withComputed
 } from '@ngrx/signals';
-import { computed, inject } from '@angular/core';
+import { rxMethod } from '@ngrx/signals/rxjs-interop';
+import { pipe, switchMap, tap } from 'rxjs';
+
+import { Tag } from '../../types/supabase';
 import { ReaderApiService } from '../../reader/_services/reader-api.service';
 
 type TagsState = {
-  tags: Tag[];
+  tags: Tag[] | null;
   loading: boolean;
   error: string | null;
 };
 
 const initialState: TagsState = {
   tags: [],
   loading: false,
-  error: null,
+  error: null
 };
 
 export const TagsStore = signalStore(
   { providedIn: 'root' },
   withState(initialState),
 
-  withMethods((state, tagsService = inject(ReaderApiService)) => ({
-    async getTags() {
-      patchState(state, { loading: true, error: null });
-      try {
-        const tags = await tagsService.getTags();
-        if (tags) {
-          patchState(state, { tags, loading: false });
-        } else {
-          patchState(state, { error: 'No tags found', loading: false });
-        }
-      } catch (error) {
-        patchState(state, { error: 'Failed to fetch tags', loading: false });
-      }
-    },
+  withMethods((store, api = inject(ReaderApiService)) => ({
+    loadTags: rxMethod<void>(
+      pipe(
+        tap(() => patchState(store, { loading: true, error: null })),
+        switchMap(() =>
+          api.getTags().pipe(
+            tapResponse({
+              next: (tags) =>
+                patchState(store, { tags, loading: false }),
+              error: (err) =>
+                patchState(store, {
+                  error: 'Failed to fetch tags',
+                  loading: false
+                })
+            })
+          )
+        )
+      )
+    )
   })),
 
-  withHooks({
-    onInit(store) {
-      store.getTags();
-    },
-  }),
+  withHooks(({ loadTags }) => ({
+    onInit() {
+      loadTags();
+    }
+  }))
 );