Skip to content

Commit 09a85e1

Browse files
Ismaestroiramos
authored andcommitted
feat(style): added bootstrap and font awesome
1 parent 0942cc6 commit 09a85e1

45 files changed

Lines changed: 335 additions & 639 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

angular-cli.json

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,25 @@
1818
"prefix": "toh",
1919
"mobile": false,
2020
"styles": [
21+
"../node_modules/bootstrap/dist/css/bootstrap.css",
22+
"../node_modules/font-awesome/css/font-awesome.css",
2123
"assets/css/styles.css"
2224
],
23-
"scripts": [],
25+
"scripts": [
26+
"../node_modules/jquery/dist/jquery.js",
27+
"../node_modules/tether/dist/js/tether.js",
28+
"../node_modules/bootstrap/dist/js/bootstrap.js"
29+
],
2430
"environments": {
2531
"source": "environments/environment.ts",
2632
"dev": "environments/environment.ts",
2733
"prod": "environments/environment.prod.ts"
2834
}
2935
}
3036
],
31-
"addons": [],
37+
"addons": [
38+
"../node_modules/font-awesome/fonts/*.+(otf|eot|svg|ttf|woff|woff2)"
39+
],
3240
"packages": [],
3341
"e2e": {
3442
"protractor": {

e2e/app.e2e-spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ describe('angular-hero-cli App', function () {
99

1010
it('Title', () => {
1111
page.navigateTo();
12-
expect(page.getParagraphText()).toEqual('Tour of Heroes');
12+
expect(page.getParagraphText()).toEqual('Top Heroes');
1313
});
1414
});

e2e/app.po.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ export class AngularTOHPage {
66
}
77

88
getParagraphText() {
9-
return element(by.css('toh-app > h1')).getText();
9+
return element(by.css('toh-hero-top h3')).getText();
1010
}
1111
}

package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@
2222
"@angular/platform-browser": "^2.3.1",
2323
"@angular/platform-browser-dynamic": "^2.3.1",
2424
"@angular/router": "^3.3.1",
25+
"bootstrap": "^4.0.0-alpha.6",
2526
"core-js": "^2.4.1",
27+
"font-awesome": "^4.7.0",
2628
"json-server": "^0.9.4",
2729
"rxjs": "^5.0.1",
2830
"ts-helpers": "^1.1.1",

protractor.conf.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ exports.config = {
1313
'browserName': 'chrome'
1414
},
1515
directConnect: true,
16-
baseUrl: 'http://localhost:3002/',
16+
baseUrl: 'http://localhost:4200/',
1717
framework: 'jasmine',
1818
jasmineNodeOpts: {
1919
showColors: true,

server/db.json

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,6 @@
1818
"power": "Weather Changer",
1919
"alterEgo": "bombi"
2020
},
21-
{
22-
"id": 14,
23-
"name": "Celeritas",
24-
"power": "Super Hot",
25-
"alterEgo": "cele"
26-
},
2721
{
2822
"id": 15,
2923
"name": "Magneta",
@@ -47,12 +41,6 @@
4741
"name": "Magma",
4842
"power": "Super Flexible",
4943
"alterEgo": "cold"
50-
},
51-
{
52-
"id": 20,
53-
"name": "Tornado",
54-
"power": "Really Smart",
55-
"alterEgo": "torny"
5644
}
5745
]
5846
}

src/app/app.component.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
<h1>{{title}}</h1>
2-
<toh-nav></toh-nav>
1+
<toh-nav [title]="'Tour of heroes'"></toh-nav>
32
<router-outlet></router-outlet>

src/app/app.component.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ import {IAppConfig} from './config/iapp.config';
55

66
@Component({
77
selector: 'toh-app',
8-
templateUrl: './app.component.html',
9-
styleUrls: [],
8+
templateUrl: './app.component.html'
109
})
1110

1211
export class AppComponent {

src/app/core/core.module.js

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

src/app/core/core.module.js.map

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

0 commit comments

Comments
 (0)