Skip to content

Codecrew / Moya

Go to a project
Commit 1ee4566f by Tuukka Kivilahti
Options

litle stuff

1 parent d51e420e
Inline Side-by-side
Showing with 26 additions and 27 deletions
code/moya-angular/package.json
...@@ -6,44 +6,44 @@ ...@@ -6,44 +6,44 @@
"scripts": {}, "scripts": {},
"private": true, "private": true,
"dependencies": { "dependencies": {
"@angular/common": "^2.3.1", "@angular/common": "^4.1.2",
"@angular/compiler": "^2.3.1", "@angular/compiler": "^4.1.2",
"@angular/core": "^2.3.1", "@angular/core": "^4.1.2",
"@angular/forms": "^2.3.1", "@angular/forms": "^4.1.2",
"@angular/http": "^2.3.1", "@angular/http": "^4.1.2",
"@angular/material": "^2.0.0-beta.1", "@angular/material": "^2.0.0-beta.1",
"@angular/platform-browser": "^2.3.1", "@angular/platform-browser": "^4.1.2",
"@angular/platform-browser-dynamic": "^2.3.1", "@angular/platform-browser-dynamic": "^4.1.2",
"@angular/router": "^3.3.1", "@angular/router": "^4.1.2",
"bootstrap": "^4.0.0-alpha.6", "bootstrap": "^4.0.0-alpha.6",
"core-js": "^2.4.1", "core-js": "^2.4.1",
"ng2-bootstrap": "^1.3.3", "ng2-bootstrap": "^1.3.3",
"node-sass": "^4.5.0", "node-sass": "^4.5.0",
"rxjs": "^5.0.1", "rxjs": "^5.0.1",
"ts-helpers": "^1.1.1", "ts-helpers": "^1.1.1",
"zone.js": "^0.7.2" "zone.js": "^0.8.10"
}, },
"devDependencies": { "devDependencies": {
"@angular/cli": "^1.0.0-beta.32.3", "@angular/cli": "^1.0.0-beta.32.3",
"@angular/compiler-cli": "^2.3.1", "@angular/compiler-cli": "^4.1.2",
"@angularclass/hmr": "^1.2.2", "@angularclass/hmr": "^1.2.2",
"@types/jasmine": "2.5.38", "@types/jasmine": "2.5.47",
"@types/node": "^6.0.42", "@types/node": "^7.0.18",
"angular-cli": "1.0.0-beta.24", "angular-cli": "1.0.0-beta.28.3",
"codelyzer": "~2.0.0-beta.1", "codelyzer": "~3.0.1",
"jasmine-core": "2.5.2", "jasmine-core": "2.6.1",
"jasmine-spec-reporter": "2.5.0", "jasmine-spec-reporter": "4.1.0",
"karma": "1.2.0", "karma": "1.7.0",
"karma-chrome-launcher": "^2.0.0", "karma-chrome-launcher": "^2.0.0",
"karma-cli": "^1.0.1", "karma-cli": "^1.0.1",
"karma-jasmine": "^1.0.2", "karma-jasmine": "^1.0.2",
"karma-remap-istanbul": "^0.2.1", "karma-remap-istanbul": "^0.6.0",
"node-sass": "^4.5.0", "node-sass": "^4.5.0",
"protractor": "~4.0.13", "protractor": "~5.1.1",
"raw-loader": "^0.5.1", "raw-loader": "^0.5.1",
"sass-loader": "^4.1.1", "sass-loader": "^6.0.5",
"ts-node": "1.2.1", "ts-node": "3.0.4",
"tslint": "^4.0.2", "tslint": "^5.2.0",
"typescript": "~2.1.5" "typescript": "~2.3.2"
} }
} }
code/moya-angular/src/app/app.module.ts
...@@ -30,7 +30,7 @@ const appRoutes: Routes = [ ...@@ -30,7 +30,7 @@ const appRoutes: Routes = [
HttpModule, HttpModule,
MaterialModule.forRoot(), MaterialModule.forRoot(),
AlertModule.forRoot(), AlertModule.forRoot(),
MoyaRestModule.forRoot(), MoyaRestModule.forRoot() ,
RouterModule.forRoot(appRoutes) RouterModule.forRoot(appRoutes)
], ],
providers: [], providers: [],
......
code/moya-web/src/main/java/fi/codecrew/moya/rest/v3/VipRestViewV3.java
package fi.codecrew.moya.rest.v3; package fi.codecrew.moya.rest.v3;
import com.wordnik.swagger.annotations.Api;
import fi.codecrew.moya.beans.PermissionBeanLocal; import fi.codecrew.moya.beans.PermissionBeanLocal;
import fi.codecrew.moya.beans.ProductBeanLocal; import fi.codecrew.moya.beans.ProductBeanLocal;
import fi.codecrew.moya.beans.UserBeanLocal; import fi.codecrew.moya.beans.UserBeanLocal;
...@@ -9,10 +8,10 @@ import fi.codecrew.moya.model.EventUser; ...@@ -9,10 +8,10 @@ import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.Vip; import fi.codecrew.moya.model.Vip;
import fi.codecrew.moya.model.VipProduct; import fi.codecrew.moya.model.VipProduct;
import fi.codecrew.moya.rest.v2.pojo.VipProductPojo; import fi.codecrew.moya.rest.v2.pojo.VipProductPojo;
import fi.codecrew.moya.rest.v2.pojo.VipRestPojo;
import fi.codecrew.moya.rest.v3.pojo.VipRestPojoV3; import fi.codecrew.moya.rest.v3.pojo.VipRestPojoV3;
import fi.codecrew.moya.utilities.SearchQuery; import fi.codecrew.moya.utilities.SearchQuery;
import fi.codecrew.moya.utilities.SearchResult; import fi.codecrew.moya.utilities.SearchResult;
import io.swagger.annotations.Api;
import javax.ejb.EJB; import javax.ejb.EJB;
import javax.enterprise.context.RequestScoped; import javax.enterprise.context.RequestScoped;
......
code/moya-web/src/main/java/fi/codecrew/moya/rest/v3/pojo/VipRestPojoV3.java
package fi.codecrew.moya.rest.v3.pojo; package fi.codecrew.moya.rest.v3.pojo;
import com.wordnik.swagger.annotations.ApiModel;
import fi.codecrew.moya.model.Vip; import fi.codecrew.moya.model.Vip;
import fi.codecrew.moya.model.VipProduct; import fi.codecrew.moya.model.VipProduct;
import fi.codecrew.moya.rest.v2.pojo.VipProductPojo; import fi.codecrew.moya.rest.v2.pojo.VipProductPojo;
import io.swagger.annotations.ApiModel;
import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlRootElement;
import java.util.ArrayList; import java.util.ArrayList;
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!