Skip to content

Commit

Permalink
added loading gif, custom carousel css
Browse files Browse the repository at this point in the history
  • Loading branch information
iAlbertTran committed Jan 30, 2019
1 parent 25de6c5 commit 7bb4d1e
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import { DefaultUrlSerializer, UrlTree } from '@angular/router';
// Import your library
import { CountdownTimerModule } from 'ngx-countdown-timer';

import { MDBBootstrapModule } from 'angular-bootstrap-md
import { MDBBootstrapModule } from 'angular-bootstrap-md';

export class LowerCaseUrlSerializer extends DefaultUrlSerializer {
parse(url: string): UrlTree {
Expand Down
3 changes: 3 additions & 0 deletions src/app/dashboard/dashboard.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ export class DashboardComponent implements OnInit {
collection = [];
wishlist = [];

loading = true;

constructor(public router: Router, private apiService: FunkollectionApiService, private _helperService: HelperService) { }

ngOnInit() {
Expand All @@ -43,6 +45,7 @@ export class DashboardComponent implements OnInit {
//this.funkopops = res['funkopops'];
let pops = res['funkopops'];
let size = 0;

setInterval(() =>{
if(size == pops.length)
return;
Expand Down
Binary file added src/assets/loading.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 15 additions & 1 deletion src/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ html{
width: 100%;
text-align: center;
justify-content: center;
background: #1C1C1E;
color: #3CA5AD;
padding: 20px 0;
}
Expand Down Expand Up @@ -91,4 +90,19 @@ html{
}


//md bootstrap custom css

.carousel:hover .carousel-control-prev, .carousel:hover .carousel-control-next{
background: rgba(0, 0, 0, 0.5);
}


@media only screen and (max-width: 767px) {
.carousel .carousel-control-prev, .carousel .carousel-control-next{
background: rgba(0, 0, 0, 0.5);
}
}




0 comments on commit 7bb4d1e

Please sign in to comment.