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

Merge branch 'develop' into fix/#1110-use-specific-carries-error

parents ab68a0d5 d2fa8ff9

packages/admin-web-angular/angular.json

+2 −1
Original line number Diff line number Diff line
@@ -38,7 +38,8 @@ 
							"../../node_modules/angular-tree-component/dist/angular-tree-component.css",

							"../../node_modules/pace-js/templates/pace-theme-flash.tmpl.css",

							"../../node_modules/leaflet/dist/leaflet.css",

							"src/app/@theme/styles/styles.scss"

							"src/app/@theme/styles/styles.scss",

							"./node_modules/swiper/css/swiper.css"

						],

						"stylePreprocessorOptions": {

							"includePaths": ["src/app", "src/assets"]

packages/admin-web-angular/package.json

+2 −0
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ 
		"ngx-highlightjs": "^2.1.4",

		"ngx-moment": "^3.4.0",

		"ngx-translate-multi-http-loader": "^3.0.0",

		"ngx-useful-swiper": "9.0.3",

		"node-sass": "^4.12.0",

		"normalize.css": "^8.0.1",

		"pace-js": "1.0.2",
@@ -148,6 +149,7 @@ 
		"socket.io-client": "^2.2.0",

		"stripe": "^7.0.0",

		"subscriptions-transport-ws": "^0.9.16",

		"swiper": "^5.2.1",

		"tinymce": "^5.0.4",

		"tslib": "^1.10.0",

		"typeface-exo": "^0.0.61",

packages/admin-web-angular/src/app/@core/data/warehouseOrders.service.ts

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ export class WarehouseOrdersService { 
				`,

				variables: { createInput },

			})

			.map((result: any) => result.data.createOrder);

			.pipe(map((result: any) => result.data.createOrder));

	}



	getDashboardOrdersChartOrders(storeId: string): Observable<Order[]> {

packages/admin-web-angular/src/app/@shared/render-component/image-slider/image-slider.component.html

0 → 100644
+11 −0
Original line number Diff line number Diff line 
<swiper [config]="config" style="height: 400px;">

	<div class="swiper-wrapper">

		<div class="swiper-slide" *ngFor="let image of slideImages">

			<img [src]="image.url" [ngStyle]="image.style" />

			<div class="slide-title">{{ image.title }}</div>

		</div>

	</div>

	<div class="swiper-pagination"></div>

	<div class="swiper-button-next"></div>

	<div class="swiper-button-prev"></div>

</swiper>

packages/admin-web-angular/src/app/@shared/render-component/image-slider/image-slider.component.scss

0 → 100644
+11 −0
Original line number Diff line number Diff line 
.slide-title {

	background-color: rgba(0, 0, 0, 0.5);

	color: rgba(255, 255, 255, 0.8);

	position: absolute;

	bottom: 0;

	width: 100%;

	padding: 1rem 0;

}

.swiper-pagination {

	top: 0;

}