checkpoint

src/frontend/src/app/@core/core.module.ts

@@ -9,7 +9,7 @@ import {
   PlayerService,
   StateService,
 } from './utils';
-import { LoginApiService, initializeLoginSvc } from '../frontcraft/login-api';
+import { LoginApiService, initializeLoginSvc } from '../frontcraft/services/login-api';
 
 const DATA_SERVICES = [  
   {provide: LoginApiService, useClass: LoginApiService},

src/frontend/src/app/@theme/components/footer/footer.component.ts

@@ -4,7 +4,7 @@ import { Component } from '@angular/core';
   selector: 'ngx-footer',
   styleUrls: ['./footer.component.scss'],
   template: `
-    <span class="created-by">Created with ♥ by <b><a href="https://akveo.com" target="_blank">Akveo</a></b> 2019</span>
+    <span class="created-by">Created with <i class="fa fa-gamepad"></i> by <b><a href="https://frontcraft.me" target="_blank">FrontCraft</a></b></span>
     <div class="socials">
       <a href="http://www.versioncontrol.me/" target="_blank" class="ion ion-social-github"></a>
     </div>

src/frontend/src/app/@theme/components/header/header.component.html

@@ -15,12 +15,14 @@
     </nb-action>
     <nb-action class="control-item" icon="email-outline"></nb-action>
     <nb-action class="control-item" icon="bell-outline"></nb-action>
+
     <nb-action class="user-action">
       <nb-user [nbContextMenu]="userMenu"
-               [onlyPicture]="userPictureOnly"
+               [onlyPicture]="false"
                [name]="user?.name"
                [picture]="user?.picture">
       </nb-user>
     </nb-action>
+
   </nb-actions>
 </div>

src/frontend/src/app/@theme/components/header/header.component.ts

@@ -1,10 +1,11 @@
 import { Component, OnDestroy, OnInit } from '@angular/core';
 import { NbMediaBreakpointsService, NbMenuService, NbSidebarService, NbThemeService } from '@nebular/theme';
 
-import { UserData } from '../../../@core/data/users';
 import { LayoutService } from '../../../@core/utils';
 import { map, takeUntil } from 'rxjs/operators';
 import { Subject } from 'rxjs';
+import { LoginApiService } from '../../../frontcraft/services/login-api';
+import { User } from '../../../../../../backend/Types/Types';
 
 @Component({
   selector: 'ngx-header',
@@ -15,7 +16,7 @@ export class HeaderComponent implements OnInit, OnDestroy {
 
   private destroy$: Subject<void> = new Subject<void>();
   userPictureOnly: boolean = false;
-  user: any;
+  user: User;
 
   themes = [
     {
@@ -44,12 +45,15 @@ export class HeaderComponent implements OnInit, OnDestroy {
               private menuService: NbMenuService,
               private themeService: NbThemeService,
               private layoutService: LayoutService,
-              private breakpointService: NbMediaBreakpointsService) {
-  }
+              private breakpointService: NbMediaBreakpointsService,
+              private loginService: LoginApiService
+             ) {}
 
   ngOnInit() {
     this.currentTheme = this.themeService.currentTheme;
 
+    this.user = this.loginService.getCurrentUser()
+
     /*
     this.userService.getUsers()
       .pipe(takeUntil(this.destroy$))

src/frontend/src/app/app-routing.module.ts

@@ -1,22 +1,25 @@
 import { ExtraOptions, RouterModule, Routes } from '@angular/router';
 import { NgModule } from '@angular/core';
-import {
-  NbLoginComponent,
-  NbLogoutComponent,
-  NbRegisterComponent,
-  NbRequestPasswordComponent,
-  NbResetPasswordComponent,
-} from '@nebular/auth';
 
 const routes: Routes = [
   {
     path: 'pages',
-    loadChildren: () => import('./pages/pages.module')
+    loadChildren: () => import('./demo_pages/pages.module')
       .then(m => m.PagesModule),
   },
+  {
+    path: 'auth',
+    loadChildren: () => import('./frontcraft/auth/auth.module')
+      .then(m => m.MyAuthModule),
+  },
+  {
+    path: 'frontcraft',
+    loadChildren: () => import('./frontcraft/pages/pages.module')
+      .then(m => m.FrontcraftPagesModule),
+  },
   
-  { path: '', redirectTo: 'pages', pathMatch: 'full' },
-  { path: '**', redirectTo: 'pages' },
+  { path: '', redirectTo: 'frontcraft', pathMatch: 'full' },
+  { path: '**', redirectTo: 'frontcraft' },
 ];
 
 const config: ExtraOptions = {

src/frontend/src/app/app.component.ts

@@ -5,7 +5,7 @@
  */
 import { Component, OnInit } from '@angular/core';
 import { AnalyticsService } from './@core/utils/analytics.service';
-import { LoginApiService } from './frontcraft/login-api';
+import { LoginApiService } from './frontcraft/services/login-api';
 
 @Component({
   selector: 'ngx-app',