Skip to content

Fix bug with about page #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix bug with about page #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/app/components/pages/about/about.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ <h1 align="center" class="h6-about">Welcome to Neptun!</h1>
<div align="center">
<img src="./../../../../assets/logo.png" alt="Logo" width="350" />
</div>
<div class="container">
<div class="box_row">
<div class="row">
<div class="col-md-4">
<div class="about-page-border" align="center">
Expand All @@ -18,11 +18,11 @@ <h4 class="h4-about">Tromsø</h4>
</div>
</div>
<div class="col-md-4">
<div class="about-page-border" align="center">
<h4 class="h4-about">{{get_todo_count()}}</h4>
<p class="p-about1">TODOs in total!</p>
</div>
<div class="about-page-border" align="center">
<h4 class="h4-about">{{todoLength}}</h4>
<p class="p-about1">TODOs in total!</p>
</div>
</div>
</div>
</div>

Expand Down
5 changes: 5 additions & 0 deletions src/app/components/pages/about/about.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,9 @@
padding-left: 10%;
padding-right: 10%;
color: $primary-color;
}

.box_row {
padding-left: 10px;
padding-right: 10px;
}
7 changes: 3 additions & 4 deletions src/app/components/pages/about/about.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,12 @@ import {TodoService} from './../../../todo.service';
styleUrls: ['./about.component.scss']
})
export class AboutComponent implements OnInit {

todoLength = 0;

constructor(private todoService: TodoService) { }

ngOnInit() {
}

get_todo_count() {
return this.todoService.get_Todos_Length();
this.todoLength = this.todoService.getAllTodos().length;
}
}
4 changes: 0 additions & 4 deletions src/app/todo.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,4 @@ export class TodoService {
}
});
}

get_Todos_Length(): number {
return this.todos.length;
}
}