Tuukka Kivilahti · @tkfftk · Aino Leppänen · Aino Leppänen · Aino Leppänen · Aino Leppänen
--- a/code/moya-angular/src/app/app-routing.module.ts
+++ b/code/moya-angular/src/app/app-routing.module.ts
-import { LoginComponent } from './pages/login/login.component';
-import { InfoComponent } from './pages/info/info.component';
+import {Routes, RouterModule, PreloadAllModules, NoPreloading} from '@angular/router';
+import { LoginComponent } from './modules/login/login.component';
+import {FrontpageComponent} from './components/frontpage/frontpage.component';

 const APP_ROUTES: Routes = [
-  { path: 'info', loadChildren: 'app/pages/info/info.module#InfoModule' },
-  { path: 'admin', loadChildren: 'app/pages/admin/admin.module#AdminModule' },
-  { path: 'user', loadChildren: 'app/pages/user/user.module#UserModule' },
  { path: 'login', component: LoginComponent },
-  { path: '', pathMatch: 'full', redirectTo: 'login' },
-  { path: '**', component: LoginComponent }
-]; 
+  { path: 'viplist', loadChildren: 'app/modules/viplist/viplist.module#ViplistModule'  },
+  /*{ path: 'viplist', component: InfoViplistPageComponent  },*/
--- a/code/moya-angular/src/app/components/moya-locale/moya-locale.component.ts
+++ b/code/moya-angular/src/app/components/moya-locale/moya-locale.component.ts
  svSelected = true;
  enSelected = true;

-  constructor(private localeService: MoyaLocaleService, private translate: TranslateService) {
-    // fallback language
-    translate.setDefaultLang(DEFAULT_LOCALE);
-    this.selectLocale(DEFAULT_LOCALE);
-  }
+  constructor(private localeService: MoyaLocaleService) { }
--- a/code/moya-angular/src/app/components/moya-locale/moya-locale.service.ts
+++ b/code/moya-angular/src/app/components/moya-locale/moya-locale.service.ts
+export const DEFAULT_LOCALE = FINNISH;
 const LOCALSTORAGE_NAME = 'currently used locale code';

+
+
+
+
 @Injectable()
 export class MoyaLocaleService {
-  constructor(private http: HttpClient) { }
+
+  selectedLocale: string;
+
+  constructor(private http: HttpClient, private translate: TranslateService) {
+
+    // Falback to be something what everyone can read
--- a/code/moya-angular/src/app/menu/defines/menu.ts
+++ b/code/moya-angular/src/app/menu/defines/menu.ts
      'items': [
-        { 'path': '/user/old', 'name': 'Poll', 'params': {p: 'poll/index.jsf'} },
-        { 'path': '/user/old', 'name': 'Invite friends', 'params': {p: 'user/invite.jsf'} },
+        { 'path': '/old/user', 'name': 'Poll', 'params': {p: 'poll/index.jsf'} },
+        { 'path': '/old/user', 'name': 'Invite friends', 'params': {p: 'user/invite.jsf'} },
      ]},
    {
      'name': 'Shop',
      'items': [
-        { 'path': '/user/old', 'name': 'Buy Tickets', 'params': {p: 'shop/createBill.jsf'} },
-        { 'path': '/user/old', 'name': 'Reserve Places', 'params': {p: 'neomap/reserve.jsf'} },
-        { 'path': '/user/old', 'name': 'Change Places', 'params': {p: 'neomap/moveplaces.jsf'} },
-        { 'path': '/user/old', 'name': 'Food Orders', 'params': {p: 'foodwave/list.jsf'} },
-        { 'path': '/user/old', 'name': 'Own Orders', 'params': {p: 'bill/list.jsf'} },
-        { 'path': '/user/old', 'name': 'Account Events', 'params': {p: 'user/accountEvents.jsf'} },
+        { 'path': '/old/user', 'name': 'Buy Tickets', 'params': {p: 'shop/createBill.jsf'} },
--- a/code/moya-angular/src/app/menu/defines/menu.ts
+++ b/code/moya-angular/src/app/menu/defines/menu.ts
+        { 'path': '/viplist/info', 'name': 'VipList'}
      ]}
  ];

  static USER: MenuGroup[] = [
    {
+      'name': '',
+      'items': [
+        { 'path': '/index', 'name': 'Frontpage' },
+      ]},
+    {
      'name': 'Event',
      'items': [
-        { 'path': '/user/old', 'name': 'Poll', 'params': {p: 'poll/index.jsf'} },
-        { 'path': '/user/old', 'name': 'Invite friends', 'params': {p: 'user/invite.jsf'} },
+        { 'path': '/old/user', 'name': 'Poll', 'params': {p: 'poll/index.jsf'} },
--- a/code/moya-angular/src/app/menu/left-menu/left-menu.component.ts
+++ b/code/moya-angular/src/app/menu/left-menu/left-menu.component.ts
+        this.activateInfo();
+        return;
+      }
+
+      if (this.searchPath(revent.url, MENU.ADMIN)) {
+        this.activateAdmin();
+        return;
+      }
+
+    });

  }

+
+
  ngOnInit() {