väliaikacommit

code/moya-angular/WebContent/WEB-INF/pretty-config.xml

@@ -3,6 +3,6 @@
                xsi:schemaLocation="http://ocpsoft.org/schema/rewrite-config-prettyfaces
                       http://ocpsoft.org/xml/ns/prettyfaces/rewrite-config-prettyfaces.xsd">
 
-    <rewrite match="^(?!.*\.(js|css|jpg|gif|png|ico|html)$).*$" substitute="/index.html" redirect="chain" />
+    <rewrite match="^(?!.*\.(js|css|jpg|gif|png|ico|html|svg)$).*$" substitute="/index.html" redirect="chain" />
 
   </pretty-config>

code/moya-angular/pom.xml

@@ -27,35 +27,35 @@
         <executions>
 
           <execution>
-            <!-- optional: you don't really need execution ids,
-            but it looks nice in your build log. -->
-            <id>install node and npm</id>
-            <goals>
-              <goal>install-node-and-npm</goal>
-            </goals>
-            <configuration>
-              <nodeVersion>${js.node.version}</nodeVersion>
-              <npmVersion>${js.npm.version}</npmVersion>
-            </configuration>
-          </execution>
+          <!-- optional: you don't really need execution ids,
+          but it looks nice in your build log. -->
+          <id>install node and npm</id>
+          <goals>
+            <goal>install-node-and-npm</goal>
+          </goals>
+          <configuration>
+            <nodeVersion>${js.node.version}</nodeVersion>
+            <npmVersion>${js.npm.version}</npmVersion>
+          </configuration>
+        </execution>
 
-          <execution>
-            <id>npm install</id>
-            <goals>
-              <goal>npm</goal>
-            </goals>
-          </execution>
+        <execution>
+          <id>npm install</id>
+          <goals>
+            <goal>npm</goal>
+          </goals>
+        </execution>
 
-          <execution>
-            <id>npm run build</id>
-            <goals>
-              <goal>npm</goal>
-            </goals>
-            <phase>generate-resources</phase>
-            <configuration>
-              <arguments>run build</arguments>
-            </configuration>
-          </execution>
+        <execution>
+          <id>npm run build</id>
+          <goals>
+            <goal>npm</goal>
+          </goals>
+          <phase>generate-resources</phase>
+          <configuration>
+            <arguments>run build</arguments>
+          </configuration>
+        </execution>
 
         </executions>
       </plugin>

code/moya-angular/src/app/app.module.ts

@@ -35,6 +35,7 @@ const appRoutes: Routes = [
       { path: '', component: InfoMenuComponent, outlet: 'left-menu' },
       { path: '', pathMatch: 'full', component: OldMoyaComponent },
       { path: 'old', component: OldMoyaComponent },
+      { path: 'viplist', component: ViplistComponent },
     ]
   },
   { path: 'admin',

code/moya-angular/src/app/menu/admin-menu/admin-menu.component.ts

@@ -9,7 +9,7 @@ import {MENU} from '../defines/menu';
 })
 export class AdminMenuComponent implements OnInit {
 
-  menu: MenuGroup[]= MENU.INFO;
+  menu: MenuGroup[]= MENU.ADMIN;
 
   constructor() { }
 

code/moya-angular/src/app/menu/defines/menu.ts

@@ -18,7 +18,8 @@ export class MENU {
     {
       'name': 'Users',
       'items': [
-        { 'path': '/info/old', 'name': 'List users', 'params': {p: 'useradmin/list.jsf'} }
+        { 'path': '/info/old', 'name': 'List users', 'params': {p: 'useradmin/list.jsf'} },
+        { 'path': '/info/viplist', 'name': 'VipList'}
       ]}
   ];
 

code/moya-angular/src/app/menu/left-menu/left-menu.component.html

@@ -13,6 +13,6 @@
 
   </nav>
 
-  <img id="moya-logo" src="assets/moya-logo.svg" />
+  <a href="http://codecrew.fi" alt="Codecrew homepage" target="_blank"><img id="moya-logo" src="assets/moya-logo.svg" /></a>
 </div>
 

code/moya-angular/src/app/old-moya/old-moya.component.ts

@@ -28,7 +28,6 @@ export class OldMoyaComponent implements OnInit {
         this.frameUrl = '/MoyaWeb/' + x;
       }
     });
-
   }
 
 

code/moya-web/WebContent/resources/templates/nglayout/template.xhtml

@@ -180,10 +180,10 @@
 				if(window.self === window.top) {
 
 				    var url = document.location.href.split("/MoyaWeb/", 2);
-				    var realUrl = "/MoyaNG/old";
+				    var realUrl = "/MoyaNG";
 
 				    if(url.length > 1) {
-				        realUrl = "/MoyaNG/old?p=" + url[1];
+				        realUrl = "/MoyaNG/user/old?p=" + url[1];
 					}
 
 					document.location.href = realUrl;

code/pom.xml

@@ -47,8 +47,8 @@
 		<rewriteservlet.version>3.4.1.Final</rewriteservlet.version>
 		<iudex.standalone>1.0.23</iudex.standalone>
 
-		<js.node.version>v7.10.0</js.node.version>
-		<js.npm.version>4.1.0</js.npm.version>
+		<js.node.version>v6.9.1</js.node.version>
+		<js.npm.version>4.1.2</js.npm.version>
 		<eirslett.frontend.version>1.4</eirslett.frontend.version>
 	</properties>
 
@@ -105,8 +105,11 @@
 			<name>jvnet-nexus-releases</name>
 			<url>https://maven.java.net/content/repositories/releases/</url>
 		</repository>
-		<!--
-		 -->
+		<repository>
+			<id>prime-repo</id>
+			<name>PrimeFaces Maven Repository</name>
+			<url>https://repository.primefaces.org</url>
+		</repository>
 		<repository>
 			<id>apache.snapshots</id>
 			<url>http://repository.apache.org/snapshots/</url>