Implement list of orders

Also corrects font in css files
This commit is contained in:
Rene Vergara 2021-11-05 16:32:01 -05:00
parent b88fe7fc20
commit 99bec8f739
19 changed files with 180 additions and 15 deletions

View file

@ -352,6 +352,25 @@ app.get('/api/price', (req, res, next) => {
}); });
}); });
app.get('/api/allorders', (req, res, next) => {
console.log('Get /api/allorders');
if (req.query.address.length > 0) {
const orders = ordermodel.find({address: req.query.address, closed: true}).then((documents) => {
if (documents != null) {
res.status(200).json({
message: 'orders found!',
orders: documents
});
} else {
res.status(204).json({
message: 'no orders found',
orders: null
});
}
});
}
});
app.get('/api/order', (req, res, next) => { app.get('/api/order', (req, res, next) => {
console.log('Get /api/order'); console.log('Get /api/order');
if (req.query.session.length > 0) { if (req.query.session.length > 0) {

View file

@ -2,6 +2,7 @@ import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router'; import { RouterModule, Routes } from '@angular/router';
import { ViewerComponent } from './viewer/viewer.component'; import { ViewerComponent } from './viewer/viewer.component';
import { LoginComponent } from './login/login.component'; import { LoginComponent } from './login/login.component';
import { ListOrdersComponent } from './listorders/listorders.component';
import { AuthGuardService } from './auth-guard.service'; import { AuthGuardService } from './auth-guard.service';
import { NodeResolverService } from './node-resolver.service'; import { NodeResolverService } from './node-resolver.service';
@ -9,6 +10,7 @@ const routes: Routes = [
{ path: '', component: LoginComponent, resolve: { response: NodeResolverService} }, { path: '', component: LoginComponent, resolve: { response: NodeResolverService} },
//{ path: 'create', component: PostCreateComponent, canActivate: [AuthGuardService]}, //{ path: 'create', component: PostCreateComponent, canActivate: [AuthGuardService]},
{ path: 'shop', component: ViewerComponent, canActivate: [AuthGuardService]}, { path: 'shop', component: ViewerComponent, canActivate: [AuthGuardService]},
{ path: 'orders', component: ListOrdersComponent, canActivate: [AuthGuardService]},
{ path: 'login', component: LoginComponent} { path: 'login', component: LoginComponent}
]; ];

View file

@ -9,6 +9,8 @@ import { MatExpansionModule } from '@angular/material/expansion';
import { HttpClientModule } from '@angular/common/http'; import { HttpClientModule } from '@angular/common/http';
import { MatDialogModule } from '@angular/material/dialog'; import { MatDialogModule } from '@angular/material/dialog';
import { MatIconModule } from '@angular/material/icon'; import { MatIconModule } from '@angular/material/icon';
import { MatDividerModule } from '@angular/material/divider';
import { MatListModule } from '@angular/material/list';
import { AppRoutingModule } from './app-routing.module'; import { AppRoutingModule } from './app-routing.module';
import { AppComponent } from './app.component'; import { AppComponent } from './app.component';
@ -23,7 +25,7 @@ import { OrderComponent } from './order/order.component';
import { CancelComponent } from './cancel/cancel.component'; import { CancelComponent } from './cancel/cancel.component';
import { CheckoutComponent } from './checkout/checkout.component'; import { CheckoutComponent } from './checkout/checkout.component';
import { SettingsComponent } from './settings/settings.component'; import { SettingsComponent } from './settings/settings.component';
//import { NameDialogComponent } from './namedialog/namedialog.component'; import { ListOrdersComponent } from './listorders/listorders.component';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
@NgModule({ @NgModule({
@ -39,7 +41,8 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
ItemAddComponent, ItemAddComponent,
CancelComponent, CancelComponent,
CheckoutComponent, CheckoutComponent,
SettingsComponent SettingsComponent,
ListOrdersComponent
], ],
imports: [ imports: [
BrowserModule, BrowserModule,
@ -54,6 +57,8 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
MatToolbarModule, MatToolbarModule,
MatExpansionModule, MatExpansionModule,
MatDialogModule, MatDialogModule,
MatDividerModule,
MatListModule,
BrowserAnimationsModule BrowserAnimationsModule
], ],
exports: [ exports: [

View file

@ -1,3 +1,3 @@
.text { .text {
font-family: "Roboto-Mono", monospace; font-family: "Roboto Mono", monospace;
} }

View file

@ -1,3 +1,3 @@
.text { .text {
font-family: "Roboto-Mono", monospace; font-family: "Roboto Mono", monospace;
} }

View file

@ -1,5 +1,5 @@
.text { .text {
font-family: 'Roboto-Mono', monospace; font-family: 'Roboto Mono', monospace;
} }
a{ a{

View file

@ -1,5 +1,5 @@
.text { .text {
font-family: 'Roboto-Mono', monospace; font-family: 'Roboto Mono', monospace;
} }
input[type=number]{ input[type=number]{

View file

@ -1,3 +1,3 @@
.text { .text {
font-family: 'Roboto-Mono', monospace; font-family: 'Roboto Mono', monospace;
} }

View file

@ -1,9 +1,9 @@
.card { .card {
font-family: 'Roboto-Mono', monospace; font-family: 'Roboto Mono', monospace;
} }
.text { .text {
font-family: 'Roboto-Mono', monospace; font-family: 'Roboto Mono', monospace;
} }
.small { .small {
font-size: 75%; font-size: 75%;

View file

@ -37,5 +37,5 @@
</div> </div>
<p *ngIf = "items.length <= 0">No items yet!</p> <p *ngIf = "items.length <= 0">No items yet!</p>
<br> <br>
<button mat-raised-button (click)="openDialog()"> <button class="text" mat-raised-button (click)="openDialog()">
<mat-icon>add</mat-icon>Add item</button> <mat-icon class="icon">add</mat-icon>Add item</button>

View file

@ -0,0 +1,22 @@
.text{
font-family: 'Roboto Mono', monospace;
}
img.icon{
margin-bottom: -2px;
}
.price{
display: flex;
align-items: center;
}
.mini{
font-size: x-small;
align-items: center;
display: flex;
padding: 3px;
}
.small{
font-size: small;
}
.total{
font-size: large;
}

View file

@ -0,0 +1,40 @@
<app-header></app-header>
<div align="center">
<h1 class="text">{{(ownerUpdate | async)!.name}}</h1>
<button class="text" mat-raised-button [routerLink]="['/shop']" color="primary">
Back to Shop
</button>
</div>
<mat-divider></mat-divider>
<div align="center">
<table class="text" width="75%">
<tr>
<td width="50%" align="center">
<h3>Today's Total:</h3>
<p class="total"><img src="/assets/zec-roboto.png" height="14px" />{{todayTotal}}</p>
</td>
<td width="50%" align="center">
<h3>Overall Total:</h3>
<p class="total"><img src="/assets/zec-roboto.png" height="14px" />{{total}}</p>
</td>
</tr>
</table>
</div>
<mat-divider></mat-divider>
<mat-accordion *ngIf = "orders.length > 0">
<mat-expansion-panel class="text" *ngFor = "let order of orders">
<mat-expansion-panel-header class="text" >
<mat-panel-title>
<span class="price"><img src="/assets/zec-roboto.png" height="50%" />{{order.totalZec}}</span> <span class="mini"> (@{{order.price | currency: 'USD'}})</span>
</mat-panel-title>
<mat-panel-description>
{{order.timestamp | date: 'medium'}}
</mat-panel-description>
</mat-expansion-panel-header>
<p class="text">Order: {{order._id}}</p>
<mat-list>
<mat-list-item class="text small" *ngFor="let item of order.lines">{{item.qty}} x {{item.name}}</mat-list-item>
</mat-list>
</mat-expansion-panel>
</mat-accordion>
<p class="text" *ngIf = "orders.length <= 0">No orders</p>

View file

@ -0,0 +1,53 @@
import { Component, OnInit, OnDestroy } from '@angular/core';
import { Observable } from 'rxjs';
import { Order } from '../order/order.model';
import { FullnodeService } from '../fullnode.service';
import { UserService } from '../user.service';
import {Owner} from '../owner.model';
import { OrderService } from '../order/order.service';
@Component({
selector: 'app-list-orders',
templateUrl: './listorders.component.html',
styleUrls: ['./listorders.component.css']
})
export class ListOrdersComponent implements OnInit, OnDestroy{
public todayTotal: number = 0;
public total: number = 0;
public orders: Order[] = [];
public ownerUpdate: Observable<Owner>;
public ordersUpdate: Observable<Order[]>;
constructor(
public orderService: OrderService,
public userService: UserService
){
this.ownerUpdate = userService.ownerUpdate;
this.orderService.getAllOrders();
this.ordersUpdate = orderService.allOrdersUpdate;
}
ngOnInit(){
this.ordersUpdate.subscribe((orders) => {
this.total = 0;
this.todayTotal = 0;
var today = new Date();
this.orders = orders;
console.log('lisord', this.orders.length);
for (let i=0; i < this.orders.length; i++){
this.total += this.orders[i].totalZec;
var date = new Date(this.orders[i]!.timestamp!);
var diff = (today.getTime() / 1000) - (date.getTime()/1000);
if (diff < (24*3600)){
this.todayTotal += this.orders[i].totalZec;
}
}
});
}
ngOnDestroy(){
this.total = 0;
this.todayTotal = 0;
}
}

View file

@ -1,5 +1,5 @@
* { * {
font-family: 'Roboto-Mono', monospace; font-family: 'Roboto Mono', monospace;
} }
mat-card.coolcard{ mat-card.coolcard{
background-color: #FF5722; background-color: #FF5722;

View file

@ -1,5 +1,5 @@
.text { .text {
font-family: "Roboto-Mono", monospace; font-family: "Roboto Mono", monospace;
} }
img.icon{ img.icon{

View file

@ -10,7 +10,8 @@ import { LineItem} from '../items/lineitem.model';
@Injectable({providedIn: 'root'}) @Injectable({providedIn: 'root'})
export class OrderService { export class OrderService {
private dataStore: { user: User, order: Order } = { private dataStore: {allOrders: Order[], user: User, order: Order } = {
allOrders: [],
user:{ user:{
address: '', address: '',
session: '', session: '',
@ -37,6 +38,8 @@ export class OrderService {
public readonly orderUpdate: Observable<Order> = this._orderUpdated.asObservable(); public readonly orderUpdate: Observable<Order> = this._orderUpdated.asObservable();
private _totalUpdated: BehaviorSubject<number> = new BehaviorSubject(this.dataStore.order.total); private _totalUpdated: BehaviorSubject<number> = new BehaviorSubject(this.dataStore.order.total);
public readonly totalUpdate: Observable<number> = this._totalUpdated.asObservable(); public readonly totalUpdate: Observable<number> = this._totalUpdated.asObservable();
private _allOrdersUpdated: BehaviorSubject<Order[]> = new BehaviorSubject(this.dataStore.allOrders);
public readonly allOrdersUpdate: Observable<Order[]> = this._allOrdersUpdated.asObservable();
public userUpdate: Observable<User>; public userUpdate: Observable<User>;
constructor( constructor(
@ -74,6 +77,23 @@ export class OrderService {
return obs; return obs;
} }
getAllOrders(){
var address = this.dataStore.user.address;
const params = new HttpParams().append('address', address);
let obs = this.http.get<{message: string, orders: any}>('http://localhost:3000/api/allorders', { headers:{}, params:params, observe: 'response'});
obs.subscribe((OrdersData) => {
if (OrdersData.status == 200 ){
console.log('getAllOrder:', OrdersData.body);
this.dataStore.allOrders = OrdersData.body!.orders;
this._allOrdersUpdated.next(Object.assign({}, this.dataStore).allOrders);
} else {
console.log('No orders');
}
});
return obs;
}
addToOrder(lineItem: LineItem) { addToOrder(lineItem: LineItem) {
if(this.dataStore.order._id != null) { if(this.dataStore.order._id != null) {
let obs = this.http.post<{message: string}>('http://localhost:3000/api/lineitem', { order_id: this.dataStore.order._id, line: lineItem }); let obs = this.http.post<{message: string}>('http://localhost:3000/api/lineitem', { order_id: this.dataStore.order._id, line: lineItem });

View file

@ -0,0 +1,3 @@
.text {
font-family: 'Roboto Mono', monospace;
}

View file

@ -1,3 +1,3 @@
* { * {
font-family: 'Roboto-Mono', monospace; font-family: 'Roboto Mono', monospace;
} }

View file

@ -1,6 +1,7 @@
<app-header></app-header> <app-header></app-header>
<div align="center"> <div align="center">
<h1>{{(ownerUpdate | async)!.name}}</h1> <h1>{{(ownerUpdate | async)!.name}}</h1>
<button mat-raised-button [routerLink]="['/orders']">View Orders</button>
</div> </div>
<table cellspacing="0" width="100%"> <table cellspacing="0" width="100%">
<tr> <tr>