wip

Author: Lukecsharpwalker

angular.json

@@ -21,7 +21,10 @@
             "index": "src/index.html",
             "browser": "src/main.ts",
             "allowedCommonJsDependencies": [
-              "highlight.js"
+              "highlight.js",
+              "quill-delta",
+              "whatwg-url",
+              "@supabase/node-fetch"
             ],
             "polyfills": [
               "zone.js"
@@ -40,11 +43,10 @@
             "scripts": [],
             "server": "src/main.server.ts",
             "prerender": {
+              "discoverRoutes": false,
               "routesFile": "routes.txt"
             },
-            "ssr": {
-              "entry": "server.ts"
-            }
+            "ssr": true
           },
           "configurations": {
             "production": {

routes.txt

@@ -0,0 +1 @@
+/

src/app/app.component.html

@@ -1,3 +1,3 @@
 <div>
-  <router-outlet/>
+  <!--  <router-outlet/>-->
 </div>

src/app/app.component.ts

@@ -17,24 +17,14 @@ import { SupabaseService } from './services/supabase.service';
   templateUrl: './app.component.html',
   styleUrl: './app.component.scss',
 })
-export class AppComponent implements OnInit {
-  cookieConsentService = inject(CookieConsentService);
-  viewContainerRef = inject(ViewContainerRef);
-
-  supabase = inject(SupabaseService);
+export class AppComponent {
+  // cookieConsentService = inject(CookieConsentService);
+  // viewContainerRef = inject(ViewContainerRef);
 
   constructor() {
-    afterNextRender(() =>
-      this.cookieConsentService.showCookieConsent(this.viewContainerRef),
-    );
-  }
-
-  ngOnInit() {
-    this.supabase.getClient
-      .from('tags')
-      .select('*')
-      .then((tags) => {
-        console.log(tags);
-      });
+    console.log('AppComponent');
+    // afterNextRender(() =>
+    //   this.cookieConsentService.showCookieConsent(this.viewContainerRef),
+    // );
   }
 }

src/app/app.routes.ts

@@ -1,6 +1,6 @@
 import { Routes } from '@angular/router';
 import { readerRoutes } from './reader/reader.routes';
-import { authGuard } from './auth/_guards/auth.guard';
+import { authAdminGuard } from './auth/_guards/authAdminGuard';
 
 export const routes: Routes = [
   {
@@ -9,12 +9,13 @@ export const routes: Routes = [
   },
   {
     path: 'admin',
-    loadChildren: () => import('./admin/admin.routes').then(r => r.adminRoutes),
+    loadChildren: () =>
+      import('./admin/admin.routes').then((r) => r.adminRoutes),
     title: 'Admin',
-    canActivate: [authGuard],
+    canActivate: [authAdminGuard],
   },
   {
-    path:'**',
-    redirectTo: ''
+    path: '**',
+    redirectTo: '',
   },
 ];

src/app/auth/_guards/auth.guard.ts renamed to src/app/auth/_guards/authAdminGuard.ts

@@ -16,7 +16,7 @@ import { AuthService } from '../auth.service';
 import { SupabaseService } from '../../services/supabase.service';
 >>>>>>> 793fe4a (login fixed)
 
-export const authGuard: CanMatchFn = (): boolean => {
+export const authAdminGuard: CanMatchFn = (): boolean => {
   const supabaseService = inject(SupabaseService);
   const router = inject(Router);
 <<<<<<< HEAD
@@ -31,10 +31,14 @@ export const authGuard: CanMatchFn = (): boolean => {
 =======
   const session = supabaseService.getSession();
 
+<<<<<<< HEAD:src/app/auth/_guards/auth.guard.ts
   // For now, just check if the user is authenticated
   // In a real application, you would check for specific roles in the user's metadata
   if (session) {
 >>>>>>> 793fe4a (login fixed)
+=======
+  if (session?.user?.app_metadata?.['role'] === Roles.ADMIN) {
+>>>>>>> bc9c691 (wip):src/app/auth/_guards/authAdminGuard.ts
     return true;
   } else {
     router.navigate(['/posts']);

src/app/reader/_components/main-page/posts-list/posts-list.component.ts

@@ -52,6 +52,7 @@ export class PostsListComponent {
         this.onScroll.bind(this),
       );
     });
+    console.log('init');
   }
 
   onScroll(event: Event) {

src/styles.scss

@@ -1,3 +1,4 @@
+@use 'tailwindcss/utilities';
 @import "../node_modules/quill/dist/quill.core.css";
 @import "../node_modules/quill/dist/quill.snow.css";
 @import 'highlight.js/styles/atom-one-dark.css';
@@ -80,8 +81,6 @@ h4 {
   @apply bg-gray-300 text-gray-500 cursor-not-allowed;
 }
 
-/* Import TailwindCSS */
-@import 'tailwindcss/utilities';
 
 /* Additional styles for the card component */
 .post-card {