Archives
/
RTL
mirror of https://github.com/Ride-The-Lightning/RTL
2
0
Fork 0
Code Issues Releases Wiki Activity

Some more IX updates

Browse Source 
Some more IX updates
pull/260/head
Shahana Farooqui 5 years ago
parent 8f92611ebb
commit d11ae4f916
11 changed files with 73 additions and 39 deletions
Show Stats Download Patch File Download Diff File

4
angular/index.html
Unescape Escape View File

@ -9,8 +9,8 @@
<link rel="icon" type="image/png" sizes="32x32" href="assets/images/favicon/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="assets/images/favicon/favicon-16x16.png">
<link rel="manifest" href="assets/images/favicon/site.webmanifest">
<link rel="stylesheet" href="styles.5123c011b428e0af4a77.css"></head>
<link rel="stylesheet" href="styles.5f4e054d3598702b6fb0.css"></head>
<body>
<rtl-app></rtl-app>
<script src="runtime.9b2fce285f8c03dde3ad.js"></script><script src="polyfills-es5.92f4069201c83f4833ef.js" nomodule></script><script src="polyfills.5ddcccdb990eb395f306.js"></script><script src="main.831294c4c8228a1dbac5.js"></script></body>
<script src="runtime.9b2fce285f8c03dde3ad.js"></script><script src="polyfills-es5.92f4069201c83f4833ef.js" nomodule></script><script src="polyfills.5ddcccdb990eb395f306.js"></script><script src="main.a8d7c33cc661c997a839.js"></script></body>
</html>

2
angular/main.831294c4c8228a1dbac5.js → angular/main.a8d7c33cc661c997a839.js
View File

File diff suppressed because one or more lines are too long

1
angular/styles.5123c011b428e0af4a77.css
View File

File diff suppressed because one or more lines are too long

1
angular/styles.5f4e054d3598702b6fb0.css
View File

File diff suppressed because one or more lines are too long

2
src/app/lnd/home/home.component.html
Unescape Escape View File

@ -136,7 +136,7 @@
</mat-list>
</div>
<mat-progress-bar *ngIf="flgLoading[5]===true" mode="indeterminate" class="mt-minus-5"></mat-progress-bar>
<mat-divider></mat-divider>
<mat-divider></mat-divider>
</mat-card-content>
</mat-card>
</div>

6
src/app/shared/components/app-settings/app-settings.component.html
Unescape Escape View File

@ -1,6 +1,6 @@
<div fxLayout="row" class="padding-gap page-title">
<fa-icon [icon]="faTools" class="mr-1"></fa-icon>
<span>Application Settings</span>
<div fxLayout="row" class="padding-gap page-title-container">
<fa-icon [icon]="faTools" class="page-title-img mr-1"></fa-icon>
<span class="page-title">Application Settings</span>
</div>
<div fxLayout="column" class="padding-gap-x settings-container">
<mat-card>

37
src/app/shared/components/navigation/side-navigation/side-navigation.component.html
Unescape Escape View File

@ -4,12 +4,13 @@
{{node.lnNode}} ({{node.lnImplementation}})
</mat-option>
</mat-select>
<mat-tree [dataSource]="navMenus" [treeControl]="treeControlNested" *ngIf="settings.menuType !== 'compact' && settings.menuType !== 'mini'">
<mat-divider class="w-100 mb-2"></mat-divider>
<mat-tree [dataSource]="navMenus" [treeControl]="treeControlNested" *ngIf="settings.menuType === 'regular'">
<mat-tree-node *matTreeNodeDef="let node" matTreeNodeToggle routerLinkActive="active-link" routerLink="{{node.link}}">
<div (click)="onChildNavClicked(node)">
<div fxLayout="row" fxFlex="100" fxLayoutAlign="start center">
<fa-icon *ngIf="node.iconType === 'FA'" [icon]="node.icon" class="fa-icon-small mr-4"></fa-icon>
<span *ngIf="settings.menuType !== 'compact' && settings.menuType !== 'mini'">{{node.name}}</span><span
<span *ngIf="settings.menuType === 'regular'">{{node.name}}</span><span
*ngIf="node.name === 'Peers/Channels'" [matBadgeHidden]="numPendingChannels<1"
matBadge="{{numPendingChannels}}" matBadgeOverlap="false" matBadgeColor="primary"></span>
</div>
@ -32,8 +33,7 @@
</div>
</mat-nested-tree-node>
</mat-tree>
<mat-tree [dataSource]="navMenusLogout" [treeControl]="treeControlLogout"
*ngIf="settings.menuType !== 'compact' && settings.menuType !== 'mini' && showLogout">
<mat-tree [dataSource]="navMenusLogout" [treeControl]="treeControlLogout" *ngIf="settings.menuType === 'regular' && showLogout">
<mat-tree-node *matTreeNodeDef="let node" (click)="onClick(node)">
<fa-icon *ngIf="node.iconType === 'FA'" [icon]="node.icon" class="fa-icon-small mr-4" matTooltip="{{node.name}}" matTooltipPosition="right"></fa-icon>
<span>{{node.name}}</span>
@ -64,10 +64,8 @@
</div>
</mat-nested-tree-node>
</mat-tree>
<mat-tree [dataSource]="navMenusLogout" [treeControl]="treeControlLogout"
*ngIf="settings.menuType === 'compact' && showLogout">
<mat-tree-node fxLayout="row" fxLayoutAlign="start center" *matTreeNodeDef="let node"
(click)="onClick(node)">
<mat-tree [dataSource]="navMenusLogout" [treeControl]="treeControlLogout" *ngIf="settings.menuType === 'compact' && showLogout">
<mat-tree-node fxLayout="row" fxLayoutAlign="start center" *matTreeNodeDef="let node" (click)="onClick(node)">
<fa-icon *ngIf="node.iconType === 'FA'" [icon]="node.icon" class="fa-icon-small mr-1"></fa-icon>
<span>{{node.name}}</span>
</mat-tree-node>
@ -100,10 +98,29 @@
</div>
</mat-nested-tree-node>
</mat-tree>
<mat-tree [dataSource]="navMenusLogout" [treeControl]="treeControlLogout"
*ngIf="settings.menuType === 'mini' && showLogout">
<mat-tree [dataSource]="navMenusLogout" [treeControl]="treeControlLogout" *ngIf="settings.menuType === 'mini' && showLogout">
<mat-tree-node *matTreeNodeDef="let node" (click)="onClick(node)" fxLayoutAlign="start center">
<fa-icon *ngIf="node.iconType === 'FA'" [icon]="node.icon" class="fa-icon-regular" matTooltip="{{node.name}}" matTooltipPosition="right"></fa-icon>
</mat-tree-node>
</mat-tree>
<mat-divider class="w-100 mt-2"></mat-divider>
<mat-tree [dataSource]="navMenusShowData" [treeControl]="treeControlShowData" *ngIf="settings.menuType === 'regular'">
<mat-tree-node *matTreeNodeDef="let node" (click)="onShowData(node)">
<fa-icon *ngIf="node.iconType === 'FA'" [icon]="node.icon" class="fa-icon-small mr-4" matTooltip="{{node.name}}" matTooltipPosition="right"></fa-icon>
<span>{{node.name}}</span>
</mat-tree-node>
</mat-tree>
<mat-tree [dataSource]="navMenusShowData" [treeControl]="treeControlShowData" *ngIf="settings.menuType === 'compact'">
<mat-tree-node fxLayout="row" fxLayoutAlign="start center" *matTreeNodeDef="let node" (click)="onShowData(node)">
<fa-icon *ngIf="node.iconType === 'FA'" [icon]="node.icon" class="fa-icon-small mr-1"></fa-icon>
<span>{{node.name}}</span>
</mat-tree-node>
</mat-tree>
<mat-tree [dataSource]="navMenusShowData" [treeControl]="treeControlShowData" *ngIf="settings.menuType === 'mini'">
<mat-tree-node *matTreeNodeDef="let node" (click)="onShowData(node)" fxLayoutAlign="start center">
<fa-icon *ngIf="node.iconType === 'FA'" [icon]="node.icon" class="fa-icon-regular" matTooltip="{{node.name}}" matTooltipPosition="right"></fa-icon>
</mat-tree-node>
</mat-tree>
</div>

13
src/app/shared/components/navigation/side-navigation/side-navigation.component.ts
Unescape Escape View File

@ -8,7 +8,7 @@ import { environment } from '../../../../../environments/environment';
import { NestedTreeControl } from '@angular/cdk/tree';
import { MatTreeNestedDataSource } from '@angular/material/tree';
import { faEject } from '@fortawesome/free-solid-svg-icons';
import { faEject, faEye } from '@fortawesome/free-solid-svg-icons';
import { RTLConfiguration, LightningNode, Settings, GetInfoRoot } from '../../../models/RTLconfig';
import { LoggerService } from '../../../services/logger.service';
@ -28,6 +28,7 @@ import * as fromRTLReducer from '../../../../store/rtl.reducers';
export class SideNavigationComponent implements OnInit, OnDestroy {
@Output() ChildNavClicked = new EventEmitter<any>();
faEject = faEject;
faEye = faEye;
public appConfig: RTLConfiguration;
public selNode: LightningNode;
public settings: Settings;
@ -36,15 +37,18 @@ export class SideNavigationComponent implements OnInit, OnDestroy {
public informationChain: GetInfoChain = {};
public flgLoading = true;
public logoutNode = [{id: 200, parentId: 0, name: 'Logout', iconType: 'FA', icon: faEject}];
public showDataNodes = [{id: 1000, parentId: 0, name: 'Public Key', iconType: 'FA', icon: faEye}];
public showLogout = false;
public numPendingChannels = 0;
public smallScreen = false;
public childRootRoute = '';
private unSubs = [new Subject(), new Subject(), new Subject(), new Subject()];
treeControlLogout = new NestedTreeControl<MenuChildNode>(node => node.children);
treeControlNested = new NestedTreeControl<MenuChildNode>(node => node.children);
treeControlLogout = new NestedTreeControl<MenuChildNode>(node => node.children);
treeControlShowData = new NestedTreeControl<MenuChildNode>(node => node.children);
navMenus = new MatTreeNestedDataSource<MenuChildNode>();
navMenusLogout = new MatTreeNestedDataSource<MenuChildNode>();
navMenusShowData = new MatTreeNestedDataSource<MenuChildNode>();
constructor(private logger: LoggerService, private sessionService: SessionService, private store: Store<fromRTLReducer.RTLState>, private actions$: Actions, private rtlEffects: RTLEffects, private router: Router, private activatedRoute: ActivatedRoute) {
this.version = environment.VERSION;
@ -53,6 +57,7 @@ export class SideNavigationComponent implements OnInit, OnDestroy {
}
this.navMenus.data = MENU_DATA.LNDChildren;
this.navMenusLogout.data = this.logoutNode;
this.navMenusShowData.data = this.showDataNodes;
}
ngOnInit() {
@ -129,6 +134,10 @@ export class SideNavigationComponent implements OnInit, OnDestroy {
this.ChildNavClicked.emit(node);
}
onShowData(node: MenuChildNode) {
console.warn(node);
}
onNodeSelectionChange(selNodeValue: LightningNode) {
this.selNode = selNodeValue;
this.store.dispatch(new RTLActions.OpenSpinner('Updating Selected Node...'));

26
src/app/shared/models/navMenu.ts
Unescape Escape View File

@ -5,8 +5,8 @@ export const MENU_DATA: MenuRootNode = {
{id: 1, parentId: 0, name: 'Dashboard', iconType: 'FA', icon: faTachometerAlt, link: '/lnd/home'},
{id: 2, parentId: 0, name: 'On-chain', iconType: 'FA', icon: faLink, link: '/lnd/transsendreceive'},
{id: 3, parentId: 0, name: 'Lightning', iconType: 'FA', icon: faBolt, link: '/lnd/chnlmanage', children: [
{id: 31, parentId: 3, name: 'Transactions', iconType: 'FA', icon: faExchangeAlt, link: '/lnd/chnlmanage'},
{id: 32, parentId: 3, name: 'Peers/Channels', iconType: 'FA', icon: faUsers, link: '/lnd/chnlpending'},
{id: 31, parentId: 3, name: 'Peers/Channels', iconType: 'FA', icon: faUsers, link: '/lnd/chnlpending'},
{id: 32, parentId: 3, name: 'Transactions', iconType: 'FA', icon: faExchangeAlt, link: '/lnd/chnlmanage'},
{id: 33, parentId: 3, name: 'Lookup', iconType: 'FA', icon: faSearch, link: '/lnd/chnlclosed'},
{id: 34, parentId: 3, name: 'Routing', iconType: 'FA', icon: faProjectDiagram, link: '/lnd/chnlbackup'}
]},
@ -15,19 +15,17 @@ export const MENU_DATA: MenuRootNode = {
{id: 6, parentId: 0, name: 'Help', iconType: 'FA', icon: faLifeRing, link: '/help'}
],
CLChildren: [
{id: 1, parentId: 0, name: 'Home', icon: 'home', link: '/cl/home'},
{id: 2, parentId: 0, name: 'On Chain', icon: 'account_balance_wallet', link: '/cl/onchain'},
{id: 3, parentId: 0, name: 'Peers', icon: 'group', link: '/cl/peers'},
{id: 4, parentId: 0, name: 'Channels', icon: 'settings_ethernet', link: '/cl/chnlmanage'},
{id: 5, parentId: 0, name: 'Payments', icon: 'payment', link: '/cl/paymentsend', children: [
{id: 51, parentId: 5, name: 'Send', icon: 'send', link: '/cl/paymentsend'},
{id: 52, parentId: 5, name: 'Query Routes', icon: 'explore', link: '/cl/queryroutes'}
{id: 1, parentId: 0, name: 'Dashboard', iconType: 'FA', icon: faTachometerAlt, link: '/cl/home'},
{id: 2, parentId: 0, name: 'On-chain', iconType: 'FA', icon: faLink, link: '/cl/onchain'},
{id: 3, parentId: 0, name: 'Lightning', iconType: 'FA', icon: faBolt, link: '/cl/chnlmanage', children: [
{id: 31, parentId: 3, name: 'Peers/Channels', iconType: 'FA', icon: faUsers, link: '/cl/peers'},
{id: 32, parentId: 3, name: 'Transactions', iconType: 'FA', icon: faExchangeAlt, link: '/cl/chnlmanage'},
{id: 33, parentId: 3, name: 'Lookup', iconType: 'FA', icon: faSearch, link: '/cl/lookups'},
{id: 34, parentId: 3, name: 'Routing', iconType: 'FA', icon: faProjectDiagram, link: '/cl/queryroutes'}
]},
{id: 6, parentId: 0, name: 'Invoices', icon: 'receipt', link: '/cl/invoices'},
{id: 7, parentId: 0, name: 'Forwarding History', icon: 'timeline', link: '/cl/forwardinghistory'},
{id: 9, parentId: 0, name: 'Lookups', icon: 'search', link: '/cl/lookups'},
{id: 10, parentId: 0, name: 'Node Config', icon: 'perm_data_setting', link: '/sconfig'},
{id: 11, parentId: 0, name: 'Help', icon: 'help', link: '/help'}
{id: 4, parentId: 0, name: 'Advanced', iconType: 'FA', icon: faCog, link: '/sconfig'},
{id: 5, parentId: 0, name: 'Settings', iconType: 'FA', icon: faTools, link: '/settings'},
{id: 6, parentId: 0, name: 'Help', iconType: 'FA', icon: faLifeRing, link: '/help'}
]
};

16
src/app/shared/theme/styles/change-theme.scss
Unescape Escape View File

@ -52,6 +52,12 @@
.selected-color {
border-color: $primary-darker;
}
.page-title-container {
& .page-title-img {
color: rgba(0, 0, 0, 0.4);
}
color: rgba(0, 0, 0, 0.6);
}
}
&.small-font {
@ -75,7 +81,7 @@
.insecure-message {
font-size: 1.2rem * 1.2;
}
.page-title {
.page-title-container {
font-size: 1.2rem * 1.1;
& .page-title-img {
width: 2rem;
@ -120,7 +126,7 @@
.insecure-message {
font-size: 1.4rem * 1.2;
}
.page-title {
.page-title-container {
font-size: 1.4rem * 1.1;
& .page-title-img {
width: 2rem;
@ -165,7 +171,7 @@
.insecure-message {
font-size: 1.6rem * 1.2;
}
.page-title {
.page-title-container {
margin-top: 0.5rem;
font-size: 1.6rem * 1.1;
& .page-title-img {
@ -228,7 +234,7 @@
}
.mat-tree-node .sidenav-img, .mat-nested-tree-node .sidenav-img, .mat-nested-tree-node-parent .sidenav-img,
.page-title .page-title-img, .horizontal-button .sidenav-img svg, svg.top-icon-small {
.page-title-container .page-title-img, .horizontal-button .sidenav-img svg, svg.top-icon-small {
fill: $foreground-color;
}
@ -266,7 +272,7 @@
color: mat-color($accent);
}
.page-title {
.page-title-container {
color: mat-color($foreground);
}

4
src/app/shared/theme/styles/root.scss
Unescape Escape View File

@ -316,6 +316,10 @@ body {
padding: 0 !important;
}
.w-100 {
width: 100% !important;
}
.mt-1px {
margin-top: 1px !important;
}

Write Preview
Loading…
Cancel
Save