ng5 migration
Migrate to angular 5.1.1 Adjusted some visuals Fixed some errors Formatted all sources to LF endline
This commit is contained in:
parent
6e51a9f391
commit
374087bf28
@ -3,8 +3,7 @@
|
|||||||
"project": {
|
"project": {
|
||||||
"name": "WebSPA"
|
"name": "WebSPA"
|
||||||
},
|
},
|
||||||
"apps": [
|
"apps": [{
|
||||||
{
|
|
||||||
"root": "Client",
|
"root": "Client",
|
||||||
"outDir": "wwwroot",
|
"outDir": "wwwroot",
|
||||||
"assets": [
|
"assets": [
|
||||||
@ -28,15 +27,13 @@
|
|||||||
"dev": "environments/environment.ts",
|
"dev": "environments/environment.ts",
|
||||||
"prod": "environments/environment.prod.ts"
|
"prod": "environments/environment.prod.ts"
|
||||||
}
|
}
|
||||||
}
|
}],
|
||||||
],
|
|
||||||
"e2e": {
|
"e2e": {
|
||||||
"protractor": {
|
"protractor": {
|
||||||
"config": "./protractor.conf.js"
|
"config": "./protractor.conf.js"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"lint": [
|
"lint": [{
|
||||||
{
|
|
||||||
"project": "Client/tsconfig.app.json"
|
"project": "Client/tsconfig.app.json"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
4
src/Web/WebSPA/.angulardoc.json
Normal file
4
src/Web/WebSPA/.angulardoc.json
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
{
|
||||||
|
"repoId": "bccb75c8-567f-4f97-923c-d56cd1208aa5",
|
||||||
|
"lastSync": 0
|
||||||
|
}
|
@ -1,9 +1,4 @@
|
|||||||
using System;
|
namespace eShopOnContainers.WebSPA
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
namespace eShopOnContainers.WebSPA
|
|
||||||
{
|
{
|
||||||
public class AppSettings
|
public class AppSettings
|
||||||
{
|
{
|
||||||
|
@ -1,8 +1,7 @@
|
|||||||
/* You can add global styles to this file, and also import other style files */
|
/* You can add global styles to this file, and also import other style files */
|
||||||
|
|
||||||
@import './modules/variables';
|
@import './modules/variables';
|
||||||
|
|
||||||
$dist: './fonts/Montserrat-Regular';
|
$dist: './fonts/Montserrat-Regular';
|
||||||
|
|
||||||
@font-face {
|
@font-face {
|
||||||
font-family: Montserrat;
|
font-family: Montserrat;
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
@ -74,4 +73,3 @@ select::-ms-expand {
|
|||||||
color: #FB0D0D;
|
color: #FB0D0D;
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
export class Guid {
|
export class Guid {
|
||||||
static newGuid() {
|
static newGuid() {
|
||||||
return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
|
return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
|
||||||
var r = Math.random() * 16 | 0, v = c == 'x' ? r : (r & 0x3 | 0x8);
|
let r = Math.random() * 16 | 0, v = c == 'x' ? r : (r & 0x3 | 0x8);
|
||||||
return v.toString(16);
|
return v.toString(16);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
<!doctype html>
|
<!doctype html>
|
||||||
<html>
|
<html>
|
||||||
|
|
||||||
<head>
|
<head>
|
||||||
<meta charset="utf-8">
|
<meta charset="utf-8">
|
||||||
<title>eShopConContainers.WebSPA</title>
|
<title>eShopConContainers.WebSPA</title>
|
||||||
@ -8,6 +9,7 @@
|
|||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
<link rel="icon" type="image/x-icon" href="favicon.ico">
|
<link rel="icon" type="image/x-icon" href="favicon.ico">
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
<esh-app>
|
<esh-app>
|
||||||
<div class="preloading">
|
<div class="preloading">
|
||||||
@ -15,4 +17,5 @@
|
|||||||
</div>
|
</div>
|
||||||
</esh-app>
|
</esh-app>
|
||||||
</body>
|
</body>
|
||||||
|
|
||||||
</html>
|
</html>
|
@ -4,41 +4,34 @@ $color-brand-dark: darken($color-brand, 10%);
|
|||||||
$color-brand-darker: darken($color-brand, 20%);
|
$color-brand-darker: darken($color-brand, 20%);
|
||||||
$color-brand-bright: lighten($color-brand, 10%);
|
$color-brand-bright: lighten($color-brand, 10%);
|
||||||
$color-brand-brighter: lighten($color-brand, 20%);
|
$color-brand-brighter: lighten($color-brand, 20%);
|
||||||
|
|
||||||
$color-secondary: #83D01B;
|
$color-secondary: #83D01B;
|
||||||
$color-secondary-dark: darken($color-secondary, 5%);
|
$color-secondary-dark: darken($color-secondary, 5%);
|
||||||
$color-secondary-darker: darken($color-secondary, 20%);
|
$color-secondary-darker: darken($color-secondary, 20%);
|
||||||
$color-secondary-bright: lighten($color-secondary, 10%);
|
$color-secondary-bright: lighten($color-secondary, 10%);
|
||||||
$color-secondary-brighter: lighten($color-secondary, 20%);
|
$color-secondary-brighter: lighten($color-secondary, 20%);
|
||||||
|
|
||||||
$color-background-dark: #333333;
|
$color-background-dark: #333333;
|
||||||
$color-background-darker: #000000;
|
$color-background-darker: #000000;
|
||||||
$color-background-bright: #EEEEFF;
|
$color-background-bright: #EEEEFF;
|
||||||
$color-background-brighter: #FFFFFF;
|
$color-background-brighter: #FFFFFF;
|
||||||
|
|
||||||
$color-foreground-dark: #333333;
|
$color-foreground-dark: #333333;
|
||||||
$color-foreground-darker: #000000;
|
$color-foreground-darker: #000000;
|
||||||
$color-foreground-bright: #EEEEEE;
|
$color-foreground-bright: #EEEEEE;
|
||||||
$color-foreground-brighter: #FFFFFF;
|
$color-foreground-brighter: #FFFFFF;
|
||||||
|
|
||||||
// Animations
|
// Animations
|
||||||
$animation-speed-default: .35s;
|
$animation-speed-default: .35s;
|
||||||
$animation-speed-slow: .5s;
|
$animation-speed-slow: .5s;
|
||||||
$animation-speed-fast: .15s;
|
$animation-speed-fast: .15s;
|
||||||
|
|
||||||
// Fonts
|
// Fonts
|
||||||
$font-weight-light: 200;
|
$font-weight-light: 200;
|
||||||
$font-weight-semilight: 300;
|
$font-weight-semilight: 300;
|
||||||
$font-weight-normal: 400;
|
$font-weight-normal: 400;
|
||||||
$font-weight-semibold: 600;
|
$font-weight-semibold: 600;
|
||||||
$font-weight-bold: 700;
|
$font-weight-bold: 700;
|
||||||
|
|
||||||
$font-size-xs: .65rem; // 10.4px
|
$font-size-xs: .65rem; // 10.4px
|
||||||
$font-size-s: .85rem; // 13.6px
|
$font-size-s: .85rem; // 13.6px
|
||||||
$font-size-m: 1rem; // 16px
|
$font-size-m: 1rem; // 16px
|
||||||
$font-size-l: 1.25rem; // 20px
|
$font-size-l: 1.25rem; // 20px
|
||||||
$font-size-xl: 1.5rem; // 24px
|
$font-size-xl: 1.5rem; // 24px
|
||||||
|
|
||||||
// Medias
|
// Medias
|
||||||
$media-screen-xxs: 360px;
|
$media-screen-xxs: 360px;
|
||||||
$media-screen-xs: 640px;
|
$media-screen-xs: 640px;
|
||||||
@ -48,10 +41,8 @@ $media-screen-l: 1280px;
|
|||||||
$media-screen-xl: 1440px;
|
$media-screen-xl: 1440px;
|
||||||
$media-screen-xxl: 1680px;
|
$media-screen-xxl: 1680px;
|
||||||
$media-screen-xxxl: 1920px;
|
$media-screen-xxxl: 1920px;
|
||||||
|
|
||||||
// Borders
|
// Borders
|
||||||
$border-light: 1px;
|
$border-light: 1px;
|
||||||
|
|
||||||
// Images
|
// Images
|
||||||
$image_path: '/assets/images/';
|
$image_path: '/assets/images/';
|
||||||
$image-main_banner: '#{$image_path}main_banner.png';
|
$image-main_banner: '#{$image_path}main_banner.png';
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
<header class="navbar navbar-light navbar-static-top">
|
<header class="navbar-light navbar-static-top">
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<article class="row">
|
<article class="row">
|
||||||
|
|
||||||
@ -38,4 +38,3 @@
|
|||||||
</article>
|
</article>
|
||||||
</div>
|
</div>
|
||||||
</footer>
|
</footer>
|
||||||
|
|
||||||
|
@ -1,23 +1,18 @@
|
|||||||
@import './variables';
|
@import './variables';
|
||||||
|
|
||||||
.esh-app {
|
.esh-app {
|
||||||
&-footer {
|
&-footer {
|
||||||
$margin: 2.5rem;
|
$margin: 2.5rem;
|
||||||
$padding: 2.5rem;
|
$padding: 2.5rem;
|
||||||
|
|
||||||
background-color: $color-background-darker;
|
background-color: $color-background-darker;
|
||||||
border-top: $border-light solid $color-foreground-bright;
|
border-top: $border-light solid $color-foreground-bright;
|
||||||
margin-top: $margin;
|
margin-top: $margin;
|
||||||
padding-bottom: $padding;
|
padding-bottom: $padding;
|
||||||
padding-top: $padding;
|
padding-top: $padding;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
|
||||||
$height: 50px;
|
$height: 50px;
|
||||||
|
|
||||||
&-brand {
|
&-brand {
|
||||||
height: $height;
|
height: $height;
|
||||||
width: 230px;
|
width: 230px;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -21,7 +21,10 @@ export class AppComponent implements OnInit {
|
|||||||
Authenticated: boolean = false;
|
Authenticated: boolean = false;
|
||||||
subscription: Subscription;
|
subscription: Subscription;
|
||||||
|
|
||||||
constructor(private titleService: Title, private securityService: SecurityService, private configurationService: ConfigurationService) {
|
constructor(
|
||||||
|
private titleService: Title,
|
||||||
|
private securityService: SecurityService,
|
||||||
|
private configurationService: ConfigurationService) {
|
||||||
this.Authenticated = this.securityService.IsAuthorized;
|
this.Authenticated = this.securityService.IsAuthorized;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,6 +1,4 @@
|
|||||||
<a class="esh-basketstatus"
|
<a class="esh-basketstatus" [ngClass]="{'is-disabled': badge < 1}" [routerLink]="['basket']">
|
||||||
[ngClass]="{'is-disabled': badge < 1}"
|
|
||||||
[routerLink]="['basket']">
|
|
||||||
|
|
||||||
<div class="esh-basketstatus-image">
|
<div class="esh-basketstatus-image">
|
||||||
<img src="assets/images/cart.png" />
|
<img src="assets/images/cart.png" />
|
||||||
|
@ -1,22 +1,18 @@
|
|||||||
@import '../../variables';
|
@import '../../variables';
|
||||||
|
|
||||||
.esh-basketstatus {
|
.esh-basketstatus {
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
float: right;
|
float: right;
|
||||||
position: relative;
|
position: relative;
|
||||||
transition: all $animation-speed-default;
|
transition: all $animation-speed-default;
|
||||||
|
|
||||||
&.is-disabled {
|
&.is-disabled {
|
||||||
opacity: .5;
|
opacity: .5;
|
||||||
pointer-events: none;
|
pointer-events: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
&-image {
|
&-image {
|
||||||
height: 36px;
|
height: 36px;
|
||||||
margin-top: .5rem;
|
margin-top: .5rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
&-badge {
|
&-badge {
|
||||||
$size: 1.5rem;
|
$size: 1.5rem;
|
||||||
background-color: $color-secondary;
|
background-color: $color-secondary;
|
||||||
@ -32,7 +28,6 @@
|
|||||||
transition: all $animation-speed-default;
|
transition: all $animation-speed-default;
|
||||||
width: $size;
|
width: $size;
|
||||||
}
|
}
|
||||||
|
|
||||||
&:hover &-badge {
|
&:hover &-badge {
|
||||||
background-color: transparent;
|
background-color: transparent;
|
||||||
color: $color-secondary-dark;
|
color: $color-secondary-dark;
|
||||||
|
@ -25,12 +25,7 @@
|
|||||||
<section class="esh-basket-item esh-basket-item--middle col-xs-3">{{item.productName}}</section>
|
<section class="esh-basket-item esh-basket-item--middle col-xs-3">{{item.productName}}</section>
|
||||||
<section class="esh-basket-item esh-basket-item--middle col-xs-2">$ {{item.unitPrice | number:'.2-2'}}</section>
|
<section class="esh-basket-item esh-basket-item--middle col-xs-2">$ {{item.unitPrice | number:'.2-2'}}</section>
|
||||||
<section class="esh-basket-item esh-basket-item--middle col-xs-2">
|
<section class="esh-basket-item esh-basket-item--middle col-xs-2">
|
||||||
<input id="quantity"
|
<input id="quantity" class="esh-basket-input" type="number" min="1" [(ngModel)]="item.quantity" (change)="itemQuantityChanged(item)" />
|
||||||
class="esh-basket-input"
|
|
||||||
type="number"
|
|
||||||
min="1"
|
|
||||||
[(ngModel)]="item.quantity"
|
|
||||||
(change)="itemQuantityChanged(item)"/>
|
|
||||||
</section>
|
</section>
|
||||||
<section class="esh-basket-item esh-basket-item--middle esh-basket-item--mark col-xs-2">$ {{(item.unitPrice * item.quantity) | number:'.2-2'}}</section>
|
<section class="esh-basket-item esh-basket-item--middle esh-basket-item--mark col-xs-2">$ {{(item.unitPrice * item.quantity) | number:'.2-2'}}</section>
|
||||||
</article>
|
</article>
|
||||||
|
@ -1,69 +1,54 @@
|
|||||||
@import '../variables';
|
@import '../variables';
|
||||||
|
|
||||||
@mixin margin-left($distance) {
|
@mixin margin-left($distance) {
|
||||||
margin-left: $distance;
|
margin-left: $distance;
|
||||||
}
|
}
|
||||||
|
|
||||||
.esh-basket {
|
.esh-basket {
|
||||||
min-height: 80vh;
|
min-height: 80vh;
|
||||||
|
|
||||||
&-titles {
|
&-titles {
|
||||||
padding-bottom: 1rem;
|
padding-bottom: 1rem;
|
||||||
padding-top: 2rem;
|
padding-top: 2rem;
|
||||||
|
|
||||||
&--clean {
|
&--clean {
|
||||||
padding-bottom: 0;
|
padding-bottom: 0;
|
||||||
padding-top: 0;
|
padding-top: 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&-title {
|
&-title {
|
||||||
text-transform: uppercase;
|
text-transform: uppercase;
|
||||||
}
|
}
|
||||||
|
|
||||||
&-items {
|
&-items {
|
||||||
&--border {
|
&--border {
|
||||||
border-bottom: $border-light solid $color-foreground-bright;
|
border-bottom: $border-light solid $color-foreground-bright;
|
||||||
padding: .5rem 0;
|
padding: .5rem 0;
|
||||||
|
|
||||||
&:last-of-type {
|
&:last-of-type {
|
||||||
border-color: transparent;
|
border-color: transparent;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&-margin-left1 {
|
&-margin-left1 {
|
||||||
@include margin-left(1px);
|
@include margin-left(1px);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$item-height: 8rem;
|
$item-height: 8rem;
|
||||||
|
|
||||||
&-item {
|
&-item {
|
||||||
font-size: $font-size-m;
|
font-size: $font-size-m;
|
||||||
font-weight: $font-weight-semilight;
|
font-weight: $font-weight-semilight;
|
||||||
|
|
||||||
&--middle {
|
&--middle {
|
||||||
line-height: $item-height;
|
line-height: $item-height;
|
||||||
|
|
||||||
@media screen and (max-width: $media-screen-m) {
|
@media screen and (max-width: $media-screen-m) {
|
||||||
line-height: $font-size-m;
|
line-height: $font-size-m;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&--mark {
|
&--mark {
|
||||||
color: $color-brand;
|
color: $color-brand;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&-image {
|
&-image {
|
||||||
height: $item-height;
|
height: $item-height;
|
||||||
}
|
}
|
||||||
|
|
||||||
&-input {
|
&-input {
|
||||||
line-height: 1rem;
|
line-height: 1rem;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
&-checkout {
|
&-checkout {
|
||||||
background-color: $color-secondary;
|
background-color: $color-secondary;
|
||||||
border: 0;
|
border: 0;
|
||||||
@ -77,13 +62,9 @@
|
|||||||
text-align: center;
|
text-align: center;
|
||||||
text-transform: uppercase;
|
text-transform: uppercase;
|
||||||
transition: all $animation-speed-default;
|
transition: all $animation-speed-default;
|
||||||
|
|
||||||
&:hover {
|
&:hover {
|
||||||
background-color: $color-secondary-darker;
|
background-color: $color-secondary-darker;
|
||||||
transition: all $animation-speed-default;
|
transition: all $animation-speed-default;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -52,8 +52,7 @@ export class BasketComponent implements OnInit {
|
|||||||
x => {
|
x => {
|
||||||
this.errorMessages = [];
|
this.errorMessages = [];
|
||||||
this.basketwrapper.basket = this.basket;
|
this.basketwrapper.basket = this.basket;
|
||||||
this.router.navigate(['order'],
|
this.router.navigate(['order']);
|
||||||
errMessage => this.errorMessages = errMessage.messages);
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -92,7 +92,7 @@ export class BasketService {
|
|||||||
mapBasketInfoCheckout(order: IOrder): IBasketCheckout {
|
mapBasketInfoCheckout(order: IOrder): IBasketCheckout {
|
||||||
let basketCheckout = <IBasketCheckout>{};
|
let basketCheckout = <IBasketCheckout>{};
|
||||||
|
|
||||||
basketCheckout.street = order.street
|
basketCheckout.street = order.street;
|
||||||
basketCheckout.city = order.city;
|
basketCheckout.city = order.city;
|
||||||
basketCheckout.country = order.country;
|
basketCheckout.country = order.country;
|
||||||
basketCheckout.state = order.state;
|
basketCheckout.state = order.state;
|
||||||
|
@ -1,56 +1,43 @@
|
|||||||
@import '../../variables';
|
@import '../../variables';
|
||||||
|
|
||||||
.esh-campaign_detail {
|
.esh-campaign_detail {
|
||||||
min-height: 80vh;
|
min-height: 80vh;
|
||||||
margin-top: 1rem;
|
margin-top: 1rem;
|
||||||
|
|
||||||
&-section {
|
&-section {
|
||||||
padding: 1rem 0;
|
padding: 1rem 0;
|
||||||
|
|
||||||
&--right {
|
&--right {
|
||||||
text-align: right;
|
text-align: right;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&-titles {
|
&-titles {
|
||||||
padding-bottom: 1rem;
|
padding-bottom: 1rem;
|
||||||
padding-top: 2rem;
|
padding-top: 2rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
&-title {
|
&-title {
|
||||||
text-transform: uppercase;
|
text-transform: uppercase;
|
||||||
}
|
}
|
||||||
|
|
||||||
&-items {
|
&-items {
|
||||||
&--border {
|
&--border {
|
||||||
border-bottom: $border-light solid $color-foreground-bright;
|
border-bottom: $border-light solid $color-foreground-bright;
|
||||||
padding: .5rem 0;
|
padding: .5rem 0;
|
||||||
|
|
||||||
&:last-of-type {
|
&:last-of-type {
|
||||||
border-color: transparent;
|
border-color: transparent;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$item-height: 8rem;
|
$item-height: 8rem;
|
||||||
|
|
||||||
&-item {
|
&-item {
|
||||||
font-size: $font-size-m;
|
font-size: $font-size-m;
|
||||||
font-weight: $font-weight-semilight;
|
font-weight: $font-weight-semilight;
|
||||||
|
|
||||||
&--middle {
|
&--middle {
|
||||||
line-height: $item-height;
|
line-height: $item-height;
|
||||||
|
|
||||||
@media screen and (max-width: $media-screen-s) {
|
@media screen and (max-width: $media-screen-s) {
|
||||||
line-height: $font-size-m;
|
line-height: $font-size-m;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&--mark {
|
&--mark {
|
||||||
color: $color-secondary;
|
color: $color-secondary;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&-image {
|
&-image {
|
||||||
height: $item-height;
|
height: $item-height;
|
||||||
}
|
}
|
||||||
|
@ -6,8 +6,7 @@
|
|||||||
<div *ngIf="campaigns?.data?.length > 0">
|
<div *ngIf="campaigns?.data?.length > 0">
|
||||||
<esh-pager [model]="paginationInfo" (changed)="onPageChanged($event)"></esh-pager>
|
<esh-pager [model]="paginationInfo" (changed)="onPageChanged($event)"></esh-pager>
|
||||||
<div class="card-group esh-campaign-items row">
|
<div class="card-group esh-campaign-items row">
|
||||||
<div class="esh-campaign-item col-md-4"
|
<div class="esh-campaign-item col-md-4" *ngFor="let item of campaigns.data">
|
||||||
*ngFor="let item of campaigns.data">
|
|
||||||
|
|
||||||
<div class="card-block">
|
<div class="card-block">
|
||||||
<h4 class="card-title esh-campaign-name">{{item.name}}</h4>
|
<h4 class="card-title esh-campaign-name">{{item.name}}</h4>
|
||||||
@ -31,4 +30,3 @@
|
|||||||
<span>THERE ARE NO RESULTS THAT MATCH YOUR SEARCH</span>
|
<span>THERE ARE NO RESULTS THAT MATCH YOUR SEARCH</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -1,38 +1,30 @@
|
|||||||
@import '../variables';
|
@import '../variables';
|
||||||
|
|
||||||
.esh-campaign {
|
.esh-campaign {
|
||||||
$banner-height: 260px;
|
$banner-height: 260px;
|
||||||
|
|
||||||
&-title {
|
&-title {
|
||||||
position: relative;
|
position: relative;
|
||||||
top: $banner-height / 3.5;
|
top: $banner-height / 3.5;
|
||||||
}
|
}
|
||||||
|
|
||||||
&-items {
|
&-items {
|
||||||
margin-top: 1rem;
|
margin-top: 1rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
&-item {
|
&-item {
|
||||||
margin-bottom: 1.5rem;
|
margin-bottom: 1.5rem;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
width: 33%;
|
width: 33%;
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
float: none !important;
|
float: none !important;
|
||||||
|
|
||||||
@media screen and (max-width: $media-screen-m) {
|
@media screen and (max-width: $media-screen-m) {
|
||||||
width: 50%;
|
width: 50%;
|
||||||
}
|
}
|
||||||
|
|
||||||
@media screen and (max-width: $media-screen-s) {
|
@media screen and (max-width: $media-screen-s) {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&-thumbnail {
|
&-thumbnail {
|
||||||
max-width: 370px;
|
max-width: 370px;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
&-button {
|
&-button {
|
||||||
background-color: $color-secondary;
|
background-color: $color-secondary;
|
||||||
border: 0;
|
border: 0;
|
||||||
@ -43,18 +35,15 @@
|
|||||||
margin-top: 1rem;
|
margin-top: 1rem;
|
||||||
transition: all $animation-speed-default;
|
transition: all $animation-speed-default;
|
||||||
width: 80%;
|
width: 80%;
|
||||||
|
|
||||||
&.is-disabled {
|
&.is-disabled {
|
||||||
opacity: .5;
|
opacity: .5;
|
||||||
pointer-events: none;
|
pointer-events: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
&:hover {
|
&:hover {
|
||||||
background-color: $color-secondary-darker;
|
background-color: $color-secondary-darker;
|
||||||
transition: all $animation-speed-default;
|
transition: all $animation-speed-default;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&-name {
|
&-name {
|
||||||
font-size: $font-size-m;
|
font-size: $font-size-m;
|
||||||
font-weight: $font-weight-semilight;
|
font-weight: $font-weight-semilight;
|
||||||
@ -62,7 +51,6 @@
|
|||||||
text-align: center;
|
text-align: center;
|
||||||
text-transform: uppercase;
|
text-transform: uppercase;
|
||||||
}
|
}
|
||||||
|
|
||||||
&-alert {
|
&-alert {
|
||||||
margin-top: 10px;
|
margin-top: 10px;
|
||||||
}
|
}
|
||||||
|
@ -21,7 +21,7 @@ export class CampaignsComponent implements OnInit {
|
|||||||
|
|
||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
if (this.configurationService.isReady) {
|
if (this.configurationService.isReady) {
|
||||||
this.getCampaigns(9, 0)
|
this.getCampaigns(9, 0);
|
||||||
} else {
|
} else {
|
||||||
this.configurationService.settingsLoaded$.subscribe(x => {
|
this.configurationService.settingsLoaded$.subscribe(x => {
|
||||||
this.getCampaigns(9, 0);
|
this.getCampaigns(9, 0);
|
||||||
@ -32,7 +32,7 @@ export class CampaignsComponent implements OnInit {
|
|||||||
}
|
}
|
||||||
|
|
||||||
onPageChanged(value: any) {
|
onPageChanged(value: any) {
|
||||||
console.log('campaigns pager event fired' + value);
|
console.log(`campaigns pager event fired` + value);
|
||||||
// event.preventDefault();
|
// event.preventDefault();
|
||||||
this.paginationInfo.actualPage = value;
|
this.paginationInfo.actualPage = value;
|
||||||
this.getCampaigns(this.paginationInfo.itemsPage, value);
|
this.getCampaigns(this.paginationInfo.itemsPage, value);
|
||||||
@ -55,7 +55,7 @@ export class CampaignsComponent implements OnInit {
|
|||||||
}
|
}
|
||||||
|
|
||||||
onNavigateToDetails(uri: string) {
|
onNavigateToDetails(uri: string) {
|
||||||
window.open(uri, "_blank");
|
window.open(uri, `_blank`);
|
||||||
}
|
}
|
||||||
|
|
||||||
private handleError(error: any) {
|
private handleError(error: any) {
|
||||||
|
@ -28,8 +28,7 @@
|
|||||||
<esh-pager [model]="paginationInfo" (changed)="onPageChanged($event)"></esh-pager>
|
<esh-pager [model]="paginationInfo" (changed)="onPageChanged($event)"></esh-pager>
|
||||||
|
|
||||||
<div class="esh-catalog-items row">
|
<div class="esh-catalog-items row">
|
||||||
<div class="esh-catalog-item col-md-4"
|
<div class="esh-catalog-item col-md-4" *ngFor="let item of catalog?.data">
|
||||||
*ngFor="let item of catalog?.data">
|
|
||||||
|
|
||||||
<img class="esh-catalog-thumbnail" src="{{item.pictureUri}}" />
|
<img class="esh-catalog-thumbnail" src="{{item.pictureUri}}" />
|
||||||
<button [ngClass]="{'esh-catalog-button': true, 'is-disabled': !authenticated}" (click)="addToCart(item)">
|
<button [ngClass]="{'esh-catalog-button': true, 'is-disabled': !authenticated}" (click)="addToCart(item)">
|
||||||
@ -51,4 +50,3 @@
|
|||||||
<span>THERE ARE NO RESULTS THAT MATCH YOUR SEARCH</span>
|
<span>THERE ARE NO RESULTS THAT MATCH YOUR SEARCH</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -1,29 +1,22 @@
|
|||||||
@import '../variables';
|
@import '../variables';
|
||||||
|
|
||||||
.esh-catalog {
|
.esh-catalog {
|
||||||
$banner-height: 260px;
|
$banner-height: 260px;
|
||||||
|
|
||||||
&-hero {
|
&-hero {
|
||||||
background-image: url($image-main_banner);
|
background-image: url($image-main_banner);
|
||||||
background-size: cover;
|
background-size: cover;
|
||||||
height: $banner-height;
|
height: $banner-height;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
&-title {
|
&-title {
|
||||||
position: relative;
|
position: relative;
|
||||||
top: $banner-height / 3.5;
|
top: $banner-height / 3.5;
|
||||||
}
|
}
|
||||||
|
|
||||||
$filter-height: 65px;
|
$filter-height: 65px;
|
||||||
|
|
||||||
&-filters {
|
&-filters {
|
||||||
background-color: $color-brand;
|
background-color: $color-brand;
|
||||||
height: $filter-height;
|
height: $filter-height;
|
||||||
}
|
}
|
||||||
|
|
||||||
$filter-padding: .5rem;
|
$filter-padding: .5rem;
|
||||||
|
|
||||||
&-filter {
|
&-filter {
|
||||||
-webkit-appearance: none;
|
-webkit-appearance: none;
|
||||||
background-color: transparent;
|
background-color: transparent;
|
||||||
@ -38,17 +31,14 @@
|
|||||||
padding-left: $filter-padding;
|
padding-left: $filter-padding;
|
||||||
padding-right: $filter-padding;
|
padding-right: $filter-padding;
|
||||||
padding-top: $filter-padding * 3;
|
padding-top: $filter-padding * 3;
|
||||||
|
|
||||||
option {
|
option {
|
||||||
background-color: $color-brand;
|
background-color: $color-brand;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&-label {
|
&-label {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
position: relative;
|
position: relative;
|
||||||
z-index: 0;
|
z-index: 0;
|
||||||
|
|
||||||
&::before {
|
&::before {
|
||||||
color: rgba($color-foreground-brighter, .5);
|
color: rgba($color-foreground-brighter, .5);
|
||||||
content: attr(data-title);
|
content: attr(data-title);
|
||||||
@ -59,7 +49,6 @@
|
|||||||
text-transform: uppercase;
|
text-transform: uppercase;
|
||||||
z-index: 1;
|
z-index: 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
&::after {
|
&::after {
|
||||||
background-image: url($image-arrow_down);
|
background-image: url($image-arrow_down);
|
||||||
content: '';
|
content: '';
|
||||||
@ -71,7 +60,6 @@
|
|||||||
z-index: 1;
|
z-index: 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&-send {
|
&-send {
|
||||||
background-color: $color-secondary;
|
background-color: $color-secondary;
|
||||||
color: $color-foreground-brighter;
|
color: $color-foreground-brighter;
|
||||||
@ -80,38 +68,31 @@
|
|||||||
margin-top: -$filter-padding * 3;
|
margin-top: -$filter-padding * 3;
|
||||||
padding: $filter-padding;
|
padding: $filter-padding;
|
||||||
transition: all $animation-speed-default;
|
transition: all $animation-speed-default;
|
||||||
|
|
||||||
&:hover {
|
&:hover {
|
||||||
background-color: $color-secondary-darker;
|
background-color: $color-secondary-darker;
|
||||||
transition: all $animation-speed-default;
|
transition: all $animation-speed-default;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&-items {
|
&-items {
|
||||||
margin-top: 1rem;
|
margin-top: 1rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
&-item {
|
&-item {
|
||||||
margin-bottom: 1.5rem;
|
margin-bottom: 1.5rem;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
width: 33%;
|
width: 33%;
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
float: none !important;
|
float: none !important;
|
||||||
|
|
||||||
@media screen and (max-width: $media-screen-m) {
|
@media screen and (max-width: $media-screen-m) {
|
||||||
width: 50%;
|
width: 50%;
|
||||||
}
|
}
|
||||||
|
|
||||||
@media screen and (max-width: $media-screen-s) {
|
@media screen and (max-width: $media-screen-s) {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&-thumbnail {
|
&-thumbnail {
|
||||||
max-width: 370px;
|
max-width: 370px;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
&-button {
|
&-button {
|
||||||
background-color: $color-secondary;
|
background-color: $color-secondary;
|
||||||
border: 0;
|
border: 0;
|
||||||
@ -122,18 +103,15 @@
|
|||||||
margin-top: 1rem;
|
margin-top: 1rem;
|
||||||
transition: all $animation-speed-default;
|
transition: all $animation-speed-default;
|
||||||
width: 80%;
|
width: 80%;
|
||||||
|
|
||||||
&.is-disabled {
|
&.is-disabled {
|
||||||
opacity: .5;
|
opacity: .5;
|
||||||
pointer-events: none;
|
pointer-events: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
&:hover {
|
&:hover {
|
||||||
background-color: $color-secondary-darker;
|
background-color: $color-secondary-darker;
|
||||||
transition: all $animation-speed-default;
|
transition: all $animation-speed-default;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&-name {
|
&-name {
|
||||||
font-size: $font-size-m;
|
font-size: $font-size-m;
|
||||||
font-weight: $font-weight-semilight;
|
font-weight: $font-weight-semilight;
|
||||||
@ -141,17 +119,14 @@
|
|||||||
text-align: center;
|
text-align: center;
|
||||||
text-transform: uppercase;
|
text-transform: uppercase;
|
||||||
}
|
}
|
||||||
|
|
||||||
&-price {
|
&-price {
|
||||||
font-size: 28px;
|
font-size: 28px;
|
||||||
font-weight: 900;
|
font-weight: 900;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
|
|
||||||
&::before {
|
&::before {
|
||||||
content: '$';
|
content: '$';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&-alert {
|
&-alert {
|
||||||
margin-top: 10px;
|
margin-top: 10px;
|
||||||
}
|
}
|
||||||
|
@ -50,5 +50,5 @@ export class CatalogService {
|
|||||||
return this.service.get(this.typesUrl).map((response: Response) => {
|
return this.service.get(this.typesUrl).map((response: Response) => {
|
||||||
return response.json();
|
return response.json();
|
||||||
});
|
});
|
||||||
};
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,55 +1,46 @@
|
|||||||
@import '../../variables';
|
@import '../../variables';
|
||||||
|
|
||||||
.esh-orders_detail {
|
.esh-orders_detail {
|
||||||
min-height: 80vh;
|
min-height: 80vh;
|
||||||
|
|
||||||
&-section {
|
&-section {
|
||||||
padding: 1rem 0;
|
padding: 1rem 0;
|
||||||
|
|
||||||
&--right {
|
&--right {
|
||||||
text-align: right;
|
text-align: right;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&-titles {
|
&-titles {
|
||||||
padding-bottom: 1rem;
|
padding-bottom: 1rem;
|
||||||
padding-top: 2rem;
|
padding-top: 2rem;
|
||||||
|
justify-content: space-between;
|
||||||
|
align-items: right;
|
||||||
}
|
}
|
||||||
|
|
||||||
&-title {
|
&-title {
|
||||||
text-transform: uppercase;
|
text-transform: uppercase;
|
||||||
}
|
}
|
||||||
|
|
||||||
&-items {
|
&-items {
|
||||||
|
justify-content: space-between;
|
||||||
|
align-items: right;
|
||||||
&--border {
|
&--border {
|
||||||
border-bottom: $border-light solid $color-foreground-bright;
|
border-bottom: $border-light solid $color-foreground-bright;
|
||||||
padding: .5rem 0;
|
padding: .5rem 0;
|
||||||
|
|
||||||
&:last-of-type {
|
&:last-of-type {
|
||||||
border-color: transparent;
|
border-color: transparent;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$item-height: 8rem;
|
$item-height: 8rem;
|
||||||
|
|
||||||
&-item {
|
&-item {
|
||||||
font-size: $font-size-m;
|
font-size: $font-size-m;
|
||||||
font-weight: $font-weight-semilight;
|
font-weight: $font-weight-semilight;
|
||||||
|
|
||||||
&--middle {
|
&--middle {
|
||||||
line-height: $item-height;
|
line-height: $item-height;
|
||||||
|
|
||||||
@media screen and (max-width: $media-screen-s) {
|
@media screen and (max-width: $media-screen-s) {
|
||||||
line-height: $font-size-m;
|
line-height: $font-size-m;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&--mark {
|
&--mark {
|
||||||
color: $color-secondary;
|
color: $color-secondary;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&-image {
|
&-image {
|
||||||
height: $item-height;
|
height: $item-height;
|
||||||
}
|
}
|
||||||
|
@ -80,8 +80,7 @@
|
|||||||
<section class="esh-orders_new-title col-xs-12">Order details</section>
|
<section class="esh-orders_new-title col-xs-12">Order details</section>
|
||||||
</article>
|
</article>
|
||||||
|
|
||||||
<article class="esh-orders_new-items esh-orders_new-items--border row"
|
<article class="esh-orders_new-items esh-orders_new-items--border row" *ngFor="let item of order.orderItems">
|
||||||
*ngFor="let item of order.orderItems">
|
|
||||||
<section class="esh-orders_new-item col-md-4 hidden-md-down">
|
<section class="esh-orders_new-item col-md-4 hidden-md-down">
|
||||||
<img class="esh-orders_new-image" src="{{item.pictureurl}}">
|
<img class="esh-orders_new-image" src="{{item.pictureurl}}">
|
||||||
</section>
|
</section>
|
||||||
|
@ -1,36 +1,28 @@
|
|||||||
@import '../../variables';
|
@import '../../variables';
|
||||||
|
|
||||||
.esh-orders_new {
|
.esh-orders_new {
|
||||||
min-height: 80vh;
|
min-height: 80vh;
|
||||||
|
|
||||||
$header-height: 4rem;
|
$header-height: 4rem;
|
||||||
|
|
||||||
&-header {
|
&-header {
|
||||||
background-color: #00A69C;
|
background-color: #00A69C;
|
||||||
height: $header-height;
|
height: $header-height;
|
||||||
}
|
}
|
||||||
|
|
||||||
&-back {
|
&-back {
|
||||||
color: rgba($color-foreground-brighter, .4);
|
color: rgba($color-foreground-brighter, .4);
|
||||||
line-height: $header-height;
|
line-height: $header-height;
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
text-transform: uppercase;
|
text-transform: uppercase;
|
||||||
transition: color $animation-speed-default;
|
transition: color $animation-speed-default;
|
||||||
|
|
||||||
&:hover {
|
&:hover {
|
||||||
color: $color-foreground-brighter;
|
color: $color-foreground-brighter;
|
||||||
transition: color $animation-speed-default;
|
transition: color $animation-speed-default;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&-section {
|
&-section {
|
||||||
padding: 1rem 0;
|
padding: 1rem 0;
|
||||||
|
|
||||||
&--right {
|
&--right {
|
||||||
text-align: right;
|
text-align: right;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&-placeOrder {
|
&-placeOrder {
|
||||||
background-color: $color-secondary;
|
background-color: $color-secondary;
|
||||||
border: 0;
|
border: 0;
|
||||||
@ -44,57 +36,45 @@
|
|||||||
text-align: center;
|
text-align: center;
|
||||||
text-transform: uppercase;
|
text-transform: uppercase;
|
||||||
transition: all $animation-speed-default;
|
transition: all $animation-speed-default;
|
||||||
|
|
||||||
&:hover {
|
&:hover {
|
||||||
background-color: $color-secondary-darker;
|
background-color: $color-secondary-darker;
|
||||||
transition: all $animation-speed-default;
|
transition: all $animation-speed-default;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&-titles {
|
&-titles {
|
||||||
padding-bottom: 1rem;
|
padding-bottom: 1rem;
|
||||||
padding-top: 2rem;
|
padding-top: 2rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
&-title {
|
&-title {
|
||||||
font-size: $font-size-l;
|
font-size: $font-size-l;
|
||||||
text-transform: uppercase;
|
text-transform: uppercase;
|
||||||
}
|
}
|
||||||
|
|
||||||
&-items {
|
&-items {
|
||||||
&--border {
|
&--border {
|
||||||
border-bottom: $border-light solid $color-foreground-bright;
|
border-bottom: $border-light solid $color-foreground-bright;
|
||||||
padding: .5rem 0;
|
padding: .5rem 0;
|
||||||
|
|
||||||
&:last-of-type {
|
&:last-of-type {
|
||||||
border-color: transparent;
|
border-color: transparent;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$item-height: 8rem;
|
$item-height: 8rem;
|
||||||
|
|
||||||
&-item {
|
&-item {
|
||||||
font-size: $font-size-m;
|
font-size: $font-size-m;
|
||||||
font-weight: $font-weight-semilight;
|
font-weight: $font-weight-semilight;
|
||||||
|
|
||||||
&--middle {
|
&--middle {
|
||||||
line-height: $item-height;
|
line-height: $item-height;
|
||||||
|
|
||||||
@media screen and (max-width: $media-screen-s) {
|
@media screen and (max-width: $media-screen-s) {
|
||||||
line-height: $font-size-m;
|
line-height: $font-size-m;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&--mark {
|
&--mark {
|
||||||
color: $color-secondary;
|
color: $color-secondary;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&-image {
|
&-image {
|
||||||
height: $item-height;
|
height: $item-height;
|
||||||
}
|
}
|
||||||
|
|
||||||
&-alert {
|
&-alert {
|
||||||
margin-top: 10px;
|
margin-top: 10px;
|
||||||
}
|
}
|
||||||
|
@ -13,8 +13,7 @@
|
|||||||
<section class="esh-orders-title col-xs-2"></section>
|
<section class="esh-orders-title col-xs-2"></section>
|
||||||
</article>
|
</article>
|
||||||
|
|
||||||
<article class="esh-orders-items row"
|
<article class="esh-orders-items row" *ngFor="let order of orders">
|
||||||
*ngFor="let order of orders">
|
|
||||||
<section class="esh-orders-item col-xs-2">{{order.ordernumber}}</section>
|
<section class="esh-orders-item col-xs-2">{{order.ordernumber}}</section>
|
||||||
<section class="esh-orders-item col-xs-4">{{order.date | date:'short'}}</section>
|
<section class="esh-orders-item col-xs-4">{{order.date | date:'short'}}</section>
|
||||||
<section class="esh-orders-item col-xs-2">$ {{order.total}}</section>
|
<section class="esh-orders-item col-xs-2">$ {{order.total}}</section>
|
||||||
|
@ -1,44 +1,39 @@
|
|||||||
@import '../variables';
|
@import '../variables';
|
||||||
|
|
||||||
.esh-orders {
|
.esh-orders {
|
||||||
min-height: 80vh;
|
min-height: 80vh;
|
||||||
overflow-x: hidden;
|
overflow-x: hidden;
|
||||||
|
|
||||||
$header-height: 4rem;
|
$header-height: 4rem;
|
||||||
|
|
||||||
&-header {
|
&-header {
|
||||||
background-color: #00A69C;
|
background-color: #00A69C;
|
||||||
height: $header-height;
|
height: $header-height;
|
||||||
}
|
}
|
||||||
|
|
||||||
&-back {
|
&-back {
|
||||||
color: rgba($color-foreground-brighter, .4);
|
color: rgba($color-foreground-brighter, .4);
|
||||||
line-height: $header-height;
|
line-height: $header-height;
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
text-transform: uppercase;
|
text-transform: uppercase;
|
||||||
transition: color $animation-speed-default;
|
transition: color $animation-speed-default;
|
||||||
|
|
||||||
&:hover {
|
&:hover {
|
||||||
color: $color-foreground-brighter;
|
color: $color-foreground-brighter;
|
||||||
transition: color $animation-speed-default;
|
transition: color $animation-speed-default;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&-titles {
|
&-titles {
|
||||||
padding-bottom: 1rem;
|
padding-bottom: 1rem;
|
||||||
padding-top: 2rem;
|
padding-top: 2rem;
|
||||||
|
justify-content: space-between;
|
||||||
|
align-items: right;
|
||||||
}
|
}
|
||||||
|
|
||||||
&-title {
|
&-title {
|
||||||
text-transform: uppercase;
|
text-transform: uppercase;
|
||||||
}
|
}
|
||||||
|
|
||||||
&-items {
|
&-items {
|
||||||
$height: 2rem;
|
$height: 2rem;
|
||||||
height: $height;
|
height: $height;
|
||||||
line-height: $height;
|
line-height: $height;
|
||||||
position: relative;
|
position: relative;
|
||||||
|
justify-content: space-between;
|
||||||
|
align-items: right;
|
||||||
&:nth-of-type(2n + 1) {
|
&:nth-of-type(2n + 1) {
|
||||||
&:before {
|
&:before {
|
||||||
background-color: $color-background-bright;
|
background-color: $color-background-bright;
|
||||||
@ -53,32 +48,26 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&-item {
|
&-item {
|
||||||
font-weight: $font-weight-semilight;
|
font-weight: $font-weight-semilight;
|
||||||
|
|
||||||
&--hover {
|
&--hover {
|
||||||
opacity: 0;
|
opacity: 0;
|
||||||
pointer-events: none;
|
pointer-events: none;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&-items:hover &-item--hover {
|
&-items:hover &-item--hover {
|
||||||
opacity: 1;
|
opacity: 1;
|
||||||
pointer-events: all;
|
pointer-events: all;
|
||||||
}
|
}
|
||||||
|
|
||||||
&-link {
|
&-link {
|
||||||
color: $color-secondary;
|
color: $color-secondary;
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
transition: color $animation-speed-default;
|
transition: color $animation-speed-default;
|
||||||
|
|
||||||
&:hover {
|
&:hover {
|
||||||
color: $color-secondary-dark;
|
color: $color-secondary-dark;
|
||||||
transition: color $animation-speed-default;
|
transition: color $animation-speed-default;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&-alert {
|
&-alert {
|
||||||
margin-top: 10px;
|
margin-top: 10px;
|
||||||
}
|
}
|
||||||
|
@ -4,7 +4,7 @@ import { Response } from '@angular/http';
|
|||||||
import { DataService } from '../shared/services/data.service';
|
import { DataService } from '../shared/services/data.service';
|
||||||
import { IOrder } from '../shared/models/order.model';
|
import { IOrder } from '../shared/models/order.model';
|
||||||
import { IOrderItem } from '../shared/models/orderItem.model';
|
import { IOrderItem } from '../shared/models/orderItem.model';
|
||||||
import { IOrderDetail } from "../shared/models/order-detail.model";
|
import { IOrderDetail } from '../shared/models/order-detail.model';
|
||||||
import { SecurityService } from '../shared/services/security.service';
|
import { SecurityService } from '../shared/services/security.service';
|
||||||
import { ConfigurationService } from '../shared/services/configuration.service';
|
import { ConfigurationService } from '../shared/services/configuration.service';
|
||||||
import { BasketWrapperService } from '../shared/services/basket.wrapper.service';
|
import { BasketWrapperService } from '../shared/services/basket.wrapper.service';
|
||||||
|
@ -1,18 +1,14 @@
|
|||||||
@import '../../../variables';
|
@import '../../../variables';
|
||||||
|
|
||||||
.esh-header {
|
.esh-header {
|
||||||
$header-height: 4rem;
|
$header-height: 4rem;
|
||||||
|
|
||||||
background-color: $color-brand;
|
background-color: $color-brand;
|
||||||
height: $header-height;
|
height: $header-height;
|
||||||
|
|
||||||
&-back {
|
&-back {
|
||||||
color: rgba($color-foreground-brighter, .5);
|
color: rgba($color-foreground-brighter, .5);
|
||||||
line-height: $header-height;
|
line-height: $header-height;
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
text-transform: uppercase;
|
text-transform: uppercase;
|
||||||
transition: color $animation-speed-default;
|
transition: color $animation-speed-default;
|
||||||
|
|
||||||
&:hover {
|
&:hover {
|
||||||
color: $color-foreground-brighter;
|
color: $color-foreground-brighter;
|
||||||
transition: color $animation-speed-default;
|
transition: color $animation-speed-default;
|
||||||
|
@ -1,39 +1,32 @@
|
|||||||
<div class="esh-identity">
|
<div class="esh-identity">
|
||||||
<section class="esh-identity-section"
|
<section class="esh-identity-section" *ngIf="!authenticated">
|
||||||
*ngIf="!authenticated">
|
<div class="esh-identity-item" (click)="login()">
|
||||||
<div class="esh-identity-item"
|
|
||||||
(click)="login()">
|
|
||||||
|
|
||||||
<div class="esh-identity-name esh-identity-name--upper">Login</div>
|
<div class="esh-identity-name esh-identity-name--upper">Login</div>
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<section class="esh-identity-section"
|
<section class="esh-identity-section" *ngIf="authenticated">
|
||||||
*ngIf="authenticated">
|
|
||||||
|
|
||||||
<div class="esh-identity-name">{{userName}}</div>
|
<div class="esh-identity-name">{{getUserName()}}</div>
|
||||||
<img class="esh-identity-image" src="assets/images/arrow-down.png">
|
<img class="esh-identity-image" src="assets/images/arrow-down.png">
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<section class="esh-identity-drop"
|
<section class="esh-identity-drop" *ngIf="authenticated">
|
||||||
*ngIf="authenticated">
|
|
||||||
|
|
||||||
<div class="esh-identity-item"
|
<div class="esh-identity-item" [routerLink]="['orders']">
|
||||||
[routerLink]="['orders']">
|
|
||||||
|
|
||||||
<div class="esh-identity-name esh-identity-name--upper">My orders</div>
|
<div class="esh-identity-name esh-identity-name--upper">My orders</div>
|
||||||
<img class="esh-identity-image" src="assets/images/my_orders.png">
|
<img class="esh-identity-image" src="assets/images/my_orders.png">
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="esh-identity-item"
|
<div class="esh-identity-item" [routerLink]="['campaigns']">
|
||||||
[routerLink]="['campaigns']">
|
|
||||||
|
|
||||||
<div class="esh-identity-name esh-identity-name--upper">My campaigns</div>
|
<div class="esh-identity-name esh-identity-name--upper">My campaigns</div>
|
||||||
<img class="esh-identity-image" src="assets/images/my_orders.png">
|
<img class="esh-identity-image" src="assets/images/my_orders.png">
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="esh-identity-item"
|
<div class="esh-identity-item" (click)="logoutClicked($event)">
|
||||||
(click)="logoutClicked($event)">
|
|
||||||
|
|
||||||
<div class="esh-identity-name esh-identity-name--upper">Log Out</div>
|
<div class="esh-identity-name esh-identity-name--upper">Log Out</div>
|
||||||
<img class="esh-identity-image" src="assets/images/logout.png">
|
<img class="esh-identity-image" src="assets/images/logout.png">
|
||||||
|
@ -1,31 +1,24 @@
|
|||||||
@import '../../../variables';
|
@import '../../../variables';
|
||||||
|
|
||||||
.esh-identity {
|
.esh-identity {
|
||||||
line-height: 2.1rem;
|
line-height: 2.1rem;
|
||||||
position: relative;
|
position: relative;
|
||||||
text-align: right;
|
text-align: right;
|
||||||
|
|
||||||
&-section {
|
&-section {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
&-name {
|
&-name {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
|
|
||||||
&--upper {
|
&--upper {
|
||||||
text-transform: uppercase;
|
text-transform: uppercase;
|
||||||
}
|
}
|
||||||
|
|
||||||
@media screen and (max-width: $media-screen-s) {
|
@media screen and (max-width: $media-screen-s) {
|
||||||
font-size: $font-size-s;
|
font-size: $font-size-s;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&-image {
|
&-image {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
}
|
}
|
||||||
|
|
||||||
&-drop {
|
&-drop {
|
||||||
background: $color-background-brighter;
|
background: $color-background-brighter;
|
||||||
height: 0;
|
height: 0;
|
||||||
@ -37,17 +30,14 @@
|
|||||||
top: 2.5rem;
|
top: 2.5rem;
|
||||||
transition: height $animation-speed-default;
|
transition: height $animation-speed-default;
|
||||||
}
|
}
|
||||||
|
|
||||||
&:hover &-drop {
|
&:hover &-drop {
|
||||||
border: $border-light solid $color-foreground-bright;
|
border: $border-light solid $color-foreground-bright;
|
||||||
height: 7rem;
|
height: 7rem;
|
||||||
transition: height $animation-speed-default;
|
transition: height $animation-speed-default;
|
||||||
}
|
}
|
||||||
|
|
||||||
&-item {
|
&-item {
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
transition: color $animation-speed-default;
|
transition: color $animation-speed-default;
|
||||||
|
|
||||||
&:hover {
|
&:hover {
|
||||||
color: $color-secondary-dark;
|
color: $color-secondary-dark;
|
||||||
transition: color $animation-speed-default;
|
transition: color $animation-speed-default;
|
||||||
|
@ -50,4 +50,8 @@ export class Identity implements OnInit {
|
|||||||
logout() {
|
logout() {
|
||||||
this.service.Logoff();
|
this.service.Logoff();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
getUserName() {
|
||||||
|
return this.userName;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -2,11 +2,7 @@
|
|||||||
<div class="container">
|
<div class="container">
|
||||||
<article class="esh-pager-wrapper row">
|
<article class="esh-pager-wrapper row">
|
||||||
<nav>
|
<nav>
|
||||||
<span class="esh-pager-item esh-pager-item--navigable"
|
<span class="esh-pager-item esh-pager-item--navigable" id="Previous" [ngClass]="{'is-disabled': buttonStates?.previousDisabled}" (click)="onPreviousCliked($event)" aria-label="Previous">
|
||||||
id="Previous"
|
|
||||||
[ngClass]="{'is-disabled': buttonStates?.previousDisabled}"
|
|
||||||
(click)="onPreviousCliked($event)"
|
|
||||||
aria-label="Previous">
|
|
||||||
Previous
|
Previous
|
||||||
</span>
|
</span>
|
||||||
|
|
||||||
@ -14,11 +10,7 @@
|
|||||||
Showing {{model?.items}} of {{model?.totalItems}} products - Page {{model?.actualPage + 1}} - {{model?.totalPages}}
|
Showing {{model?.items}} of {{model?.totalItems}} products - Page {{model?.actualPage + 1}} - {{model?.totalPages}}
|
||||||
</span>
|
</span>
|
||||||
|
|
||||||
<span class="esh-pager-item esh-pager-item--navigable"
|
<span class="esh-pager-item esh-pager-item--navigable" id="Next" [ngClass]="{'is-disabled': buttonStates?.nextDisabled}" (click)="onNextClicked($event)" aria-label="Next">
|
||||||
id="Next"
|
|
||||||
[ngClass]="{'is-disabled': buttonStates?.nextDisabled}"
|
|
||||||
(click)="onNextClicked($event)"
|
|
||||||
aria-label="Next">
|
|
||||||
Next
|
Next
|
||||||
</span>
|
</span>
|
||||||
</nav>
|
</nav>
|
||||||
|
@ -1,34 +1,26 @@
|
|||||||
@import '../../../variables';
|
@import '../../../variables';
|
||||||
|
|
||||||
.esh-pager {
|
.esh-pager {
|
||||||
|
|
||||||
&-wrapper {
|
&-wrapper {
|
||||||
padding-top: 1rem;
|
padding-top: 1rem;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
&-item {
|
&-item {
|
||||||
$margin: 5vw;
|
$margin: 5vw;
|
||||||
margin: 0 $margin;
|
margin: 0 $margin;
|
||||||
|
|
||||||
&.is-disabled {
|
&.is-disabled {
|
||||||
opacity: 0;
|
opacity: 0;
|
||||||
pointer-events: none;
|
pointer-events: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
&--navigable {
|
&--navigable {
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
|
|
||||||
&:hover {
|
&:hover {
|
||||||
color: $color-secondary;
|
color: $color-secondary;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@media screen and (max-width: $media-screen-l) {
|
@media screen and (max-width: $media-screen-l) {
|
||||||
font-size: $font-size-s;
|
font-size: $font-size-s;
|
||||||
}
|
}
|
||||||
|
|
||||||
@media screen and (max-width: $media-screen-m) {
|
@media screen and (max-width: $media-screen-m) {
|
||||||
margin: 0 $margin / 2;
|
margin: 0 $margin / 2;
|
||||||
}
|
}
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
export interface IConfiguration {
|
export interface IConfiguration {
|
||||||
catalogUrl: string,
|
catalogUrl: string;
|
||||||
orderingUrl: string,
|
orderingUrl: string;
|
||||||
identityUrl: string,
|
identityUrl: string;
|
||||||
basketUrl: string,
|
basketUrl: string;
|
||||||
marketingUrl: string,
|
marketingUrl: string;
|
||||||
activateCampaignDetailFunction: boolean
|
activateCampaignDetailFunction: boolean;
|
||||||
}
|
}
|
@ -25,7 +25,7 @@ export class SecurityService {
|
|||||||
this.storage = _storageService;
|
this.storage = _storageService;
|
||||||
|
|
||||||
this._configurationService.settingsLoaded$.subscribe(x => {
|
this._configurationService.settingsLoaded$.subscribe(x => {
|
||||||
this.authorityUrl = this._configurationService.serverSettings.identityUrl
|
this.authorityUrl = this._configurationService.serverSettings.identityUrl;
|
||||||
this.storage.store('IdentityUrl', this.authorityUrl);
|
this.storage.store('IdentityUrl', this.authorityUrl);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -1,20 +0,0 @@
|
|||||||
{
|
|
||||||
"extends": "../tsconfig.json",
|
|
||||||
"compilerOptions": {
|
|
||||||
"outDir": "../out-tsc/spec",
|
|
||||||
"module": "commonjs",
|
|
||||||
"target": "es5",
|
|
||||||
"baseUrl": "",
|
|
||||||
"types": [
|
|
||||||
"jasmine",
|
|
||||||
"node"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"files": [
|
|
||||||
"test.ts"
|
|
||||||
],
|
|
||||||
"include": [
|
|
||||||
"**/*.spec.ts",
|
|
||||||
"**/*.d.ts"
|
|
||||||
]
|
|
||||||
}
|
|
5
src/Web/WebSPA/Client/typings.d.ts
vendored
5
src/Web/WebSPA/Client/typings.d.ts
vendored
@ -1,5 +0,0 @@
|
|||||||
/* SystemJS module definition */
|
|
||||||
declare var module: NodeModule;
|
|
||||||
interface NodeModule {
|
|
||||||
id: string;
|
|
||||||
}
|
|
11454
src/Web/WebSPA/package-lock.json
generated
11454
src/Web/WebSPA/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -26,41 +26,42 @@
|
|||||||
"lint:ts": "tslint -c tslint.json Client/**/*.ts"
|
"lint:ts": "tslint -c tslint.json Client/**/*.ts"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@angular/common": "^4.0.0",
|
"@angular/common": "5.1.1",
|
||||||
"@angular/compiler": "^4.0.0",
|
"@angular/compiler": "5.1.1",
|
||||||
"@angular/core": "^4.0.0",
|
"@angular/core": "5.1.1",
|
||||||
"@angular/forms": "^4.0.0",
|
"@angular/forms": "5.1.1",
|
||||||
"@angular/http": "^4.0.0",
|
"@angular/http": "5.1.1",
|
||||||
"@angular/platform-browser": "^4.0.0",
|
"@angular/platform-browser": "5.1.1",
|
||||||
"@angular/platform-browser-dynamic": "^4.0.0",
|
"@angular/platform-browser-dynamic": "5.1.1",
|
||||||
"@angular/router": "^4.0.0",
|
"@angular/router": "5.1.1",
|
||||||
"@ng-bootstrap/ng-bootstrap": "1.0.0-alpha.22",
|
"@ng-bootstrap/ng-bootstrap": "1.0.0-beta.8",
|
||||||
"bootstrap": "4.0.0-alpha.5",
|
"bootstrap": "4.0.0-beta.2",
|
||||||
"core-js": "^2.4.1",
|
"jquery": "3.2.1",
|
||||||
"file-loader": "0.9.0",
|
"popper.js": "1.12.9",
|
||||||
"font-awesome": "4.6.3",
|
"core-js": "2.5.3",
|
||||||
|
"file-loader": "1.1.6",
|
||||||
|
"font-awesome": "4.7.0",
|
||||||
"isomorphic-fetch": "2.2.1",
|
"isomorphic-fetch": "2.2.1",
|
||||||
"normalize.css": "5.0.0",
|
"normalize.css": "7.0.0",
|
||||||
"preboot": "4.5.2",
|
"preboot": "4.5.2",
|
||||||
"rxjs": "^5.1.0",
|
"rxjs": "5.5.5",
|
||||||
"zone.js": "^0.8.4"
|
"zone.js": "^0.8.18"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@angular/cli": "^1.3.0",
|
"@angular/cli": "1.6.1",
|
||||||
"@angular/compiler-cli": "^4.0.0",
|
"@angular/compiler-cli": "5.1.1",
|
||||||
"@types/core-js": "0.9.34",
|
"@types/core-js": "0.9.43",
|
||||||
"@types/hammerjs": "2.0.33",
|
"@types/hammerjs": "2.0.35",
|
||||||
"@types/jasmine": "2.5.38",
|
"@types/jasmine": "2.8.2",
|
||||||
"@types/node": "~6.0.60",
|
"@types/node": "8.5.1",
|
||||||
"@types/protractor": "1.5.20",
|
"@types/selenium-webdriver": "3.0.8",
|
||||||
"@types/selenium-webdriver": "2.44.26",
|
"codelyzer": "4.0.2",
|
||||||
"codelyzer": "~2.0.0",
|
"sass-lint": "1.12.1",
|
||||||
"sass-lint": "1.10.2",
|
"ts-helpers": "1.1.2",
|
||||||
"ts-helpers": "1.1.1",
|
"ts-node": "4.0.2",
|
||||||
"ts-node": "~2.0.0",
|
"tslint": "5.8.0",
|
||||||
"tslint": "~4.5.0",
|
"typedoc": "0.9.0",
|
||||||
"typedoc": "0.5.0",
|
"typescript": "2.6.2",
|
||||||
"typescript": "~2.2.0",
|
"url-loader": "0.6.2"
|
||||||
"url-loader": "0.5.7"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,10 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<configuration>
|
<configuration>
|
||||||
|
<!-- Configure your application settings in appsettings.json. Learn more at https://go.microsoft.com/fwlink/?LinkId=786380 -->
|
||||||
<!--
|
|
||||||
Configure your application settings in appsettings.json. Learn more at https://go.microsoft.com/fwlink/?LinkId=786380
|
|
||||||
-->
|
|
||||||
|
|
||||||
<system.webServer>
|
<system.webServer>
|
||||||
<handlers>
|
<handlers>
|
||||||
<add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModule" resourceType="Unspecified" />
|
<add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModule" resourceType="Unspecified" />
|
||||||
|
Loading…
x
Reference in New Issue
Block a user