Skip to content
This repository was archived by the owner on Nov 19, 2021. It is now read-only.

Commit b0d4139

Browse files
salfuvesalfuve
committed
All working with mock data
1 parent 0d9d518 commit b0d4139

9 files changed

+110
-141
lines changed

‎src/app/cart.service.ts

+3-57
Original file line numberDiff line numberDiff line change
@@ -2,69 +2,16 @@ import { observable } from 'rxjs/symbol/observable';
22
import { Injectable } from '@angular/core';
33
import { MdSnackBar } from '@angular/material';
44
import { Observable } from 'rxjs/Observable';
5+
import { Column, Image, Item } from './shared/backend/models';
56

67
@Injectable()
78
export class CartService {
89

9-
itemArray: string[] = [];
10-
11-
imageArray: any[] = [{
12-
13-
columnSize: '40',
14-
column: [{
15-
url: '../../assets/images/alex-lambley-205711-min.jpg',
16-
isclicked: false,
17-
}, {
18-
url: '../../assets/images/norman-toth-177290-min.jpg',
19-
isclicked: false,
20-
}, {
21-
url: '../../assets/images/kaci-baum-108756-min.jpg',
22-
isclicked: false,
23-
}, {
24-
url: '../../assets/images/ariel-lustre-232891-min.jpg',
25-
isclicked: false,
26-
}],
27-
}, {
28-
columnSize: '25',
29-
column: [{
30-
url: '../../assets/images/pete-bellis-189599-min.jpg',
31-
isclicked: false,
32-
}, {
33-
url: '../../assets/images/remy_loz-188297-min.jpg',
34-
isclicked: false,
35-
}, {
36-
url: '../../assets/images/brooke-cagle-195860-min.jpg',
37-
isclicked: false,
38-
}, {
39-
url: '../../assets/images/freestocks-org-195640-min.jpg',
40-
isclicked: false,
41-
}],
42-
}, {
43-
columnSize: '25',
44-
column: [{
45-
url: '../../assets/images/pete-bellis-189613-min.jpg',
46-
isclicked: false,
47-
}, {
48-
url: '../../assets/images/pete-bellis-191833-min.jpg',
49-
isclicked: false,
50-
},
51-
],
52-
}, {
53-
columnSize: '25',
54-
column: [{
55-
url: '../../assets/images/valerie-elash-275588-min.jpg',
56-
isclicked: false,
57-
},
58-
{
59-
url: '../../assets/images/jason-blackeye-221058-min.jpg',
60-
isclicked: false,
61-
}],
62-
}];
63-
10+
itemArray: Item[] = [];
6411
constructor(public snackBar: MdSnackBar) { }
6512

6613
public clickedAddToCart(imageUrl: any): void {
67-
const items: string[] = this.itemArray;
14+
const items: Item[] = this.itemArray;
6815
const msg: string = 'Added to cart';
6916
const action: string = 'Ok';
7017
const color: string = 'green';
@@ -75,7 +22,6 @@ export class CartService {
7522
});
7623
items.push(imageUrl);
7724
}
78-
7925
public getNitems(): number {
8026
return this.itemArray.length;
8127
}

‎src/app/dashboard/dashboard.component.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<div td-menu-header class="md-subhead">Products in your cart</div>
1414
<md-nav-list dense>
1515
<a md-list-item *ngFor="let item of itemArray">
16-
<md-icon md-list-avatar>today</md-icon>
16+
<md-icon md-list-avatar><img class="img-avatar" src="../../assets/images/alex-lambley-205711-icon.jpg"> </md-icon>
1717
<h4 md-line><span class="text-wrap">{{item}}</span></h4>
1818
</a>
1919
<md-divider *ngIf="!last"></md-divider>
@@ -33,7 +33,7 @@ <h4 md-line><span class="text-wrap">{{item}}</span></h4>
3333

3434

3535
<div layout-gt-sm="row" tdMediaToggle="gt-xs" [mediaClasses]="['push-sm']">
36-
<div flex-gt-sm="column.columnSize" *ngFor="let column of imageArray">
36+
<div flex-gt-sm="column.columnSize" *ngFor="let column of images">
3737
<md-card *ngFor="let image of column.column">
3838
<img class="img" md-card-image (click)="clickedImage(image.url)" [class.biggerImg]="image.isclicked" [src]=image.url>
3939
<md-card-actions>

‎src/app/dashboard/dashboard.component.scss

+8
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,11 @@
1717
.biggerImg {
1818
padding: 1000px;
1919
}
20+
21+
.img-avatar{
22+
border-radius: 100%;
23+
width: 40px;
24+
height: 40px;
25+
margin-bottom: 5px;
26+
margin-top: 5px;
27+
}

‎src/app/dashboard/dashboard.component.ts

+4-65
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ import { Title } from '@angular/platform-browser';
55
import { TdLoadingService, TdDigitsPipe, CovalentNotificationsModule } from '@covalent/core';
66
import { MdSnackBar } from '@angular/material';
77
import { CartService } from '../cart.service';
8+
import { Column, Image, Item } from '../shared/backend/models';
9+
import { imageArray } from '../shared/backend/mock-data';
810

911
@Component({
1012
selector: 'qs-dashboard',
@@ -13,71 +15,8 @@ import { CartService } from '../cart.service';
1315
})
1416

1517
export class DashboardComponent implements OnInit {
16-
itemArray: any[] = [];
17-
imageArray: any[] = [{
18-
19-
columnSize: '40',
20-
column: [{
21-
name: '',
22-
url: '../../assets/images/alex-lambley-205711-min.jpg',
23-
isclicked: false,
24-
}, {
25-
name: '',
26-
url: '../../assets/images/norman-toth-177290-min.jpg',
27-
isclicked: false,
28-
}, {
29-
name: '',
30-
url: '../../assets/images/kaci-baum-108756-min.jpg',
31-
isclicked: false,
32-
}, {
33-
name: '',
34-
url: '../../assets/images/ariel-lustre-232891-min.jpg',
35-
isclicked: false,
36-
}],
37-
}, {
38-
columnSize: '25',
39-
column: [{
40-
name: '',
41-
url: '../../assets/images/pete-bellis-189599-min.jpg',
42-
isclicked: false,
43-
}, {
44-
name: '',
45-
url: '../../assets/images/remy_loz-188297-min.jpg',
46-
isclicked: false,
47-
}, {
48-
name: '',
49-
url: '../../assets/images/brooke-cagle-195860-min.jpg',
50-
isclicked: false,
51-
}, {
52-
name: '',
53-
url: '../../assets/images/freestocks-org-195640-min.jpg',
54-
isclicked: false,
55-
}],
56-
}, {
57-
columnSize: '25',
58-
column: [{
59-
name: '',
60-
url: '../../assets/images/pete-bellis-189613-min.jpg',
61-
isclicked: false,
62-
}, {
63-
name: '',
64-
url: '../../assets/images/pete-bellis-191833-min.jpg',
65-
isclicked: false,
66-
},
67-
],
68-
}, {
69-
columnSize: '25',
70-
column: [{
71-
name: '',
72-
url: '../../assets/images/valerie-elash-275588-min.jpg',
73-
isclicked: false,
74-
},
75-
{
76-
name: '',
77-
url: '../../assets/images/jason-blackeye-221058-min.jpg',
78-
isclicked: false,
79-
}],
80-
}];
18+
itemArray: Item;
19+
images: Image[] = imageArray;
8120

8221
constructor(
8322
private _titleService: Title,

‎src/app/models.ts

-11
This file was deleted.

‎src/app/shared/backend/mock-data.ts

+77
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
import { Column, Image, Item } from './models';
2+
3+
export const imageArray: Image[] = [{
4+
columnSize: '40',
5+
column: [{
6+
name: 'alex-lambley',
7+
url: '../../assets/images/alex-lambley-205711-min.jpg',
8+
url_icon: '',
9+
isclicked: false,
10+
}, {
11+
name: 'norman-toth',
12+
url: '../../assets/images/norman-toth-177290-min.jpg',
13+
url_icon: '',
14+
isclicked: false,
15+
}, {
16+
name: 'kaci-baum',
17+
url: '../../assets/images/kaci-baum-108756-min.jpg',
18+
url_icon: '',
19+
isclicked: false,
20+
}, {
21+
name: 'ariel-lustre',
22+
url: '../../assets/images/ariel-lustre-232891-min.jpg',
23+
url_icon: '',
24+
isclicked: false,
25+
}],
26+
}, {
27+
columnSize: '25',
28+
column: [{
29+
name: 'pete-bellis',
30+
url: '../../assets/images/pete-bellis-189599-min.jpg',
31+
url_icon: '',
32+
isclicked: false,
33+
}, {
34+
name: 'remy_loz',
35+
url: '../../assets/images/remy_loz-188297-min.jpg',
36+
url_icon: '',
37+
isclicked: false,
38+
}, {
39+
name: 'brooke-cagle',
40+
url: '../../assets/images/brooke-cagle-195860-min.jpg',
41+
url_icon: '',
42+
isclicked: false,
43+
}, {
44+
name: 'freestocks-org',
45+
url: '../../assets/images/freestocks-org-195640-min.jpg',
46+
url_icon: '',
47+
isclicked: false,
48+
}],
49+
}, {
50+
columnSize: '25',
51+
column: [{
52+
name: 'pete-bellis',
53+
url: '../../assets/images/pete-bellis-189613-min.jpg',
54+
url_icon: '',
55+
isclicked: false,
56+
}, {
57+
name: 'pete-bellis',
58+
url: '../../assets/images/pete-bellis-191833-min.jpg',
59+
url_icon: '',
60+
isclicked: false,
61+
},
62+
],
63+
}, {
64+
columnSize: '25',
65+
column: [{
66+
name: 'valerie-elash',
67+
url: '../../assets/images/valerie-elash-275588-min.jpg',
68+
url_icon: '',
69+
isclicked: false,
70+
},
71+
{
72+
name: 'jason-blackeye',
73+
url: '../../assets/images/jason-blackeye-221058-min.jpg',
74+
url_icon: '',
75+
isclicked: false,
76+
}],
77+
}];

‎src/app/shared/backend/models.ts

+15-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,15 @@
1-
// export interface Product = {
2-
// name: string,
3-
4-
// }
1+
export interface Item {
2+
name: string;
3+
url: string;
4+
count: number;
5+
}
6+
export interface Column {
7+
name: string;
8+
url: string;
9+
url_icon: string;
10+
isclicked: boolean;
11+
}
12+
export interface Image {
13+
columnSize: string;
14+
column: Column[];
15+
}

‎src/assets/images/alex-lambley-205711-icon.jpg

15.9 KB
Loading

‎tslint.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
true,
66
"statements"
77
],
8-
"experimentalDecorators":false,
98
"array-type": [
109
true,
1110
"array"
@@ -28,7 +27,7 @@
2827
"spaces"
2928
],
3029
"interface-name": [
31-
true,
30+
false,
3231
"always-prefix"
3332
],
3433
"jsdoc-format": true,

0 commit comments

Comments
 (0)