Skip to content

Commit

Permalink
adding logo and attempting code coverage report
Browse files Browse the repository at this point in the history
  • Loading branch information
aaron-bond committed Jun 4, 2017
1 parent 415c106 commit ec855fa
Show file tree
Hide file tree
Showing 6 changed files with 57 additions and 54 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,9 @@ before_script:

after_success:
- npm run prep
- ./node_modules/.bin/codecov

script: karma start karma.conf.js --single-run
script: karma start karma.conf.js --single-run --code-coverage

deploy:
provider: pages
Expand Down
92 changes: 46 additions & 46 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,48 +1,48 @@
{
"name": "ng-todo",
"version": "0.0.0",
"license": "MIT",
"scripts": {
"ng": "ng",
"start": "ng serve",
"build": "ng build",
"test": "ng test",
"lint": "ng lint",
"e2e": "ng e2e",
"prep": "ng build --prod --output-path docs --base-href ng-todo"
},
"private": true,
"dependencies": {
"@angular/common": "^4.1.3",
"@angular/compiler": "^4.1.3",
"@angular/core": "^4.1.3",
"@angular/forms": "^4.1.3",
"@angular/http": "^4.1.3",
"@angular/platform-browser": "^4.1.3",
"@angular/platform-browser-dynamic": "^4.1.3",
"@angular/router": "^4.1.3",
"core-js": "^2.4.1",
"rxjs": "^5.1.0",
"zone.js": "^0.8.4"
},
"devDependencies": {
"@angular/cli": "1.1.0",
"@angular/compiler-cli": "^4.1.3",
"@types/jasmine": "^2.5.51",
"@types/node": "~6.0.60",
"codecov": "~2.2.0",
"codelyzer": "~2.0.0",
"jasmine-core": "~2.6.2",
"jasmine-spec-reporter": "~4.1.0",
"karma": "~1.7.0",
"karma-chrome-launcher": "~2.1.1",
"karma-cli": "~1.0.1",
"karma-jasmine": "~1.1.0",
"karma-jasmine-html-reporter": "0.2.2",
"karma-coverage-istanbul-reporter": "^1.3.0",
"protractor": "~5.1.0",
"ts-node": "~3.0.4",
"tslint": "~5.4.2",
"typescript": "~2.3.4"
}
"name": "ng-todo",
"version": "0.0.0",
"license": "MIT",
"scripts": {
"ng": "ng",
"start": "ng serve",
"build": "ng build",
"test": "ng test",
"lint": "ng lint",
"e2e": "ng e2e",
"prep": "ng build --prod --output-path docs --base-href ng-todo"
},
"private": true,
"dependencies": {
"@angular/common": "^4.1.3",
"@angular/compiler": "^4.1.3",
"@angular/core": "^4.1.3",
"@angular/forms": "^4.1.3",
"@angular/http": "^4.1.3",
"@angular/platform-browser": "^4.1.3",
"@angular/platform-browser-dynamic": "^4.1.3",
"@angular/router": "^4.1.3",
"core-js": "^2.4.1",
"rxjs": "^5.1.0",
"zone.js": "^0.8.4"
},
"devDependencies": {
"@angular/cli": "1.1.0",
"@angular/compiler-cli": "^4.1.3",
"@types/jasmine": "^2.5.51",
"@types/node": "~6.0.60",
"codecov": "^2.2.0",
"codelyzer": "~2.0.0",
"jasmine-core": "~2.6.2",
"jasmine-spec-reporter": "~4.1.0",
"karma": "~1.7.0",
"karma-chrome-launcher": "~2.1.1",
"karma-cli": "~1.0.1",
"karma-coverage-istanbul-reporter": "^1.3.0",
"karma-jasmine": "~1.1.0",
"karma-jasmine-html-reporter": "0.2.2",
"protractor": "~5.1.0",
"ts-node": "~3.0.4",
"tslint": "~5.4.2",
"typescript": "~2.3.4"
}
}
4 changes: 3 additions & 1 deletion src/app/header/header.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
</span>
</div>

<span class="filler"></span>
<span class="filler">
<i class="material-icons">done_all</i>
</span>

<div id="day">
<span>{{ Today | date:'EEEE' }}</span>
Expand Down
6 changes: 2 additions & 4 deletions src/app/header/header.component.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
section {
display: flex;

margin-top: 3rem;
margin-top: 1.5rem;
margin-bottom: 1rem;

#date {
Expand All @@ -16,12 +16,10 @@ section {
#month {
font-weight: bold;
}
#year {

}
}

.filler {
text-align: center;
flex-grow: 1;
}

Expand Down
4 changes: 2 additions & 2 deletions src/app/todo-list/todo-list.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
<!-- Active -->
<todo-item *ngFor="let item of (TodoItems | todoStatus: TodoItemStatus.Active)" [TodoItem]="item" (UpdateItem)="UpdateItem(item.Id, $event)"></todo-item>

<div class="section-header">Completed</div>
<div class="section-header" *ngIf="(TodoItems | todoStatus: TodoItemStatus.Completed).length !== 0">Completed</div>

<!-- Complete -->
<todo-item *ngFor="let item of (TodoItems | todoStatus: TodoItemStatus.Completed)" [TodoItem]="item" (UpdateItem)="UpdateItem(item.Id, $event)"></todo-item>

<div class="section-header">Later...</div>
<div class="section-header" *ngIf="(TodoItems | todoStatus: TodoItemStatus.Paused).length !== 0">Later...</div>

<!-- Paused -->
<todo-item *ngFor="let item of (TodoItems | todoStatus: TodoItemStatus.Paused)" [TodoItem]="item" (UpdateItem)="UpdateItem(item.Id, $event)"></todo-item>
2 changes: 2 additions & 0 deletions src/app/todo-list/todo-list.component.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import "~styles/variables.scss";

.section-header {
width: 100%;
font-size: 1rem;
Expand Down

0 comments on commit ec855fa

Please sign in to comment.