Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
#78 fix lint suggestions
  • Loading branch information
enriquezrene committed Apr 13, 2020
commit 254aa1145c02e77a4de45e9f7d5c4ccfd6bdaf18
4 changes: 3 additions & 1 deletion src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ import { environment } from '../environments/environment';
import { CustomerComponent } from './modules/customer/pages/customer.component';
import { CustomerTableListComponent } from './modules/customer/components/customer-table-list/customer-table-list.component';
import { SearchComponent } from './modules/customer/components/search/search.component';
import { ManagmentCustomerProjectsComponent } from './modules/customer/components/managment-customer-projects/managment-customer-projects.component';
// tslint:disable-next-line:import-spacing
import { ManagmentCustomerProjectsComponent }
from './modules/customer/components/managment-customer-projects/managment-customer-projects.component';
import { InputCustomerComponent } from './modules/customer/components/input-customer/input-customer';
import { InputProjectComponent } from './modules/customer/components/input-project/input-project.component';
import { ProjectTableListComponent } from './modules/customer/components/project-table-list/project-table-list.component';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
<tbody>
<tr
class="d-flex"
*ngFor="let customer of customers | paginate: { itemsPerPage: 3, currentPage: initPage1, id: 'first' }"
*ngFor="let customer of customers | paginate: { itemsPerPage: 5, currentPage: initPage1, id: 'first' }"
>
<td class="col-sm-9">{{ customer.name }}</td>
<td class="col-sm-3 text-center">
<button (click)="activateCustomerForm()" type="button" class="btn btn-sm btn-edit">
<button (click)="activateCustomerForm()" type="button" class="btn btn-sm btn-secondary">
<i class="fa fa-pencil fa-xs"></i>
</button>
<button type="button" class="btn btn-sm btn-delete ml-2"><i class="fas fa-trash-alt fa-xs"></i></button>
<button type="button" class="btn btn-sm btn-danger ml-2"><i class="fas fa-trash-alt fa-xs"></i></button>
</td>
</tr>
</tbody>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,6 @@
color: white;
}

.btn-edit {
background-color: $modal-button-secondary;
color: white;
}

.btn-delete {
background-color: $danger-color;
color: white;
}

.scroll {
max-height: 165px;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
styleUrls: ['./customer-table-list.component.scss'],
})
export class CustomerTableListComponent implements OnInit {
initPage1: number = 1;
initPage1 = 1;

customers = [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
rows="3"
placeholder="Customer description"
></textarea>
<button type="submit" class="btn btn-sm btn-save mb-2 mt-2">Save</button>
<button type="submit" class="btn btn-sm btn-cancel mb-2 ml-2 mt-2">Cancel</button>
<button type="submit" class="btn btn-sm btn-primary">Save</button>
<button type="submit" class="btn btn-sm btn-secondary mb-2 ml-2 mt-2">Cancel</button>
</div>
</form>
</div>
Original file line number Diff line number Diff line change
@@ -1,11 +0,0 @@
@import '../../../../../styles/colors.scss';

.btn-cancel {
background-color: $modal-button-secondary;
color: white;
}

.btn-save {
background-color: $danger-color;
color: white;
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
rows="3"
placeholder="Description"
></textarea>
<button type="submit" class="btn btn-sm btn-save mb-2 mt-2">Save</button>
<button type="submit" class="btn btn-sm btn-cancel mb-2 ml-2 mt-2">Cancel</button>
<button type="submit" class="btn btn-sm btn-primary mb-2 mt-2">Save</button>
<button type="submit" class="btn btn-sm btn-secondary mb-2 ml-2 mt-2">Cancel</button>
</div>
</form>
<hr />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +0,0 @@
@import '../../../../../styles/colors.scss';

.btn-cancel {
background-color: $modal-button-secondary;
color: white;
}

.btn-save {
background-color: $danger-color;
color: white;
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
<option value="1">a..</option>
<option value="2">b..</option>
</select>
<button type="submit" class="btn btn-sm btn-save mb-2 mt-2">Save</button>
<button type="submit" class="btn btn-sm btn-cancel mb-2 ml-2 mt-2">Cancel</button>
<button type="submit" class="btn btn-sm btn-primary">Save</button>
<button type="submit" class="btn btn-sm btn-secondary mb-2 ml-2 mt-2">Cancel</button>
</div>
</form>
<hr />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +0,0 @@
@import '../../../../../styles/colors.scss';

.btn-cancel {
background-color: $modal-button-secondary;
color: white;
}

.btn-save {
background-color: $danger-color;
color: white;
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
>
<td class="col-sm-9">{{ project.name }}</td>
<td class="col-sm-3 text-center">
<button type="button" class="btn btn-sm btn-edit"><i class="fa fa-pencil fa-xs"></i></button>
<button type="button" class="btn btn-sm btn-delete ml-2"><i class="fas fa-trash-alt fa-xs"></i></button>
<button type="button" class="btn btn-sm btn-secondary"><i class="fa fa-pencil fa-xs"></i></button>
<button type="button" class="btn btn-sm btn-danger ml-2"><i class="fas fa-trash-alt fa-xs"></i></button>
</td>
</tr>
</tbody>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,6 @@
color: white;
}

.btn-edit {
background-color: $modal-button-secondary;
color: white;
}

.btn-delete {
background-color: $danger-color;
color: white;
}

.scroll {
max-height: 165px;
overflow-y: auto;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { Component, OnInit } from '@angular/core';
styleUrls: ['./project-table-list.component.scss'],
})
export class ProjectTableListComponent implements OnInit {
initPage3: number = 1;
initPage3 = 1;

projects = [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
>
<td class="col-sm-9">{{ projectType.name }}</td>
<td class="col-sm-3 text-center">
<button type="button" class="btn btn-sm btn-edit"><i class="fa fa-pencil fa-xs"></i></button>
<button type="button" class="btn btn-sm btn-delete ml-2"><i class="fas fa-trash-alt fa-xs"></i></button>
<button type="button" class="btn btn-sm btn-secondary"><i class="fa fa-pencil fa-xs"></i></button>
<button type="button" class="btn btn-sm btn-danger ml-2"><i class="fas fa-trash-alt fa-xs"></i></button>
</td>
</tr>
</tbody>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,6 @@
color: white;
}

.btn-edit {
background-color: $modal-button-secondary;
color: white;
}

.btn-delete {
background-color: $danger-color;
color: white;
}

.scroll {
max-height: 165px;
overflow-y: auto;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { Component, OnInit } from '@angular/core';
styleUrls: ['./project-type-table-list.component.scss'],
})
export class ProjectTypeTableListComponent implements OnInit {
initPage2: number = 1;
initPage2 = 1;
projectsType = [
{
id: '1',
Expand Down
2 changes: 1 addition & 1 deletion src/app/modules/customer/pages/customer.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { Component, OnInit } from '@angular/core';
styleUrls: ['./customer.component.scss'],
})
export class CustomerComponent implements OnInit {
showCustomerForm: boolean = false;
showCustomerForm = false;

constructor() {}

Expand Down
26 changes: 6 additions & 20 deletions src/styles/themes/_orange-theme.scss
Original file line number Diff line number Diff line change
@@ -1,36 +1,22 @@
@import '../colors.scss';

$primary:#fc5630;
$secondary:#ff3f56;
$secondary:#16bac5;
$success:#16bac5;
$info:#30bced;
$warning:#fc5630;
$danger:#ff3663;
$light:#ffffff;
$dark:#5c4e63;

.bg-primary,
.btn-primary,
.badge-primary,
.alert-primary {
background-image: linear-gradient(to right,
#ff3948,
#ff384d,
#ff3752,
#ff3657,
#ff365c,
#ff385a,
#ff3b59,
#ff3d57,
#ff434e,
#ff4944,
#fe4f3a,
#fc5630);
background-image: $background-pantone;
}

.bg-secondary,
.btn-secondary,
.badge-secondary,
.alert-secondary {
background-image: linear-gradient(to right,
#FF3663,
#A50D8A);
}
background-image: linear-gradient(to right, #00CC6C,#00BCBD);
}