1 files changed, 19 insertions, 6 deletions

diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 7943788..e8e156d 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -11,35 +11,38 @@
    WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Affero General Public License for more details.
-  
+
    You should have received a copy of the GNU Affero General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
    */
 /**
  * @author Philippe Buschmann
  * @file src/app/app-routing.module.ts
- * @brief 
+ * @brief
  *
  */
 
 import { NgModule } from '@angular/core';
-import { RouterModule, Routes } from '@angular/router';
+import { RouterModule, Routes, Router, ActivatedRoute, NavigationEnd } from '@angular/router';
+
+import { filter } from 'rxjs/operators';
 
 import { RestApisComponent } from './rest-apis/rest-apis.component';
 import { MainPageComponent } from './main-page/main-page.component';
 import { IdentityPageComponent } from './identity-page/identity-page.component';
-import { GnsPageComponent } from './gns-page/gns-page.component';
 import { PeerstorePageComponent } from './peerstore-page/peerstore-page.component';
 import { NamestorePageComponent } from './namestore-page/namestore-page.component';
+import { ErrorPageComponent } from './error-page/error-page.component';
 
+import { MessagesService } from './messages.service';
 
 const routes: Routes = [
   { path: '', component: MainPageComponent },
   { path: 'apis', component: RestApisComponent },
   { path: 'identity', component: IdentityPageComponent },
-  { path: 'gns', component: GnsPageComponent },
   { path: 'peerstore', component: PeerstorePageComponent },
-  { path: 'namestore', component: NamestorePageComponent }
+  { path: 'namestore', component: NamestorePageComponent },
+  { path: '**', component: ErrorPageComponent }
 ];
 
 @NgModule({
@@ -47,4 +50,14 @@ const routes: Routes = [
   exports: [ RouterModule ]
 })
 export class AppRoutingModule {
+  constructor(private router: Router,
+              private messages: MessagesService) {
+    router.events.pipe(filter(event => event instanceof NavigationEnd))
+    .subscribe((route: ActivatedRoute) => {
+      this.messages.dismissError();
+      this.messages.dismissSuccess();
+      this.messages.dismissWarning();
+      this.messages.dismissInformation();
+    });
+  }
 }