more web cleanup

This commit is contained in:
Eugene Pankov
2021-06-19 22:52:18 +02:00
parent 6742c77378
commit b60c36054f
25 changed files with 105 additions and 62 deletions

View File

@@ -65,7 +65,7 @@
input(type='radio', ngbButton, [value]='"publicKey"')
i.fas.fa-key
.m-0 Key
label.btn.btn-secondary(ngbButtonLabel)
label.btn.btn-secondary(ngbButtonLabel, ng:if='hostApp.platform !== Platform.Web')
input(type='radio', ngbButton, [value]='"agent"')
i.fas.fa-user-secret
.m-0 Agent
@@ -117,12 +117,12 @@
option(value='') None
option([ngValue]='x.name', *ngFor='let x of config.store.ssh.connections') {{x.name}}
.form-line
.form-line(ng:if='hostApp.platform !== Platform.Web')
.header
.title X11 forwarding
toggle([(ngModel)]='connection.x11')
.form-line
.form-line(ng:if='hostApp.platform !== Platform.Web')
.header
.title Agent forwarding
toggle([(ngModel)]='connection.agentForward')
@@ -176,7 +176,7 @@
[(ngModel)]='connection.readyTimeout',
)
.form-line(*ngIf='!connection.jumpHost')
.form-line(*ngIf='!connection.jumpHost && hostApp.platform !== Platform.Web')
.header
.title Use a proxy command
.description Command's stdin/stdout is used instead of a network connection

View File

@@ -4,7 +4,7 @@ import { NgbModal, NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
import { Observable } from 'rxjs'
import { debounceTime, distinctUntilChanged, map } from 'rxjs/operators'
import { ConfigService, PlatformService, FileProvidersService } from 'terminus-core'
import { ConfigService, PlatformService, FileProvidersService, Platform, HostAppService } from 'terminus-core'
import { PasswordStorageService } from '../services/passwordStorage.service'
import { SSHConnection, LoginScript, ForwardedPortConfig, SSHAlgorithmType, ALGORITHM_BLACKLIST } from '../api'
import { PromptModalComponent } from './promptModal.component'
@@ -15,6 +15,7 @@ import * as ALGORITHMS from 'ssh2/lib/protocol/constants'
template: require('./editConnectionModal.component.pug'),
})
export class EditConnectionModalComponent {
Platform = Platform
connection: SSHConnection
hasSavedPassword: boolean
useProxyCommand: boolean
@@ -27,6 +28,7 @@ export class EditConnectionModalComponent {
constructor (
public config: ConfigService,
public hostApp: HostAppService,
private modalInstance: NgbActiveModal,
private platform: PlatformService,
private passwordStorage: PasswordStorageService,

View File

@@ -15,7 +15,10 @@
i.fas.fa-flask
span Experimental
button.btn.btn-secondary((click)='showPortForwarding()', *ngIf='session && session.open')
button.btn.btn-secondary(
*ngIf='session && session.open && hostApp.platform !== Platform.Web',
(click)='showPortForwarding()'
)
i.fas.fa-plug
span Ports

View File

@@ -3,7 +3,7 @@ import { Spinner } from 'cli-spinner'
import { Component, Injector, HostListener } from '@angular/core'
import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
import { first } from 'rxjs/operators'
import { RecoveryToken } from 'terminus-core'
import { Platform, RecoveryToken } from 'terminus-core'
import { BaseTerminalTabComponent } from 'terminus-terminal'
import { SSHService } from '../services/ssh.service'
import { SSHConnection, SSHSession } from '../api'
@@ -18,6 +18,7 @@ import { SSHPortForwardingModalComponent } from './sshPortForwardingModal.compon
animations: BaseTerminalTabComponent.animations,
})
export class SSHTabComponent extends BaseTerminalTabComponent {
Platform = Platform
connection?: SSHConnection
session: SSHSession|null = null
sftpPanelVisible = false