Unverified Commit 7eb8bc73 authored by Ruslan Konviser's avatar Ruslan Konviser Committed by GitHub
Browse files

Merge pull request #1468 from ever-co/feature/admin-ui-improvement 

Feature: admin ui improvement
parents 41a6bb37 22da86f8

packages/admin-web-angular/package.json

+10 −1
Original line number Diff line number Diff line
@@ -20,7 +20,16 @@ 
	"browserslist": [

		"> 1%",

		"last 2 versions",

		"IE 11"

		"IE 11",

		"last 1 Chrome version",

		"last 1 Firefox version",

		"last 2 Edge major versions",

		"last 2 Safari major versions",

		"last 2 iOS major versions",

		"Firefox ESR",

		"not IE 9-10",

		"not ios_saf 15.2-15.3",

		"not safari 15.2-15.3"

	],

	"scripts": {

		"config": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn ts-node -P tsconfig.commonjs.json ./scripts/configure.ts",

packages/admin-web-angular/src/app/@shared/product/forms/products-table/products-table.component.ts

+6 −6
Original line number Diff line number Diff line
@@ -46,11 +46,11 @@ export class ProductsTableComponent implements OnInit, OnDestroy { 
	selectProducts$: EventEmitter<any> = new EventEmitter();

	$subSlectProducts: Subscription;

	pagesChanges$: EventEmitter<number> = new EventEmitter();



	@Input()

	perPage: number = 0;

	@Input()

	hiddenTableActions: boolean;



	@Input()

	boxShadow: string;
@@ -198,9 +198,8 @@ export class ProductsTableComponent implements OnInit, OnDestroy { 
		this.$subSlectProducts = this.selectProducts$

			.pipe(takeUntil(this.ngDestroy$))

			.subscribe(({ current, allData }) => {

				allData.find((d) => d && d.id === current['id'])[

					'checked'

				] = !current.checked;

				allData.find((d) => d && d.id === current['id'])['checked'] =

					!current.checked;



				if (current.checked) {

					this._selectedProducts.push(current);
@@ -258,10 +257,11 @@ export class ProductsTableComponent implements OnInit, OnDestroy { 
						position: 'left',

					},

					edit: {

						editButtonContent: '<i class="ion-md-create"></i>',

						editButtonContent: '<i class="fa fa-fw fa-edit"></i>',

					},

					delete: {

						deleteButtonContent: '<i class="ion-md-trash"></i>',

						deleteButtonContent:

							'<i class="fa fa-fw fa-trash"></i>',

						confirmDelete: true,

					},

					mode: 'external',

packages/admin-web-angular/src/app/@shared/render-component/product-categories/product-categories.ts

+3 −3
Original line number Diff line number Diff line
@@ -10,8 +10,9 @@ import { ProductLocalesService } from '@modules/client.common.angular2/locale/pr 
			}



			div img {

				width: 40px;

				height: 40px;

				width: 35px;

				height: 35px;

				border-radius: 50%;

			}

		`,

	],
@@ -20,7 +21,6 @@ import { ProductLocalesService } from '@modules/client.common.angular2/locale/pr 
export class ProductCategoriesComponent implements ViewCell, OnInit {

	value: any;

	rowData: any;



	categoriesArr = [];



	constructor(private readonly _localeTranslate: ProductLocalesService) {}

packages/admin-web-angular/src/app/@theme/styles/themes.scss

+77 −80
Original line number Diff line number Diff line
@@ -29,8 +29,7 @@ $nb-themes: nb-register-theme( 
		//

		//list-item-border-width: 1px,

		//

			slide-out-background:

			linear-gradient(270deg, #edf1f7 0%, #e4e9f2 100%),

		slide-out-background: linear-gradient(270deg, #edf1f7 0%, #e4e9f2 100%),

		slide-out-shadow-color: 0 4px 14px 0 #8f9bb3,

		slide-out-shadow-color-rtl: 0 4px 14px 0 #8f9bb3,

		//
@@ -71,8 +70,7 @@ $nb-themes: nb-register-theme( 
		//

		//list-item-border-width: 1px,

		//

			slide-out-background:

			radial-gradient(circle, #5a37b8 0%, #7b51db 100%),

		slide-out-background: radial-gradient(circle, #5a37b8 0%, #7b51db 100%),

		slide-out-shadow-color: 2px 0 3px #29157a,

		slide-out-shadow-color-rtl: -2px 0 3px #29157a,

		smart-table-bg-even: transparent,
@@ -85,7 +83,7 @@ $nb-themes: nb-register-theme( 
		//

		//ecommerce-card-border-width: 1px,

		//

			//progress-bar-background: linear-gradient(90deg, #00c7c7 0%, #00d977 100%),,

		//progress-bar-background: linear-gradient(90deg, #00c7c7 0%, #00d977 100%),,,,

	),

	cosmic,

	cosmic
@@ -115,8 +113,7 @@ $nb-themes: nb-register-theme( 
		//

		//list-item-border-width: 1px,

		//

			slide-out-background:

			linear-gradient(270deg, #edf1f7 0%, #e4e9f2 100%),

		slide-out-background: linear-gradient(270deg, #edf1f7 0%, #e4e9f2 100%),

		slide-out-shadow-color: 0 4px 14px 0 #8f9bb3,

		slide-out-shadow-color-rtl: 0 4px 14px 0 #8f9bb3,

		//
@@ -127,7 +124,7 @@ $nb-themes: nb-register-theme( 
		//

		//ecommerce-card-border-width: 1px,

		//

			//progress-bar-background: linear-gradient(90deg, #ff9f6f 0%, #ff8b97 100%),,

		//progress-bar-background: linear-gradient(90deg, #ff9f6f 0%, #ff8b97 100%),,,,

	),

	corporate,

	corporate