Fix app routes

jdnichollsc · jdnichollsc · commit 7828e7d5cc7b · 2017-11-06T22:59:02.000-05:00
diff --git a/nativescript/package.json b/nativescript/package.json
@@ -1,39 +1,38 @@
 {
-  "name": "angular-native-seed",
-  "version": "0.0.0",
+  "name": "nativescript-ionic-template",
+  "version": "1.0.0",
   "repository": "<fill-your-repository-here>",
   "nativescript": {
     "id": "com.domain.project",
     "tns-ios": {
-      "version": "3.1.0"
+      "version": "3.2.0"
     },
     "tns-android": {
-      "version": "3.0.1"
+      "version": "3.2.0"
     }
   },
   "dependencies": {
-    "@angular/animations": "~4.1.0",
-    "@angular/common": "~4.1.0",
-    "@angular/compiler": "~4.1.0",
-    "@angular/core": "~4.1.0",
-    "@angular/forms": "~4.1.0",
-    "@angular/http": "~4.1.0",
-    "@angular/platform-browser": "~4.1.0",
-    "@angular/platform-browser-dynamic": "~4.1.0",
-    "@angular/router": "~4.1.0",
+    "@angular/animations": "~4.4.1",
+    "@angular/common": "~4.4.1",
+    "@angular/compiler": "~4.4.1",
+    "@angular/core": "~4.4.1",
+    "@angular/forms": "~4.4.1",
+    "@angular/http": "~4.4.1",
+    "@angular/platform-browser": "~4.4.1",
+    "@angular/platform-browser-dynamic": "~4.4.1",
+    "@angular/router": "~4.4.1",
     "@ngx-translate/core": "^6.0.1",
     "@ngx-translate/http-loader": "0.0.3",
-    "nativescript-angular": "^3.1.0",
+    "nativescript-angular": "~4.4.0",
     "nativescript-cardview": "^2.0.4",
     "nativescript-theme-core": "~1.0.2",
     "reflect-metadata": "~0.1.8",
-    "rxjs": "~5.3.0",
-    "tns-core-modules": "^3.1.0",
-    "typescript": "~2.2.0",
+    "rxjs": "~5.4.2",
+    "tns-core-modules": "^3.3.0",
     "zone.js": "~0.8.2"
   },
   "devDependencies": {
-    "@angular/compiler-cli": "~4.1.0",
+    "@angular/compiler-cli": "~4.4.1",
     "@ngtools/webpack": "~1.5.5",
     "@types/jasmine": "^2.5.47",
     "babel-traverse": "6.25.0",
@@ -55,7 +54,7 @@
     "nativescript-dev-webpack": "^0.7.3",
     "raw-loader": "~0.5.1",
     "resolve-url-loader": "~2.0.2",
-    "typescript": "~2.2.0",
+    "typescript": "~2.4.2",
     "webpack": "~2.6.0",
     "webpack-sources": "~0.2.3",
     "webpack-bundle-analyzer": "^2.8.2"
diff --git a/nativescript/src/_app-common.scss b/nativescript/src/_app-common.scss
@@ -9,7 +9,9 @@
 @import '~nativescript-theme-core/scss/index';
 
 .ion-icon {
-    font-family: 'Ionicons';
+    &, ActionBar & * {
+        font-family: 'Ionicons';
+    }
 
     ActionBar & {
         font-size: 35;
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nativescript-ionic-template",
-  "version": "0.0.0",
+  "version": "1.0.0",
   "scripts": {
     "postinstall": "node symlink.js",
     "ng": "ng",
diff --git a/src/app/about/about.common.ts b/src/app/about/about.common.ts
@@ -8,8 +8,9 @@ import { AboutComponent } from './components/about/about.component';
 
 export const SHARED_MODULES: any[] = [
     SharedModule,
-    RouterModule.forChild(<any>AboutRoutes),
-    TranslateModule.forChild(),
+    RouterModule,
+    RouterModule.forChild(AboutRoutes),
+    TranslateModule.forChild()
 ];
 
 export const COMPONENT_DECLARATIONS: any[] = [
diff --git a/src/app/about/about.module.tns.ts b/src/app/about/about.module.tns.ts
@@ -3,7 +3,7 @@ import { SHARED_MODULES, COMPONENT_DECLARATIONS } from './about.common';
 
 @NgModule({
     imports: [
-        ...SHARED_MODULES,
+        ...SHARED_MODULES
     ],
     declarations: [
         ...COMPONENT_DECLARATIONS
diff --git a/src/app/about/about.module.ts b/src/app/about/about.module.ts
diff --git a/src/app/about/about.routes.ts b/src/app/about/about.routes.ts
diff --git a/src/app/about/components/about/about.component.html b/src/app/about/components/about/about.component.html
diff --git a/src/app/about/components/about/about.component.scss b/src/app/about/components/about/about.component.scss
diff --git a/src/app/about/components/about/about.component.spec.ts b/src/app/about/components/about/about.component.spec.ts
diff --git a/src/app/about/components/about/about.component.tns.html b/src/app/about/components/about/about.component.tns.html
@@ -1,10 +1,11 @@
 <Page>
     <ActionBar title="About">
+        <NavigationButton visibility="collapsed"/>
         <ActionItem ios.position="left" [nsRouterLink]="['/home']" clearHistory="true">
-            <Button class="ion-icon" text="{{ '\uF30C' }}"></Button>
+            <NavigationButton class="ion-icon" text="{{ '\uF30C' }}"></NavigationButton>
         </ActionItem>
     </ActionBar>
     <GridLayout rows="auto, *">
         <Label class="h1 title" text="About me!"></Label>
     </GridLayout>
-</Page>
+</Page>
diff --git a/src/app/about/components/about/about.component.tns.scss b/src/app/about/components/about/about.component.tns.scss
diff --git a/src/app/about/components/about/about.component.ts b/src/app/about/components/about/about.component.ts
diff --git a/src/app/app-routing.module.tns.ts b/src/app/app-routing.module.tns.ts
@@ -1,13 +1,12 @@
 // angular
 import { NgModule } from '@angular/core';
-import { NativeScriptRouterModule } from 'nativescript-angular';
+import { NativeScriptRouterModule } from 'nativescript-angular/router';
 // app
 import { AppRoutes } from './app.routes';
 
 @NgModule({
     imports: [
-        NativeScriptRouterModule,
-        NativeScriptRouterModule.forRoot(<any>AppRoutes),
+        NativeScriptRouterModule.forRoot(AppRoutes),
     ],
     exports: [NativeScriptRouterModule]
 })
diff --git a/src/app/app.common.ts b/src/app/app.common.ts
@@ -1,12 +1,10 @@
 import { AppRoutingModule } from './app-routing.module';
 // demo
-import { HomeModule } from './home/home.module';
 import { MenuModule } from './menu/menu.module';
 
 export const SHARED_MODULES: any[] = [
     AppRoutingModule,
-    HomeModule,
-    MenuModule,
+    MenuModule
 ];
 
 export * from './app-routing.module';
diff --git a/src/app/app.component.tns.html b/src/app/app.component.tns.html
@@ -1 +1,7 @@
-<page-router-outlet></page-router-outlet>
+<GridLayout rows="auto, *">
+    <ActionBar title="NativeScript Mobile App, yay!">
+    </ActionBar>
+    <StackLayout class="container" row="1">
+        <page-router-outlet></page-router-outlet>
+    </StackLayout>
+</GridLayout>
diff --git a/src/app/app.routes.ts b/src/app/app.routes.ts
@@ -5,5 +5,6 @@ import { Routes } from '@angular/router';
  */
 export const AppRoutes: Routes = [
     { path: '', pathMatch: 'full', redirectTo: '/home' },
-    { path: 'about', loadChildren: './+about/about.module#AboutModule' }
+    { path: 'home', loadChildren: './home/home.module#HomeModule' },
+    { path: 'about', loadChildren: './about/about.module#AboutModule' }
 ];
diff --git a/src/app/common/utils/router-module.tns.ts b/src/app/common/utils/router-module.tns.ts
@@ -1 +1 @@
-export { NativeScriptRouterModule as RouterModule } from 'nativescript-angular';
+export { NativeScriptRouterModule as RouterModule } from 'nativescript-angular/router';
diff --git a/src/app/home/components/home/home.component.tns.html b/src/app/home/components/home/home.component.tns.html
@@ -1,9 +1,9 @@
 <Page xmlns:Card="nativescript-cardview">
-    <ActionBar title="NativeScript Mobile App, yay!">
+    <ActionBarExtension>
         <ActionItem ios.position="right">
             <Button class="ion-icon" [nsRouterLink]="['/about']" text="{{ '\uf41a' }}" pageTransition="flip"></Button>
         </ActionItem>
-    </ActionBar>
+    </ActionBarExtension>
     <scroll-view>
         <GridLayout rows="auto, *">
             <SearchBar row="0" hint="Search hint" [text]="Search"></SearchBar>
diff --git a/src/app/home/home.common.ts b/src/app/home/home.common.ts
@@ -8,8 +8,8 @@ import { HomeComponent } from './components/home/home.component';
 
 export const SHARED_MODULES: any[] = [
     SharedModule,
-    RouterModule.forChild(<any>HomeRoutes),
-    TranslateModule.forChild(),
+    RouterModule.forChild(HomeRoutes),
+    TranslateModule.forChild()
 ];
 
 export const COMPONENT_DECLARATIONS: any[] = [
diff --git a/src/app/home/home.module.tns.ts b/src/app/home/home.module.tns.ts
@@ -12,11 +12,4 @@ import { SHARED_MODULES } from './home.common';
         NO_ERRORS_SCHEMA
     ]
 })
-export class HomeModule {
-
-    constructor( @Optional() @SkipSelf() parentModule: HomeModule) {
-        if (parentModule) {
-            throw new Error('HomeModule already loaded; Import in root module only.');
-        }
-    }
-}
+export class HomeModule { }
diff --git a/src/app/home/home.routes.ts b/src/app/home/home.routes.ts
@@ -4,7 +4,7 @@ import { HomeComponent } from './components/home/home.component';
 
 export const HomeRoutes: Routes = [
     {
-        path: 'home',
+        path: '',
         component: HomeComponent
     }
 ];
diff --git a/src/app/menu/menu.module.tns.ts b/src/app/menu/menu.module.tns.ts
@@ -1,5 +1,5 @@
 import { NgModule, NO_ERRORS_SCHEMA } from '@angular/core';
-import { NativeScriptRouterModule } from 'nativescript-angular';
+import { NativeScriptRouterModule } from 'nativescript-angular/router';
 // app
 import { SHARED_MODULES, COMPONENT_DECLARATIONS, COMPONENT_EXPORTS } from './menu.common';
 
diff --git a/src/fonts/ionicons-icons.scss b/src/fonts/ionicons-icons.scss
@@ -3,4 +3,6 @@
 // The premium icon font for Ionic. For more info, please see:
 // http://ionicframework.com/docs/v2/ionicons/
 $font-path: "./fonts";
-$ionicons-font-path: "./fonts";
+$ionicons-font-path: "./fonts";
+$roboto-font-path: "./fonts";
+$noto-sans-font-path: "./fonts";
diff --git a/src/styles.scss b/src/styles.scss
@@ -1,14 +1,14 @@
+// Fonts
+// --------------------------------------------------
+
+@import "fonts/roboto";
+@import "fonts/noto-sans";
+
 /*
 In many cases you may want to use the NativeScript core theme instead
 of writing your own CSS rules. For a full list of class names in the theme
 refer to http://docs.nativescript.org/ui/theme.
 */
 
 @import "~ionic-angular/themes/ionic.theme.default";
-@import "~ionic-angular/themes/ionic.components";
-
-// Fonts
-// --------------------------------------------------
-
-@import "fonts/roboto";
-@import "fonts/noto-sans";
+@import "~ionic-angular/themes/ionic.components";

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "nativescript-ionic-template",`
`3`		`- "version": "0.0.0",`
	`3`	`+ "version": "1.0.0",`
`4`	`4`	`"scripts": {`
`5`	`5`	`"postinstall": "node symlink.js",`
`6`	`6`	`"ng": "ng",`