Skip to content

Commit f97930f

Browse files
committed
up
1 parent ec7077c commit f97930f

39 files changed

+61
-27
lines changed

.angular-cli.json

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,15 @@
2020
"prefix": "app",
2121
"styles": [
2222
"styles.css",
23-
"../node_modules/ngx-toastr/toastr.css"
23+
"../node_modules/ngx-toastr/toastr.css",
24+
"../node_modules/font-awesome/css/font-awesome.css",
25+
"../node_modules/bootstrap/dist/css/bootstrap.min.css"
2426
],
2527
"scripts": [
2628
"../node_modules/lodash/lodash.js",
27-
"../node_modules/moment/moment.js"
29+
"../node_modules/moment/moment.js",
30+
"../node_modules/jquery/dist/jquery.min.js",
31+
"../node_modules/bootstrap/dist/js/bootstrap.min.js"
2832
],
2933
"environmentSource": "environments/environment.ts",
3034
"environments": {
@@ -58,7 +62,7 @@
5862
}
5963
},
6064
"defaults": {
61-
"styleExt": "css",
65+
"styleExt": "scss",
6266
"component": {}
6367
}
6468
}

package-lock.json

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

package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"scripts": {
66
"ng": "ng",
77
"start": "ng serve --proxy-config proxy.conf.json",
8-
"build": "ng build --prod",
8+
"build": "ng build --prod --aot",
99
"test": "ng test",
1010
"lint": "ng lint",
1111
"e2e": "ng e2e",
@@ -24,9 +24,12 @@
2424
"@angular/router": "^5.2.0",
2525
"angular-highcharts": "^5.2.13",
2626
"angularfire": "^2.3.0",
27+
"bootstrap": "^3.3.7",
2728
"core-js": "^2.4.1",
2829
"firebase": "^5.3.1",
30+
"font-awesome": "^4.7.0",
2931
"highcharts": "^6.1.1",
32+
"jquery": "^3.3.1",
3033
"moment": "^2.22.2",
3134
"ng2-file-upload": "^1.3.0",
3235
"ngx-bootstrap": "^2.0.5",

src/_variables.scss

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
@import 'variables';
2+
@import '../node_modules/font-awesome/scss/font-awesome';
3+
4+
$icon-font-path: '../node_modules/bootstrap-sass/assets/fonts/bootstrap/';
5+
@import 'variables';
6+
@import '../node_modules/bootstrap/scss/bootstrap';
7+

src/app/app.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { Router } from '@angular/router';
88
@Component({
99
selector: 'app-root',
1010
templateUrl: './app.component.html',
11-
styleUrls: ['./app.component.css']
11+
styleUrls: ['./app.component.scss']
1212
})
1313
export class AppComponent {
1414
title = 'app';
File renamed without changes.

src/app/private/about/about.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { Component, OnInit } from '@angular/core';
33
@Component({
44
selector: 'app-about',
55
templateUrl: './about.component.html',
6-
styleUrls: ['./about.component.css']
6+
styleUrls: ['./about.component.scss']
77
})
88
export class AboutComponent implements OnInit {
99

src/app/private/demo-charts/demo-charts.component.css renamed to src/app/private/demo-charts/demo-charts.component.scss

File renamed without changes.

src/app/private/demo-charts/demo-charts.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { Chart } from 'angular-highcharts';
44
@Component({
55
selector: 'app-demo-charts',
66
templateUrl: './demo-charts.component.html',
7-
styleUrls: ['./demo-charts.component.css']
7+
styleUrls: ['./demo-charts.component.scss']
88
})
99
export class DemoChartsComponent implements OnInit {
1010
public linechart = new Chart();

0 commit comments

Comments
 (0)