fix: capture entire URL for page viewer

brandonroberts · Mar 11, 2019 · 3ea3118 · 3ea3118
1 parent fd04d9a
commit 3ea3118
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
@@ -21,7 +21,7 @@ import { PageNotFoundComponent, PageComponent } from './core/components';
       { path: '', redirectTo: '/blog', pathMatch: 'full' },
       { path: 'blog', loadChildren: './blog/blog.module#BlogModule' },
       { path: '404', component: PageNotFoundComponent },
-      { path: ':pageId', component: PageComponent },
+      { path: '**', component: PageComponent },
     ]),
     MarkdownModule.forRoot(),
     CoreModule

diff --git a/src/app/core/components/page/page.component.ts b/src/app/core/components/page/page.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
-import { tap, switchMap } from 'rxjs/operators';
+import { tap, switchMap, map } from 'rxjs/operators';
 
 import { PageService } from 'src/app/core/services';
 
@@ -23,9 +23,10 @@ import { PageService } from 'src/app/core/services';
   ]
 })
 export class PageComponent implements OnInit {
-  page$ = this.route.paramMap.pipe(
-    switchMap(params => 
-      this.postService.getPageContent(params.get('pageId'))
+  page$ = this.route.url.pipe(
+    map(paths => paths.reduce((curr, path) => curr += `/${path.path}`, '')),
+    switchMap(pagePath => 
+      this.postService.getPageContent(pagePath)
         .pipe(tap(() => {}, () => {
           this.router.navigate(['/404']);
         }))