Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
Codecrew
/
Moya
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
30
Merge Requests
2
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit cdf83bdf
authored
Aug 03, 2018
by
Tuukka Kivilahti
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
comments fixed
1 parent
a8e0ae8c
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
10 additions
and
11 deletions
code/moya-angular/package.json
code/moya-angular/src/app/app-routing.module.ts
code/moya-angular/src/app/app.module.ts
code/moya-angular/src/app/components/moya-locale/moya-locale.service.ts
code/moya-angular/src/app/menu/left-menu/left-menu.component.ts
code/moya-web/src/main/java/fi/codecrew/moya/rest/RestApplicationEntrypoint.java
code/moya-angular/package.json
View file @
cdf83bd
...
...
@@ -29,8 +29,14 @@
"@angular/router"
:
"^5.2.9"
,
"@ngx-translate/core"
:
"^9.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"
,
"core-js"
:
"^2.5.1"
,
"graphql"
:
"^0.13.2"
,
"graphql-tag"
:
"^2.9.2"
,
"ngx-bootstrap"
:
"^2.0.2"
,
"rxjs"
:
"^5.5.0"
,
"ts-helpers"
:
"^1.1.1"
,
...
...
code/moya-angular/src/app/app-routing.module.ts
View file @
cdf83bd
...
...
@@ -6,7 +6,6 @@ import {FrontpageComponent} from './components/frontpage/frontpage.component';
const
APP_ROUTES
:
Routes
=
[
{
path
:
'login'
,
component
:
LoginComponent
},
{
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
:
'index'
,
component
:
FrontpageComponent
},
{
path
:
''
,
pathMatch
:
'full'
,
redirectTo
:
'/index'
,
}
...
...
code/moya-angular/src/app/app.module.ts
View file @
cdf83bd
...
...
@@ -16,6 +16,7 @@ import { NgModule } from '@angular/core';
import
{
LoginModule
}
from
'./modules/login/login.module'
;
import
{
LeftMenuModule
}
from
'./menu/left-menu/left-menu.module'
;
import
{
FrontpageComponent
}
from
'./components/frontpage/frontpage.component'
;
import
{
ApolloModule
}
from
"apollo-angular"
;
@
NgModule
({
declarations
:
[
...
...
@@ -31,6 +32,8 @@ import { FrontpageComponent } from './components/frontpage/frontpage.component';
HttpClientModule
,
LoginModule
,
LeftMenuModule
,
ApolloModule
,
AlertModule
.
forRoot
(),
...
...
code/moya-angular/src/app/components/moya-locale/moya-locale.service.ts
View file @
cdf83bd
...
...
@@ -24,8 +24,6 @@ export class MoyaLocaleService {
selectedLocale
:
string
;
constructor
(
private
http
:
HttpClient
,
private
translate
:
TranslateService
)
{
// Falback to be something what everyone can read
this
.
translate
.
setDefaultLang
(
ENGLISH
);
this
.
getUserLocale
().
subscribe
();
}
...
...
code/moya-angular/src/app/menu/left-menu/left-menu.component.ts
View file @
cdf83bd
...
...
@@ -58,13 +58,6 @@ export class LeftMenuComponent implements OnInit {
}
ngOnInit
()
{
}
activateInfo
()
{
this
.
menu
=
MENU
.
INFO
;
this
.
styleClass
=
'infoMenu'
;
...
...
code/moya-web/src/main/java/fi/codecrew/moya/rest/RestApplicationEntrypoint.java
View file @
cdf83bd
...
...
@@ -63,7 +63,7 @@ public class RestApplicationEntrypoint extends ResourceConfig {
// packages to scan
packages
(
"fi.codecrew.moya.rest"
);
registerInstances
(
new
LoggingFeature
());
//
registerInstances(new LoggingFeature());
}
}
Write
Preview
Markdown
is supported
Attach a file
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to post a comment