From cb6c840776dcc1bb9a39b5ffd373cf76940b949c Mon Sep 17 00:00:00 2001 From: Kyle Knight Date: Thu, 17 Nov 2016 12:16:09 -0600 Subject: [PATCH] Removing hardcoded icons and replacing with icon font (#506) --- assets/fonts/kolidecons/kolidecons.woff | Bin 9400 -> 9668 bytes .../ConfirmationPage/ConfirmationPage.jsx | 3 +- frontend/components/icons/Icon.jsx | 32 -- .../components/icons/svg/Check/Check.svg.jsx | 45 -- frontend/components/icons/svg/Check/index.js | 2 - .../icons/svg/Clipboard/Clipboard.svg.jsx | 52 --- .../icons/svg/Clipboard/_styles.scss | 11 - .../components/icons/svg/Clipboard/index.js | 1 - .../icons/svg/Envelope/Envelope.svg.jsx | 58 --- .../icons/svg/Envelope/_styles.scss | 25 - .../components/icons/svg/Envelope/index.js | 1 - .../KolideLoginBackground.svg.jsx | 432 ------------------ .../icons/svg/KolideLoginBackground/index.js | 1 - .../components/icons/svg/Lock/Lock.svg.jsx | 61 --- .../components/icons/svg/Lock/_styles.scss | 37 -- frontend/components/icons/svg/Lock/index.js | 1 - .../components/icons/svg/User/User.svg.jsx | 78 ---- .../components/icons/svg/User/_styles.scss | 14 - frontend/components/icons/svg/User/index.js | 2 - frontend/components/icons/svg/base.jsx | 32 -- frontend/components/icons/svg/base.tests.jsx | 39 -- .../ForgotPasswordPage/ForgotPasswordPage.jsx | 3 +- .../pages/ForgotPasswordPage/_styles.scss | 3 +- .../LoginSuccessfulPage.jsx | 4 +- .../pages/LoginSuccessfulPage/_styles.scss | 5 + .../pages/hosts/NewHostPage/NewHostPage.jsx | 20 +- .../hosts/NewHostPage/NewHostPage.tests.jsx | 6 +- frontend/pages/hosts/NewHostPage/_styles.scss | 6 + frontend/styles/global/_icons.scss | 4 + 29 files changed, 39 insertions(+), 939 deletions(-) delete mode 100644 frontend/components/icons/Icon.jsx delete mode 100644 frontend/components/icons/svg/Check/Check.svg.jsx delete mode 100644 frontend/components/icons/svg/Check/index.js delete mode 100644 frontend/components/icons/svg/Clipboard/Clipboard.svg.jsx delete mode 100644 frontend/components/icons/svg/Clipboard/_styles.scss delete mode 100644 frontend/components/icons/svg/Clipboard/index.js delete mode 100644 frontend/components/icons/svg/Envelope/Envelope.svg.jsx delete mode 100644 frontend/components/icons/svg/Envelope/_styles.scss delete mode 100644 frontend/components/icons/svg/Envelope/index.js delete mode 100644 frontend/components/icons/svg/KolideLoginBackground/KolideLoginBackground.svg.jsx delete mode 100644 frontend/components/icons/svg/KolideLoginBackground/index.js delete mode 100644 frontend/components/icons/svg/Lock/Lock.svg.jsx delete mode 100644 frontend/components/icons/svg/Lock/_styles.scss delete mode 100644 frontend/components/icons/svg/Lock/index.js delete mode 100644 frontend/components/icons/svg/User/User.svg.jsx delete mode 100644 frontend/components/icons/svg/User/_styles.scss delete mode 100644 frontend/components/icons/svg/User/index.js delete mode 100644 frontend/components/icons/svg/base.jsx delete mode 100644 frontend/components/icons/svg/base.tests.jsx diff --git a/assets/fonts/kolidecons/kolidecons.woff b/assets/fonts/kolidecons/kolidecons.woff index 12816f87a4b8322509a0f812393cfb4f9bd21601..034390129799c3c3778346f1de12a8892cba9ade 100644 GIT binary patch delta 7575 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 H590p-vBT~- diff --git a/frontend/components/forms/RegistrationForm/ConfirmationPage/ConfirmationPage.jsx b/frontend/components/forms/RegistrationForm/ConfirmationPage/ConfirmationPage.jsx index 47ecb1204d..e5ab98ea80 100644 --- a/frontend/components/forms/RegistrationForm/ConfirmationPage/ConfirmationPage.jsx +++ b/frontend/components/forms/RegistrationForm/ConfirmationPage/ConfirmationPage.jsx @@ -2,7 +2,6 @@ import React, { Component, PropTypes } from 'react'; import Button from 'components/buttons/Button'; import formDataInterface from 'interfaces/registration_form_data'; -import Icon from 'components/icons/Icon'; class ConfirmationPage extends Component { static propTypes = { @@ -32,7 +31,7 @@ class ConfirmationPage extends Component { return (
- + diff --git a/frontend/components/icons/Icon.jsx b/frontend/components/icons/Icon.jsx deleted file mode 100644 index 636f5d6321..0000000000 --- a/frontend/components/icons/Icon.jsx +++ /dev/null @@ -1,32 +0,0 @@ -import React, { Component, PropTypes } from 'react'; - -import Check from './svg/Check'; -import Clipboard from './svg/Clipboard'; -import Envelope from './svg/Envelope'; -import KolideLoginBackground from './svg/KolideLoginBackground'; -import Lock from './svg/Lock'; -import User from './svg/User'; - -class Icon extends Component { - static propTypes = { - name: PropTypes.string.isRequired, - className: PropTypes.string, - }; - - static iconNames = { - check: Check, - clipboard: Clipboard, - envelope: Envelope, - kolideLoginBackground: KolideLoginBackground, - lock: Lock, - user: User, - }; - - render () { - const IconComponent = Icon.iconNames[this.props.name]; - - return ; - } -} - -export default Icon; diff --git a/frontend/components/icons/svg/Check/Check.svg.jsx b/frontend/components/icons/svg/Check/Check.svg.jsx deleted file mode 100644 index 4f87e5cf37..0000000000 --- a/frontend/components/icons/svg/Check/Check.svg.jsx +++ /dev/null @@ -1,45 +0,0 @@ -import React, { Component } from 'react'; - -import base, { basePropTypes } from '../base'; - -class Check extends Component { - static propTypes = { - ...basePropTypes, - }; - - static variants = { - default: ( - - - - - - - - - - - - - ), - }; - - render () { - const { alt, style, variant, className } = this.props; - - return ( - - {Check.variants[variant]} - - ); - } -} - -export default base(Check); diff --git a/frontend/components/icons/svg/Check/index.js b/frontend/components/icons/svg/Check/index.js deleted file mode 100644 index e99fec10eb..0000000000 --- a/frontend/components/icons/svg/Check/index.js +++ /dev/null @@ -1,2 +0,0 @@ -export default from './Check.svg.jsx'; - diff --git a/frontend/components/icons/svg/Clipboard/Clipboard.svg.jsx b/frontend/components/icons/svg/Clipboard/Clipboard.svg.jsx deleted file mode 100644 index 4c2ef9aa51..0000000000 --- a/frontend/components/icons/svg/Clipboard/Clipboard.svg.jsx +++ /dev/null @@ -1,52 +0,0 @@ -import React, { Component } from 'react'; -import classnames from 'classnames'; - -import base, { basePropTypes } from '../base'; - -const baseClass = 'clipboard-svg'; - -class Envelope extends Component { - static propTypes = { - ...basePropTypes, - }; - - render () { - const { alt, onClick, style, variant, className } = this.props; - - const clipboardClasses = classnames( - baseClass, - `${baseClass}--${variant}` - ); - - return ( - - - - - - - - - - - - - - - - - - - ); - } -} - -export default base(Envelope); diff --git a/frontend/components/icons/svg/Clipboard/_styles.scss b/frontend/components/icons/svg/Clipboard/_styles.scss deleted file mode 100644 index 8388ea105f..0000000000 --- a/frontend/components/icons/svg/Clipboard/_styles.scss +++ /dev/null @@ -1,11 +0,0 @@ -.clipboard-svg { - fill: $text-dark; - - &__paper { - fill: $bg-light; - } - - &--copied { - fill: $brand-light; - } -} diff --git a/frontend/components/icons/svg/Clipboard/index.js b/frontend/components/icons/svg/Clipboard/index.js deleted file mode 100644 index 229feb70de..0000000000 --- a/frontend/components/icons/svg/Clipboard/index.js +++ /dev/null @@ -1 +0,0 @@ -export default from './Clipboard.svg.jsx'; diff --git a/frontend/components/icons/svg/Envelope/Envelope.svg.jsx b/frontend/components/icons/svg/Envelope/Envelope.svg.jsx deleted file mode 100644 index e295c0ccc9..0000000000 --- a/frontend/components/icons/svg/Envelope/Envelope.svg.jsx +++ /dev/null @@ -1,58 +0,0 @@ -import React, { Component } from 'react'; -import classnames from 'classnames'; - -import base, { basePropTypes } from '../base'; - -const baseClass = 'envelope-svg'; - -class Envelope extends Component { - static propTypes = { - ...basePropTypes, - }; - - render () { - const { alt, style, variant, className } = this.props; - - const envelopeBorderClasses = classnames( - `${baseClass}__border`, - `${baseClass}__border--${variant}` - ); - - const envelopeFillClasses = classnames( - `${baseClass}__fill`, - `${baseClass}__fill--${variant}` - ); - - return ( - - - - - - - - - - - - - - - - - - - - - ); - } -} - -export default base(Envelope); diff --git a/frontend/components/icons/svg/Envelope/_styles.scss b/frontend/components/icons/svg/Envelope/_styles.scss deleted file mode 100644 index f1d29f8817..0000000000 --- a/frontend/components/icons/svg/Envelope/_styles.scss +++ /dev/null @@ -1,25 +0,0 @@ -.envelope-svg { - &__border { - stroke: $accent-medium; - - &--colored { - stroke: $brand-light; - } - - &--error { - stroke: $alert; - } - } - - &__fill { - fill: $accent-light; - - &--colored { - fill: $brand-ultralight; - } - - &--error { - fill: $alert-light; - } - } -} diff --git a/frontend/components/icons/svg/Envelope/index.js b/frontend/components/icons/svg/Envelope/index.js deleted file mode 100644 index a7e7c9b3e9..0000000000 --- a/frontend/components/icons/svg/Envelope/index.js +++ /dev/null @@ -1 +0,0 @@ -export default from './Envelope.svg.jsx'; diff --git a/frontend/components/icons/svg/KolideLoginBackground/KolideLoginBackground.svg.jsx b/frontend/components/icons/svg/KolideLoginBackground/KolideLoginBackground.svg.jsx deleted file mode 100644 index 043d751cec..0000000000 --- a/frontend/components/icons/svg/KolideLoginBackground/KolideLoginBackground.svg.jsx +++ /dev/null @@ -1,432 +0,0 @@ -/* eslint-disable */ -import React, { Component } from 'react'; - -import base, { basePropTypes } from '../base'; - -export class KolideLoginBackground extends Component { - static propTypes = { - ...basePropTypes, - }; - - static variants = { - default: ( - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ), - }; - - render () { - const { alt, style, variant, className } = this.props; - - return ( - - {KolideLoginBackground.variants[variant]} - - ); - } -} - -export default base(KolideLoginBackground); diff --git a/frontend/components/icons/svg/KolideLoginBackground/index.js b/frontend/components/icons/svg/KolideLoginBackground/index.js deleted file mode 100644 index 06536e94b0..0000000000 --- a/frontend/components/icons/svg/KolideLoginBackground/index.js +++ /dev/null @@ -1 +0,0 @@ -export default from './KolideLoginBackground.svg.jsx'; diff --git a/frontend/components/icons/svg/Lock/Lock.svg.jsx b/frontend/components/icons/svg/Lock/Lock.svg.jsx deleted file mode 100644 index c1559dc4b4..0000000000 --- a/frontend/components/icons/svg/Lock/Lock.svg.jsx +++ /dev/null @@ -1,61 +0,0 @@ -import React, { Component } from 'react'; -import classnames from 'classnames'; - -import base, { basePropTypes } from '../base'; - -const baseClass = 'lock-svg'; - -class Lock extends Component { - static propTypes = { - ...basePropTypes, - }; - - render () { - const { alt, style, variant, className } = this.props; - - const lockBorderClasses = classnames( - `${baseClass}__border`, - `${baseClass}__border--${variant}` - ); - - const lockFill1Classes = classnames( - `${baseClass}__fill1`, - `${baseClass}__fill1--${variant}` - ); - - const lockFill2Classes = classnames( - `${baseClass}__fill2`, - `${baseClass}__fill2--${variant}` - ); - - return ( - - - - - - - - - - - - - - - - ); - } -} - -export default base(Lock); diff --git a/frontend/components/icons/svg/Lock/_styles.scss b/frontend/components/icons/svg/Lock/_styles.scss deleted file mode 100644 index cfae0356c3..0000000000 --- a/frontend/components/icons/svg/Lock/_styles.scss +++ /dev/null @@ -1,37 +0,0 @@ -.lock-svg { - &__border { - stroke: $accent-medium; - - &--colored { - stroke: $brand-light; - } - - &--error { - stroke: $alert; - } - } - - &__fill1 { - fill: $accent-light; - - &--colored { - fill: $brand-ultralight; - } - - &--error { - fill: $alert-light; - } - } - - &__fill2 { - fill: $accent-medium; - - &--colored { - fill: $brand-light; - } - - &--error { - fill: $alert; - } - } -} diff --git a/frontend/components/icons/svg/Lock/index.js b/frontend/components/icons/svg/Lock/index.js deleted file mode 100644 index 9f1390326d..0000000000 --- a/frontend/components/icons/svg/Lock/index.js +++ /dev/null @@ -1 +0,0 @@ -export default from './Lock.svg.jsx'; diff --git a/frontend/components/icons/svg/User/User.svg.jsx b/frontend/components/icons/svg/User/User.svg.jsx deleted file mode 100644 index 3cb8ac6595..0000000000 --- a/frontend/components/icons/svg/User/User.svg.jsx +++ /dev/null @@ -1,78 +0,0 @@ -import React, { Component } from 'react'; -import classnames from 'classnames'; - -import base, { basePropTypes } from '../base'; - -const baseClass = 'user-svg'; - -export class User extends Component { - static propTypes = { - ...basePropTypes, - }; - - render () { - const { alt, style, variant, className } = this.props; - - const userClasses = classnames( - `${baseClass}__border`, - `${baseClass}__border--${variant}` - ); - - if (variant === 'circle') { - return ( - - - - - - - - - - - - - - - ); - } - - return ( - - - - - - - - - - - - - - - ); - } -} - -export default base(User); diff --git a/frontend/components/icons/svg/User/_styles.scss b/frontend/components/icons/svg/User/_styles.scss deleted file mode 100644 index 9ed2913405..0000000000 --- a/frontend/components/icons/svg/User/_styles.scss +++ /dev/null @@ -1,14 +0,0 @@ -.user-svg { - stroke: $accent-medium; - fill: $accent-light; - - &--colored { - stroke: $brand-light; - fill: $brand-ultralight; - } - - &--error { - stroke: $alert; - fill: $alert-light; - } -} diff --git a/frontend/components/icons/svg/User/index.js b/frontend/components/icons/svg/User/index.js deleted file mode 100644 index 767d48dcd0..0000000000 --- a/frontend/components/icons/svg/User/index.js +++ /dev/null @@ -1,2 +0,0 @@ -export default from './User.svg.jsx'; - diff --git a/frontend/components/icons/svg/base.jsx b/frontend/components/icons/svg/base.jsx deleted file mode 100644 index 43f4530b82..0000000000 --- a/frontend/components/icons/svg/base.jsx +++ /dev/null @@ -1,32 +0,0 @@ -import React, { Component, PropTypes } from 'react'; -import { keys, noop, pick } from 'lodash'; - -export const basePropTypes = { - alt: PropTypes.string, - name: PropTypes.string, - onClick: PropTypes.func, - style: PropTypes.object, - variant: PropTypes.string, - className: PropTypes.string, -}; - -export default function (SVGComponent) { - class ComponentWrapper extends Component { - static propTypes = { - ...basePropTypes, - }; - - static defaultProps = { - onClick: noop, - variant: 'default', - className: '', - }; - - render () { - const svgProps = pick(this.props, keys(ComponentWrapper.propTypes)); - return ; - } - } - - return ComponentWrapper; -} diff --git a/frontend/components/icons/svg/base.tests.jsx b/frontend/components/icons/svg/base.tests.jsx deleted file mode 100644 index 9b6b63bad4..0000000000 --- a/frontend/components/icons/svg/base.tests.jsx +++ /dev/null @@ -1,39 +0,0 @@ -import React from 'react'; -import expect from 'expect'; -import { mount } from 'enzyme'; -import { noop } from 'lodash'; - -import base from './base'; -import { KolideLoginBackground } from './KolideLoginBackground/KolideLoginBackground.svg'; - -describe('base - svg HOC', () => { - const WrappedComponent = base(KolideLoginBackground); - const mountedComponent = mount( - - ); - - it('renders a wrapped component', () => { - expect(mountedComponent).toExist(); - }); - - it('filters out unwanted props', () => { - expect(mountedComponent.find(KolideLoginBackground).props()).toEqual({ - alt: 'image alt', - name: 'component name', - onClick: noop, - variant: 'default', - className: '', - }); - }); - - it('allows overriding the default variant prop', () => { - const Component = base(KolideLoginBackground); - const mounted = mount( - - ); - - expect(mounted.find(KolideLoginBackground).props()).toContain({ - variant: 'my variant', - }); - }); -}); diff --git a/frontend/pages/ForgotPasswordPage/ForgotPasswordPage.jsx b/frontend/pages/ForgotPasswordPage/ForgotPasswordPage.jsx index 6125859347..1fd2155d74 100644 --- a/frontend/pages/ForgotPasswordPage/ForgotPasswordPage.jsx +++ b/frontend/pages/ForgotPasswordPage/ForgotPasswordPage.jsx @@ -8,7 +8,6 @@ import { } from '../../redux/nodes/components/ForgotPasswordPage/actions'; import debounce from '../../utilities/debounce'; import ForgotPasswordForm from '../../components/forms/ForgotPasswordForm'; -import Icon from '../../components/icons/Icon'; import StackedWhiteBoxes from '../../components/StackedWhiteBoxes'; export class ForgotPasswordPage extends Component { @@ -51,7 +50,7 @@ export class ForgotPasswordPage extends Component {

- + EMAIL SENT
diff --git a/frontend/pages/ForgotPasswordPage/_styles.scss b/frontend/pages/ForgotPasswordPage/_styles.scss index 1f338ef02a..c5e39f2a1a 100644 --- a/frontend/pages/ForgotPasswordPage/_styles.scss +++ b/frontend/pages/ForgotPasswordPage/_styles.scss @@ -29,10 +29,9 @@ } &__icon { - height: 35px; + font-size: 35px; left: 18px; position: absolute; top: 14px; - width: 35px; } } diff --git a/frontend/pages/LoginSuccessfulPage/LoginSuccessfulPage.jsx b/frontend/pages/LoginSuccessfulPage/LoginSuccessfulPage.jsx index 5622c8bad5..02296f55e3 100644 --- a/frontend/pages/LoginSuccessfulPage/LoginSuccessfulPage.jsx +++ b/frontend/pages/LoginSuccessfulPage/LoginSuccessfulPage.jsx @@ -1,8 +1,6 @@ import React, { Component, PropTypes } from 'react'; import { connect } from 'react-redux'; -import Icon from '../../components/icons/Icon'; - class LoginSuccessfulPage extends Component { static propTypes = { dispatch: PropTypes.func.isRequired, @@ -12,7 +10,7 @@ class LoginSuccessfulPage extends Component { const baseClass = 'login-success'; return (
- +

Login successful

hold on to your butts...

diff --git a/frontend/pages/LoginSuccessfulPage/_styles.scss b/frontend/pages/LoginSuccessfulPage/_styles.scss index 579ac9868f..d8aa193dc0 100644 --- a/frontend/pages/LoginSuccessfulPage/_styles.scss +++ b/frontend/pages/LoginSuccessfulPage/_styles.scss @@ -24,4 +24,9 @@ font-size: $medium; color: $accent-text; } + + &__icon { + color: $success; + font-size: 100px; + } } diff --git a/frontend/pages/hosts/NewHostPage/NewHostPage.jsx b/frontend/pages/hosts/NewHostPage/NewHostPage.jsx index be5e5ef185..b739947218 100644 --- a/frontend/pages/hosts/NewHostPage/NewHostPage.jsx +++ b/frontend/pages/hosts/NewHostPage/NewHostPage.jsx @@ -4,7 +4,6 @@ import { map, noop } from 'lodash'; import classnames from 'classnames'; import { copyText } from './helpers'; -import Icon from '../../../components/icons/Icon'; import { renderFlash } from '../../../redux/nodes/notifications/actions'; const HOST_TABS = { @@ -123,6 +122,21 @@ export class NewHostPage extends Component { const { method1Text, method1TextCopied, method2Text, method2TextCopied } = this.state; const { onCopyText, renderHostTabContent, renderHostTabHeaders } = this; + const method1IconClasses = classnames('kolidecon', + 'kolidecon-clipboard', + `${baseClass}__clipboard-icon`, + { + [`${baseClass}__clipboard-icon--copied`]: method1TextCopied, + } + ); + const method2IconClasses = classnames('kolidecon', + 'kolidecon-clipboard', + `${baseClass}__clipboard-icon`, + { + [`${baseClass}__clipboard-icon--copied`]: method2TextCopied, + } + ); + return (
@@ -130,7 +144,7 @@ export class NewHostPage extends Component {
{method1TextCopied && copied!} - +
{renderHostTabHeaders()} @@ -144,7 +158,7 @@ export class NewHostPage extends Component {
{method2TextCopied && copied!} - +

This method allows you to configure an existing osqueryd installation to work with Kolide. The --config_endpoints flag allows us to point your osqueryd installation to your Kolide configuration.

diff --git a/frontend/pages/hosts/NewHostPage/NewHostPage.tests.jsx b/frontend/pages/hosts/NewHostPage/NewHostPage.tests.jsx index eadb3dff87..afb8f51a86 100644 --- a/frontend/pages/hosts/NewHostPage/NewHostPage.tests.jsx +++ b/frontend/pages/hosts/NewHostPage/NewHostPage.tests.jsx @@ -11,7 +11,7 @@ describe('New Host Page - component', () => { const page = mount( connectedComponent(ConnectedNewHostPage, { mockStore }) ); - const icon = page.find('Icon').first(); + const icon = page.find('.kolidecon-clipboard').first(); icon.simulate('click'); const dispatchedActionMessages = mockStore.getActions().map((action) => { return action.payload.message; }); @@ -20,8 +20,8 @@ describe('New Host Page - component', () => { it('saves the copied text in state', () => { const page = mount(); - const method1Icon = page.find('Icon').first(); - const method2Icon = page.find('Icon').last(); + const method1Icon = page.find('.kolidecon-clipboard').first(); + const method2Icon = page.find('.kolidecon-clipboard').last(); method1Icon.simulate('click'); diff --git a/frontend/pages/hosts/NewHostPage/_styles.scss b/frontend/pages/hosts/NewHostPage/_styles.scss index 53d950e72c..9328f3df55 100644 --- a/frontend/pages/hosts/NewHostPage/_styles.scss +++ b/frontend/pages/hosts/NewHostPage/_styles.scss @@ -48,6 +48,12 @@ right: 10px; cursor: pointer; top: 18px; + font-size: $large; + color: $text-medium; + + &--copied { + color: $brand-light; + } } &__tab-wrap { diff --git a/frontend/styles/global/_icons.scss b/frontend/styles/global/_icons.scss index d61075222f..2649fe6fdb 100644 --- a/frontend/styles/global/_icons.scss +++ b/frontend/styles/global/_icons.scss @@ -200,6 +200,10 @@ content: '\f040'; } + .kolidecon-clipboard:before { + content: '\f043'; +} + .sr-only { position: absolute;
Administrator Configuration