build: update dependencies
Update dependencies and configure the app for angular material and flex layout. Fixes #44
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
import { NgModule } from '@angular/core';
|
||||
import { Routes, RouterModule } from '@angular/router';
|
||||
|
||||
import { Route, extract } from '@app/core';
|
||||
import { Route, extract } from '../../app/core';
|
||||
import { AboutComponent } from './about.component';
|
||||
|
||||
const routes: Routes = [
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { Component, OnInit } from '@angular/core';
|
||||
|
||||
import { environment } from '@env/environment';
|
||||
import { environment } from '../../environments/environment';
|
||||
|
||||
@Component({
|
||||
selector: 'app-about',
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { NgModule } from '@angular/core';
|
||||
import { Routes, RouterModule } from '@angular/router';
|
||||
|
||||
import { Route, extract } from '@app/core';
|
||||
import { Route, extract } from '../../app/core';
|
||||
import { AccountingComponent } from './accounting.component';
|
||||
|
||||
const routes: Routes = [
|
||||
|
||||
@@ -5,9 +5,8 @@ import { TranslateService } from '@ngx-translate/core';
|
||||
import { merge } from 'rxjs';
|
||||
import { filter, map, mergeMap } from 'rxjs/operators';
|
||||
|
||||
import { environment } from '@env/environment';
|
||||
import { Logger, I18nService } from '@app/core';
|
||||
import * as $ from 'jquery';
|
||||
import { environment } from '../environments/environment';
|
||||
import { Logger, I18nService } from '../app/core';
|
||||
const log = new Logger('App');
|
||||
|
||||
@Component({
|
||||
|
||||
@@ -4,13 +4,11 @@ import { FormsModule } from '@angular/forms';
|
||||
import { HttpClientModule } from '@angular/common/http';
|
||||
import { ServiceWorkerModule } from '@angular/service-worker';
|
||||
import { TranslateModule } from '@ngx-translate/core';
|
||||
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
|
||||
import { AlertModule } from 'ngx-bootstrap';
|
||||
import { NgxChartsModule } from '@swimlane/ngx-charts';
|
||||
|
||||
import { environment } from '@env/environment';
|
||||
import { CoreModule } from '@app/core';
|
||||
import { SharedModule } from '@app/shared';
|
||||
import { environment } from '../environments/environment';
|
||||
import { CoreModule } from '../app/core';
|
||||
import { SharedModule } from '../app/shared';
|
||||
import { HomeModule } from './home/home.module';
|
||||
import { AboutModule } from './about/about.module';
|
||||
import { ClientsModule} from './clients/clients.module';
|
||||
@@ -28,8 +26,6 @@ import { SelfServiceModule } from './self-service/self-service.module';
|
||||
FormsModule,
|
||||
HttpClientModule,
|
||||
TranslateModule.forRoot(),
|
||||
NgbModule.forRoot(),
|
||||
AlertModule.forRoot(),
|
||||
NgxChartsModule,
|
||||
CoreModule,
|
||||
SharedModule,
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { NgModule } from '@angular/core';
|
||||
import { Routes, RouterModule } from '@angular/router';
|
||||
|
||||
import { Route, extract } from '@app/core';
|
||||
import { Route, extract } from '../../app/core';
|
||||
import { ClientsComponent } from './clients.component';
|
||||
import { CreateClientComponent} from './create-client/create-client.component';
|
||||
import { ViewClientComponent } from './view-client/view-client.component';
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { Component, OnInit } from '@angular/core';
|
||||
import { environment } from '@env/environment';
|
||||
import { environment } from '../../environments/environment';
|
||||
|
||||
import { HeaderComponent } from '../core/shell/header/header.component';
|
||||
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
|
||||
import { CommonModule } from '@angular/common';
|
||||
import { ArchwizardModule } from 'angular-archwizard';
|
||||
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
|
||||
|
||||
import { ClientsComponent } from './clients.component';
|
||||
import { CreateClientComponent} from './create-client/create-client.component';
|
||||
@@ -15,9 +14,7 @@ import { ViewLoanComponent } from './view-loan/view-loan.component';
|
||||
CoreModule,
|
||||
CommonModule,
|
||||
ClientsRoutingModule,
|
||||
ArchwizardModule,
|
||||
NgbModule
|
||||
|
||||
ArchwizardModule
|
||||
],
|
||||
declarations: [
|
||||
ClientsComponent,
|
||||
|
||||
@@ -3,7 +3,6 @@ import { CommonModule } from '@angular/common';
|
||||
import { HTTP_INTERCEPTORS, HttpClient, HttpClientModule } from '@angular/common/http';
|
||||
import { RouteReuseStrategy, RouterModule } from '@angular/router';
|
||||
import { TranslateModule } from '@ngx-translate/core';
|
||||
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
|
||||
|
||||
import { ShellComponent } from './shell/shell.component';
|
||||
import { HeaderComponent } from './shell/header/header.component';
|
||||
@@ -22,7 +21,6 @@ import { CacheInterceptor } from './http/cache.interceptor';
|
||||
CommonModule,
|
||||
HttpClientModule,
|
||||
TranslateModule,
|
||||
NgbModule,
|
||||
RouterModule
|
||||
],
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
|
||||
import { HttpEvent, HttpInterceptor, HttpHandler, HttpRequest } from '@angular/common/http';
|
||||
import { Observable } from 'rxjs';
|
||||
|
||||
import { environment } from '@env/environment';
|
||||
import { environment } from '../../../environments/environment';
|
||||
|
||||
/**
|
||||
* Prefixes all requests with `environment.serverUrl`.
|
||||
|
||||
@@ -3,7 +3,7 @@ import { HttpEvent, HttpInterceptor, HttpHandler, HttpRequest } from '@angular/c
|
||||
import { Observable } from 'rxjs';
|
||||
import { catchError } from 'rxjs/operators';
|
||||
|
||||
import { environment } from '@env/environment';
|
||||
import { environment } from '../../../environments/environment';
|
||||
import { Logger } from '../logger.service';
|
||||
|
||||
const log = new Logger('ErrorHandlerInterceptor');
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { NgModule } from '@angular/core';
|
||||
import { Routes, RouterModule } from '@angular/router';
|
||||
|
||||
import { Route, extract } from '@app/core';
|
||||
import { Route, extract } from '../../app/core';
|
||||
import { HomeComponent } from './home.component';
|
||||
import { DashboardComponent } from './dashboard/dashboard.component';
|
||||
|
||||
|
||||
@@ -3,8 +3,8 @@ import { CommonModule } from '@angular/common';
|
||||
import { TranslateModule } from '@ngx-translate/core';
|
||||
import { NgxChartsModule } from '@swimlane/ngx-charts';
|
||||
|
||||
import { CoreModule } from '@app/core';
|
||||
import { SharedModule } from '@app/shared';
|
||||
import { CoreModule } from '../../app/core';
|
||||
import { SharedModule } from '../../app/shared';
|
||||
import { HomeRoutingModule } from './home-routing.module';
|
||||
import { HomeComponent } from './home.component';
|
||||
import { QuoteService } from './quote.service';
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { NgModule } from '@angular/core';
|
||||
import { Routes, RouterModule } from '@angular/router';
|
||||
|
||||
import { extract } from '@app/core';
|
||||
import { extract } from '../../app/core';
|
||||
import { LoginComponent } from './login.component';
|
||||
|
||||
const routes: Routes = [
|
||||
|
||||
@@ -1,29 +1,29 @@
|
||||
@import "../../theme/theme-variables";
|
||||
@import "~bootstrap/scss/mixins/_breakpoints";
|
||||
// @import "../../theme/theme-variables";
|
||||
// @import "~bootstrap/scss/mixins/_breakpoints";
|
||||
|
||||
.login-container {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
}
|
||||
// .login-container {
|
||||
// position: absolute;
|
||||
// top: 0;
|
||||
// bottom: 0;
|
||||
// left: 0;
|
||||
// right: 0;
|
||||
// }
|
||||
|
||||
.login-box {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
width: 100%;
|
||||
min-height: 100%;
|
||||
}
|
||||
// .login-box {
|
||||
// display: flex;
|
||||
// flex-direction: column;
|
||||
// justify-content: center;
|
||||
// align-items: center;
|
||||
// width: 100%;
|
||||
// min-height: 100%;
|
||||
// }
|
||||
|
||||
.ng-invalid.ng-touched:not(form) {
|
||||
border-left: 4px solid theme-color("danger");
|
||||
}
|
||||
// .ng-invalid.ng-touched:not(form) {
|
||||
// border-left: 4px solid theme-color("danger");
|
||||
// }
|
||||
|
||||
@include media-breakpoint-down(xs) {
|
||||
.container {
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
// @include media-breakpoint-down(xs) {
|
||||
// .container {
|
||||
// width: 100%;
|
||||
// }
|
||||
// }
|
||||
|
||||
@@ -3,8 +3,8 @@ import { Router } from '@angular/router';
|
||||
import { FormGroup, FormBuilder, Validators } from '@angular/forms';
|
||||
import { finalize } from 'rxjs/operators';
|
||||
|
||||
import { environment } from '@env/environment';
|
||||
import { Logger, I18nService, AuthenticationService } from '@app/core';
|
||||
import { environment } from '../../environments/environment';
|
||||
import { Logger, I18nService, AuthenticationService } from '../../app/core';
|
||||
|
||||
const log = new Logger('Login');
|
||||
|
||||
|
||||
@@ -2,7 +2,6 @@ import { NgModule } from '@angular/core';
|
||||
import { CommonModule } from '@angular/common';
|
||||
import { ReactiveFormsModule } from '@angular/forms';
|
||||
import { TranslateModule } from '@ngx-translate/core';
|
||||
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
|
||||
|
||||
import { LoginRoutingModule } from './login-routing.module';
|
||||
import { LoginComponent } from './login.component';
|
||||
@@ -12,7 +11,6 @@ import { LoginComponent } from './login.component';
|
||||
CommonModule,
|
||||
ReactiveFormsModule,
|
||||
TranslateModule,
|
||||
NgbModule,
|
||||
LoginRoutingModule
|
||||
],
|
||||
declarations: [
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { NgModule } from '@angular/core';
|
||||
import { Routes, RouterModule } from '@angular/router';
|
||||
|
||||
import { Route, extract } from '@app/core';
|
||||
import { Route, extract } from '../../app/core';
|
||||
import { NavigationComponent } from './navigation.component';
|
||||
|
||||
const routes: Routes = [
|
||||
|
||||
@@ -10,9 +10,9 @@
|
||||
|
||||
|
||||
|
||||
<ngb-tabset justify="center">
|
||||
<ngb-tab title="Client">
|
||||
<ng-template ngbTabContent>
|
||||
<div>
|
||||
<div>
|
||||
<ng-template>
|
||||
<div class="card col-sm-4 mx-auto">
|
||||
<table class="table table-hover table-responsive-md table-fixed">
|
||||
|
||||
@@ -85,11 +85,11 @@
|
||||
</table>
|
||||
</div>
|
||||
</ng-template>
|
||||
</ngb-tab>
|
||||
<ngb-tab>
|
||||
<ng-template ngbTabTitle>
|
||||
</div>
|
||||
<div>
|
||||
<ng-template>
|
||||
Loan</ng-template>
|
||||
<ng-template ngbTabContent>
|
||||
<ng-template>
|
||||
<div class="card col-sm-4 mx-auto">
|
||||
<table class="table table-hover table-responsive-md table-fixed">
|
||||
|
||||
@@ -147,9 +147,9 @@
|
||||
</table>
|
||||
</div>
|
||||
</ng-template>
|
||||
</ngb-tab>
|
||||
<ngb-tab title="Groups">
|
||||
<ng-template ngbTabContent>
|
||||
</div>
|
||||
<div>
|
||||
<ng-template>
|
||||
<p>Sed commodo, leo at suscipit dictum, quam est porttitor sapien, eget sodales nibh elit id diam. Nulla facilisi.
|
||||
Donec egestas ligula vitae odio interdum aliquet. Duis lectus turpis, luctus eget tincidunt eu, congue et
|
||||
odio. Duis pharetra et nisl at faucibus. Quisque luctus pulvinar arcu, et molestie lectus ultrices et. Sed
|
||||
@@ -158,7 +158,7 @@
|
||||
penatibus et magnis dis parturient montes, nascetur ridiculus mus. Mauris aliquet odio ac lorem aliquet ultricies
|
||||
in eget neque. Phasellus nec tortor vel tellus pulvinar feugiat.</p>
|
||||
</ng-template>
|
||||
</ngb-tab>
|
||||
</ngb-tabset>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
import { NgModule } from '@angular/core';
|
||||
import { CommonModule } from '@angular/common';
|
||||
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
|
||||
|
||||
import { CoreModule } from '../core/core.module';
|
||||
import { NavigationComponent } from './navigation.component';
|
||||
@@ -11,7 +10,6 @@ import { NavigationRoutingModule } from './navigation-routing.module';
|
||||
imports: [
|
||||
CoreModule,
|
||||
CommonModule,
|
||||
NgbModule,
|
||||
NavigationRoutingModule
|
||||
],
|
||||
declarations: [NavigationComponent]
|
||||
|
||||
@@ -9,17 +9,17 @@
|
||||
<div class="col-sm-12">
|
||||
<!-- <div class="form-group"> -->
|
||||
<div class="custom-control custom-radio custom-control-inline">
|
||||
<input type="radio" id="customRadio1" name="customRadio" class="custom-control-input" (change)="isCollapsed = false" [ngbCollapse]="isCollapsed" checked>
|
||||
<input type="radio" id="customRadio1" name="customRadio" class="custom-control-input" (change)="isCollapsed = false" checked>
|
||||
<label class="custom-control-label" for="customRadio1">Existing User</label>
|
||||
</div>
|
||||
<div class="custom-control custom-radio custom-control-inline">
|
||||
<input type="radio" id="customRadio2" name="customRadio" class="custom-control-input" (change)="isCollapsed = true" [ngbCollapse]="!isCollapsed">
|
||||
<input type="radio" id="customRadio2" name="customRadio" class="custom-control-input" (change)="isCollapsed = true">
|
||||
<label class="custom-control-label" for="customRadio2">New User</label>
|
||||
</div>
|
||||
<!-- </div> -->
|
||||
</div>
|
||||
</div>
|
||||
<div id="collapseExample" [ngbCollapse]="isCollapsed">
|
||||
<div id="collapseExample">
|
||||
<div class="row">
|
||||
<div class="offset-sm-1 col-sm-5 my-3">
|
||||
<select class="custom-select">
|
||||
@@ -57,7 +57,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="collapseExample" [ngbCollapse]="!isCollapsed">
|
||||
<div id="collapseExample">
|
||||
<div class="row">
|
||||
<div class="offset-sm-1 col-sm-4 my-3">
|
||||
<select class="custom-select">
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { NgModule } from '@angular/core';
|
||||
import { Routes, RouterModule } from '@angular/router';
|
||||
|
||||
import { Route, extract } from '@app/core';
|
||||
import { Route, extract } from '../../app/core';
|
||||
import { UserManagementComponent } from './user-management/user-management.component';
|
||||
import { CreateUserComponent } from './create-user/create-user.component';
|
||||
import { ViewUserComponent } from './view-user/view-user.component';
|
||||
|
||||
@@ -1,11 +1,9 @@
|
||||
import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
|
||||
import { CommonModule } from '@angular/common';
|
||||
|
||||
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
|
||||
|
||||
import { UserManagementComponent } from './user-management/user-management.component';
|
||||
import { SelfServiceRoutingModule } from './self-service-routing.module';
|
||||
import { CoreModule } from '@app/core';
|
||||
import { CoreModule } from '../../app/core';
|
||||
import { CreateUserComponent } from './create-user/create-user.component';
|
||||
import { ViewUserComponent } from './view-user/view-user.component';
|
||||
|
||||
@@ -13,8 +11,7 @@ import { ViewUserComponent } from './view-user/view-user.component';
|
||||
imports: [
|
||||
CommonModule,
|
||||
CoreModule,
|
||||
SelfServiceRoutingModule,
|
||||
NgbModule
|
||||
SelfServiceRoutingModule
|
||||
],
|
||||
declarations: [
|
||||
UserManagementComponent,
|
||||
|
||||
@@ -6,11 +6,11 @@
|
||||
<div class="row">
|
||||
<div class="col-sm-10">
|
||||
<div class="row">
|
||||
<div class="col-sm-6" [ngbCollapse]="!isCollapsed">
|
||||
<div class="col-sm-6">
|
||||
<input class="form-control mr-sm-2" placeholder="Search" type="text">
|
||||
</div>
|
||||
<div class="col-sm-2">
|
||||
<button type="button" class="btn btn-outline-primary" (click)="isCollapsed = !isCollapsed" [ngbCollapse]="!isCollapsed" [attr.aria-expanded]="!isCollapsed" aria-controls="collapseExample"><i class="fas fa-chevron-down mr-2"></i>
|
||||
<button type="button" class="btn btn-outline-primary" (click)="isCollapsed = !isCollapsed" [attr.aria-expanded]="!isCollapsed" aria-controls="collapseExample"><i class="fas fa-chevron-down mr-2"></i>
|
||||
Parameters
|
||||
</button>
|
||||
</div>
|
||||
@@ -22,7 +22,7 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div id="collapseExample" [ngbCollapse]="isCollapsed">
|
||||
<div id="collapseExample">
|
||||
<div class="row">
|
||||
<div class="col-sm-4">
|
||||
<input class="form-control mr-sm-2 mb-sm-2" placeholder="Name" type="text">
|
||||
@@ -52,7 +52,7 @@
|
||||
<button type="button" class="btn btn-outline-primary mb-sm-2">Reset</button>
|
||||
</div>
|
||||
<div class="col-sm-3">
|
||||
<button type="button" class="btn btn-outline-primary float-right mb-sm-2" (click)="isCollapsed = !isCollapsed" [ngbCollapse]="isCollapsed" [attr.aria-expanded]="!isCollapsed" aria-controls="collapseExample"><i class="fas fa-chevron-up"></i>
|
||||
<button type="button" class="btn btn-outline-primary float-right mb-sm-2" (click)="isCollapsed = !isCollapsed" [attr.aria-expanded]="!isCollapsed" aria-controls="collapseExample"><i class="fas fa-chevron-up"></i>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
@@ -94,7 +94,7 @@
|
||||
</th>
|
||||
<td>Data</td>
|
||||
<td>Data</td>
|
||||
<td><i class="fas fa-stop" style="color: #00ce00" placement="top" ngbTooltip="Active"></i></td>
|
||||
<td><i class="fas fa-stop" style="color: #00ce00" placement="top"></i></td>
|
||||
<td>Data</td>
|
||||
<td>Data</td>
|
||||
|
||||
@@ -108,7 +108,7 @@
|
||||
</th>
|
||||
<td>Data</td>
|
||||
<td>Data</td>
|
||||
<td><i class="fas fa-stop" style="color: #00ce00" placement="top" ngbTooltip="Active"></i></td>
|
||||
<td><i class="fas fa-stop" style="color: #00ce00" placement="top"></i></td>
|
||||
<td>Data</td>
|
||||
<td>Data</td>
|
||||
|
||||
@@ -122,7 +122,7 @@
|
||||
</th>
|
||||
<td>Data</td>
|
||||
<td>Data</td>
|
||||
<td><i class="fas fa-stop" style="color: #00ce00" placement="top" ngbTooltip="Active"></i></td>
|
||||
<td><i class="fas fa-stop" style="color: #00ce00" placement="top"></i></td>
|
||||
<td>Data</td>
|
||||
<td>Data</td>
|
||||
|
||||
@@ -136,7 +136,7 @@
|
||||
</th>
|
||||
<td>Data</td>
|
||||
<td>Data</td>
|
||||
<td><i class="fas fa-stop" placement="top" ngbTooltip="Inactive"></i></td>
|
||||
<td><i class="fas fa-stop" placement="top"></i></td>
|
||||
<td>Data</td>
|
||||
<td>Data</td>
|
||||
|
||||
@@ -150,7 +150,7 @@
|
||||
</th>
|
||||
<td>Data</td>
|
||||
<td>Data</td>
|
||||
<td><i class="fas fa-stop" placement="top" ngbTooltip="Inactive"></i></td>
|
||||
<td><i class="fas fa-stop" placement="top"></i></td>
|
||||
<td>Data</td>
|
||||
<td>Data</td>
|
||||
|
||||
@@ -164,7 +164,7 @@
|
||||
</th>
|
||||
<td>Data</td>
|
||||
<td>Data</td>
|
||||
<td><i class="fas fa-stop" style="color: #00ce00" placement="top" ngbTooltip="Active"></i></td>
|
||||
<td><i class="fas fa-stop" style="color: #00ce00" placement="top"></i></td>
|
||||
<td>Data</td>
|
||||
<td>Data</td>
|
||||
|
||||
@@ -177,6 +177,6 @@
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<ngb-pagination class="d-flex justify-content-center" [collectionSize]="70" [(page)]="page" [boundaryLinks]="true"></ngb-pagination>
|
||||
<!-- <ngb-pagination class="d-flex justify-content-center" [collectionSize]="70" [(page)]="page" [boundaryLinks]="true"></ngb-pagination> -->
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user