From 9aaf6700927dc3f99a63019b7764bb69b81c134a Mon Sep 17 00:00:00 2001 From: Eugene Pankov Date: Fri, 21 Dec 2018 21:37:34 +0100 Subject: [PATCH] fontawesome 5 --- app/src/entry.preload.ts | 4 +- package.json | 2 +- .../src/components/checkbox.component.pug | 4 +- .../src/components/startPage.component.pug | 4 +- .../pluginsSettingsTab.component.pug | 37 ++++++++++--------- .../src/components/settingsTab.component.pug | 14 +++---- .../editConnectionModal.component.pug | 12 +++--- .../src/components/sshModal.component.pug | 4 +- .../components/sshSettingsTab.component.pug | 8 ++-- .../src/services/passwordStorage.service.ts | 3 +- terminus-ssh/src/services/ssh.service.ts | 3 +- .../appearanceSettingsTab.component.pug | 2 +- .../components/editProfileModal.component.pug | 4 +- .../environmentEditor.component.pug | 4 +- .../components/shellSettingsTab.component.pug | 6 +-- yarn.lock | 10 ++--- 16 files changed, 61 insertions(+), 60 deletions(-) diff --git a/app/src/entry.preload.ts b/app/src/entry.preload.ts index ecbd5838..ec47a4e3 100644 --- a/app/src/entry.preload.ts +++ b/app/src/entry.preload.ts @@ -1,7 +1,9 @@ import '../lib/lru' import 'source-sans-pro' import 'source-code-pro/source-code-pro.css' -import 'font-awesome/css/font-awesome.css' +import '@fortawesome/fontawesome-free/css/solid.css' +import '@fortawesome/fontawesome-free/css/brands.css' +import '@fortawesome/fontawesome-free/css/fontawesome.css' import 'ngx-toastr/toastr.css' import './preload.scss' diff --git a/package.json b/package.json index e1785fad..8b438bd6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,7 @@ { "name": "term", "devDependencies": { + "@fortawesome/fontawesome-free": "^5.6.3", "@types/electron-config": "^0.2.1", "@types/electron-debug": "^1.1.0", "@types/fs-promise": "1.0.1", @@ -19,7 +20,6 @@ "electron-installer-snap": "^3.0.0", "electron-rebuild": "^1.8.2", "file-loader": "^1.1.11", - "font-awesome": "4.7.0", "graceful-fs": "^4.1.11", "html-loader": "0.4.4", "json-loader": "0.5.4", diff --git a/terminus-core/src/components/checkbox.component.pug b/terminus-core/src/components/checkbox.component.pug index 2a5115a6..fc25f2ae 100644 --- a/terminus-core/src/components/checkbox.component.pug +++ b/terminus-core/src/components/checkbox.component.pug @@ -1,4 +1,4 @@ .icon(tabindex='0', [class.active]='model', (keyup.space)='click()') - i.fa.fa-square-o.off - i.fa.fa-check-square.on + i.fas.fa-square.off + i.fas.fa-check-square.on .text {{text}} diff --git a/terminus-core/src/components/startPage.component.pug b/terminus-core/src/components/startPage.component.pug index 9ea99aa1..256b9096 100644 --- a/terminus-core/src/components/startPage.component.pug +++ b/terminus-core/src/components/startPage.component.pug @@ -14,10 +14,10 @@ div footer.d-flex.align-items-center .btn-group.mr-auto button.btn.btn-secondary((click)='homeBase.openGitHub()') - i.fa.fa-github + i.fab.fa-github span GitHub button.btn.btn-secondary((click)='homeBase.reportBug()') - i.fa.fa-bug + i.fas.fa-bug span Report a problem .form-control-static.selectable.no-drag Version: {{homeBase.appVersion}} diff --git a/terminus-plugin-manager/src/components/pluginsSettingsTab.component.pug b/terminus-plugin-manager/src/components/pluginsSettingsTab.component.pug index 39a91277..e8866569 100644 --- a/terminus-plugin-manager/src/components/pluginsSettingsTab.component.pug +++ b/terminus-plugin-manager/src/components/pluginsSettingsTab.component.pug @@ -2,12 +2,13 @@ strong Error in {{erroredPlugin}}: pre {{errorMessage}} -button.btn.btn-outline-info.btn-sm.pull-right((click)='openPluginsFolder()') - i.fa.fa-folder - span Plugins folder - -h3.mb-1 Installed +.d-flex + h3.mb-1 Installed + button.btn.btn-outline-info.btn-sm.ml-auto((click)='openPluginsFolder()') + i.fas.fa-folder + span Plugins folder + .list-group.list-group-flush.mt-2 .list-group-item.d-flex.align-items-center(*ngFor='let plugin of pluginManager.installedPlugins|orderBy:"name"') .mr-auto.d-flex.flex-column @@ -23,39 +24,39 @@ h3.mb-1 Installed (click)='upgradePlugin(plugin)', [disabled]='busy[plugin.name] != undefined' ) - i.fa.fa-fw.fa-arrow-up(*ngIf='busy[plugin.name] != BusyState.Installing') - i.fa.fa-fw.fa-circle-o-notch.fa-spin(*ngIf='busy[plugin.name] == BusyState.Installing') + i.fas.fa-fw.fa-arrow-up(*ngIf='busy[plugin.name] != BusyState.Installing') + i.fas.fa-fw.fa-circle-notch.fa-spin(*ngIf='busy[plugin.name] == BusyState.Installing') span Upgrade ({{knownUpgrades[plugin.name].version}}) button.btn.btn-primary.ml-2( *ngIf='config.store.pluginBlacklist.includes(plugin.name)', (click)='enablePlugin(plugin)' ) - i.fa.fa-fw.fa-play + i.fas.fa-fw.fa-play button.btn.btn-secondary.ml-2( *ngIf='!config.store.pluginBlacklist.includes(plugin.name)', (click)='disablePlugin(plugin)' ) - i.fa.fa-fw.fa-pause + i.fas.fa-fw.fa-pause button.btn.btn-danger.ml-2( (click)='uninstallPlugin(plugin)', *ngIf='!plugin.isBuiltin && npmInstalled', [disabled]='busy[plugin.name] != undefined' ) - i.fa.fa-fw.fa-trash-o(*ngIf='busy[plugin.name] != BusyState.Uninstalling') - i.fa.fa-fw.fa-circle-o-notch.fa-spin(*ngIf='busy[plugin.name] == BusyState.Uninstalling') + i.fas.fa-fw.fa-trash(*ngIf='busy[plugin.name] != BusyState.Uninstalling') + i.fas.fa-fw.fa-circle-notch.fa-spin(*ngIf='busy[plugin.name] == BusyState.Uninstalling') .text-center.mt-5(*ngIf='npmMissing') h4 npm not installed p.mb-2 npm is required to install Terminus plugins. .btn-group button.btn.btn-outline-primary((click)='downloadNPM()') - i.fa.fa-download + i.fas.fa-download span Get npm button.btn.btn-outline-info((click)='checkNPM()') - i.fa.fa-refresh + i.fas.fa-refresh span Try again div(*ngIf='npmInstalled') @@ -64,8 +65,8 @@ div(*ngIf='npmInstalled') .input-group.mb-3 .input-group-prepend .input-group-text - i.fa.fa-fw.fa-circle-o-notch.fa-spin(*ngIf='!availablePluginsReady') - i.fa.fa-fw.fa-search(*ngIf='availablePluginsReady') + i.fas.fa-fw.fa-circle-o-notch.fa-spin(*ngIf='!availablePluginsReady') + i.fas.fa-fw.fa-search(*ngIf='availablePluginsReady') input.form-control( type='text', [(ngModel)]='_1', @@ -81,12 +82,12 @@ div(*ngIf='npmInstalled') (click)='installPlugin(plugin)', [disabled]='busy[plugin.name] != undefined' ) - i.fa.fa-fw.fa-download(*ngIf='busy[plugin.name] != BusyState.Installing') - i.fa.fa-fw.fa-circle-o-notch.fa-spin(*ngIf='busy[plugin.name] == BusyState.Installing') + i.fas.fa-fw.fa-download(*ngIf='busy[plugin.name] != BusyState.Installing') + i.fas.fa-fw.fa-circle-notch.fa-spin(*ngIf='busy[plugin.name] == BusyState.Installing') div((click)='showPluginInfo(plugin)') div strong {{plugin.name}} small.text-muted.ml-1 {{plugin.version}} / {{plugin.author}} - i.fa.fa-check.text-success.ml-1(*ngIf='plugin.isOfficial', title='Official') + i.fas.fa-check.text-success.ml-1(*ngIf='plugin.isOfficial', title='Official') small.text-muted {{plugin.description}} diff --git a/terminus-settings/src/components/settingsTab.component.pug b/terminus-settings/src/components/settingsTab.component.pug index fdc073f8..27c27ec9 100644 --- a/terminus-settings/src/components/settingsTab.component.pug +++ b/terminus-settings/src/components/settingsTab.component.pug @@ -12,11 +12,11 @@ ngb-tabset.vertical(type='pills', [activeId]='activeTab') .text-muted.mr-auto {{homeBase.appVersion}} button.btn.btn-secondary.mr-3((click)='homeBase.openGitHub()') - i.fa.fa-github + i.fab.fa-github span GitHub button.btn.btn-secondary((click)='homeBase.reportBug()') - i.fa.fa-bug + i.fas.fa-bug span Report a problem .form-line(*ngIf='!isShellIntegrationInstalled') @@ -24,7 +24,7 @@ ngb-tabset.vertical(type='pills', [activeId]='activeTab') .title Shell integration .description Allows quickly opening a terminal in the selected folder button.btn.btn-primary((click)='installShellIntegration()') - i.fa.fa-check + i.fas.fa-check span Install .form-line @@ -225,7 +225,7 @@ ngb-tabset.vertical(type='pills', [activeId]='activeTab') .title Debugging button.btn.btn-secondary((click)='hostApp.openDevTools()') - i.fa.fa-bug + i.fas.fa-bug span Open DevTools .form-line @@ -254,7 +254,7 @@ ngb-tabset.vertical(type='pills', [activeId]='activeTab') .input-group.mb-4 .input-group-prepend .input-group-text - i.fa.fa-fw.fa-search + i.fas.fa-fw.fa-search input.form-control(type='search', placeholder='Search hotkeys', [(ngModel)]='hotkeyFilter') .form-group @@ -298,8 +298,8 @@ ngb-tabset.vertical(type='pills', [activeId]='activeTab') ) .mt-3 button.btn.btn-primary((click)='saveConfigFile()', *ngIf='isConfigFileValid()') - i.fa.fa-check.mr-2 + i.fas.fa-check.mr-2 | Save and apply button.btn.btn-primary(disabled, *ngIf='!isConfigFileValid()') - i.fa.fa-warning.mr-2 + i.fas.fa-exclamation-triangle.mr-2 | Invalid syntax diff --git a/terminus-ssh/src/components/editConnectionModal.component.pug b/terminus-ssh/src/components/editConnectionModal.component.pug index e2b7ce73..c9683131 100644 --- a/terminus-ssh/src/components/editConnectionModal.component.pug +++ b/terminus-ssh/src/components/editConnectionModal.component.pug @@ -56,7 +56,7 @@ ) .input-group-btn button.btn.btn-secondary((click)='selectPrivateKey()') - i.fa.fa-folder-open + i.fas.fa-folder-open ngb-tab(id='advanced') ng-template(ngbTabTitle) @@ -119,11 +119,11 @@ td .input-group.flex-nowrap button.btn.btn-outline-info.ml-0((click)='moveScriptUp(script)') - i.fa.fa-arrow-up + i.fas.fa-arrow-up button.btn.btn-outline-info.ml-0((click)='moveScriptDown(script)') - i.fa.fa-arrow-down + i.fas.fa-arrow-down button.btn.btn-outline-danger.ml-0((click)='deleteScript(script)') - i.fa.fa-trash-o + i.fas.fa-trash tr td input.form-control( @@ -148,9 +148,9 @@ td .input-group.flex-nowrap button.btn.btn-outline-info.ml-0((click)='addScript()') - i.fa.fa-check + i.fas.fa-check button.btn.btn-outline-danger.ml-0((click)='clearScript()') - i.fa.fa-trash-o + i.fas.fa-trash .modal-footer button.btn.btn-outline-primary((click)='save()') Save diff --git a/terminus-ssh/src/components/sshModal.component.pug b/terminus-ssh/src/components/sshModal.component.pug index 12581d6a..f1d97ae6 100644 --- a/terminus-ssh/src/components/sshModal.component.pug +++ b/terminus-ssh/src/components/sshModal.component.pug @@ -10,10 +10,10 @@ .list-group.mt-3(*ngIf='lastConnection') a.list-group-item.list-group-item-action.d-flex.align-items-center((click)='connect(lastConnection)') - i.fa.fa-fw.fa-history + i.fas.fa-fw.fa-history .mr-auto {{lastConnection.name}} button.btn.btn-outline-danger.btn-sm((click)='clearLastConnection(); $event.stopPropagation()') - i.fa.fa-trash-o + i.fas.fa-trash .list-group.mt-3.connections-list(*ngIf='childGroups.length') ng-container(*ngFor='let group of childGroups') diff --git a/terminus-ssh/src/components/sshSettingsTab.component.pug b/terminus-ssh/src/components/sshSettingsTab.component.pug index 830ed2d7..463c79c5 100644 --- a/terminus-ssh/src/components/sshSettingsTab.component.pug +++ b/terminus-ssh/src/components/sshSettingsTab.component.pug @@ -9,9 +9,9 @@ h3 Connections .fa.fa-fw.fa-chevron-down(*ngIf='!groupCollapsed[group.name]') span.ml-3.mr-auto {{group.name || "Ungrouped"}} button.btn.btn-outline-info.ml-2((click)='editGroup(group)') - i.fa.fa-pencil + i.fas.fa-edit button.btn.btn-outline-danger.ml-1((click)='deleteGroup(group)') - i.fa.fa-trash-o + i.fas.fa-trash ng-container(*ngIf='!groupCollapsed[group.name]') .list-group-item.list-group-item-action.pl-5.d-flex.align-items-center( *ngFor='let connection of group.connections', @@ -21,8 +21,8 @@ h3 Connections div {{connection.name}} .text-muted {{connection.host}} button.btn.btn-outline-danger.ml-1((click)='$event.stopPropagation(); deleteConnection(connection)') - i.fa.fa-trash-o + i.fas.fa-trash button.btn.btn-primary((click)='createConnection()') - i.fa.fa-fw.fa-plus + i.fas.fa-fw.fa-plus span.ml-2 Add connection diff --git a/terminus-ssh/src/services/passwordStorage.service.ts b/terminus-ssh/src/services/passwordStorage.service.ts index 7fbcbd35..56823c57 100644 --- a/terminus-ssh/src/services/passwordStorage.service.ts +++ b/terminus-ssh/src/services/passwordStorage.service.ts @@ -1,6 +1,5 @@ import { Injectable, NgZone } from '@angular/core' import { SSHConnection } from '../api' -import SSHModule from '..' let xkeychain let wincredmgr @@ -14,7 +13,7 @@ try { } } -@Injectable({ providedIn: SSHModule }) +@Injectable({ providedIn: 'root' }) export class PasswordStorageService { constructor ( private zone: NgZone, diff --git a/terminus-ssh/src/services/ssh.service.ts b/terminus-ssh/src/services/ssh.service.ts index 0abf41ab..76e46fdd 100644 --- a/terminus-ssh/src/services/ssh.service.ts +++ b/terminus-ssh/src/services/ssh.service.ts @@ -9,7 +9,6 @@ import { TerminalTabComponent } from 'terminus-terminal' import { SSHConnection, SSHSession } from '../api' import { PromptModalComponent } from '../components/promptModal.component' import { PasswordStorageService } from './passwordStorage.service' -import SSHModule from '..' const { SSH2Stream } = require('ssh2-streams') let windowsProcessTree @@ -18,7 +17,7 @@ try { } catch (e) { } // tslint:disable-line -@Injectable({ providedIn: SSHModule }) +@Injectable({ providedIn: 'root' }) export class SSHService { private logger: Logger diff --git a/terminus-terminal/src/components/appearanceSettingsTab.component.pug b/terminus-terminal/src/components/appearanceSettingsTab.component.pug index 481d32d8..8c22feb3 100644 --- a/terminus-terminal/src/components/appearanceSettingsTab.component.pug +++ b/terminus-terminal/src/components/appearanceSettingsTab.component.pug @@ -57,7 +57,7 @@ h3.mb-3 Appearance (click)='deleteScheme(config.store.terminal.colorScheme)', *ngIf='isCustomScheme(config.store.terminal.colorScheme)' ) - i.fa.fa-trash-o + i.fas.fa-trash .form-group(*ngIf='editingColorScheme') label Editing diff --git a/terminus-terminal/src/components/editProfileModal.component.pug b/terminus-terminal/src/components/editProfileModal.component.pug index 203d2965..c8eb4c49 100644 --- a/terminus-terminal/src/components/editProfileModal.component.pug +++ b/terminus-terminal/src/components/editProfileModal.component.pug @@ -25,11 +25,11 @@ ) .input-group-btn button.btn.btn-secondary((click)='profile.sessionOptions.args.splice(i, 1)') - i.fa.fa-trash-o + i.fas.fa-trash .mt-2 button.btn.btn-secondary((click)='profile.sessionOptions.args.push("")') - i.fa.fa-plus.mr-2 + i.fas.fa-plus.mr-2 | Add .form-group diff --git a/terminus-terminal/src/components/environmentEditor.component.pug b/terminus-terminal/src/components/environmentEditor.component.pug index d32af006..bc077f44 100644 --- a/terminus-terminal/src/components/environmentEditor.component.pug +++ b/terminus-terminal/src/components/environmentEditor.component.pug @@ -5,8 +5,8 @@ .input-group-text = input.form-control.w-50.mr-1([(ngModel)]='pair.value', (blur)='emitUpdate()', placeholder='Value') button.btn.btn-secondary((click)='removeEnvironmentVar(pair.key)') - i.fa.fa-trash-o + i.fas.fa-trash button.btn.btn-secondary((click)='addEnvironmentVar()') - i.fa.fa-plus.mr-2 + i.fas.fa-plus.mr-2 span Add diff --git a/terminus-terminal/src/components/shellSettingsTab.component.pug b/terminus-terminal/src/components/shellSettingsTab.component.pug index b1ebc8b4..17025e90 100644 --- a/terminus-terminal/src/components/shellSettingsTab.component.pug +++ b/terminus-terminal/src/components/shellSettingsTab.component.pug @@ -50,7 +50,7 @@ h3.mb-3 Shell ) .input-group-btn button.btn.btn-secondary((click)='pickWorkingDirectory()') - i.fa.fa-folder-open + i.fas.fa-folder-open .form-line.align-items-start .header @@ -70,11 +70,11 @@ h3.mt-3 Saved Profiles div {{profile.name}} .text-muted {{profile.sessionOptions.command}} button.btn.btn-outline-danger.ml-1((click)='$event.stopPropagation(); deleteProfile(profile)') - i.fa.fa-trash-o + i.fas.fa-trash div(ngbDropdown, placement='top-left') button.btn.btn-primary(ngbDropdownToggle) - i.fa.fa-fw.fa-plus + i.fas.fa-fw.fa-plus | New profile div(ngbDropdownMenu) button.dropdown-item(*ngFor='let shell of shells', (click)='newProfile(shell)') {{shell.name}} diff --git a/yarn.lock b/yarn.lock index 525089a4..f9115503 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12,6 +12,11 @@ resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-4.1.0.tgz#33eff662a5c39c0c2061170cc003c5120743fff0" integrity sha512-AsnBZN3a8/JcNt+KPkGGODaA4c7l3W5+WpeKgGSbstSLxqWtTXqd1ieJGBQ8IFCtRg8DmmKUcSkIkUc0A4p3YA== +"@fortawesome/fontawesome-free@^5.6.3": + version "5.6.3" + resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.6.3.tgz#61c122c420d7a91613f393d6a06e5a4c6ae6abf3" + integrity sha512-s5PLdI9NYgjBvfrv6rhirPHlAHWx+Sfo/IjsAeiXYfmemC/GSjwsyz1wLnGPazbLPXWfk62ks980o9AmsxYUEQ== + "@types/babel-types@*", "@types/babel-types@^7.0.0": version "7.0.4" resolved "https://registry.yarnpkg.com/@types/babel-types/-/babel-types-7.0.4.tgz#bfd5b0d0d1ba13e351dff65b6e52783b816826c8" @@ -2658,11 +2663,6 @@ flush-write-stream@^1.0.0: inherits "^2.0.1" readable-stream "^2.0.4" -font-awesome@4.7.0: - version "4.7.0" - resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133" - integrity sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM= - for-in@^0.1.3: version "0.1.8" resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1"