first commit

frontend/src/app/ecommerce/ecommerce.component.html

@@ -0,0 +1,31 @@
+<nav class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
+    <div class="container">
+        <a class="navbar-brand" href="#">Сосисочная у дома</a>
+        <button class="navbar-toggler" type="button" data-toggle="collapse"
+                data-target="#navbarResponsive" aria-controls="navbarResponsive"
+                aria-expanded="false" aria-label="Toggle navigation" (click)="toggleCollapsed()">
+            <span class="navbar-toggler-icon"></span>
+        </button>
+        <div id="navbarResponsive" [ngClass]="{'collapse': collapsed, 'navbar-collapse': true}">
+            <ul class="navbar-nav ml-auto">
+                <li class="nav-item active">
+                    <a class="nav-link" href="#" (click)="reset()">Магазин
+                        <span class="sr-only">(current)</span>
+                    </a>
+                </li>
+            </ul>
+        </div>
+    </div>
+</nav>
+<div class="row">
+    <div class="col-md-9">
+        <app-products #productsC [hidden]="orderFinished"></app-products>
+    </div>
+    <div class="col-md-3">
+        <app-shopping-cart (onOrderFinished)=finishOrder($event) #shoppingCartC
+                           [hidden]="orderFinished"></app-shopping-cart>
+    </div>
+    <div class="col-md-6 offset-3">
+        <app-orders #ordersC [hidden]="!orderFinished"></app-orders>
+    </div>
+</div>

frontend/src/app/ecommerce/ecommerce.component.spec.ts

@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { EcommerceComponent } from './ecommerce.component';
+
+describe('EcommerceComponent', () => {
+  let component: EcommerceComponent;
+  let fixture: ComponentFixture<EcommerceComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ EcommerceComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(EcommerceComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

frontend/src/app/ecommerce/ecommerce.component.ts

@@ -0,0 +1,44 @@
+import {Component, OnInit, ViewChild} from '@angular/core';
+import {ProductsComponent} from "./products/products.component";
+import {ShoppingCartComponent} from "./shopping-cart/shopping-cart.component";
+import {OrdersComponent} from "./orders/orders.component";
+
+@Component({
+    selector: 'app-ecommerce',
+    templateUrl: './ecommerce.component.html',
+    styleUrls: ['./ecommerce.component.css']
+})
+export class EcommerceComponent implements OnInit {
+    private collapsed = true;
+    orderFinished = false;
+
+    @ViewChild('productsC')
+    productsC: ProductsComponent;
+
+    @ViewChild('shoppingCartC')
+    shoppingCartC: ShoppingCartComponent;
+
+    @ViewChild('ordersC')
+    ordersC: OrdersComponent;
+
+    constructor() {
+    }
+
+    ngOnInit() {
+    }
+
+    toggleCollapsed(): void {
+        this.collapsed = !this.collapsed;
+    }
+
+    finishOrder(orderFinished: boolean) {
+        this.orderFinished = orderFinished;
+    }
+
+    reset() {
+        this.orderFinished = false;
+        this.productsC.reset();
+        this.shoppingCartC.reset();
+        this.ordersC.paid = false;
+    }
+}

frontend/src/app/ecommerce/models/product-order.model.ts

@@ -0,0 +1,11 @@
+import {Product} from "./product.model";
+
+export class ProductOrder {
+    product: Product;
+    quantity: number;
+
+    constructor(product: Product, quantity: number) {
+        this.product = product;
+        this.quantity = quantity;
+    }
+}

frontend/src/app/ecommerce/models/product-orders.model.ts

@@ -0,0 +1,5 @@
+import {ProductOrder} from "./product-order.model";
+
+export class ProductOrders {
+    productOrders: ProductOrder[] = [];
+}

frontend/src/app/ecommerce/models/product.model.ts

@@ -0,0 +1,13 @@
+export class Product {
+    id: number;
+    name: string;
+    price: number;
+    pictureUrl: string;
+
+    constructor(id: number, name: string, price: number, pictureUrl: string) {
+        this.id = id;
+        this.name = name;
+        this.price = price;
+        this.pictureUrl = pictureUrl;
+    }
+}

frontend/src/app/ecommerce/orders/orders.component.html

@@ -0,0 +1,13 @@
+<h2 class="text-center">Оформление заказа</h2>
+<ul>
+    <li *ngFor="let order of orders.productOrders">
+        {{ order.product.name }} - {{ order.product.price }}₽ x {{ order.quantity}} шт.
+    </li>
+</ul>
+<h3 class="text-right">Общая стоимость: {{ total }}₽</h3>
+
+<button class="btn btn-primary btn-block" (click)="pay()" *ngIf="!paid">Оплатить</button>
+
+<div class="alert alert-success" role="alert" *ngIf="paid">
+    <strong>Отлично!</strong> Заказ успешно оформлен.
+</div>

frontend/src/app/ecommerce/orders/orders.component.spec.ts

@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { OrdersComponent } from './orders.component';
+
+describe('OrdersComponent', () => {
+  let component: OrdersComponent;
+  let fixture: ComponentFixture<OrdersComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ OrdersComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(OrdersComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

frontend/src/app/ecommerce/orders/orders.component.ts

@@ -0,0 +1,39 @@
+import {Component, OnInit} from '@angular/core';
+import {ProductOrders} from "../models/product-orders.model";
+import {Subscription} from "rxjs/internal/Subscription";
+import {EcommerceService} from "../services/EcommerceService";
+
+@Component({
+    selector: 'app-orders',
+    templateUrl: './orders.component.html',
+    styleUrls: ['./orders.component.css']
+})
+export class OrdersComponent implements OnInit {
+    orders: ProductOrders;
+    total: number;
+    paid: boolean;
+    sub: Subscription;
+
+    constructor(private ecommerceService: EcommerceService) {
+        this.orders = this.ecommerceService.ProductOrders;
+    }
+
+    ngOnInit() {
+        this.paid = false;
+        this.sub = this.ecommerceService.OrdersChanged.subscribe(() => {
+            this.orders = this.ecommerceService.ProductOrders;
+        });
+        this.loadTotal();
+    }
+
+    pay() {
+        this.paid = true;
+        this.ecommerceService.saveOrder(this.orders).subscribe();
+    }
+
+    loadTotal() {
+        this.sub = this.ecommerceService.TotalChanged.subscribe(() => {
+            this.total = this.ecommerceService.Total;
+        });
+    }
+}

frontend/src/app/ecommerce/products/products.component.css

@@ -0,0 +1,4 @@
+.padding-0 {
+    padding-right: 0;
+    padding-left: 1;
+}

frontend/src/app/ecommerce/products/products.component.html

@@ -0,0 +1,28 @@
+<div class="row card-deck">
+    <div class="col-lg-4 col-md-6 mb-4" *ngFor="let order of productOrders">
+        <div class="card text-center">
+            <div class="card-header">
+                <h4>{{order.product.name}}</h4>
+            </div>
+            <div class="card-body">
+                <a href="#"><img class="card-img-top" src={{order.product.pictureUrl}} alt=""></a>
+                <h5 class="card-title">{{order.product.price}}₽</h5>
+                <div class="row">
+                    <div class="col-4 padding-0" *ngIf="!isProductSelected(order.product)">
+                        <input type="number" min="1" class="form-control" [(ngModel)]=order.quantity>
+                    </div>
+                    <div class="col-4 padding-0" *ngIf="!isProductSelected(order.product)">
+                        <button class="btn btn-primary" (click)="addToCart(order)"
+                                [disabled]="order.quantity <= 0">В корзину
+                        </button>
+                    </div>
+                    <div class="col-12" *ngIf="isProductSelected(order.product)">
+                        <button class="btn btn-primary btn-block"
+                                (click)="removeFromCart(order)">Убрать из корзины
+                        </button>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>

frontend/src/app/ecommerce/products/products.component.spec.ts

@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ProductsComponent } from './products.component';
+
+describe('ProductsComponent', () => {
+  let component: ProductsComponent;
+  let fixture: ComponentFixture<ProductsComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ ProductsComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ProductsComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

frontend/src/app/ecommerce/products/products.component.ts

@@ -0,0 +1,85 @@
+import {Component, OnInit} from '@angular/core';
+import {ProductOrder} from "../models/product-order.model";
+import {EcommerceService} from "../services/EcommerceService";
+import {Subscription} from "rxjs/internal/Subscription";
+import {ProductOrders} from "../models/product-orders.model";
+import {Product} from "../models/product.model";
+
+@Component({
+    selector: 'app-products',
+    templateUrl: './products.component.html',
+    styleUrls: ['./products.component.css']
+})
+export class ProductsComponent implements OnInit {
+    productOrders: ProductOrder[] = [];
+    products: Product[] = [];
+    selectedProductOrder: ProductOrder;
+    private shoppingCartOrders: ProductOrders;
+    sub: Subscription;
+    productSelected: boolean = false;
+
+    constructor(private ecommerceService: EcommerceService) {
+    }
+
+    ngOnInit() {
+        this.productOrders = [];
+        this.loadProducts();
+        this.loadOrders();
+    }
+
+    addToCart(order: ProductOrder) {
+        this.ecommerceService.SelectedProductOrder = order;
+        this.selectedProductOrder = this.ecommerceService.SelectedProductOrder;
+        this.productSelected = true;
+    }
+
+    removeFromCart(productOrder: ProductOrder) {
+        let index = this.getProductIndex(productOrder.product);
+        if (index > -1) {
+            this.shoppingCartOrders.productOrders.splice(
+                this.getProductIndex(productOrder.product), 1);
+        }
+        this.ecommerceService.ProductOrders = this.shoppingCartOrders;
+        this.shoppingCartOrders = this.ecommerceService.ProductOrders;
+        this.productSelected = false;
+    }
+
+    getProductIndex(product: Product): number {
+        return this.ecommerceService.ProductOrders.productOrders.findIndex(
+            value => value.product === product);
+    }
+
+    isProductSelected(product: Product): boolean {
+        return this.getProductIndex(product) > -1;
+    }
+
+    loadProducts() {
+        this.ecommerceService.getAllProducts()
+            .subscribe(
+                (products: any[]) => {
+                    this.products = products;
+                    this.products.forEach(product => {
+                        this.productOrders.push(new ProductOrder(product, 0));
+                    })
+                },
+                (error) => {
+                    window.alert('На сайте ведутся технические работы. Приходите позже!');
+                    console.log(error);
+                }
+            );
+    }
+
+    loadOrders() {
+        this.sub = this.ecommerceService.OrdersChanged.subscribe(() => {
+            this.shoppingCartOrders = this.ecommerceService.ProductOrders;
+        });
+    }
+
+    reset() {
+        this.productOrders = [];
+        this.loadProducts();
+        this.ecommerceService.ProductOrders.productOrders = [];
+        this.loadOrders();
+        this.productSelected = false;
+    }
+}

frontend/src/app/ecommerce/services/EcommerceService.ts

@@ -0,0 +1,62 @@
+import {ProductOrder} from "../models/product-order.model";
+import {Subject} from "rxjs/internal/Subject";
+import {ProductOrders} from "../models/product-orders.model";
+import {HttpClient} from '@angular/common/http';
+import {Injectable} from "@angular/core";
+
+@Injectable()
+export class EcommerceService {
+    private productsUrl = "/api/products";
+    private ordersUrl = "/api/orders";
+
+    private productOrder: ProductOrder;
+    private orders: ProductOrders = new ProductOrders();
+
+    private productOrderSubject = new Subject();
+    private ordersSubject = new Subject();
+    private totalSubject = new Subject();
+
+    private total: number;
+
+    ProductOrderChanged = this.productOrderSubject.asObservable();
+    OrdersChanged = this.ordersSubject.asObservable();
+    TotalChanged = this.totalSubject.asObservable();
+
+    constructor(private http: HttpClient) {
+    }
+
+    getAllProducts() {
+        return this.http.get(this.productsUrl);
+    }
+
+    saveOrder(order: ProductOrders) {
+        return this.http.post(this.ordersUrl, order);
+    }
+
+    set SelectedProductOrder(value: ProductOrder) {
+        this.productOrder = value;
+        this.productOrderSubject.next();
+    }
+
+    get SelectedProductOrder() {
+        return this.productOrder;
+    }
+
+    set ProductOrders(value: ProductOrders) {
+        this.orders = value;
+        this.ordersSubject.next();
+    }
+
+    get ProductOrders() {
+        return this.orders;
+    }
+
+    get Total() {
+        return this.total;
+    }
+
+    set Total(value: number) {
+        this.total = value;
+        this.totalSubject.next();
+    }
+}

frontend/src/app/ecommerce/shopping-cart/shopping-cart.component.html

@@ -0,0 +1,18 @@
+<div class="card text-white bg-danger mb-3" style="max-width: 18rem;">
+    <div class="card-header text-center">Корзина</div>
+    <div class="card-body">
+        <h5 class="card-title">Всего: {{total}}₽</h5>
+        <hr>
+        <h6 class="card-title">Товары в корзине:</h6>
+
+        <ul>
+            <li *ngFor="let order of orders.productOrders">
+                {{ order.product.name }} - {{ order.quantity}} шт.
+            </li>
+        </ul>
+
+        <button class="btn btn-light btn-block" (click)="finishOrder()"
+                [disabled]="orders.productOrders.length == 0">Оформить заказ
+        </button>
+    </div>
+</div>

frontend/src/app/ecommerce/shopping-cart/shopping-cart.component.spec.ts

@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ShoppingCartComponent } from './shopping-cart.component';
+
+describe('ShoppingCartComponent', () => {
+  let component: ShoppingCartComponent;
+  let fixture: ComponentFixture<ShoppingCartComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ ShoppingCartComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ShoppingCartComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

frontend/src/app/ecommerce/shopping-cart/shopping-cart.component.ts

@@ -0,0 +1,76 @@
+import {Component, EventEmitter, OnDestroy, OnInit, Output} from '@angular/core';
+import {ProductOrders} from "../models/product-orders.model";
+import {ProductOrder} from "../models/product-order.model";
+import {EcommerceService} from "../services/EcommerceService";
+import {Subscription} from "rxjs/internal/Subscription";
+
+@Component({
+    selector: 'app-shopping-cart',
+    templateUrl: './shopping-cart.component.html',
+    styleUrls: ['./shopping-cart.component.css']
+})
+export class ShoppingCartComponent implements OnInit, OnDestroy {
+    orderFinished: boolean;
+    orders: ProductOrders;
+    total: number;
+    sub: Subscription;
+
+    @Output() onOrderFinished: EventEmitter<boolean>;
+
+    constructor(private ecommerceService: EcommerceService) {
+        this.total = 0;
+        this.orderFinished = false;
+        this.onOrderFinished = new EventEmitter<boolean>();
+    }
+
+    ngOnInit() {
+        this.orders = new ProductOrders();
+        this.loadCart();
+        this.loadTotal();
+    }
+
+    private calculateTotal(products: ProductOrder[]): number {
+        let sum = 0;
+        products.forEach(value => {
+            sum += (value.product.price * value.quantity);
+        });
+        return sum;
+    }
+
+    ngOnDestroy() {
+        this.sub.unsubscribe();
+    }
+
+    finishOrder() {
+        this.orderFinished = true;
+        this.ecommerceService.Total = this.total;
+        this.onOrderFinished.emit(this.orderFinished);
+    }
+
+    loadTotal() {
+        this.sub = this.ecommerceService.OrdersChanged.subscribe(() => {
+            this.total = this.calculateTotal(this.orders.productOrders);
+        });
+    }
+
+    loadCart() {
+        this.sub = this.ecommerceService.ProductOrderChanged.subscribe(() => {
+            let productOrder = this.ecommerceService.SelectedProductOrder;
+            if (productOrder) {
+                this.orders.productOrders.push(new ProductOrder(
+                    productOrder.product, productOrder.quantity));
+            }
+            this.ecommerceService.ProductOrders = this.orders;
+            this.orders = this.ecommerceService.ProductOrders;
+            this.total = this.calculateTotal(this.orders.productOrders);
+        });
+    }
+
+    reset() {
+        this.orderFinished = false;
+        this.orders = new ProductOrders();
+        this.orders.productOrders = []
+        this.loadTotal();
+        this.total = 0;
+    }
+}