From 0d718b10e647c1224630f3312ee99ee2f147673f Mon Sep 17 00:00:00 2001 From: Krzysztof Cieslak Date: Thu, 16 Aug 2018 23:59:31 +0200 Subject: [PATCH 1/2] Allow users optionaly enable time, uptime and docker plugins --- src/index.js | 6 +++--- src/lib/plugins/index.js | 10 ++++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/index.js b/src/index.js index 46b97ef..bda19a1 100644 --- a/src/index.js +++ b/src/index.js @@ -2,7 +2,7 @@ import React, { Component } from 'react' import PropTypes from 'prop-types' import HyperLine from './lib/core/hyperline' import { getColorList } from './lib/utils/colors' -import hyperlinePlugins from './lib/plugins' +import { allPlugins, defaultPlugins } from './lib/plugins' export function reduceUI(state, { type, config }) { switch (type) { @@ -50,7 +50,7 @@ function filterPluginsByConfig(plugins) { return plugins } - plugins = pluginsByName(plugins) + plugins = pluginsByName(allPlugins) const filtered = [] userPluginNames.forEach((name) => { @@ -81,7 +81,7 @@ export function decorateHyperLine(HyperLine) { } render() { - const plugins = [...this.props.plugins, ...hyperlinePlugins] + const plugins = [...this.props.plugins, ...defaultPlugins] return } diff --git a/src/lib/plugins/index.js b/src/lib/plugins/index.js index 41c8b99..827e720 100644 --- a/src/lib/plugins/index.js +++ b/src/lib/plugins/index.js @@ -1,12 +1,14 @@ import hostname from './hostname' import ip from './ip' import memory from './memory' -// Import Uptime from './uptime' +import uptime from './uptime' import cpu from './cpu' import network from './network' import battery from './battery' -// Import Time from './time' -// Import Docker from './docker' +import time from './time' +import docker from './docker' import spotify from './spotify' +// import gitStatus from './git-status' -export default [hostname, ip, memory, battery, cpu, network, spotify] +export const defaultPlugins = [hostname, ip, memory, battery, cpu, network, spotify] +export const allPlugins = [hostname, ip, memory, battery, cpu, network, spotify, time, uptime, docker] From b3adef2fbbee480e82af55edea7a1ba83aabad1b Mon Sep 17 00:00:00 2001 From: Krzysztof Cieslak Date: Thu, 16 Aug 2018 23:59:46 +0200 Subject: [PATCH 2/2] Fix uptime plugin --- src/lib/plugins/uptime.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/plugins/uptime.js b/src/lib/plugins/uptime.js index 7243f78..0a689f0 100644 --- a/src/lib/plugins/uptime.js +++ b/src/lib/plugins/uptime.js @@ -53,7 +53,7 @@ export default class Uptime extends Component { return formatUptime(os.uptime()) } - template(css) { + render() { return (
{this.state.uptime}