Merge pull request #125 from b3nab/master

Fix issue #111 and fix generation of sdk different from ng2web

generator-fireloop/src/ng2native/index.ts

@@ -61,7 +61,7 @@ module.exports = generators.extend({
     let dest = this.destinationPath(this.options.current);
     if (this.options.current) {
       this.spawnCommand(
-        `npm`, ['install', '--save', 'nativescript-socketio'], {
+        `npm`, ['install', '--save', 'nativescript-socket.io'], {
           cwd: dest
         });
     } else {
@@ -74,7 +74,7 @@ module.exports = generators.extend({
       [
         {
           template: 'templates/nativescript/app.module.ts',
-          output: `${this.options.current}/app/main.ts`,
+          output: `${this.options.current}/app/app.module.ts`,
           params: {}
         }
       ].forEach(

generator-fireloop/src/sdk/index.ts

@@ -104,14 +104,16 @@ module.exports = generators.extend({
       }
     });
 
+    console.log('SDK Driver: ', this.client.type);
+
     this.spawnCommand(
       this.destinationPath(path.join(serverPath, 'node_modules/.bin/lb-sdk')),
       [
         'server/server',
         this.destinationPath(this.sdkPath || 'webapp/src/app/shared/sdk'),
-        '-d', !this.options.clientType || this.options.clientType.match(/(ng2web|ng2ionic)/)
+        '-d', !this.client.type || this.client.type.match(/(ng2web|ng2ionic)/)
           ? 'ng2web'
-          : this.options.clientType.trim(),
+          : this.client.type.trim(),
         '-w', 'enabled',
         '-i', (this.sdkFeatures.indexOf(this.sdkOptions.IO) > -1) ? 'enabled' : 'disabled',
         '-f', (this.sdkFeatures.indexOf(this.sdkOptions.FIRELOOP) > -1) ? 'enabled' : 'disabled',

generator-fireloop/templates/nativescript/app.module.ts

@@ -1,17 +1,43 @@
-// this import should be first in order to load some required settings (like globals and reflect-metadata)
-import { platformNativeScriptDynamic, NativeScriptModule } from "nativescript-angular/platform";
-import { NgModule } from "@angular/core";
+import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
+import { NativeScriptModule } from "nativescript-angular/nativescript.module";
+import { AppRoutingModule } from "./app.routing";
 import { AppComponent } from "./app.component";
+
+// Loopback NativeScript SDK Module
 import { SDKNativeModule } from './shared/sdk/index';
 
+import { ItemService } from "./item/item.service";
+import { ItemsComponent } from "./item/items.component";
+import { ItemDetailComponent } from "./item/item-detail.component";
+
+// Uncomment and add to NgModule imports if you need to use two-way binding
+// import { NativeScriptFormsModule } from "nativescript-angular/forms";
+
+// Uncomment and add to NgModule imports  if you need to use the HTTP wrapper
+// import { NativeScriptHttpModule } from "nativescript-angular/http";
+
 @NgModule({
-    declarations: [AppComponent],
-    bootstrap: [AppComponent],
+    bootstrap: [
+        AppComponent
+    ],
     imports: [
         NativeScriptModule,
-        SDKNativeModule.forRoot()
+        SDKNativeModule.forRoot(),
+        AppRoutingModule
+    ],
+    declarations: [
+        AppComponent,
+        ItemsComponent,
+        ItemDetailComponent
     ],
+    providers: [
+        ItemService
+    ],
+    schemas: [
+        NO_ERRORS_SCHEMA
+    ]
 })
-class AppComponentModule {}
-
-platformNativeScriptDynamic().bootstrapModule(AppComponentModule);
+/*
+Pass your application module to the bootstrapModule function located in main.ts to start your app
+*/
+export class AppModule { }