Skip to content

Commit 6759ffe

Browse files
committed
feat: link to GitHub repo. add more versions and icons
- remove tests - update dependencies - remove unnecessary code - clarify titles - extract top toolbar into a component - rename `<tabs>` to `<ng1-tabs>`1
1 parent 3fcd4d7 commit 6759ffe

22 files changed

+949
-1673
lines changed

angular.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,14 @@
1010
"prefix": "app",
1111
"schematics": {
1212
"@schematics/angular:component": {
13-
"style": "scss"
13+
"style": "scss",
14+
"skipTests": true
15+
},
16+
"@schematics/angular:service": {
17+
"skipTests": true
18+
},
19+
"@schematics/angular:pipe": {
20+
"skipTests": true
1421
}
1522
},
1623
"architect": {

package-lock.json

Lines changed: 749 additions & 1533 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -2,66 +2,66 @@
22
"name": "angularjs-angular-material-hybrid-demo",
33
"version": "0.2.1",
44
"private": true,
5+
"scripts": {
6+
"ng": "ng",
7+
"start": "npm run build:templates && ng serve",
8+
"build:templates": "gulp templates",
9+
"build": "npm run build:templates && ng build",
10+
"test": "ng test",
11+
"lint": "ng lint",
12+
"e2e": "ng e2e",
13+
"deploy": "npm run build:templates && ng deploy",
14+
"update": "npm-check -u"
15+
},
516
"dependencies": {
6-
"@angular/animations": "9.1.3",
7-
"@angular/cdk": "9.2.1",
8-
"@angular/common": "9.1.3",
9-
"@angular/compiler": "9.1.3",
10-
"@angular/core": "9.1.3",
17+
"@angular/animations": "9.1.6",
18+
"@angular/cdk": "9.2.3",
19+
"@angular/common": "9.1.6",
20+
"@angular/compiler": "9.1.6",
21+
"@angular/core": "9.1.6",
1122
"@angular/fire": "^6.0.0",
12-
"@angular/forms": "9.1.3",
13-
"@angular/material": "9.2.1",
14-
"@angular/platform-browser": "9.1.3",
15-
"@angular/platform-browser-dynamic": "9.1.3",
16-
"@angular/upgrade": "9.1.3",
23+
"@angular/forms": "9.1.6",
24+
"@angular/material": "9.2.3",
25+
"@angular/platform-browser": "9.1.6",
26+
"@angular/platform-browser-dynamic": "9.1.6",
27+
"@angular/upgrade": "9.1.6",
1728
"@types/angular": "^1.7.0",
1829
"@types/angular-material": "^1.1.71",
1930
"angular": "^1.7.9",
2031
"angular-animate": "^1.7.9",
2132
"angular-aria": "^1.7.9",
2233
"angular-material": "^1.1.22",
2334
"angular-messages": "^1.7.9",
24-
"firebase": "^7.14.2",
35+
"firebase": "^7.14.3",
2536
"rxjs": "^6.5.5",
26-
"tslib": "^1.11.1",
37+
"tslib": "^1.11.2",
2738
"zone.js": "~0.10.3"
2839
},
29-
"scripts": {
30-
"ng": "ng",
31-
"start": "npm run build:templates && ng serve",
32-
"build:templates": "gulp templates",
33-
"build": "npm run build:templates && ng build",
34-
"test": "ng test",
35-
"lint": "ng lint",
36-
"e2e": "ng e2e",
37-
"deploy": "npm run build:templates && ng deploy",
38-
"update": "npm-check -u"
39-
},
4040
"devDependencies": {
41-
"@angular-devkit/architect": "^0.901.3",
42-
"@angular-devkit/build-angular": "~0.901.3",
43-
"@angular/cli": "~9.1.3",
44-
"@angular/compiler-cli": "~9.1.3",
45-
"@angular/language-service": "~9.1.3",
41+
"@angular-devkit/architect": "~0.901.5",
42+
"@angular-devkit/build-angular": "~0.901.5",
43+
"@angular/cli": "~9.1.5",
44+
"@angular/compiler-cli": "~9.1.6",
45+
"@angular/language-service": "~9.1.6",
4646
"@types/jasmine": "^3.5.10",
4747
"@types/jasminewd2": "^2.0.8",
48-
"@types/node": "^12.12.37",
48+
"@types/node": "^13.13.5",
4949
"codelyzer": "^5.2.2",
50-
"firebase-tools": "^8.1.1",
50+
"firebase-tools": "^8.2.0",
5151
"gulp": "^4.0.2",
5252
"gulp-angular-templatecache": "^3.0.0",
5353
"gulp-htmlmin": "^5.0.1",
5454
"jasmine-core": "^3.5.0",
5555
"jasmine-spec-reporter": "^5.0.2",
56-
"karma": "^5.0.2",
56+
"karma": "^5.0.5",
5757
"karma-chrome-launcher": "^3.1.0",
58-
"karma-coverage-istanbul-reporter": "^2.1.1",
58+
"karma-coverage-istanbul-reporter": "^3.0.2",
5959
"karma-jasmine": "^3.1.1",
6060
"karma-jasmine-html-reporter": "^1.5.3",
6161
"npm-check": "^5.9.2",
6262
"protractor": "^5.4.4",
63-
"ts-node": "^8.9.0",
64-
"tslint": "^6.1.1",
63+
"ts-node": "^8.10.1",
64+
"tslint": "^6.1.2",
6565
"typescript": "~3.8.3"
6666
}
6767
}

src/app/angular/app.component.html

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
<mat-toolbar color="primary" class="mat-elevation-z1">
2-
<span>AngularJS/Angular Material Hybrid</span>
3-
</mat-toolbar>
1+
<app-top-nav></app-top-nav>
42
<!-- Input that came from AngularJS -->
5-
<h2>{{ name }} Demo</h2>
3+
<h2>{{ name }} Hybrid</h2>
64
<br>
75
<mat-accordion>
86
<mat-expansion-panel>
@@ -15,7 +13,7 @@ <h2>{{ name }} Demo</h2>
1513
</mat-panel-description>
1614
</mat-expansion-panel-header>
1715
<!-- AngularJS Component that uses templateUrl-->
18-
<tabs></tabs>
16+
<ng1-tabs></ng1-tabs>
1917
</mat-expansion-panel>
2018
<mat-expansion-panel>
2119
<mat-expansion-panel-header>

src/app/angular/buttons/buttons.component.spec.ts

Lines changed: 0 additions & 25 deletions
This file was deleted.

src/app/angular/cdk-tree/cdk-tree.component.spec.ts

Lines changed: 0 additions & 25 deletions
This file was deleted.

src/app/angular/main-angular.module.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,15 @@ import {MatIconModule} from '@angular/material/icon';
1616
import {MatDividerModule} from '@angular/material/divider';
1717
import {CdkTreeComponent} from './cdk-tree/cdk-tree.component';
1818
import {CdkTreeModule} from '@angular/cdk/tree';
19+
import {TopNavComponent} from './top-nav/top-nav.component';
20+
import {HttpClientModule} from '@angular/common/http';
1921

2022
@NgModule({
2123
imports: [
2224
BrowserModule,
2325
BrowserAnimationsModule,
2426
CommonModule,
27+
HttpClientModule,
2528
MatToolbarModule,
2629
MatProgressSpinnerModule,
2730
MatExpansionModule,
@@ -37,7 +40,8 @@ import {CdkTreeModule} from '@angular/cdk/tree';
3740
TabsComponentFacade,
3841
TabsComponent,
3942
ButtonsComponent,
40-
CdkTreeComponent
43+
CdkTreeComponent,
44+
TopNavComponent
4145
]
4246
})
4347
export class MainAngularModule {

src/app/angular/tabs/tabs.component.spec.ts

Lines changed: 0 additions & 25 deletions
This file was deleted.
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<mat-toolbar color="primary" class="mat-elevation-z1">
2+
<span>Angular Upgrade and Angular CLI Demo</span>
3+
<span style="flex: auto;"></span>
4+
<a mat-icon-button href="https://github.com/Splaktar/angularjs-angular-material-hybrid-demo"
5+
target="_blank" rel="noopener">
6+
<mat-icon svgIcon="github"></mat-icon>
7+
</a>
8+
</mat-toolbar>

src/app/angular/top-nav/top-nav.component.scss

Whitespace-only changes.

0 commit comments

Comments
 (0)