Skip to content

Linnea Samila / Moya

Go to a project
Commit 3f479bc0 by Tuukka Kivilahti
Options

working test version

1 parent 45a70c54
Inline Side-by-side
Showing with 53 additions and 92 deletions
code/moya-angular/src/app/app.component.html
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<div id="contentarea"> <div id="contentarea">
<div id="topbar"> <div id="topbar">
<top-menu></top-menu> <top-menu></top-menu>
<h1>{{"Testing"|i18n}}</h1> <!-- h1>{{"Testing"|i18n}}</h1 -->
</div> </div>
<div id="content"> <div id="content">
<router-outlet></router-outlet> <router-outlet></router-outlet>
......
code/moya-angular/src/app/app.module.ts
import { BrowserModule } from '@angular/platform-browser'; import {BrowserModule} from '@angular/platform-browser';
import { NgModule } from '@angular/core'; import {NgModule} from '@angular/core';
import { FormsModule } from '@angular/forms'; import {FormsModule} from '@angular/forms';
import { HttpModule } from '@angular/http'; import {HttpModule} from '@angular/http';
import { AppComponent } from './app.component'; import {AppComponent} from './app.component';
import { ViplistComponent } from './viplist/viplist.component'; import {ViplistComponent} from './viplist/viplist.component';
import {AlertModule} from 'ng2-bootstrap'; import {AlertModule} from 'ng2-bootstrap';
import {MoyaRestModule} from 'moya-angular-common'; import {MoyaRestModule} from 'moya-angular-common';
import { RouterModule, Routes } from '@angular/router'; import {RouterModule, Routes} from '@angular/router';
import { OldMoyaComponent } from './old-moya/old-moya.component'; import {OldMoyaComponent} from './old-moya/old-moya.component';
import {SafePipe } from './pipes/safe.pipe'; import {SafePipe} from './pipes/safe.pipe';
import {TestComponent} from './test/test.component'; import {TestComponent} from './test/test.component';
import { AdminMenuComponent } from './menu/admin-menu/admin-menu.component'; import {AdminMenuComponent} from './menu/admin-menu/admin-menu.component';
import {TopMenuComponent} from './menu/top-menu/top-menu.component'; import {TopMenuComponent} from './menu/top-menu/top-menu.component';
import {LeftMenuComponent} from './menu/left-menu/left-menu.component'; import {LeftMenuComponent} from './menu/left-menu/left-menu.component';
import { InfoMenuComponent } from './menu/info-menu/info-menu.component'; import {InfoMenuComponent} from './menu/info-menu/info-menu.component';
import { UserMenuComponent } from './menu/user-menu/user-menu.component'; import {UserMenuComponent} from './menu/user-menu/user-menu.component';
import { UserComponent } from './user/user.component'; import {UserComponent} from './user/user.component';
import { InfoComponent } from './info/info.component'; import {InfoComponent} from './info/info.component';
import { AdminComponent } from './admin/admin.component'; import {AdminComponent} from './admin/admin.component';
import { I18nPipe } from './pipes/i18n.pipe'; import {I18nPipe} from './pipes/i18n.pipe';
const appRoutes: Routes = [ const appRoutes: Routes = [
{ path: 'user', {
path: 'user',
children: [ children: [
{ path: '', component: UserMenuComponent, outlet: 'left-menu' }, {path: '', component: UserMenuComponent, outlet: 'left-menu'},
{ path: '', pathMatch: 'full', component: UserComponent }, {path: '', pathMatch: 'full', component: UserComponent},
{ path: 'old', component: OldMoyaComponent }, {path: 'old', component: OldMoyaComponent},
] ]
}, },
{ path: 'info', {
path: 'info',
children: [ children: [
{ path: '', component: InfoMenuComponent, outlet: 'left-menu' }, {path: '', component: InfoMenuComponent, outlet: 'left-menu'},
{ path: '', pathMatch: 'full', component: OldMoyaComponent }, {path: '', pathMatch: 'full', component: OldMoyaComponent},
{ path: 'old', component: OldMoyaComponent }, {path: 'old', component: OldMoyaComponent},
{ path: 'viplist', component: ViplistComponent }, {path: 'viplist', component: ViplistComponent},
] ]
}, },
{ path: 'admin', {
path: 'admin',
children: [ children: [
{ path: '', component: AdminMenuComponent, outlet: 'left-menu' }, {path: '', component: AdminMenuComponent, outlet: 'left-menu'},
{ path: '', pathMatch: 'full', component: AdminComponent }, {path: '', pathMatch: 'full', component: AdminComponent},
{ path: 'old', component: OldMoyaComponent }, {path: 'old', component: OldMoyaComponent},
] ]
}, },
{ path: 'old', pathMatch: 'prefix', component: OldMoyaComponent }, {path: 'old', pathMatch: 'prefix', component: OldMoyaComponent},
]; ];
@NgModule({ @NgModule({
declarations: [ declarations: [
AppComponent, AppComponent,
...@@ -73,10 +75,11 @@ const appRoutes: Routes = [ ...@@ -73,10 +75,11 @@ const appRoutes: Routes = [
FormsModule, FormsModule,
HttpModule, HttpModule,
AlertModule.forRoot(), AlertModule.forRoot(),
MoyaRestModule.forRoot() , MoyaRestModule.forRoot(),
RouterModule.forRoot(appRoutes) RouterModule.forRoot(appRoutes)
], ],
providers: [], providers: [],
bootstrap: [AppComponent] bootstrap: [AppComponent]
}) })
export class AppModule { } export class AppModule {
}
code/moya-angular/src/app/menu/admin-menu/admin-menu.component.ts
import { Component, OnInit } from '@angular/core'; import {Component} from '@angular/core';
import {MenuGroup} from '../../models/menu-group.model'; import {MenuGroup} from '../../models/menu-group.model';
import {MENU} from '../defines/menu'; import {MENU} from '../defines/menu';
...@@ -7,13 +7,7 @@ import {MENU} from '../defines/menu'; ...@@ -7,13 +7,7 @@ import {MENU} from '../defines/menu';
templateUrl: './admin-menu.component.html', templateUrl: './admin-menu.component.html',
styleUrls: ['./admin-menu.component.scss'] styleUrls: ['./admin-menu.component.scss']
}) })
export class AdminMenuComponent implements OnInit { export class AdminMenuComponent {
menu: MenuGroup[]= MENU.ADMIN;
constructor() { }
ngOnInit() {
}
menu: MenuGroup[] = MENU.ADMIN;
} }
code/moya-angular/src/app/viplist/viplist.component.ts
import { Component, OnInit } from '@angular/core'; import {Component, OnInit} from '@angular/core';
import {Observable} from 'rxjs'; import {Observable} from 'rxjs';
import {ViplistService, Vip} from 'moya-angular-common'; import {ViplistService, Vip} from 'moya-angular-common';
...@@ -11,7 +11,8 @@ export class ViplistComponent implements OnInit { ...@@ -11,7 +11,8 @@ export class ViplistComponent implements OnInit {
vips: Observable<Array<Vip>>; vips: Observable<Array<Vip>>;
constructor(private viplistService: ViplistService) { } constructor(private viplistService: ViplistService) {
}
ngOnInit() { ngOnInit() {
......
code/moya-beans/ejbModule/fi/codecrew/moya/beans/BootstrapBean.java
...@@ -442,7 +442,7 @@ public class BootstrapBean implements BootstrapBeanLocal { ...@@ -442,7 +442,7 @@ public class BootstrapBean implements BootstrapBeanLocal {
"ALTER TABLE account_events DROP COLUMN delivered_count;" "ALTER TABLE account_events DROP COLUMN delivered_count;"
}); });
/*
dbUpdates.add(new String[] { dbUpdates.add(new String[] {
"ALTER TABLE menuitem ADD COLUMN angularpage BOOLEAN NOT NULL DEFAULT false;" "ALTER TABLE menuitem ADD COLUMN angularpage BOOLEAN NOT NULL DEFAULT false;"
}); });
...@@ -450,7 +450,7 @@ public class BootstrapBean implements BootstrapBeanLocal { ...@@ -450,7 +450,7 @@ public class BootstrapBean implements BootstrapBeanLocal {
dbUpdates.add(new String[] { dbUpdates.add(new String[] {
"ALTER TABLE menuitem DROP COLUMN angularpage;" "ALTER TABLE menuitem DROP COLUMN angularpage;"
}); }); */
} }
public BootstrapBean() { public BootstrapBean() {
......
code/moya-beans/ejbModule/fi/codecrew/moya/beans/JaasBean.java
...@@ -48,7 +48,6 @@ import fi.codecrew.moya.model.ApplicationPermission; ...@@ -48,7 +48,6 @@ import fi.codecrew.moya.model.ApplicationPermission;
import fi.codecrew.moya.model.EventUser; import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.LanEvent; import fi.codecrew.moya.model.LanEvent;
import fi.codecrew.moya.model.Role; import fi.codecrew.moya.model.Role;
import sun.reflect.generics.reflectiveObjects.NotImplementedException;
/** /**
* Session Bean implementation class SessionHandlerBean * Session Bean implementation class SessionHandlerBean
......
code/moya-beans/ejbModule/fi/codecrew/moya/beans/MenuBean.java
...@@ -140,9 +140,6 @@ public class MenuBean implements MenuBeanLocal { ...@@ -140,9 +140,6 @@ public class MenuBean implements MenuBeanLocal {
MenuNavigation helpmenu = usermenu.addPage(null, null); MenuNavigation helpmenu = usermenu.addPage(null, null);
helpmenu.setKey("topnavi.help"); helpmenu.setKey("topnavi.help");
helpmenu.addPage(menuitemfacade.findOrCreate("/help"), UserPermission.HELPPAGE); helpmenu.addPage(menuitemfacade.findOrCreate("/help"), UserPermission.HELPPAGE);
helpmenu.addPage(menuitemfacade.findOrCreate("/angular", true), null). setVisible(false);
MenuNavigation userkauppa = usermenu.addPage(null, null); MenuNavigation userkauppa = usermenu.addPage(null, null);
userkauppa.setKey("topnavi.usershop"); userkauppa.setKey("topnavi.usershop");
......
code/moya-beans/ejbModule/fi/codecrew/moya/facade/MenuitemFacade.java
...@@ -43,32 +43,7 @@ public class MenuitemFacade extends IntegerPkGenericFacade<Menuitem> { ...@@ -43,32 +43,7 @@ public class MenuitemFacade extends IntegerPkGenericFacade<Menuitem> {
public Menuitem findOrCreate(String url) { public Menuitem findOrCreate(String url) {
return findOrCreate(url, false); return findOrCreate(url);
}
public Menuitem findOrCreate(String url, boolean angularPage) {
if (url == null || url.isEmpty()) {
return null;
}
try {
CriteriaBuilder cb = getEm().getCriteriaBuilder();
CriteriaQuery<Menuitem> cq = cb.createQuery(Menuitem.class);
Root<Menuitem> root = cq.from(Menuitem.class);
cq.where(cb.equal(root.get(Menuitem_.url), url));
Menuitem ret = super.getSingleNullableResult(getEm()
.createQuery(cq));
if (ret == null) {
ret = new Menuitem();
ret.setUrl(url);
ret.setAngularPage(angularPage);
create(ret);
}
return ret;
} catch (Exception e) {
logger.warn("Exception menussa" + url, e);
}
return null;
} }
} }
code/moya-database/src/main/java/fi/codecrew/moya/model/Menuitem.java
...@@ -38,9 +38,6 @@ public class Menuitem extends GenericEntity { ...@@ -38,9 +38,6 @@ public class Menuitem extends GenericEntity {
@Column(nullable = false, unique = true) @Column(nullable = false, unique = true)
private String url; private String url;
@Column(nullable = false, name = "angularpage")
private boolean angularPage = false;
@Lob @Lob
private String description; private String description;
......
code/moya-web/src/main/java/fi/codecrew/moya/rest/v3/VipRestViewV3.java
...@@ -7,7 +7,6 @@ import fi.codecrew.moya.beans.VipBeanLocal; ...@@ -7,7 +7,6 @@ import fi.codecrew.moya.beans.VipBeanLocal;
import fi.codecrew.moya.model.EventUser; 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.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;
...@@ -102,7 +101,7 @@ public class VipRestViewV3 { ...@@ -102,7 +101,7 @@ public class VipRestViewV3 {
vip.setEventUser(eventuser); vip.setEventUser(eventuser);
vip.setCreator(curruser); vip.setCreator(curruser);
vip.setHost(host); vip.setHost(host);
/*
for (VipProductPojo p : create.products) { for (VipProductPojo p : create.products) {
VipProduct prod = new VipProduct(vip); VipProduct prod = new VipProduct(vip);
vip.getProducts().add(prod); vip.getProducts().add(prod);
...@@ -113,7 +112,7 @@ public class VipRestViewV3 { ...@@ -113,7 +112,7 @@ public class VipRestViewV3 {
} }
prod.setQuantity(p.quantity); prod.setQuantity(p.quantity);
prod.setNotes(p.notes); prod.setNotes(p.notes);
} }*/
vipbean.create(vip); vipbean.create(vip);
......
code/moya-web/src/main/java/fi/codecrew/moya/rest/v3/pojo/VipRestPojoV3.java
...@@ -2,7 +2,7 @@ package fi.codecrew.moya.rest.v3.pojo; ...@@ -2,7 +2,7 @@ package fi.codecrew.moya.rest.v3.pojo;
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.pojo.vip.v2.VipProductPojo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlRootElement;
...@@ -51,9 +51,10 @@ public class VipRestPojoV3 { ...@@ -51,9 +51,10 @@ public class VipRestPojoV3 {
if (v.getHost() != null) { if (v.getHost() != null) {
r.hostId = v.getHost().getUser().getId(); r.hostId = v.getHost().getUser().getId();
} }
/*
for (VipProduct prod : v.getProducts()) { for (VipProduct prod : v.getProducts()) {
r.products.add(VipProductPojo.create(prod)); r.products.add(VipProductPojo.create(prod));
} }*/
return r; return r;
} }
} }
code/pom.xml
...@@ -47,8 +47,8 @@ ...@@ -47,8 +47,8 @@
<rewriteservlet.version>3.4.1.Final</rewriteservlet.version> <rewriteservlet.version>3.4.1.Final</rewriteservlet.version>
<iudex.standalone>1.0.23</iudex.standalone> <iudex.standalone>1.0.23</iudex.standalone>
<js.node.version>v6.9.1</js.node.version> <js.node.version>v8.6.0</js.node.version>
<js.npm.version>4.1.2</js.npm.version> <js.npm.version>5.6.0</js.npm.version>
<eirslett.frontend.version>1.4</eirslett.frontend.version> <eirslett.frontend.version>1.4</eirslett.frontend.version>
</properties> </properties>
...@@ -92,11 +92,6 @@ ...@@ -92,11 +92,6 @@
<repositories> <repositories>
<repository> <repository>
<id>prime-repo</id>
<name>PrimeFaces Maven Repository</name>
<url>https://repository.primefaces.org</url>
</repository>
<repository>
<id>iudex</id> <id>iudex</id>
<url>http://iudex.fi/maven/</url> <url>http://iudex.fi/maven/</url>
</repository> </repository>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!