mirror of
https://github.com/akveo/ngx-admin.git
synced 2025-12-17 07:50:12 +01:00
todo and piechart components style fixes
This commit is contained in:
parent
79d2a771a0
commit
80e4eddab3
4 changed files with 74 additions and 137 deletions
|
|
@ -1,33 +1,36 @@
|
|||
import {Injectable} from '@angular/core';
|
||||
import {BaThemeConfigProvider, colorHelper} from '../../../theme';
|
||||
|
||||
@Injectable()
|
||||
export class PieChartService {
|
||||
|
||||
private _data = [
|
||||
{
|
||||
color: 'rgba(255,255,255,0.4)',
|
||||
description: 'New Visits',
|
||||
stats: '57,820',
|
||||
icon: 'person',
|
||||
}, {
|
||||
color: 'rgba(255,255,255,0.4)',
|
||||
description: 'Purchases',
|
||||
stats: '$ 89,745',
|
||||
icon: 'money',
|
||||
}, {
|
||||
color: 'rgba(255,255,255,0.4)',
|
||||
description: 'Active Users',
|
||||
stats: '178,391',
|
||||
icon: 'face',
|
||||
}, {
|
||||
color: 'rgba(255,255,255,0.4)',
|
||||
description: 'Returned',
|
||||
stats: '32,592',
|
||||
icon: 'refresh',
|
||||
}
|
||||
];
|
||||
constructor(private _baConfig:BaThemeConfigProvider) {
|
||||
}
|
||||
|
||||
getData() {
|
||||
return this._data;
|
||||
let pieColor = colorHelper.hexToRgbA(this._baConfig.get().colors.defaultText, 0.2);
|
||||
return [
|
||||
{
|
||||
color: pieColor,
|
||||
description: 'New Visits',
|
||||
stats: '57,820',
|
||||
icon: 'person',
|
||||
}, {
|
||||
color: pieColor,
|
||||
description: 'Purchases',
|
||||
stats: '$ 89,745',
|
||||
icon: 'money',
|
||||
}, {
|
||||
color: pieColor,
|
||||
description: 'Active Users',
|
||||
stats: '178,391',
|
||||
icon: 'face',
|
||||
}, {
|
||||
color: pieColor,
|
||||
description: 'Returned',
|
||||
stats: '32,592',
|
||||
icon: 'refresh',
|
||||
}
|
||||
];
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
import {Component, ViewEncapsulation} from '@angular/core';
|
||||
import {BaThemeConfigProvider} from '../../../theme';
|
||||
|
||||
import {TodoService} from './todo.service';
|
||||
|
||||
|
|
@ -11,37 +12,24 @@ import {TodoService} from './todo.service';
|
|||
})
|
||||
export class Todo {
|
||||
|
||||
public marks:Array<any>;
|
||||
public transparent = this._baConfig.get().theme.blur;
|
||||
public dashboardColors = this._baConfig.get().colors.dashboard;
|
||||
|
||||
public todoList:Array<any>;
|
||||
public newTodoText:string = '';
|
||||
|
||||
constructor(private _todoService:TodoService) {
|
||||
this.marks = this._todoService.getMarks();
|
||||
constructor(private _baConfig:BaThemeConfigProvider, private _todoService:TodoService) {
|
||||
this.todoList = this._todoService.getTodoList();
|
||||
|
||||
this.todoList.forEach((item) => {
|
||||
item.color = this._getRandomColor();
|
||||
});
|
||||
}
|
||||
|
||||
getNotDeleted() {
|
||||
return this.todoList.filter((item:any) => {return !item.deleted})
|
||||
}
|
||||
|
||||
getMarkColor(id) {
|
||||
return this.marks.filter((item) => { return item.id === id;} )[0].color || '';
|
||||
}
|
||||
|
||||
changeColor(todo) {
|
||||
for (var i = 0; i < this.marks.length; ++i) {
|
||||
if (this.marks[i].id === todo.markId) {
|
||||
var next = (i + 1 !== this.marks.length) ? i + 1 : 0;
|
||||
todo.markId = this.marks[next].id;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
blurOnEnter(event, item) {
|
||||
if (event.which === 13) {
|
||||
item.edit = false;
|
||||
}
|
||||
return this.todoList.filter((item:any) => {
|
||||
return !item.deleted
|
||||
})
|
||||
}
|
||||
|
||||
addToDoItem($event) {
|
||||
|
|
@ -50,10 +38,16 @@ export class Todo {
|
|||
|
||||
this.todoList.unshift({
|
||||
text: this.newTodoText,
|
||||
edit: false,
|
||||
markId: 0
|
||||
color: this._getRandomColor(),
|
||||
});
|
||||
this.newTodoText = '';
|
||||
}
|
||||
}
|
||||
|
||||
private _getRandomColor() {
|
||||
let colors = Object.keys(this.dashboardColors).map(key => this.dashboardColors[key]);
|
||||
|
||||
var i = Math.floor(Math.random() * (colors.length - 1));
|
||||
return colors[i];
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,17 +1,19 @@
|
|||
<input type="text" value="" class="form-control task-todo" placeholder="Task to do.." (keyup)="addToDoItem($event)" [(ngModel)]="newTodoText"/>
|
||||
<i (click)="addToDoItem($event)" class="add-item-icon ion-plus-round"></i>
|
||||
<div class="box-shadow-border"></div>
|
||||
<div class="task-todo-container" [ngClass]="{'transparent': transparent}">
|
||||
<input type="text" value="" class="form-control task-todo" placeholder="Task to do.." (keyup)="addToDoItem($event)" [(ngModel)]="newTodoText"/>
|
||||
<i (click)="addToDoItem($event)" class="add-item-icon ion-plus-round"></i>
|
||||
<div class="box-shadow-border"></div>
|
||||
|
||||
<ul class="todo-list">
|
||||
<li *ngFor="let item of getNotDeleted()" [ngClass]="{checked: item.isChecked, active: item.isActive}" class="{{ getMarkColor(item.markId) }}"
|
||||
(mouseenter)="item.isActive=true" (mouseleave)="item.isActive=false">
|
||||
<ul class="todo-list">
|
||||
<li *ngFor="let item of getNotDeleted()" [ngClass]="{checked: item.isChecked, active: item.isActive}"
|
||||
(mouseenter)="item.isActive=true" (mouseleave)="item.isActive=false">
|
||||
|
||||
<div class="blur-container"><div class="blur-box"></div></div>
|
||||
<i class="mark"></i>
|
||||
<label class="todo-checkbox custom-checkbox custom-input-success">
|
||||
<input type="checkbox" [(ngModel)]="item.isChecked">
|
||||
<span class="cut-with-dots">{{ item.text }}</span>
|
||||
</label>
|
||||
<i class="remove-todo ion-ios-close-empty" (click)="item.deleted = true"></i>
|
||||
</li>
|
||||
</ul>
|
||||
<div class="blur-container"><div class="blur-box"></div></div>
|
||||
<i class="mark" [ngStyle]="{ 'background-color': item.color }"></i>
|
||||
<label class="todo-checkbox custom-checkbox custom-input-success">
|
||||
<input type="checkbox" [(ngModel)]="item.isChecked">
|
||||
<span class="cut-with-dots">{{ item.text }}</span>
|
||||
</label>
|
||||
<i class="remove-todo ion-ios-close-empty" (click)="item.deleted = true"></i>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -3,81 +3,19 @@ import {Injectable} from '@angular/core';
|
|||
@Injectable()
|
||||
export class TodoService {
|
||||
|
||||
private _marks = [
|
||||
{
|
||||
id: 0,
|
||||
color: 'default'
|
||||
},
|
||||
{
|
||||
id: 1,
|
||||
color: 'primary'
|
||||
},
|
||||
{
|
||||
id: 2,
|
||||
color: 'success'
|
||||
},
|
||||
{
|
||||
id: 3,
|
||||
color: 'warning'
|
||||
},
|
||||
{
|
||||
id: 4,
|
||||
color: 'danger'
|
||||
}
|
||||
];
|
||||
|
||||
private _todoList = [
|
||||
{
|
||||
text: 'Check me out',
|
||||
edit: false,
|
||||
markId: 4
|
||||
},
|
||||
{
|
||||
text: 'Lorem ipsum dolor sit amet, possit denique oportere at his, etiam corpora deseruisse te pro',
|
||||
edit: false,
|
||||
markId: 3
|
||||
},
|
||||
{
|
||||
text: 'Ex has semper alterum, expetenda dignissim',
|
||||
edit: false,
|
||||
markId: 2
|
||||
},
|
||||
{
|
||||
text: 'Vim an eius ocurreret abhorreant, id nam aeque persius ornatus.',
|
||||
edit: false,
|
||||
markId: 1
|
||||
},
|
||||
{
|
||||
text: 'Simul erroribus ad usu',
|
||||
edit: false,
|
||||
markId: 0
|
||||
},
|
||||
{
|
||||
text: 'Ei cum solet appareat, ex est graeci mediocritatem',
|
||||
edit: false,
|
||||
markId: 4
|
||||
},
|
||||
{
|
||||
text: 'Get in touch with akveo team',
|
||||
edit: false,
|
||||
markId: 1
|
||||
},
|
||||
{
|
||||
text: 'Write email to business cat',
|
||||
edit: false,
|
||||
markId: 3
|
||||
},
|
||||
{
|
||||
text: 'Have fun with blur admin',
|
||||
edit: false,
|
||||
markId: 2
|
||||
},
|
||||
{ text: 'Check me out' },
|
||||
{ text: 'Lorem ipsum dolor sit amet, possit denique oportere at his, etiam corpora deseruisse te pro' },
|
||||
{ text: 'Ex has semper alterum, expetenda dignissim' },
|
||||
{ text: 'Vim an eius ocurreret abhorreant, id nam aeque persius ornatus.' },
|
||||
{ text: 'Simul erroribus ad usu' },
|
||||
{ text: 'Ei cum solet appareat, ex est graeci mediocritatem' },
|
||||
{ text: 'Get in touch with akveo team' },
|
||||
{ text: 'Write email to business cat' },
|
||||
{ text: 'Have fun with blur admin' },
|
||||
{ text: 'What do you think?' },
|
||||
];
|
||||
|
||||
getMarks() {
|
||||
return this._marks;
|
||||
}
|
||||
|
||||
getTodoList() {
|
||||
return this._todoList;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue