Commit cdf83bdf by Tuukka Kivilahti

comments fixed

1 parent a8e0ae8c
...@@ -29,8 +29,14 @@ ...@@ -29,8 +29,14 @@
"@angular/router": "^5.2.9", "@angular/router": "^5.2.9",
"@ngx-translate/core": "^9.0.0", "@ngx-translate/core": "^9.0.0",
"@ngx-translate/http-loader": "^2.0.0", "@ngx-translate/http-loader": "^2.0.0",
"apollo-angular": "^1.1.2",
"apollo-angular-link-http": "^1.1.1",
"apollo-cache-inmemory": "^1.2.6",
"apollo-client": "^2.3.7",
"bootstrap": "^4.0.0", "bootstrap": "^4.0.0",
"core-js": "^2.5.1", "core-js": "^2.5.1",
"graphql": "^0.13.2",
"graphql-tag": "^2.9.2",
"ngx-bootstrap": "^2.0.2", "ngx-bootstrap": "^2.0.2",
"rxjs": "^5.5.0", "rxjs": "^5.5.0",
"ts-helpers": "^1.1.1", "ts-helpers": "^1.1.1",
......
...@@ -6,7 +6,6 @@ import {FrontpageComponent} from './components/frontpage/frontpage.component'; ...@@ -6,7 +6,6 @@ import {FrontpageComponent} from './components/frontpage/frontpage.component';
const APP_ROUTES: Routes = [ const APP_ROUTES: Routes = [
{ path: 'login', component: LoginComponent }, { path: 'login', component: LoginComponent },
{ path: 'viplist', loadChildren: 'app/modules/viplist/viplist.module#ViplistModule' }, { path: 'viplist', loadChildren: 'app/modules/viplist/viplist.module#ViplistModule' },
/*{ path: 'viplist', component: InfoViplistPageComponent },*/
{ path: 'old', loadChildren: 'app/modules/old-moya/old-moya.module#OldMoyaModule' }, { path: 'old', loadChildren: 'app/modules/old-moya/old-moya.module#OldMoyaModule' },
{ path: 'index', component: FrontpageComponent }, { path: 'index', component: FrontpageComponent },
{ path: '', pathMatch: 'full' , redirectTo: '/index', } { path: '', pathMatch: 'full' , redirectTo: '/index', }
......
...@@ -16,6 +16,7 @@ import { NgModule } from '@angular/core'; ...@@ -16,6 +16,7 @@ import { NgModule } from '@angular/core';
import {LoginModule} from './modules/login/login.module'; import {LoginModule} from './modules/login/login.module';
import {LeftMenuModule} from './menu/left-menu/left-menu.module'; import {LeftMenuModule} from './menu/left-menu/left-menu.module';
import { FrontpageComponent } from './components/frontpage/frontpage.component'; import { FrontpageComponent } from './components/frontpage/frontpage.component';
import {ApolloModule} from "apollo-angular";
@NgModule({ @NgModule({
declarations: [ declarations: [
...@@ -31,6 +32,8 @@ import { FrontpageComponent } from './components/frontpage/frontpage.component'; ...@@ -31,6 +32,8 @@ import { FrontpageComponent } from './components/frontpage/frontpage.component';
HttpClientModule, HttpClientModule,
LoginModule, LoginModule,
LeftMenuModule, LeftMenuModule,
ApolloModule,
AlertModule.forRoot(), AlertModule.forRoot(),
......
...@@ -24,8 +24,6 @@ export class MoyaLocaleService { ...@@ -24,8 +24,6 @@ export class MoyaLocaleService {
selectedLocale: string; selectedLocale: string;
constructor(private http: HttpClient, private translate: TranslateService) { constructor(private http: HttpClient, private translate: TranslateService) {
// Falback to be something what everyone can read
this.translate.setDefaultLang(ENGLISH); this.translate.setDefaultLang(ENGLISH);
this.getUserLocale().subscribe(); this.getUserLocale().subscribe();
} }
......
...@@ -58,13 +58,6 @@ export class LeftMenuComponent implements OnInit { ...@@ -58,13 +58,6 @@ export class LeftMenuComponent implements OnInit {
} }
ngOnInit() {
}
activateInfo() { activateInfo() {
this.menu = MENU.INFO; this.menu = MENU.INFO;
this.styleClass = 'infoMenu'; this.styleClass = 'infoMenu';
......
...@@ -63,7 +63,7 @@ public class RestApplicationEntrypoint extends ResourceConfig { ...@@ -63,7 +63,7 @@ public class RestApplicationEntrypoint extends ResourceConfig {
// packages to scan // packages to scan
packages("fi.codecrew.moya.rest"); packages("fi.codecrew.moya.rest");
registerInstances(new LoggingFeature()); //registerInstances(new LoggingFeature());
} }
} }
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!