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:
Adrian MIHAILESCU
parent
6e51a9f391
commit
374087bf28
@ -1,58 +1,55 @@
|
|||||||
{
|
{
|
||||||
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
|
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
|
||||||
"project": {
|
"project": {
|
||||||
"name": "WebSPA"
|
"name": "WebSPA"
|
||||||
},
|
|
||||||
"apps": [
|
|
||||||
{
|
|
||||||
"root": "Client",
|
|
||||||
"outDir": "wwwroot",
|
|
||||||
"assets": [
|
|
||||||
"assets",
|
|
||||||
"favicon.ico"
|
|
||||||
],
|
|
||||||
"index": "index.html",
|
|
||||||
"main": "main.ts",
|
|
||||||
"polyfills": "polyfills.ts",
|
|
||||||
"test": "test.ts",
|
|
||||||
"tsconfig": "tsconfig.app.json",
|
|
||||||
"testTsconfig": "tsconfig.spec.json",
|
|
||||||
"prefix": "app",
|
|
||||||
"styles": [
|
|
||||||
"globals.scss",
|
|
||||||
"../node_modules/bootstrap/scss/bootstrap.scss"
|
|
||||||
],
|
|
||||||
"scripts": [],
|
|
||||||
"environmentSource": "environments/environment.ts",
|
|
||||||
"environments": {
|
|
||||||
"dev": "environments/environment.ts",
|
|
||||||
"prod": "environments/environment.prod.ts"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"e2e": {
|
|
||||||
"protractor": {
|
|
||||||
"config": "./protractor.conf.js"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"lint": [
|
|
||||||
{
|
|
||||||
"project": "Client/tsconfig.app.json"
|
|
||||||
},
|
},
|
||||||
{
|
"apps": [{
|
||||||
"project": "Client/tsconfig.spec.json"
|
"root": "Client",
|
||||||
|
"outDir": "wwwroot",
|
||||||
|
"assets": [
|
||||||
|
"assets",
|
||||||
|
"favicon.ico"
|
||||||
|
],
|
||||||
|
"index": "index.html",
|
||||||
|
"main": "main.ts",
|
||||||
|
"polyfills": "polyfills.ts",
|
||||||
|
"test": "test.ts",
|
||||||
|
"tsconfig": "tsconfig.app.json",
|
||||||
|
"testTsconfig": "tsconfig.spec.json",
|
||||||
|
"prefix": "app",
|
||||||
|
"styles": [
|
||||||
|
"globals.scss",
|
||||||
|
"../node_modules/bootstrap/scss/bootstrap.scss"
|
||||||
|
],
|
||||||
|
"scripts": [],
|
||||||
|
"environmentSource": "environments/environment.ts",
|
||||||
|
"environments": {
|
||||||
|
"dev": "environments/environment.ts",
|
||||||
|
"prod": "environments/environment.prod.ts"
|
||||||
|
}
|
||||||
|
}],
|
||||||
|
"e2e": {
|
||||||
|
"protractor": {
|
||||||
|
"config": "./protractor.conf.js"
|
||||||
|
}
|
||||||
},
|
},
|
||||||
{
|
"lint": [{
|
||||||
"project": "e2e/tsconfig.e2e.json"
|
"project": "Client/tsconfig.app.json"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"project": "Client/tsconfig.spec.json"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"project": "e2e/tsconfig.e2e.json"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"test": {
|
||||||
|
"karma": {
|
||||||
|
"config": "./karma.conf.js"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"defaults": {
|
||||||
|
"styleExt": "scss",
|
||||||
|
"component": {}
|
||||||
}
|
}
|
||||||
],
|
}
|
||||||
"test": {
|
|
||||||
"karma": {
|
|
||||||
"config": "./karma.conf.js"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"defaults": {
|
|
||||||
"styleExt": "scss",
|
|
||||||
"component": {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
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
|
||||||
{
|
{
|
||||||
@ -14,6 +9,6 @@ namespace eShopOnContainers.WebSPA
|
|||||||
public string BasketUrl { get; set; }
|
public string BasketUrl { get; set; }
|
||||||
public string MarketingUrl { get; set; }
|
public string MarketingUrl { get; set; }
|
||||||
public string ActivateCampaignDetailFunction { get; set; }
|
public string ActivateCampaignDetailFunction { get; set; }
|
||||||
public bool UseCustomizationData { get; set; }
|
public bool UseCustomizationData { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -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;
|
||||||
@ -73,5 +72,4 @@ select::-ms-expand {
|
|||||||
border: 0;
|
border: 0;
|
||||||
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,18 +1,21 @@
|
|||||||
<!doctype html>
|
<!doctype html>
|
||||||
<html>
|
<html>
|
||||||
<head>
|
|
||||||
<meta charset="utf-8">
|
|
||||||
<title>eShopConContainers.WebSPA</title>
|
|
||||||
<base href="/">
|
|
||||||
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
<head>
|
||||||
<link rel="icon" type="image/x-icon" href="favicon.ico">
|
<meta charset="utf-8">
|
||||||
|
<title>eShopConContainers.WebSPA</title>
|
||||||
|
<base href="/">
|
||||||
|
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
<link rel="icon" type="image/x-icon" href="favicon.ico">
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
<esh-app>
|
<esh-app>
|
||||||
<div class="preloading">
|
<div class="preloading">
|
||||||
<i class="fa fa-spinner fa-spin fa-5x" aria-hidden="true"></i>
|
<i class="fa fa-spinner fa-spin fa-5x" aria-hidden="true"></i>
|
||||||
</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">
|
||||||
|
|
||||||
@ -37,5 +37,4 @@
|
|||||||
|
|
||||||
</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;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1,7 +1,7 @@
|
|||||||
import { Title } from '@angular/platform-browser';
|
import { Title } from '@angular/platform-browser';
|
||||||
import { Component, ViewEncapsulation, OnInit } from '@angular/core';
|
import { Component, ViewEncapsulation, OnInit } from '@angular/core';
|
||||||
import { RouterModule } from '@angular/router';
|
import { RouterModule } from '@angular/router';
|
||||||
import { Subscription } from 'rxjs/Subscription';
|
import { Subscription } from 'rxjs/Subscription';
|
||||||
|
|
||||||
import { DataService } from './shared/services/data.service';
|
import { DataService } from './shared/services/data.service';
|
||||||
import { SecurityService } from './shared/services/security.service';
|
import { SecurityService } from './shared/services/security.service';
|
||||||
@ -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;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -29,7 +32,7 @@ export class AppComponent implements OnInit {
|
|||||||
console.log('app on init');
|
console.log('app on init');
|
||||||
this.subscription = this.securityService.authenticationChallenge$.subscribe(res => this.Authenticated = res);
|
this.subscription = this.securityService.authenticationChallenge$.subscribe(res => this.Authenticated = res);
|
||||||
|
|
||||||
//Get configuration from server environment variables:
|
// Get configuration from server environment variables:
|
||||||
console.log('configuration');
|
console.log('configuration');
|
||||||
this.configurationService.load();
|
this.configurationService.load();
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,15 +1,15 @@
|
|||||||
import { NgModule, NgModuleFactoryLoader } from '@angular/core';
|
import { NgModule, NgModuleFactoryLoader } from '@angular/core';
|
||||||
import { BrowserModule } from '@angular/platform-browser';
|
import { BrowserModule } from '@angular/platform-browser';
|
||||||
// import { FormsModule } from '@angular/forms';
|
// import { FormsModule } from '@angular/forms';
|
||||||
import { HttpModule } from '@angular/http';
|
import { HttpModule } from '@angular/http';
|
||||||
import { RouterModule } from '@angular/router';
|
import { RouterModule } from '@angular/router';
|
||||||
|
|
||||||
import { routing } from './app.routes';
|
import { routing } from './app.routes';
|
||||||
import { AppService } from './app.service';
|
import { AppService } from './app.service';
|
||||||
import { AppComponent } from './app.component';
|
import { AppComponent } from './app.component';
|
||||||
import { SharedModule } from './shared/shared.module';
|
import { SharedModule } from './shared/shared.module';
|
||||||
import { CatalogModule } from './catalog/catalog.module';
|
import { CatalogModule } from './catalog/catalog.module';
|
||||||
import { OrdersModule } from './orders/orders.module';
|
import { OrdersModule } from './orders/orders.module';
|
||||||
import { BasketModule } from './basket/basket.module';
|
import { BasketModule } from './basket/basket.module';
|
||||||
import { CampaignsModule } from './campaigns/campaigns.module';
|
import { CampaignsModule } from './campaigns/campaigns.module';
|
||||||
|
|
||||||
|
|||||||
@ -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" />
|
||||||
@ -8,4 +6,4 @@
|
|||||||
<div class="esh-basketstatus-badge">
|
<div class="esh-basketstatus-badge">
|
||||||
{{badge}}
|
{{badge}}
|
||||||
</div>
|
</div>
|
||||||
</a>
|
</a>
|
||||||
@ -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,10 +28,9 @@
|
|||||||
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;
|
||||||
transition: all $animation-speed-default;
|
transition: all $animation-speed-default;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1,10 +1,10 @@
|
|||||||
import { Component, OnInit } from '@angular/core';
|
import { Component, OnInit } from '@angular/core';
|
||||||
import { Subscription } from 'rxjs/Subscription';
|
import { Subscription } from 'rxjs/Subscription';
|
||||||
|
|
||||||
import { BasketService } from '../basket.service';
|
import { BasketService } from '../basket.service';
|
||||||
import { BasketWrapperService } from '../../shared/services/basket.wrapper.service';
|
import { BasketWrapperService } from '../../shared/services/basket.wrapper.service';
|
||||||
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';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'esh-basket-status',
|
selector: 'esh-basket-status',
|
||||||
@ -32,7 +32,7 @@ export class BasketStatusComponent implements OnInit {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
// Subscribe to Drop Basket Observable:
|
// Subscribe to Drop Basket Observable:
|
||||||
this.basketDroppedSubscription = this.service.basketDroped$.subscribe(res => {
|
this.basketDroppedSubscription = this.service.basketDroped$.subscribe(res => {
|
||||||
this.badge = 0;
|
this.badge = 0;
|
||||||
});
|
});
|
||||||
|
|||||||
@ -1,13 +1,13 @@
|
|||||||
<div class="esh-basket">
|
<div class="esh-basket">
|
||||||
<esh-header url="/catalog">Back to catalog</esh-header>
|
<esh-header url="/catalog">Back to catalog</esh-header>
|
||||||
|
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<div *ngFor="let errorMessage of errorMessages">
|
<div *ngFor="let errorMessage of errorMessages">
|
||||||
<div class="esh-basket-items-margin-left1 row">
|
<div class="esh-basket-items-margin-left1 row">
|
||||||
<div class="alert alert-warning" role="alert"> {{errorMessage}}</div>
|
<div class="alert alert-warning" role="alert"> {{errorMessage}}</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<article class="esh-basket-titles row">
|
<article class="esh-basket-titles row">
|
||||||
<section class="esh-basket-title col-xs-3">Product</section>
|
<section class="esh-basket-title col-xs-3">Product</section>
|
||||||
<section class="esh-basket-title col-xs-3 hidden-lg-down"></section>
|
<section class="esh-basket-title col-xs-3 hidden-lg-down"></section>
|
||||||
@ -20,17 +20,12 @@
|
|||||||
<article class="esh-basket-items row">
|
<article class="esh-basket-items row">
|
||||||
|
|
||||||
<section class="esh-basket-item esh-basket-item--middle col-lg-3 hidden-lg-down">
|
<section class="esh-basket-item esh-basket-item--middle col-lg-3 hidden-lg-down">
|
||||||
<img class="esh-basket-image" src="{{item.pictureUrl}}"/>
|
<img class="esh-basket-image" src="{{item.pictureUrl}}" />
|
||||||
</section>
|
</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-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>
|
||||||
@ -62,4 +57,4 @@
|
|||||||
</section>
|
</section>
|
||||||
</article>
|
</article>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -49,12 +49,11 @@ export class BasketComponent implements OnInit {
|
|||||||
checkOut(event: any) {
|
checkOut(event: any) {
|
||||||
this.update(event)
|
this.update(event)
|
||||||
.subscribe(
|
.subscribe(
|
||||||
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);
|
});
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private calculateTotalPrice() {
|
private calculateTotalPrice() {
|
||||||
|
|||||||
@ -1,11 +1,11 @@
|
|||||||
import { NgModule, ModuleWithProviders } from '@angular/core';
|
import { NgModule, ModuleWithProviders } from '@angular/core';
|
||||||
import { BrowserModule } from '@angular/platform-browser';
|
import { BrowserModule } from '@angular/platform-browser';
|
||||||
|
|
||||||
import { SharedModule } from '../shared/shared.module';
|
import { SharedModule } from '../shared/shared.module';
|
||||||
import { BasketComponent } from './basket.component';
|
import { BasketComponent } from './basket.component';
|
||||||
import { BasketStatusComponent } from './basket-status/basket-status.component';
|
import { BasketStatusComponent } from './basket-status/basket-status.component';
|
||||||
import { BasketService } from './basket.service';
|
import { BasketService } from './basket.service';
|
||||||
import { Header } from '../shared/components/header/header';
|
import { Header } from '../shared/components/header/header';
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [SharedModule],
|
imports: [SharedModule],
|
||||||
|
|||||||
@ -1,24 +1,24 @@
|
|||||||
import { Injectable } from '@angular/core';
|
import { Injectable } from '@angular/core';
|
||||||
import { Response, Headers } from '@angular/http';
|
import { Response, Headers } from '@angular/http';
|
||||||
import { Router } from '@angular/router';
|
import { Router } from '@angular/router';
|
||||||
|
|
||||||
import { DataService } from '../shared/services/data.service';
|
import { DataService } from '../shared/services/data.service';
|
||||||
import { SecurityService } from '../shared/services/security.service';
|
import { SecurityService } from '../shared/services/security.service';
|
||||||
import { IBasket } from '../shared/models/basket.model';
|
import { IBasket } from '../shared/models/basket.model';
|
||||||
import { IOrder } from '../shared/models/order.model';
|
import { IOrder } from '../shared/models/order.model';
|
||||||
import { IBasketCheckout } from '../shared/models/basketCheckout.model';
|
import { IBasketCheckout } from '../shared/models/basketCheckout.model';
|
||||||
import { IBasketItem } from '../shared/models/basketItem.model';
|
import { IBasketItem } from '../shared/models/basketItem.model';
|
||||||
import { BasketWrapperService } from '../shared/services/basket.wrapper.service';
|
import { BasketWrapperService } from '../shared/services/basket.wrapper.service';
|
||||||
import { ConfigurationService } from '../shared/services/configuration.service';
|
import { ConfigurationService } from '../shared/services/configuration.service';
|
||||||
import { StorageService } from '../shared/services/storage.service';
|
import { StorageService } from '../shared/services/storage.service';
|
||||||
|
|
||||||
import 'rxjs/Rx';
|
import 'rxjs/Rx';
|
||||||
import { Observable } from 'rxjs/Observable';
|
import { Observable } from 'rxjs/Observable';
|
||||||
import 'rxjs/add/observable/throw';
|
import 'rxjs/add/observable/throw';
|
||||||
import { Observer } from 'rxjs/Observer';
|
import { Observer } from 'rxjs/Observer';
|
||||||
import 'rxjs/add/operator/map';
|
import 'rxjs/add/operator/map';
|
||||||
import 'rxjs/add/operator/catch';
|
import 'rxjs/add/operator/catch';
|
||||||
import { Subject } from 'rxjs/Subject';
|
import { Subject } from 'rxjs/Subject';
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class BasketService {
|
export class BasketService {
|
||||||
@ -28,13 +28,13 @@ export class BasketService {
|
|||||||
items: []
|
items: []
|
||||||
};
|
};
|
||||||
|
|
||||||
//observable that is fired when the basket is dropped
|
// observable that is fired when the basket is dropped
|
||||||
private basketDropedSource = new Subject();
|
private basketDropedSource = new Subject();
|
||||||
basketDroped$ = this.basketDropedSource.asObservable();
|
basketDroped$ = this.basketDropedSource.asObservable();
|
||||||
|
|
||||||
constructor(private service: DataService, private authService: SecurityService, private basketEvents: BasketWrapperService, private router: Router, private configurationService: ConfigurationService, private storageService: StorageService) {
|
constructor(private service: DataService, private authService: SecurityService, private basketEvents: BasketWrapperService, private router: Router, private configurationService: ConfigurationService, private storageService: StorageService) {
|
||||||
this.basket.items = [];
|
this.basket.items = [];
|
||||||
|
|
||||||
// Init:
|
// Init:
|
||||||
if (this.authService.IsAuthorized) {
|
if (this.authService.IsAuthorized) {
|
||||||
if (this.authService.UserData) {
|
if (this.authService.UserData) {
|
||||||
@ -56,7 +56,7 @@ export class BasketService {
|
|||||||
this.dropBasket();
|
this.dropBasket();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
addItemToBasket(item): Observable<boolean> {
|
addItemToBasket(item): Observable<boolean> {
|
||||||
this.basket.items.push(item);
|
this.basket.items.push(item);
|
||||||
return this.setBasket(this.basket);
|
return this.setBasket(this.basket);
|
||||||
@ -87,12 +87,12 @@ export class BasketService {
|
|||||||
|
|
||||||
return response.json();
|
return response.json();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
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;
|
||||||
@ -106,10 +106,10 @@ export class BasketService {
|
|||||||
basketCheckout.expiration = order.expiration;
|
basketCheckout.expiration = order.expiration;
|
||||||
|
|
||||||
return basketCheckout;
|
return basketCheckout;
|
||||||
}
|
}
|
||||||
|
|
||||||
dropBasket() {
|
dropBasket() {
|
||||||
this.basket.items = [];
|
this.basket.items = [];
|
||||||
this.basketDropedSource.next();
|
this.basketDropedSource.next();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -14,4 +14,4 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -1,57 +1,44 @@
|
|||||||
@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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -4,10 +4,9 @@
|
|||||||
Error requesting campaigns list, please try later on
|
Error requesting campaigns list, please try later on
|
||||||
</div>
|
</div>
|
||||||
<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>
|
||||||
@ -17,7 +16,7 @@
|
|||||||
<input [ngClass]="{'esh-campaign-button': true}" type="submit" value="More details" routerLink="/campaigns/{{item.id}}">
|
<input [ngClass]="{'esh-campaign-button': true}" type="submit" value="More details" routerLink="/campaigns/{{item.id}}">
|
||||||
</ng-template>
|
</ng-template>
|
||||||
</div>
|
</div>
|
||||||
<div class="card-footer">
|
<div class="card-footer">
|
||||||
<small class="text-muted">
|
<small class="text-muted">
|
||||||
From {{item.from | date }} To {{item.to | date }}
|
From {{item.from | date }} To {{item.to | date }}
|
||||||
</small>
|
</small>
|
||||||
@ -30,5 +29,4 @@
|
|||||||
<div *ngIf="campaigns?.data?.length == 0">
|
<div *ngIf="campaigns?.data?.length == 0">
|
||||||
<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,8 +51,7 @@
|
|||||||
text-align: center;
|
text-align: center;
|
||||||
text-transform: uppercase;
|
text-transform: uppercase;
|
||||||
}
|
}
|
||||||
|
|
||||||
&-alert {
|
&-alert {
|
||||||
margin-top: 10px;
|
margin-top: 10px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1,7 +1,7 @@
|
|||||||
import { Component, OnInit } from '@angular/core';
|
import { Component, OnInit } from '@angular/core';
|
||||||
import { CampaignsService } from './campaigns.service';
|
import { CampaignsService } from './campaigns.service';
|
||||||
import { ICampaign } from '../shared/models/campaign.model';
|
import { ICampaign } from '../shared/models/campaign.model';
|
||||||
import { IPager } from '../shared/models/pager.model';
|
import { IPager } from '../shared/models/pager.model';
|
||||||
import { ConfigurationService } from '../shared/services/configuration.service';
|
import { ConfigurationService } from '../shared/services/configuration.service';
|
||||||
import { Observable } from 'rxjs/Observable';
|
import { Observable } from 'rxjs/Observable';
|
||||||
|
|
||||||
@ -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);
|
||||||
@ -29,14 +29,14 @@ export class CampaignsComponent implements OnInit {
|
|||||||
}
|
}
|
||||||
|
|
||||||
this.isCampaignDetailFunctionEnabled = this.configurationService.serverSettings.activateCampaignDetailFunction;
|
this.isCampaignDetailFunctionEnabled = this.configurationService.serverSettings.activateCampaignDetailFunction;
|
||||||
}
|
}
|
||||||
|
|
||||||
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);
|
||||||
}
|
}
|
||||||
|
|
||||||
getCampaigns(pageSize: number, pageIndex: number) {
|
getCampaigns(pageSize: number, pageIndex: number) {
|
||||||
this.errorReceived = false;
|
this.errorReceived = false;
|
||||||
@ -45,22 +45,22 @@ export class CampaignsComponent implements OnInit {
|
|||||||
.subscribe(campaigns => {
|
.subscribe(campaigns => {
|
||||||
this.campaigns = campaigns;
|
this.campaigns = campaigns;
|
||||||
this.paginationInfo = {
|
this.paginationInfo = {
|
||||||
actualPage : campaigns.pageIndex,
|
actualPage: campaigns.pageIndex,
|
||||||
itemsPage : campaigns.pageSize,
|
itemsPage: campaigns.pageSize,
|
||||||
totalItems : campaigns.count,
|
totalItems: campaigns.count,
|
||||||
totalPages: Math.ceil(campaigns.count / campaigns.pageSize),
|
totalPages: Math.ceil(campaigns.count / campaigns.pageSize),
|
||||||
items: campaigns.pageSize
|
items: campaigns.pageSize
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
onNavigateToDetails(uri: string) {
|
onNavigateToDetails(uri: string) {
|
||||||
window.open(uri, "_blank");
|
window.open(uri, `_blank`);
|
||||||
}
|
}
|
||||||
|
|
||||||
private handleError(error: any) {
|
private handleError(error: any) {
|
||||||
this.errorReceived = true;
|
this.errorReceived = true;
|
||||||
return Observable.throw(error);
|
return Observable.throw(error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,11 +1,11 @@
|
|||||||
import { NgModule } from '@angular/core';
|
import { NgModule } from '@angular/core';
|
||||||
import { BrowserModule } from '@angular/platform-browser';
|
import { BrowserModule } from '@angular/platform-browser';
|
||||||
|
|
||||||
import { SharedModule } from '../shared/shared.module';
|
import { SharedModule } from '../shared/shared.module';
|
||||||
import { CampaignsComponent } from './campaigns.component';
|
import { CampaignsComponent } from './campaigns.component';
|
||||||
import { CampaignsDetailComponent } from './campaigns-detail/campaigns-detail.component';
|
import { CampaignsDetailComponent } from './campaigns-detail/campaigns-detail.component';
|
||||||
import { CampaignsService } from './campaigns.service';
|
import { CampaignsService } from './campaigns.service';
|
||||||
import { Header } from '../shared/components/header/header';
|
import { Header } from '../shared/components/header/header';
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [BrowserModule, SharedModule],
|
imports: [BrowserModule, SharedModule],
|
||||||
|
|||||||
@ -47,6 +47,6 @@ export class CampaignsService {
|
|||||||
return this.service.get(url).map((response: Response) => {
|
return this.service.get(url).map((response: Response) => {
|
||||||
return response.json();
|
return response.json();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -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)">
|
||||||
@ -50,5 +49,4 @@
|
|||||||
<div *ngIf="catalog?.data.length == 0">
|
<div *ngIf="catalog?.data.length == 0">
|
||||||
<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,18 +119,15 @@
|
|||||||
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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1,15 +1,15 @@
|
|||||||
import { Component, OnInit } from '@angular/core';
|
import { Component, OnInit } from '@angular/core';
|
||||||
import { Subscription } from 'rxjs/Subscription';
|
import { Subscription } from 'rxjs/Subscription';
|
||||||
|
|
||||||
import { CatalogService } from './catalog.service';
|
import { CatalogService } from './catalog.service';
|
||||||
import { ConfigurationService } from '../shared/services/configuration.service';
|
import { ConfigurationService } from '../shared/services/configuration.service';
|
||||||
import { ICatalog } from '../shared/models/catalog.model';
|
import { ICatalog } from '../shared/models/catalog.model';
|
||||||
import { ICatalogItem } from '../shared/models/catalogItem.model';
|
import { ICatalogItem } from '../shared/models/catalogItem.model';
|
||||||
import { ICatalogType } from '../shared/models/catalogType.model';
|
import { ICatalogType } from '../shared/models/catalogType.model';
|
||||||
import { ICatalogBrand } from '../shared/models/catalogBrand.model';
|
import { ICatalogBrand } from '../shared/models/catalogBrand.model';
|
||||||
import { IPager } from '../shared/models/pager.model';
|
import { IPager } from '../shared/models/pager.model';
|
||||||
import { BasketWrapperService} from '../shared/services/basket.wrapper.service';
|
import { BasketWrapperService } from '../shared/services/basket.wrapper.service';
|
||||||
import { SecurityService } from '../shared/services/security.service';
|
import { SecurityService } from '../shared/services/security.service';
|
||||||
import { Observable } from 'rxjs/Observable';
|
import { Observable } from 'rxjs/Observable';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
@ -35,7 +35,7 @@ export class CatalogComponent implements OnInit {
|
|||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
|
|
||||||
// Configuration Settings:
|
// Configuration Settings:
|
||||||
if (this.configurationService.isReady)
|
if (this.configurationService.isReady)
|
||||||
this.loadData();
|
this.loadData();
|
||||||
else
|
else
|
||||||
this.configurationService.settingsLoaded$.subscribe(x => {
|
this.configurationService.settingsLoaded$.subscribe(x => {
|
||||||
@ -87,13 +87,13 @@ export class CatalogComponent implements OnInit {
|
|||||||
.subscribe(catalog => {
|
.subscribe(catalog => {
|
||||||
this.catalog = catalog;
|
this.catalog = catalog;
|
||||||
this.paginationInfo = {
|
this.paginationInfo = {
|
||||||
actualPage : catalog.pageIndex,
|
actualPage: catalog.pageIndex,
|
||||||
itemsPage : catalog.pageSize,
|
itemsPage: catalog.pageSize,
|
||||||
totalItems : catalog.count,
|
totalItems: catalog.count,
|
||||||
totalPages: Math.ceil(catalog.count / catalog.pageSize),
|
totalPages: Math.ceil(catalog.count / catalog.pageSize),
|
||||||
items: catalog.pageSize
|
items: catalog.pageSize
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
getTypes() {
|
getTypes() {
|
||||||
|
|||||||
@ -1,10 +1,10 @@
|
|||||||
import { NgModule } from '@angular/core';
|
import { NgModule } from '@angular/core';
|
||||||
import { BrowserModule } from '@angular/platform-browser';
|
import { BrowserModule } from '@angular/platform-browser';
|
||||||
|
|
||||||
import { SharedModule } from '../shared/shared.module';
|
import { SharedModule } from '../shared/shared.module';
|
||||||
import { CatalogComponent } from './catalog.component';
|
import { CatalogComponent } from './catalog.component';
|
||||||
import { CatalogService } from './catalog.service';
|
import { CatalogService } from './catalog.service';
|
||||||
import { Pager } from '../shared/components/pager/pager';
|
import { Pager } from '../shared/components/pager/pager';
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [BrowserModule, SharedModule],
|
imports: [BrowserModule, SharedModule],
|
||||||
|
|||||||
@ -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,56 +1,47 @@
|
|||||||
@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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -5,7 +5,7 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<div class="alert alert-warning esh-orders_new-alert" role="alert" [hidden]="!errorReceived">
|
<div class="alert alert-warning esh-orders_new-alert" role="alert" [hidden]="!errorReceived">
|
||||||
Not possible to create a new order, please try later on
|
Not possible to create a new order, please try later on
|
||||||
</div>
|
</div>
|
||||||
<form [formGroup]="newOrderForm" (ngSubmit)="submitForm(newOrderForm.value)">
|
<form [formGroup]="newOrderForm" (ngSubmit)="submitForm(newOrderForm.value)">
|
||||||
@ -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,58 +36,46 @@
|
|||||||
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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -2,11 +2,11 @@ import { Component, OnInit } from '@angular/core';
|
|||||||
import { Observable } from 'rxjs/Observable';
|
import { Observable } from 'rxjs/Observable';
|
||||||
import { OrdersService } from '../orders.service';
|
import { OrdersService } from '../orders.service';
|
||||||
import { BasketService } from '../../basket/basket.service';
|
import { BasketService } from '../../basket/basket.service';
|
||||||
import { IOrder } from '../../shared/models/order.model';
|
import { IOrder } from '../../shared/models/order.model';
|
||||||
import { BasketWrapperService } from '../../shared/services/basket.wrapper.service';
|
import { BasketWrapperService } from '../../shared/services/basket.wrapper.service';
|
||||||
|
|
||||||
import { FormGroup, FormBuilder, Validators } from '@angular/forms';
|
import { FormGroup, FormBuilder, Validators } from '@angular/forms';
|
||||||
import { Router } from '@angular/router';
|
import { Router } from '@angular/router';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'esh-orders_new',
|
selector: 'esh-orders_new',
|
||||||
@ -37,7 +37,7 @@ export class OrdersNewComponent implements OnInit {
|
|||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
}
|
}
|
||||||
|
|
||||||
submitForm(value: any) {
|
submitForm(value: any) {
|
||||||
this.order.street = this.newOrderForm.controls['street'].value;
|
this.order.street = this.newOrderForm.controls['street'].value;
|
||||||
this.order.city = this.newOrderForm.controls['city'].value;
|
this.order.city = this.newOrderForm.controls['city'].value;
|
||||||
this.order.state = this.newOrderForm.controls['state'].value;
|
this.order.state = this.newOrderForm.controls['state'].value;
|
||||||
@ -52,7 +52,7 @@ export class OrdersNewComponent implements OnInit {
|
|||||||
.catch((errMessage) => {
|
.catch((errMessage) => {
|
||||||
this.errorReceived = true;
|
this.errorReceived = true;
|
||||||
this.isOrderProcessing = false;
|
this.isOrderProcessing = false;
|
||||||
return Observable.throw(errMessage);
|
return Observable.throw(errMessage);
|
||||||
})
|
})
|
||||||
.subscribe(res => {
|
.subscribe(res => {
|
||||||
this.router.navigate(['orders']);
|
this.router.navigate(['orders']);
|
||||||
|
|||||||
@ -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>
|
||||||
@ -24,4 +23,4 @@
|
|||||||
</section>
|
</section>
|
||||||
</article>
|
</article>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -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,33 +48,27 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&-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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1,6 +1,6 @@
|
|||||||
import { Component, OnInit } from '@angular/core';
|
import { Component, OnInit } from '@angular/core';
|
||||||
import { OrdersService } from './orders.service';
|
import { OrdersService } from './orders.service';
|
||||||
import { IOrder } from '../shared/models/order.model';
|
import { IOrder } from '../shared/models/order.model';
|
||||||
import { ConfigurationService } from '../shared/services/configuration.service';
|
import { ConfigurationService } from '../shared/services/configuration.service';
|
||||||
import { Observable } from 'rxjs/Observable';
|
import { Observable } from 'rxjs/Observable';
|
||||||
|
|
||||||
@ -46,12 +46,12 @@ export class OrdersComponent implements OnInit {
|
|||||||
this.orders = orders;
|
this.orders = orders;
|
||||||
this.oldOrders = this.orders;
|
this.oldOrders = this.orders;
|
||||||
console.log('orders items retrieved: ' + orders.length);
|
console.log('orders items retrieved: ' + orders.length);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private handleError(error: any) {
|
private handleError(error: any) {
|
||||||
this.errorReceived = true;
|
this.errorReceived = true;
|
||||||
return Observable.throw(error);
|
return Observable.throw(error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,13 +1,13 @@
|
|||||||
import { NgModule } from '@angular/core';
|
import { NgModule } from '@angular/core';
|
||||||
import { BrowserModule } from '@angular/platform-browser';
|
import { BrowserModule } from '@angular/platform-browser';
|
||||||
|
|
||||||
import { SharedModule } from '../shared/shared.module';
|
import { SharedModule } from '../shared/shared.module';
|
||||||
import { OrdersComponent } from './orders.component';
|
import { OrdersComponent } from './orders.component';
|
||||||
import { OrdersDetailComponent } from './orders-detail/orders-detail.component';
|
import { OrdersDetailComponent } from './orders-detail/orders-detail.component';
|
||||||
import { OrdersNewComponent } from './orders-new/orders-new.component';
|
import { OrdersNewComponent } from './orders-new/orders-new.component';
|
||||||
import { OrdersService } from './orders.service';
|
import { OrdersService } from './orders.service';
|
||||||
import { BasketService } from '../basket/basket.service';
|
import { BasketService } from '../basket/basket.service';
|
||||||
import { Header } from '../shared/components/header/header';
|
import { Header } from '../shared/components/header/header';
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [BrowserModule, SharedModule],
|
imports: [BrowserModule, SharedModule],
|
||||||
|
|||||||
@ -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';
|
||||||
@ -71,7 +71,7 @@ export class OrdersService {
|
|||||||
basket.items.forEach(x => {
|
basket.items.forEach(x => {
|
||||||
let item: IOrderItem = <IOrderItem>{};
|
let item: IOrderItem = <IOrderItem>{};
|
||||||
item.pictureurl = x.pictureUrl;
|
item.pictureurl = x.pictureUrl;
|
||||||
item.productId = +x.productId;
|
item.productId = +x.productId;
|
||||||
item.productname = x.productName;
|
item.productname = x.productName;
|
||||||
item.unitprice = x.unitPrice;
|
item.unitprice = x.unitPrice;
|
||||||
item.units = x.quantity;
|
item.units = x.quantity;
|
||||||
|
|||||||
@ -4,4 +4,4 @@
|
|||||||
<ng-content></ng-content>
|
<ng-content></ng-content>
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -1,21 +1,17 @@
|
|||||||
@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,42 +1,35 @@
|
|||||||
<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">
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
</div>
|
</div>
|
||||||
@ -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,20 +30,17 @@
|
|||||||
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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -2,14 +2,14 @@ import { Component, OnInit, OnChanges, Output, Input, EventEmitter } from '@angu
|
|||||||
import { Subscription } from 'rxjs/Subscription';
|
import { Subscription } from 'rxjs/Subscription';
|
||||||
|
|
||||||
import { IIdentity } from '../../models/identity.model';
|
import { IIdentity } from '../../models/identity.model';
|
||||||
import { SecurityService } from '../../services/security.service';
|
import { SecurityService } from '../../services/security.service';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'esh-identity',
|
selector: 'esh-identity',
|
||||||
templateUrl: './identity.html',
|
templateUrl: './identity.html',
|
||||||
styleUrls: ['./identity.scss']
|
styleUrls: ['./identity.scss']
|
||||||
})
|
})
|
||||||
export class Identity implements OnInit {
|
export class Identity implements OnInit {
|
||||||
authenticated: boolean = false;
|
authenticated: boolean = false;
|
||||||
private subscription: Subscription;
|
private subscription: Subscription;
|
||||||
private userName: string = '';
|
private userName: string = '';
|
||||||
@ -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,14 +10,10 @@
|
|||||||
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>
|
||||||
</article>
|
</article>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -1,36 +1,28 @@
|
|||||||
@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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -7,7 +7,7 @@ import { IPager } from '../../models/pager.model';
|
|||||||
templateUrl: './pager.html',
|
templateUrl: './pager.html',
|
||||||
styleUrls: ['./pager.scss']
|
styleUrls: ['./pager.scss']
|
||||||
})
|
})
|
||||||
export class Pager implements OnInit, OnChanges {
|
export class Pager implements OnInit, OnChanges {
|
||||||
|
|
||||||
@Output()
|
@Output()
|
||||||
changed: EventEmitter<number> = new EventEmitter<number>();
|
changed: EventEmitter<number> = new EventEmitter<number>();
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
import {ICampaignItem} from './campaignItem.model';
|
import { ICampaignItem } from './campaignItem.model';
|
||||||
|
|
||||||
export interface ICampaign {
|
export interface ICampaign {
|
||||||
data: ICampaignItem[];
|
data: ICampaignItem[];
|
||||||
pageIndex: number;
|
pageIndex: number;
|
||||||
pageSize: number;
|
pageSize: number;
|
||||||
count: number;
|
count: number;
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
export interface ICampaignItem {
|
export interface ICampaignItem {
|
||||||
id: number;
|
id: number;
|
||||||
name: string;
|
name: string;
|
||||||
description: string;
|
description: string;
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
import {ICatalogItem} from './catalogItem.model';
|
import { ICatalogItem } from './catalogItem.model';
|
||||||
|
|
||||||
export interface ICatalog {
|
export interface ICatalog {
|
||||||
pageIndex: number;
|
pageIndex: number;
|
||||||
|
|||||||
@ -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;
|
||||||
}
|
}
|
||||||
@ -1,4 +1,4 @@
|
|||||||
import {IOrderItem} from './orderItem.model';
|
import { IOrderItem } from './orderItem.model';
|
||||||
|
|
||||||
export interface IOrderDetail {
|
export interface IOrderDetail {
|
||||||
ordernumber: string;
|
ordernumber: string;
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
import {IOrderItem} from './orderItem.model';
|
import { IOrderItem } from './orderItem.model';
|
||||||
|
|
||||||
export interface IOrder {
|
export interface IOrder {
|
||||||
city: number;
|
city: number;
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
import { Pipe, PipeTransform } from '@angular/core';
|
import { Pipe, PipeTransform } from '@angular/core';
|
||||||
|
|
||||||
@Pipe({
|
@Pipe({
|
||||||
name: 'appfUppercase'
|
name: 'appfUppercase'
|
||||||
})
|
})
|
||||||
export class UppercasePipe implements PipeTransform {
|
export class UppercasePipe implements PipeTransform {
|
||||||
transform(value: string) {
|
transform(value: string) {
|
||||||
|
|||||||
@ -1,9 +1,9 @@
|
|||||||
import { Injectable } from '@angular/core';
|
import { Injectable } from '@angular/core';
|
||||||
import { Subject } from 'rxjs/Subject';
|
import { Subject } from 'rxjs/Subject';
|
||||||
|
|
||||||
import { ICatalogItem } from '../models/catalogItem.model';
|
import { ICatalogItem } from '../models/catalogItem.model';
|
||||||
import { IBasketItem } from '../models/basketItem.model';
|
import { IBasketItem } from '../models/basketItem.model';
|
||||||
import { IBasket } from '../models/basket.model';
|
import { IBasket } from '../models/basket.model';
|
||||||
import { SecurityService } from '../services/security.service';
|
import { SecurityService } from '../services/security.service';
|
||||||
import { Guid } from '../../../guid';
|
import { Guid } from '../../../guid';
|
||||||
|
|
||||||
|
|||||||
@ -1,14 +1,14 @@
|
|||||||
import { Injectable } from '@angular/core';
|
import { Injectable } from '@angular/core';
|
||||||
import { Http, Response, RequestOptionsArgs, RequestMethod, Headers } from '@angular/http';
|
import { Http, Response, RequestOptionsArgs, RequestMethod, Headers } from '@angular/http';
|
||||||
import { IConfiguration } from '../models/configuration.model';
|
import { IConfiguration } from '../models/configuration.model';
|
||||||
import { StorageService } from './storage.service';
|
import { StorageService } from './storage.service';
|
||||||
|
|
||||||
import 'rxjs/Rx';
|
import 'rxjs/Rx';
|
||||||
import { Observable } from 'rxjs/Observable';
|
import { Observable } from 'rxjs/Observable';
|
||||||
import 'rxjs/add/observable/throw';
|
import 'rxjs/add/observable/throw';
|
||||||
import { Observer } from 'rxjs/Observer';
|
import { Observer } from 'rxjs/Observer';
|
||||||
import 'rxjs/add/operator/map';
|
import 'rxjs/add/operator/map';
|
||||||
import { Subject } from 'rxjs/Subject';
|
import { Subject } from 'rxjs/Subject';
|
||||||
|
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
@ -20,7 +20,7 @@ export class ConfigurationService {
|
|||||||
isReady: boolean = false;
|
isReady: boolean = false;
|
||||||
|
|
||||||
constructor(private http: Http, private storageService: StorageService) { }
|
constructor(private http: Http, private storageService: StorageService) { }
|
||||||
|
|
||||||
load() {
|
load() {
|
||||||
const baseURI = document.baseURI.endsWith('/') ? document.baseURI : `${document.baseURI}/`;
|
const baseURI = document.baseURI.endsWith('/') ? document.baseURI : `${document.baseURI}/`;
|
||||||
let url = `${baseURI}Home/Configuration`;
|
let url = `${baseURI}Home/Configuration`;
|
||||||
|
|||||||
@ -11,7 +11,7 @@ import 'rxjs/add/operator/catch';
|
|||||||
import { SecurityService } from './security.service';
|
import { SecurityService } from './security.service';
|
||||||
import { Guid } from '../../../guid';
|
import { Guid } from '../../../guid';
|
||||||
|
|
||||||
// Implementing a Retry-Circuit breaker policy
|
// Implementing a Retry-Circuit breaker policy
|
||||||
// is pending to do for the SPA app
|
// is pending to do for the SPA app
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class DataService {
|
export class DataService {
|
||||||
@ -27,8 +27,8 @@ export class DataService {
|
|||||||
|
|
||||||
return this.http.get(url, options).map(
|
return this.http.get(url, options).map(
|
||||||
(res: Response) => {
|
(res: Response) => {
|
||||||
return res;
|
return res;
|
||||||
}).catch(this.handleError);
|
}).catch(this.handleError);
|
||||||
}
|
}
|
||||||
|
|
||||||
postWithId(url: string, data: any, params?: any): Observable<Response> {
|
postWithId(url: string, data: any, params?: any): Observable<Response> {
|
||||||
|
|||||||
@ -1,12 +1,12 @@
|
|||||||
import { Injectable } from '@angular/core';
|
import { Injectable } from '@angular/core';
|
||||||
import { Http, Response, Headers } from '@angular/http';
|
import { Http, Response, Headers } from '@angular/http';
|
||||||
import 'rxjs/add/operator/map';
|
import 'rxjs/add/operator/map';
|
||||||
import { Observable } from 'rxjs/Observable';
|
import { Observable } from 'rxjs/Observable';
|
||||||
import { Subject } from 'rxjs/Subject';
|
import { Subject } from 'rxjs/Subject';
|
||||||
import { Router } from '@angular/router';
|
import { Router } from '@angular/router';
|
||||||
import { ActivatedRoute } from '@angular/router';
|
import { ActivatedRoute } from '@angular/router';
|
||||||
import { ConfigurationService } from './configuration.service';
|
import { ConfigurationService } from './configuration.service';
|
||||||
import { StorageService } from './storage.service';
|
import { StorageService } from './storage.service';
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class SecurityService {
|
export class SecurityService {
|
||||||
@ -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);
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -205,7 +205,7 @@ export class SecurityService {
|
|||||||
return data;
|
return data;
|
||||||
}
|
}
|
||||||
|
|
||||||
//private retrieve(key: string): any {
|
// private retrieve(key: string): any {
|
||||||
// let item = this.storage.getItem(key);
|
// let item = this.storage.getItem(key);
|
||||||
|
|
||||||
// if (item && item !== 'undefined') {
|
// if (item && item !== 'undefined') {
|
||||||
@ -213,11 +213,11 @@ export class SecurityService {
|
|||||||
// }
|
// }
|
||||||
|
|
||||||
// return;
|
// return;
|
||||||
//}
|
// }
|
||||||
|
|
||||||
//private store(key: string, value: any) {
|
// private store(key: string, value: any) {
|
||||||
// this.storage.setItem(key, JSON.stringify(value));
|
// this.storage.setItem(key, JSON.stringify(value));
|
||||||
//}
|
// }
|
||||||
|
|
||||||
private getUserData = (): Observable<string[]> => {
|
private getUserData = (): Observable<string[]> => {
|
||||||
this.setHeaders();
|
this.setHeaders();
|
||||||
|
|||||||
@ -7,7 +7,7 @@ import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
|
|||||||
|
|
||||||
// Services
|
// Services
|
||||||
import { DataService } from './services/data.service';
|
import { DataService } from './services/data.service';
|
||||||
import { BasketWrapperService} from './services/basket.wrapper.service';
|
import { BasketWrapperService } from './services/basket.wrapper.service';
|
||||||
import { SecurityService } from './services/security.service';
|
import { SecurityService } from './services/security.service';
|
||||||
import { ConfigurationService } from './services/configuration.service';
|
import { ConfigurationService } from './services/configuration.service';
|
||||||
import { StorageService } from './services/storage.service';
|
import { StorageService } from './services/storage.service';
|
||||||
@ -62,8 +62,8 @@ export class SharedModule {
|
|||||||
// Providers
|
// Providers
|
||||||
DataService,
|
DataService,
|
||||||
BasketWrapperService,
|
BasketWrapperService,
|
||||||
SecurityService,
|
SecurityService,
|
||||||
ConfigurationService,
|
ConfigurationService,
|
||||||
StorageService
|
StorageService
|
||||||
]
|
]
|
||||||
};
|
};
|
||||||
|
|||||||
@ -17,7 +17,7 @@ declare var __karma__: any;
|
|||||||
declare var require: any;
|
declare var require: any;
|
||||||
|
|
||||||
// Prevent Karma from running prematurely.
|
// Prevent Karma from running prematurely.
|
||||||
__karma__.loaded = function () {};
|
__karma__.loaded = function () { };
|
||||||
|
|
||||||
// First, initialize the Angular testing environment.
|
// First, initialize the Angular testing environment.
|
||||||
getTestBed().initTestEnvironment(
|
getTestBed().initTestEnvironment(
|
||||||
|
|||||||
@ -1,13 +1,13 @@
|
|||||||
{
|
{
|
||||||
"extends": "../tsconfig.json",
|
"extends": "../tsconfig.json",
|
||||||
"compilerOptions": {
|
"compilerOptions": {
|
||||||
"outDir": "../out-tsc/app",
|
"outDir": "../out-tsc/app",
|
||||||
"module": "es2015",
|
"module": "es2015",
|
||||||
"baseUrl": "",
|
"baseUrl": "",
|
||||||
"types": []
|
"types": []
|
||||||
},
|
},
|
||||||
"exclude": [
|
"exclude": [
|
||||||
"test.ts",
|
"test.ts",
|
||||||
"**/*.spec.ts"
|
"**/*.spec.ts"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@ -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;
|
|
||||||
}
|
|
||||||
@ -28,7 +28,7 @@ namespace eShopConContainers.WebSPA
|
|||||||
builder.AddConsole();
|
builder.AddConsole();
|
||||||
builder.AddDebug();
|
builder.AddDebug();
|
||||||
})
|
})
|
||||||
.UseApplicationInsights()
|
.UseApplicationInsights()
|
||||||
.Build();
|
.Build();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,18 +1,18 @@
|
|||||||
{
|
{
|
||||||
"iisSettings": {
|
"iisSettings": {
|
||||||
"windowsAuthentication": false,
|
"windowsAuthentication": false,
|
||||||
"anonymousAuthentication": true,
|
"anonymousAuthentication": true,
|
||||||
"iisExpress": {
|
"iisExpress": {
|
||||||
"applicationUrl": "http://localhost:5104/",
|
"applicationUrl": "http://localhost:5104/",
|
||||||
"sslPort": 0
|
"sslPort": 0
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"profiles": {
|
||||||
|
"IIS Express": {
|
||||||
|
"commandName": "IISExpress",
|
||||||
|
"environmentVariables": {
|
||||||
|
"ASPNETCORE_ENVIRONMENT": "Production"
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"profiles": {
|
|
||||||
"IIS Express": {
|
|
||||||
"commandName": "IISExpress",
|
|
||||||
"environmentVariables": {
|
|
||||||
"ASPNETCORE_ENVIRONMENT": "Production"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@ -20,6 +20,6 @@ namespace eShopConContainers.WebSPA.Server.Controllers
|
|||||||
public IActionResult Configuration()
|
public IActionResult Configuration()
|
||||||
{
|
{
|
||||||
return Json(_settings.Value);
|
return Json(_settings.Value);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -54,8 +54,8 @@ namespace eShopConContainers.WebSPA
|
|||||||
checks.AddUrlCheck(Configuration["BasketUrlHC"], TimeSpan.Zero); //No cache for this HealthCheck, better just for demos
|
checks.AddUrlCheck(Configuration["BasketUrlHC"], TimeSpan.Zero); //No cache for this HealthCheck, better just for demos
|
||||||
checks.AddUrlCheck(Configuration["IdentityUrlHC"], TimeSpan.FromMinutes(minutes));
|
checks.AddUrlCheck(Configuration["IdentityUrlHC"], TimeSpan.FromMinutes(minutes));
|
||||||
checks.AddUrlCheck(Configuration["MarketingUrlHC"], TimeSpan.FromMinutes(minutes));
|
checks.AddUrlCheck(Configuration["MarketingUrlHC"], TimeSpan.FromMinutes(minutes));
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
services.Configure<AppSettings>(Configuration);
|
services.Configure<AppSettings>(Configuration);
|
||||||
|
|
||||||
@ -110,7 +110,7 @@ namespace eShopConContainers.WebSPA
|
|||||||
{
|
{
|
||||||
loggerFactory.CreateLogger("init").LogDebug($"Using PATH BASE '{pathBase}'");
|
loggerFactory.CreateLogger("init").LogDebug($"Using PATH BASE '{pathBase}'");
|
||||||
app.UsePathBase(pathBase);
|
app.UsePathBase(pathBase);
|
||||||
}
|
}
|
||||||
|
|
||||||
app.Use(async (context, next) =>
|
app.Use(async (context, next) =>
|
||||||
{
|
{
|
||||||
@ -120,12 +120,12 @@ namespace eShopConContainers.WebSPA
|
|||||||
// Rewrite request to use app root
|
// Rewrite request to use app root
|
||||||
if (context.Response.StatusCode == 404 && !Path.HasExtension(context.Request.Path.Value) && !context.Request.Path.Value.StartsWith("/api"))
|
if (context.Response.StatusCode == 404 && !Path.HasExtension(context.Request.Path.Value) && !context.Request.Path.Value.StartsWith("/api"))
|
||||||
{
|
{
|
||||||
context.Request.Path = "/index.html";
|
context.Request.Path = "/index.html";
|
||||||
context.Response.StatusCode = 200; // Make sure we update the status code, otherwise it returns 404
|
context.Response.StatusCode = 200; // Make sure we update the status code, otherwise it returns 404
|
||||||
await next();
|
await next();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
app.UseDefaultFiles();
|
app.UseDefaultFiles();
|
||||||
app.UseStaticFiles();
|
app.UseStaticFiles();
|
||||||
|
|
||||||
|
|||||||
@ -1,22 +1,22 @@
|
|||||||
{
|
{
|
||||||
"CatalogUrl": "http://localhost:5101",
|
"CatalogUrl": "http://localhost:5101",
|
||||||
"OrderingUrl": "http://localhost:5102",
|
"OrderingUrl": "http://localhost:5102",
|
||||||
"BasketUrl": "http://localhost:5103",
|
"BasketUrl": "http://localhost:5103",
|
||||||
"IdentityUrl": "http://localhost:5105",
|
"IdentityUrl": "http://localhost:5105",
|
||||||
"MarketingUrl": "http://localhost:5110",
|
"MarketingUrl": "http://localhost:5110",
|
||||||
"CallBackUrl": "http://localhost:5104/",
|
"CallBackUrl": "http://localhost:5104/",
|
||||||
"UseCustomizationData": true,
|
"UseCustomizationData": true,
|
||||||
"IsClusterEnv": "False",
|
"IsClusterEnv": "False",
|
||||||
"ActivateCampaignDetailFunction": true,
|
"ActivateCampaignDetailFunction": true,
|
||||||
"Logging": {
|
"Logging": {
|
||||||
"IncludeScopes": false,
|
"IncludeScopes": false,
|
||||||
"LogLevel": {
|
"LogLevel": {
|
||||||
"Default": "Debug",
|
"Default": "Debug",
|
||||||
"System": "Information",
|
"System": "Information",
|
||||||
"Microsoft": "Information"
|
"Microsoft": "Information"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"ApplicationInsights": {
|
||||||
|
"InstrumentationKey": ""
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"ApplicationInsights": {
|
|
||||||
"InstrumentationKey": ""
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
22754
src/Web/WebSPA/package-lock.json
generated
22754
src/Web/WebSPA/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -1,66 +1,67 @@
|
|||||||
{
|
{
|
||||||
"name": "eshopaspnetnetcoredockerspa",
|
"name": "eshopaspnetnetcoredockerspa",
|
||||||
"version": "0.0.0",
|
"version": "0.0.0",
|
||||||
"private": true,
|
"private": true,
|
||||||
"keywords": [
|
"keywords": [
|
||||||
"aspnetcore",
|
"aspnetcore",
|
||||||
"entityframework core",
|
"entityframework core",
|
||||||
"angular2",
|
"angular2",
|
||||||
"webpack2",
|
"webpack2",
|
||||||
"typescript2",
|
"typescript2",
|
||||||
"bootstrap4",
|
"bootstrap4",
|
||||||
"docker"
|
"docker"
|
||||||
],
|
],
|
||||||
"author": {
|
"author": {
|
||||||
"name": "Microsoft",
|
"name": "Microsoft",
|
||||||
"email": "cesardl@microsoft.com"
|
"email": "cesardl@microsoft.com"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"ng": "ng",
|
"ng": "ng",
|
||||||
"rimraf": "rimraf",
|
"rimraf": "rimraf",
|
||||||
"clean": "npm cache clean && npm run rimraf -- node_modules doc typings coverage wwwroot",
|
"clean": "npm cache clean && npm run rimraf -- node_modules doc typings coverage wwwroot",
|
||||||
"start": "ng serve",
|
"start": "ng serve",
|
||||||
"build:dev": "ng build",
|
"build:dev": "ng build",
|
||||||
"build:prod": "ng build --prod --aot --extract-css",
|
"build:prod": "ng build --prod --aot --extract-css",
|
||||||
"lint:sass": "sass-lint -c .sass-lint.yml Client/**/*.scss --verbose",
|
"lint:sass": "sass-lint -c .sass-lint.yml Client/**/*.scss --verbose",
|
||||||
"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",
|
||||||
"isomorphic-fetch": "2.2.1",
|
"file-loader": "1.1.6",
|
||||||
"normalize.css": "5.0.0",
|
"font-awesome": "4.7.0",
|
||||||
"preboot": "4.5.2",
|
"isomorphic-fetch": "2.2.1",
|
||||||
"rxjs": "^5.1.0",
|
"normalize.css": "7.0.0",
|
||||||
"zone.js": "^0.8.4"
|
"preboot": "4.5.2",
|
||||||
},
|
"rxjs": "5.5.5",
|
||||||
"devDependencies": {
|
"zone.js": "^0.8.18"
|
||||||
"@angular/cli": "^1.3.0",
|
},
|
||||||
"@angular/compiler-cli": "^4.0.0",
|
"devDependencies": {
|
||||||
"@types/core-js": "0.9.34",
|
"@angular/cli": "1.6.1",
|
||||||
"@types/hammerjs": "2.0.33",
|
"@angular/compiler-cli": "5.1.1",
|
||||||
"@types/jasmine": "2.5.38",
|
"@types/core-js": "0.9.43",
|
||||||
"@types/node": "~6.0.60",
|
"@types/hammerjs": "2.0.35",
|
||||||
"@types/protractor": "1.5.20",
|
"@types/jasmine": "2.8.2",
|
||||||
"@types/selenium-webdriver": "2.44.26",
|
"@types/node": "8.5.1",
|
||||||
"codelyzer": "~2.0.0",
|
"@types/selenium-webdriver": "3.0.8",
|
||||||
"sass-lint": "1.10.2",
|
"codelyzer": "4.0.2",
|
||||||
"ts-helpers": "1.1.1",
|
"sass-lint": "1.12.1",
|
||||||
"ts-node": "~2.0.0",
|
"ts-helpers": "1.1.2",
|
||||||
"tslint": "~4.5.0",
|
"ts-node": "4.0.2",
|
||||||
"typedoc": "0.5.0",
|
"tslint": "5.8.0",
|
||||||
"typescript": "~2.2.0",
|
"typedoc": "0.9.0",
|
||||||
"url-loader": "0.5.7"
|
"typescript": "2.6.2",
|
||||||
}
|
"url-loader": "0.6.2"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -17,4 +17,4 @@
|
|||||||
"dom"
|
"dom"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1,15 +1,15 @@
|
|||||||
{
|
{
|
||||||
"mode": "modules",
|
"mode": "modules",
|
||||||
"out": "doc",
|
"out": "doc",
|
||||||
"theme": "default",
|
"theme": "default",
|
||||||
"ignoreCompilerErrors": "true",
|
"ignoreCompilerErrors": "true",
|
||||||
"experimentalDecorators": "true",
|
"experimentalDecorators": "true",
|
||||||
"emitDecoratorMetadata": "true",
|
"emitDecoratorMetadata": "true",
|
||||||
"target": "ES5",
|
"target": "ES5",
|
||||||
"moduleResolution": "node",
|
"moduleResolution": "node",
|
||||||
"preserveConstEnums": "true",
|
"preserveConstEnums": "true",
|
||||||
"stripInternal": "true",
|
"stripInternal": "true",
|
||||||
"suppressExcessPropertyErrors": "true",
|
"suppressExcessPropertyErrors": "true",
|
||||||
"suppressImplicitAnyIndexErrors": "true",
|
"suppressImplicitAnyIndexErrors": "true",
|
||||||
"module": "commonjs"
|
"module": "commonjs"
|
||||||
}
|
}
|
||||||
@ -1,14 +1,10 @@
|
|||||||
<?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 -->
|
||||||
<!--
|
<system.webServer>
|
||||||
Configure your application settings in appsettings.json. Learn more at https://go.microsoft.com/fwlink/?LinkId=786380
|
<handlers>
|
||||||
-->
|
<add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModule" resourceType="Unspecified" />
|
||||||
|
</handlers>
|
||||||
<system.webServer>
|
<aspNetCore processPath="%LAUNCHER_PATH%" arguments="%LAUNCHER_ARGS%" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false" />
|
||||||
<handlers>
|
</system.webServer>
|
||||||
<add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModule" resourceType="Unspecified"/>
|
|
||||||
</handlers>
|
|
||||||
<aspNetCore processPath="%LAUNCHER_PATH%" arguments="%LAUNCHER_ARGS%" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false"/>
|
|
||||||
</system.webServer>
|
|
||||||
</configuration>
|
</configuration>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user