r
/
p5.js-web-editor
1
0
Fork 0
Code Issues 1 Pull Requests Releases 1 Wiki Activity

Migrate from React-InlineSVG to SVGR

This commit is contained in:
Cassie Tarakajian 2020-04-29 18:34:37 -04:00
parent 504cdc3fd4
commit 8bf4008c51
49 changed files with 1344 additions and 351 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
client/components/AddRemoveButton.jsx
View File

@ -1,17 +1,20 @@
import React from 'react';
import PropTypes from 'prop-types';
import InlineSVG from 'react-inlinesvg';
const addIcon = require('../images/plus.svg');
const removeIcon = require('../images/minus.svg');
import AddIcon from '../images/plus.svg';
import RemoveIcon from '../images/minus.svg';
const AddRemoveButton = ({ type, onClick }) => {
const alt = type === 'add' ? 'add to collection' : 'remove from collection';
const icon = type === 'add' ? addIcon : removeIcon;
const alt = type === 'add' ? 'Add to collection' : 'Remove from collection';
const Icon = type === 'add' ? AddIcon : RemoveIcon;
return (
<button className="overlay__close-button" onClick={onClick}>
<InlineSVG src={icon} alt={alt} />
<button
className="overlay__close-button"
onClick={onClick}
aria-label={alt}
>
<Icon focusable="false" aria-hidden="true" />
</button>
);
};

23
client/components/Nav.jsx
View File

@ -3,7 +3,6 @@ import React from 'react';
import { connect } from 'react-redux';
import { withRouter } from 'react-router';
import { Link } from 'react-router';
import InlineSVG from 'react-inlinesvg';
import classNames from 'classnames';
import * as IDEActions from '../modules/IDE/actions/ide';
import * as toastActions from '../modules/IDE/actions/toast';
@ -12,10 +11,10 @@ import { setAllAccessibleOutput } from '../modules/IDE/actions/preferences';
import { logoutUser } from '../modules/User/actions';
import { metaKeyName, } from '../utils/metaKey';
import caretLeft from '../images/left-arrow.svg';
const triangleUrl = require('../images/down-filled-triangle.svg');
const logoUrl = require('../images/p5js-logo-small.svg');
import CaretLeftIcon from '../images/left-arrow.svg';
import TriangleIcon from '../images/down-filled-triangle.svg';
import LogoIcon from '../images/p5js-logo-small.svg';
const __process = (typeof global !== 'undefined' ? global : window).process;
@ -229,11 +228,11 @@ class Nav extends React.PureComponent {
return (
<ul className="nav__items-left">
<li className="nav__item-logo">
<InlineSVG src={logoUrl} alt="p5.js logo" className="svg__logo" />
<LogoIcon title="p5.js Logo" className="svg__logo" />
</li>
<li className="nav__item nav__item--no-icon">
<Link to="/" className="nav__back-link">
<InlineSVG src={caretLeft} className="nav__back-icon" />
<CaretLeftIcon className="nav__back-icon" />
<span className="nav__item-header">
Back to Editor
</span>
@ -247,7 +246,7 @@ class Nav extends React.PureComponent {
return (
<ul className="nav__items-left">
<li className="nav__item-logo">
<InlineSVG src={logoUrl} alt="p5.js logo" className="svg__logo" />
<LogoIcon title="p5.js Logo" className="svg__logo" />
</li>
<li className={navDropdownState.file}>
<button
@ -261,7 +260,7 @@ class Nav extends React.PureComponent {
}}
>
<span className="nav__item-header">File</span>
<InlineSVG className="nav__item-header-triangle" src={triangleUrl} />
<TriangleIcon className="nav__item-header-triangle" />
</button>
<ul className="nav__dropdown">
<li className="nav__dropdown-item">
@ -363,7 +362,7 @@ class Nav extends React.PureComponent {
}}
>
<span className="nav__item-header">Edit</span>
<InlineSVG className="nav__item-header-triangle" src={triangleUrl} />
<TriangleIcon className="nav__item-header-triangle" />
</button>
<ul className="nav__dropdown" >
<li className="nav__dropdown-item">
@ -423,7 +422,7 @@ class Nav extends React.PureComponent {
}}
>
<span className="nav__item-header">Sketch</span>
<InlineSVG className="nav__item-header-triangle" src={triangleUrl} />
<TriangleIcon className="nav__item-header-triangle" />
</button>
<ul className="nav__dropdown">
<li className="nav__dropdown-item">
@ -498,7 +497,7 @@ class Nav extends React.PureComponent {
}}
>
<span className="nav__item-header">Help</span>
<InlineSVG className="nav__item-header-triangle" src={triangleUrl} />
<TriangleIcon className="nav__item-header-triangle" />
</button>
<ul className="nav__dropdown">
<li className="nav__dropdown-item">
@ -575,7 +574,7 @@ class Nav extends React.PureComponent {
}}
>
My Account
<InlineSVG className="nav__item-header-triangle" src={triangleUrl} />
<TriangleIcon className="nav__item-header-triangle" />
</button>
<ul className="nav__dropdown">
<li className="nav__dropdown-item">

9
client/components/NavBasic.jsx
View File

@ -1,9 +1,8 @@
import PropTypes from 'prop-types';
import React from 'react';
import InlineSVG from 'react-inlinesvg';
const logoUrl = require('../images/p5js-logo-small.svg');
const arrowUrl = require('../images/triangle-arrow-left.svg');
import LogoIcon from '../images/p5js-logo-small.svg';
import ArrowIcon from '../images/triangle-arrow-left.svg';
class NavBasic extends React.PureComponent {
static defaultProps = {
@ -15,13 +14,13 @@ class NavBasic extends React.PureComponent {
<nav className="nav" title="main-navigation" ref={(node) => { this.node = node; }}>
<ul className="nav__items-left">
<li className="nav__item-logo">
<InlineSVG src={logoUrl} alt="p5.js logo" className="svg__logo" />
<LogoIcon title="p5.js Logo" className="svg__logo" />
</li>
{ this.props.onBack && (
<li className="nav__item">
<button onClick={this.props.onBack}>
<span className="nav__item-header">
<InlineSVG src={arrowUrl} alt="Left arrow" />
<ArrowIcon title="Left arrow" />
</span>
Back to the editor
</button>

9
client/components/PreviewNav.jsx
View File

@ -1,16 +1,15 @@
import PropTypes from 'prop-types';
import React from 'react';
import { Link } from 'react-router';
import InlineSVG from 'react-inlinesvg';
const logoUrl = require('../images/p5js-logo-small.svg');
const editorUrl = require('../images/code.svg');
import LogoIcon from '../images/p5js-logo-small.svg';
import CodeIcon from '../images/code.svg';
const PreviewNav = ({ owner, project }) => (
<nav className="nav preview-nav">
<div className="nav__items-left">
<div className="nav__item-logo">
<InlineSVG src={logoUrl} alt="p5.js logo" className="svg__logo" />
<LogoIcon title="p5.js Logo" className="svg__logo" />
</div>
<Link className="nav__item" to={`/${owner.username}/sketches/${project.id}`}>{project.name}</Link>
<p className="toolbar__project-owner">by</p>
@ -18,7 +17,7 @@ const PreviewNav = ({ owner, project }) => (
</div>
<div className="nav__items-right">
<Link to={`/${owner.username}/sketches/${project.id}`}>
<InlineSVG className="preview-nav__editor-svg" src={editorUrl} />
<CodeIcon className="preview-nav__editor-svg" />
</Link>
</div>
</nav>

5
client/modules/App/components/Overlay.jsx
View File

@ -1,9 +1,8 @@
import PropTypes from 'prop-types';
import React from 'react';
import InlineSVG from 'react-inlinesvg';
import { browserHistory } from 'react-router';
const exitUrl = require('../../../images/exit.svg');
import ExitIcon from '../../../images/exit.svg';
class Overlay extends React.Component {
constructor(props) {
@ -82,7 +81,7 @@ class Overlay extends React.Component {
<div className="overlay__actions">
{actions}
<button className="overlay__close-button" onClick={this.close} >
<InlineSVG src={exitUrl} alt="close overlay" />
<ExitIcon title="close overlay" />
</button>
</div>
</header>

21
client/modules/IDE/components/About.jsx
View File

@ -1,10 +1,9 @@
import React from 'react';
import InlineSVG from 'react-inlinesvg';
import { Helmet } from 'react-helmet';
const squareLogoUrl = require('../../../images/p5js-square-logo.svg');
// const playUrl = require('../../../images/play.svg');
const asteriskUrl = require('../../../images/p5-asterisk.svg');
import SquareLogoIcon from '../../../images/p5js-square-logo.svg';
// import PlayIcon from '../../../images/play.svg';
import AsteriskIcon from '../../../images/p5-asterisk.svg';
function About(props) {
return (
@ -13,7 +12,7 @@ function About(props) {
<title>p5.js Web Editor | About</title>
</Helmet>
<div className="about__content-column">
<InlineSVG className="about__logo" src={squareLogoUrl} alt="p5js Square Logo" />
<SquareLogoIcon className="about__logo" title="p5.js Square Logo" />
{/* Video button to hello p5 video page */}
{/* <p className="about__play-video">
<a
@ -21,7 +20,7 @@ function About(props) {
target="_blank"
rel="noopener noreferrer"
>
<InlineSVG className="about__play-video-button" src={playUrl} alt="Play Hello Video" />
<PlayIcon className="about__play-video-button" title="Play Hello Video" />
Play hello! video</a>
</p> */}
</div>
@ -33,7 +32,7 @@ function About(props) {
target="_blank"
rel="noopener noreferrer"
>
<InlineSVG className="about__content-column-asterisk" src={asteriskUrl} alt="p5 asterisk" />
<AsteriskIcon className="about__content-column-asterisk" title="p5 asterisk" />
Examples
</a>
</p>
@ -43,7 +42,7 @@ function About(props) {
target="_blank"
rel="noopener noreferrer"
>
<InlineSVG className="about__content-column-asterisk" src={asteriskUrl} alt="p5 asterisk" />
<AsteriskIcon className="about__content-column-asterisk" title="p5 asterisk" />
Learn
</a>
</p>
@ -56,7 +55,7 @@ function About(props) {
target="_blank"
rel="noopener noreferrer"
>
<InlineSVG className="about__content-column-asterisk" src={asteriskUrl} alt="p5 asterisk" />
<AsteriskIcon className="about__content-column-asterisk" title="p5 asterisk" />
Libraries
</a>
</p>
@ -66,7 +65,7 @@ function About(props) {
target="_blank"
rel="noopener noreferrer"
>
<InlineSVG className="about__content-column-asterisk" src={asteriskUrl} alt="p5 asterisk" />
<AsteriskIcon className="about__content-column-asterisk" title="p5 asterisk" />
Reference
</a>
</p>
@ -76,7 +75,7 @@ function About(props) {
target="_blank"
rel="noopener noreferrer"
>
<InlineSVG className="about__content-column-asterisk" src={asteriskUrl} alt="p5 asterisk" />
<AsteriskIcon className="about__content-column-asterisk" title="p5 asterisk" />
Forum
</a>
</p>

5
client/modules/IDE/components/AssetList.jsx
View File

@ -5,11 +5,10 @@ import { bindActionCreators } from 'redux';
import { Link } from 'react-router';
import { Helmet } from 'react-helmet';
import prettyBytes from 'pretty-bytes';
import InlineSVG from 'react-inlinesvg';
import Loader from '../../App/components/loader';
import * as AssetActions from '../actions/assets';
import downFilledTriangle from '../../../images/down-filled-triangle.svg';
import DownFilledTriangleIcon from '../../../images/down-filled-triangle.svg';
class AssetListRowBase extends React.Component {
constructor(props) {
@ -87,7 +86,7 @@ class AssetListRowBase extends React.Component {
onBlur={this.onBlurComponent}
onFocus={this.onFocusComponent}
>
<InlineSVG src={downFilledTriangle} alt="Menu" />
<DownFilledTriangleIcon title="Menu" />
</button>
{optionsOpen &&
<ul

9
client/modules/IDE/components/CollectionList/CollectionList.jsx
View File

@ -1,7 +1,6 @@
import PropTypes from 'prop-types';
import React from 'react';
import { Helmet } from 'react-helmet';
import InlineSVG from 'react-inlinesvg';
import { connect } from 'react-redux';
import { bindActionCreators } from 'redux';
import classNames from 'classnames';
@ -19,8 +18,8 @@ import { SketchSearchbar } from '../Searchbar';
import CollectionListRow from './CollectionListRow';
const arrowUp = require('../../../../images/sort-arrow-up.svg');
const arrowDown = require('../../../../images/sort-arrow-down.svg');
import ArrowUpIcon from '../../../../images/sort-arrow-up.svg';
import ArrowDownIcon from '../../../../images/sort-arrow-down.svg';
class CollectionList extends React.Component {
constructor(props) {
@ -94,10 +93,10 @@ class CollectionList extends React.Component {
<button className="sketch-list__sort-button" onClick={() => this.props.toggleDirectionForField(fieldName)}>
<span className={headerClass}>{displayName}</span>
{field === fieldName && direction === SortingActions.DIRECTION.ASC &&
<InlineSVG src={arrowUp} />
<ArrowUpIcon />
}
{field === fieldName && direction === SortingActions.DIRECTION.DESC &&
<InlineSVG src={arrowDown} />
<ArrowDownIcon />
}
</button>
</th>

5
client/modules/IDE/components/CollectionList/CollectionListRow.jsx
View File

@ -1,7 +1,6 @@
import format from 'date-fns/format';
import PropTypes from 'prop-types';
import React from 'react';
import InlineSVG from 'react-inlinesvg';
import { connect } from 'react-redux';
import { Link } from 'react-router';
import { bindActionCreators } from 'redux';
@ -10,7 +9,7 @@ import * as CollectionsActions from '../../actions/collections';
import * as IdeActions from '../../actions/ide';
import * as ToastActions from '../../actions/toast';
const downFilledTriangle = require('../../../../images/down-filled-triangle.svg');
import DownFilledTriangleIcon from '../../../../images/down-filled-triangle.svg';
class CollectionListRowBase extends React.Component {
static projectInCollection(project, collection) {
@ -130,7 +129,7 @@ class CollectionListRowBase extends React.Component {
onBlur={this.onBlurComponent}
onFocus={this.onFocusComponent}
>
<InlineSVG src={downFilledTriangle} alt="Menu" />
<DownFilledTriangleIcon title="Menu" />
</button>
{optionsOpen &&
<ul

33
client/modules/IDE/components/Console.jsx
View File

@ -1,27 +1,26 @@
import PropTypes from 'prop-types';
import React from 'react';
import InlineSVG from 'react-inlinesvg';
import classNames from 'classnames';
import { Console as ConsoleFeed } from 'console-feed';
import {
CONSOLE_FEED_WITHOUT_ICONS, CONSOLE_FEED_LIGHT_STYLES,
CONSOLE_FEED_DARK_STYLES, CONSOLE_FEED_CONTRAST_STYLES
} from '../../../styles/components/_console-feed.scss';
import warnLightUrl from '../../../images/console-warn-light.svg';
import warnDarkUrl from '../../../images/console-warn-dark.svg';
import warnContrastUrl from '../../../images/console-warn-contrast.svg';
import errorLightUrl from '../../../images/console-error-light.svg';
import errorDarkUrl from '../../../images/console-error-dark.svg';
import errorContrastUrl from '../../../images/console-error-contrast.svg';
import debugLightUrl from '../../../images/console-debug-light.svg';
import debugDarkUrl from '../../../images/console-debug-dark.svg';
import debugContrastUrl from '../../../images/console-debug-contrast.svg';
import infoLightUrl from '../../../images/console-info-light.svg';
import infoDarkUrl from '../../../images/console-info-dark.svg';
import infoContrastUrl from '../../../images/console-info-contrast.svg';
import warnLightUrl from '../../../images/console-warn-light.svg?byUrl';
import warnDarkUrl from '../../../images/console-warn-dark.svg?byUrl';
import warnContrastUrl from '../../../images/console-warn-contrast.svg?byUrl';
import errorLightUrl from '../../../images/console-error-light.svg?byUrl';
import errorDarkUrl from '../../../images/console-error-dark.svg?byUrl';
import errorContrastUrl from '../../../images/console-error-contrast.svg?byUrl';
import debugLightUrl from '../../../images/console-debug-light.svg?byUrl';
import debugDarkUrl from '../../../images/console-debug-dark.svg?byUrl';
import debugContrastUrl from '../../../images/console-debug-contrast.svg?byUrl';
import infoLightUrl from '../../../images/console-info-light.svg?byUrl';
import infoDarkUrl from '../../../images/console-info-dark.svg?byUrl';
import infoContrastUrl from '../../../images/console-info-contrast.svg?byUrl';
const upArrowUrl = require('../../../images/up-arrow.svg');
const downArrowUrl = require('../../../images/down-arrow.svg');
import UpArrowIcon from '../../../images/up-arrow.svg';
import DownArrowIcon from '../../../images/down-arrow.svg';
class Console extends React.Component {
componentDidUpdate(prevProps) {
@ -99,10 +98,10 @@ class Console extends React.Component {
onClick={this.props.collapseConsole}
aria-label="collapse console"
>
<InlineSVG src={downArrowUrl} />
<DownArrowIcon />
</button>
<button className="preview-console__expand" onClick={this.props.expandConsole} aria-label="expand console">
<InlineSVG src={upArrowUrl} />
<UpArrowIcon />
</button>
</div>
</div>

5
client/modules/IDE/components/CopyableInput.jsx
View File

@ -1,10 +1,9 @@
import PropTypes from 'prop-types';
import React from 'react';
import Clipboard from 'clipboard';
import InlineSVG from 'react-inlinesvg';
import classNames from 'classnames';
import shareUrl from '../../../images/share.svg';
import ShareIcon from '../../../images/share.svg';
class CopyableInput extends React.Component {
constructor(props) {
@ -71,7 +70,7 @@ class CopyableInput extends React.Component {
href={value}
className="copyable-input__preview"
>
<InlineSVG src={shareUrl} alt={`open ${label} view in new tab`} />
<ShareIcon title={`open ${label} view in new tab`} />
</a>
}
</div>

9
client/modules/IDE/components/EditableInput.jsx
View File

@ -1,12 +1,7 @@
import PropTypes from 'prop-types';
import React from 'react';
import InlineSVG from 'react-inlinesvg';
const editIconUrl = require('../../../images/pencil.svg');
function EditIcon() {
return <InlineSVG className="editable-input__icon" src={editIconUrl} alt="Edit" />;
}
import EditIcon from '../../../images/pencil.svg';
function EditableInput({
validate, value, emptyPlaceholder, InputComponent, inputProps, onChange
@ -54,7 +49,7 @@ function EditableInput({
<span className={classes}>
<button className="editable-input__label" onClick={beginEditing}>
<span>{displayValue}</span>
<EditIcon />
<EditIcon className="editable-input__icon" />
</button>
<InputComponent

19
client/modules/IDE/components/Editor.jsx
View File

@ -24,7 +24,6 @@ import 'codemirror/addon/edit/matchbrackets';
import { JSHINT } from 'jshint';
import { CSSLint } from 'csslint';
import { HTMLHint } from 'htmlhint';
import InlineSVG from 'react-inlinesvg';
import classNames from 'classnames';
import { debounce } from 'lodash';
import '../../../utils/htmlmixed';
@ -36,6 +35,11 @@ import { metaKey, } from '../../../utils/metaKey';
import search from '../../../utils/codemirror-search';
import beepUrl from '../../../sounds/audioAlert.mp3';
import UnsavedChangesDotIcon from '../../../images/unsaved-changes-dot.svg';
import RightArrowIcon from '../../../images/right-arrow.svg';
import LeftArrowIcon from '../../../images/left-arrow.svg';
search(CodeMirror);
const beautifyCSS = beautifyJS.css;
@ -45,11 +49,6 @@ window.JSHINT = JSHINT;
window.CSSLint = CSSLint;
window.HTMLHint = HTMLHint;
const beepUrl = require('../../../sounds/audioAlert.mp3');
const unsavedChangesDotUrl = require('../../../images/unsaved-changes-dot.svg');
const rightArrowUrl = require('../../../images/right-arrow.svg');
const leftArrowUrl = require('../../../images/left-arrow.svg');
const IS_TAB_INDENT = false;
const INDENTATION_AMOUNT = 2;
@ -325,19 +324,21 @@ class Editor extends React.Component {
className="sidebar__contract"
onClick={this.props.collapseSidebar}
>
<InlineSVG src={leftArrowUrl} />
<LeftArrowIcon />
</button>
<button
aria-label="expand file navigation"
className="sidebar__expand"
onClick={this.props.expandSidebar}
>
<InlineSVG src={rightArrowUrl} />
<RightArrowIcon />
</button>
<div className="editor__file-name">
<span>
{this.props.file.name}
{this.props.unsavedChanges ? <InlineSVG src={unsavedChangesDotUrl} /> : null}
<span className="editor__unsaved-changes">
{this.props.unsavedChanges ? <UnsavedChangesDotIcon /> : null}
</span>
</span>
<Timer
projectSavedTime={this.props.projectSavedTime}

5
client/modules/IDE/components/Feedback.jsx
View File

@ -1,7 +1,6 @@
import React from 'react';
import InlineSVG from 'react-inlinesvg';
import { Helmet } from 'react-helmet';
import githubLogoUrl from '../../../images/github.svg';
import GitHubLogo from '../../../images/github.svg';
function Feedback(props) {
return (
@ -24,7 +23,7 @@ function Feedback(props) {
className="feedback__github-link"
>
Go to Github
<InlineSVG className="feedback__github-logo" src={githubLogoUrl} />
<GitHubLogo className="feedback__github-logo" />
</a>
</p>
</div>

17
client/modules/IDE/components/FileNode.jsx
View File

@ -2,14 +2,13 @@ import PropTypes from 'prop-types';
import React from 'react';
import { bindActionCreators } from 'redux';
import { connect } from 'react-redux';
import InlineSVG from 'react-inlinesvg';
import classNames from 'classnames';
import * as IDEActions from '../actions/ide';
import * as FileActions from '../actions/files';
import downArrowUrl from '../../../images/down-filled-triangle.svg';
import folderRightUrl from '../../../images/triangle-arrow-right.svg';
import folderDownUrl from '../../../images/triangle-arrow-down.svg';
import fileUrl from '../../../images/file.svg';
import DownArrowIcon from '../../../images/down-filled-triangle.svg';
import FolderRightIcon from '../../../images/triangle-arrow-right.svg';
import FolderDownIcon from '../../../images/triangle-arrow-down.svg';
import FileIcon from '../../../images/file.svg';
export class FileNode extends React.Component {
constructor(props) {
@ -185,7 +184,7 @@ export class FileNode extends React.Component {
<span className="file-item__spacer"></span>
{ isFile &&
<span className="sidebar__file-item-icon">
<InlineSVG src={fileUrl} />
<FileIcon />
</span>
}
{ isFolder &&
@ -194,13 +193,13 @@ export class FileNode extends React.Component {
className="sidebar__file-item-closed"
onClick={this.showFolderChildren}
>
<InlineSVG className="folder-right" src={folderRightUrl} />
<FolderRightIcon className="folder-right" />
</button>
<button
className="sidebar__file-item-open"
onClick={this.hideFolderChildren}
>
<InlineSVG className="folder-down" src={folderDownUrl} />
<FolderDownIcon className="folder-down" />
</button>
</div>
}
@ -229,7 +228,7 @@ export class FileNode extends React.Component {
onBlur={this.onBlurComponent}
onFocus={this.onFocusComponent}
>
<InlineSVG src={downArrowUrl} />
<DownArrowIcon />
</button>
<div className="sidebar__file-item-options">
<ul title="file options">

5
client/modules/IDE/components/NewFileModal.jsx
View File

@ -3,13 +3,12 @@ import React from 'react';
import { connect } from 'react-redux';
import { bindActionCreators, compose } from 'redux';
import { reduxForm } from 'redux-form';
import InlineSVG from 'react-inlinesvg';
import NewFileForm from './NewFileForm';
import { closeNewFileModal } from '../actions/ide';
import { createFile } from '../actions/files';
import { CREATE_FILE_REGEX } from '../../../../server/utils/fileUtils';
const exitUrl = require('../../../images/exit.svg');
import ExitIcon from '../../../images/exit.svg';
// At some point this will probably be generalized to a generic modal
@ -36,7 +35,7 @@ class NewFileModal extends React.Component {
<div className="modal__header">
<h2 className="modal__title">Create File</h2>
<button className="modal__exit-button" onClick={this.props.closeNewFileModal}>
<InlineSVG src={exitUrl} alt="Close New File Modal" />
<ExitIcon title="Close New File Modal" />
</button>
</div>
<NewFileForm

5
client/modules/IDE/components/NewFolderModal.jsx
View File

@ -1,10 +1,9 @@
import PropTypes from 'prop-types';
import React from 'react';
import { reduxForm } from 'redux-form';
import InlineSVG from 'react-inlinesvg';
import NewFolderForm from './NewFolderForm';
const exitUrl = require('../../../images/exit.svg');
import ExitIcon from '../../../images/exit.svg';
class NewFolderModal extends React.Component {
componentDidMount() {
@ -18,7 +17,7 @@ class NewFolderModal extends React.Component {
<div className="modal__header">
<h2 className="modal__title">Create Folder</h2>
<button className="modal__exit-button" onClick={this.props.closeModal}>
<InlineSVG src={exitUrl} alt="Close New Folder Modal" />
<ExitIcon title="Close New Folder Modal" />
</button>
</div>
<NewFolderForm {...this.props} />

11
client/modules/IDE/components/Preferences.jsx
View File

@ -1,15 +1,14 @@
import PropTypes from 'prop-types';
import React from 'react';
import InlineSVG from 'react-inlinesvg';
import { Helmet } from 'react-helmet';
import { Tab, Tabs, TabList, TabPanel } from 'react-tabs';
// import { bindActionCreators } from 'redux';
// import { connect } from 'react-redux';
// import * as PreferencesActions from '../actions/preferences';
const plusUrl = require('../../../images/plus.svg');
const minusUrl = require('../../../images/minus.svg');
const beepUrl = require('../../../sounds/audioAlert.mp3');
import PlusIcon from '../../../images/plus.svg';
import MinusIcon from '../../../images/minus.svg';
import beepUrl from '../../../sounds/audioAlert.mp3';
class Preferences extends React.Component {
constructor(props) {
@ -150,7 +149,7 @@ class Preferences extends React.Component {
aria-label="decrease font size"
disabled={this.state.fontSize <= 8}
>
<InlineSVG src={minusUrl} alt="Decrease Font Size" />
<MinusIcon title="Decrease Font Size" />
<h6 className="preference__label">Decrease</h6>
</button>
<form onSubmit={this.onFontInputSubmit}>
@ -171,7 +170,7 @@ class Preferences extends React.Component {
aria-label="increase font size"
disabled={this.state.fontSize >= 36}
>
<InlineSVG src={plusUrl} alt="Increase Font Size" />
<PlusIcon title="Increase Font Size" />
<h6 className="preference__label">Increase</h6>
</button>
</div>

11
client/modules/IDE/components/QuickAddList/Icons.jsx
View File

@ -1,9 +1,8 @@
import React from 'react';
import PropTypes from 'prop-types';
import InlineSVG from 'react-inlinesvg';
const check = require('../../../../images/check_encircled.svg');
const close = require('../../../../images/close.svg');
import CheckIcon from '../../../../images/check_encircled.svg';
import CloseIcon from '../../../../images/close.svg';
const Icons = ({ isAdded }) => {
const classes = [
@ -13,9 +12,9 @@ const Icons = ({ isAdded }) => {
return (
<div className={classes}>
<InlineSVG className="quick-add__remove-icon" src={close} alt="Remove from collection" />
<InlineSVG className="quick-add__in-icon" src={check} alt="In collection" />
<InlineSVG className="quick-add__add-icon" src={close} alt="Add to collection" />
<CloseIcon className="quick-add__remove-icon" title="Remove from collection" />
<CheckIcon className="quick-add__in-icon" title="In collection" />
<CloseIcon className="quick-add__add-icon" title="Add to collection" />
</div>
);
};

5
client/modules/IDE/components/Searchbar/Searchbar.jsx
View File

@ -1,9 +1,8 @@
import PropTypes from 'prop-types';
import React from 'react';
import InlineSVG from 'react-inlinesvg';
import { throttle } from 'lodash';
const searchIcon = require('../../../../images/magnifyingglass.svg');
import SearchIcon from '../../../../images/magnifyingglass.svg';
class Searchbar extends React.Component {
constructor(props) {
@ -46,7 +45,7 @@ class Searchbar extends React.Component {
return (
<div className={`searchbar ${searchValue === '' ? 'searchbar--is-empty' : ''}`}>
<div className="searchbar__button">
<InlineSVG className="searchbar__icon" src={searchIcon} />
<SearchIcon className="searchbar__icon" />
</div>
<input
className="searchbar__input"

5
client/modules/IDE/components/Sidebar.jsx
View File

@ -1,10 +1,9 @@
import PropTypes from 'prop-types';
import React from 'react';
import classNames from 'classnames';
import InlineSVG from 'react-inlinesvg';
import ConnectedFileNode from './FileNode';
const downArrowUrl = require('../../../images/down-filled-triangle.svg');
import DownArrowIcon from '../../../images/down-filled-triangle.svg';
class Sidebar extends React.Component {
constructor(props) {
@ -84,7 +83,7 @@ class Sidebar extends React.Component {
onBlur={this.onBlurComponent}
onFocus={this.onFocusComponent}
>
<InlineSVG src={downArrowUrl} />
<DownArrowIcon />
</button>
<ul className="sidebar__project-options">
<li>

13
client/modules/IDE/components/SketchList.jsx
View File

@ -2,7 +2,6 @@ import format from 'date-fns/format';
import PropTypes from 'prop-types';
import React from 'react';
import { Helmet } from 'react-helmet';
import InlineSVG from 'react-inlinesvg';
import { connect } from 'react-redux';
import { Link } from 'react-router';
import { bindActionCreators } from 'redux';
@ -19,9 +18,9 @@ import Loader from '../../App/components/loader';
import Overlay from '../../App/components/Overlay';
import AddToCollectionList from './AddToCollectionList';
const arrowUp = require('../../../images/sort-arrow-up.svg');
const arrowDown = require('../../../images/sort-arrow-down.svg');
const downFilledTriangle = require('../../../images/down-filled-triangle.svg');
import ArrowUpIcon from '../../../images/sort-arrow-up.svg';
import ArrowDownIcon from '../../../images/sort-arrow-down.svg';
import DownFilledTriangleIcon from '../../../images/down-filled-triangle.svg';
class SketchListRowBase extends React.Component {
constructor(props) {
@ -169,7 +168,7 @@ class SketchListRowBase extends React.Component {
onBlur={this.onBlurComponent}
onFocus={this.onFocusComponent}
>
<InlineSVG src={downFilledTriangle} alt="Menu" />
<DownFilledTriangleIcon title="Menu" />
</button>
{optionsOpen &&
<ul
@ -380,10 +379,10 @@ class SketchList extends React.Component {
<button className="sketch-list__sort-button" onClick={() => this.props.toggleDirectionForField(fieldName)}>
<span className={headerClass}>{displayName}</span>
{field === fieldName && direction === SortingActions.DIRECTION.ASC &&
<InlineSVG src={arrowUp} />
<ArrowUpIcon />
}
{field === fieldName && direction === SortingActions.DIRECTION.DESC &&
<InlineSVG src={arrowDown} />
<ArrowDownIcon />
}
</button>
</th>

5
client/modules/IDE/components/Toast.jsx
View File

@ -2,10 +2,9 @@ import PropTypes from 'prop-types';
import React from 'react';
import { bindActionCreators } from 'redux';
import { connect } from 'react-redux';
import InlineSVG from 'react-inlinesvg';
import * as ToastActions from '../actions/toast';
const exitUrl = require('../../../images/exit.svg');
import ExitIcon from '../../../images/exit.svg';
function Toast(props) {
return (
@ -14,7 +13,7 @@ function Toast(props) {
{props.text}
</p>
<button className="toast__close" onClick={props.hideToast}>
<InlineSVG src={exitUrl} alt="Close Keyboard Shortcuts Overlay" />
<ExitIcon title="Close Keyboard Shortcuts Overlay" />
</button>
</section>
);

20
client/modules/IDE/components/Toolbar.jsx
View File

@ -3,16 +3,14 @@ import React from 'react';
import { connect } from 'react-redux';
import { Link } from 'react-router';
import classNames from 'classnames';
import InlineSVG from 'react-inlinesvg';
import * as IDEActions from '../actions/ide';
import * as preferenceActions from '../actions/preferences';
import * as projectActions from '../actions/project';
const playUrl = require('../../../images/play.svg');
const stopUrl = require('../../../images/stop.svg');
const preferencesUrl = require('../../../images/preferences.svg');
const editProjectNameUrl = require('../../../images/pencil.svg');
import PlayIcon from '../../../images/play.svg';
import StopIcon from '../../../images/stop.svg';
import PreferencesIcon from '../../../images/preferences.svg';
import EditProjectNameIcon from '../../../images/pencil.svg';
class Toolbar extends React.Component {
constructor(props) {
@ -73,7 +71,7 @@ class Toolbar extends React.Component {
aria-label="play sketch"
disabled={this.props.infiniteLoop}
>
<InlineSVG src={playUrl} alt="Play Sketch" />
<PlayIcon title="Play Sketch" />
</button>
<button
className={playButtonClass}
@ -81,14 +79,14 @@ class Toolbar extends React.Component {
aria-label="play only visual sketch"
disabled={this.props.infiniteLoop}
>
<InlineSVG src={playUrl} alt="Play only visual Sketch" />
<PlayIcon title="Play only visual Sketch" />
</button>
<button
className={stopButtonClass}
onClick={this.props.stopSketch}
aria-label="stop sketch"
>
<InlineSVG src={stopUrl} alt="Stop Sketch" />
<StopIcon alt="Stop Sketch" />
</button>
<div className="toolbar__autorefresh">
<input
@ -119,7 +117,7 @@ class Toolbar extends React.Component {
<span>{this.props.project.name}</span>
{
this.canEditProjectName() &&
<InlineSVG className="toolbar__edit-name-button" src={editProjectNameUrl} alt="Edit Project Name" />
<EditProjectNameIcon className="toolbar__edit-name-button" title="Edit Project Name" />
}
</a>
<input
@ -153,7 +151,7 @@ class Toolbar extends React.Component {
onClick={this.props.openPreferences}
aria-label="preferences"
>
<InlineSVG src={preferencesUrl} alt="Preferences" />
<PreferencesIcon role="img" />
</button>
</div>
);

5
client/modules/IDE/components/UploadFileModal.jsx
View File

@ -2,11 +2,10 @@ import React from 'react';
import PropTypes from 'prop-types';
import { connect } from 'react-redux';
import { Link } from 'react-router';
import InlineSVG from 'react-inlinesvg';
import prettyBytes from 'pretty-bytes';
import FileUploader from './FileUploader';
import { getreachedTotalSizeLimit } from '../selectors/users';
import exitUrl from '../../../images/exit.svg';
import ExitIcon from '../../../images/exit.svg';
const __process = (typeof global !== 'undefined' ? global : window).process;
const limit = __process.env.UPLOAD_LIMIT || 250000000;
@ -34,7 +33,7 @@ class UploadFileModal extends React.Component {
<div className="modal__header">
<h2 className="modal__title">Upload File</h2>
<button className="modal__exit-button" onClick={this.props.closeModal}>
<InlineSVG src={exitUrl} alt="Close New File Modal" />
<ExitIcon title="Close New File Modal" />
</button>
</div>
{ this.props.reachedTotalSizeLimit &&

5
client/modules/User/components/APIKeyForm.jsx
View File

@ -1,12 +1,11 @@
import PropTypes from 'prop-types';
import React from 'react';
import InlineSVG from 'react-inlinesvg';
import CopyableInput from '../../IDE/components/CopyableInput';
import APIKeyList from './APIKeyList';
const plusIcon = require('../../../images/plus-icon.svg');
import PlusIcon from '../../../images/plus-icon.svg';
export const APIKeyPropType = PropTypes.shape({
id: PropTypes.object.isRequired,
@ -86,7 +85,7 @@ class APIKeyForm extends React.Component {
disabled={this.state.keyLabel === ''}
type="submit"
>
<InlineSVG src={plusIcon} className="api-key-form__create-icon" />
<PlusIcon className="api-key-form__create-icon" />
Create
</button>
</form>

5
client/modules/User/components/APIKeyList.jsx
View File

@ -1,13 +1,12 @@
import PropTypes from 'prop-types';
import React from 'react';
import InlineSVG from 'react-inlinesvg';
import format from 'date-fns/format';
import distanceInWordsToNow from 'date-fns/distance_in_words_to_now';
import orderBy from 'lodash/orderBy';
import { APIKeyPropType } from './APIKeyForm';
const trashCan = require('../../../images/trash-can.svg');
import TrashCanIcon from '../../../images/trash-can.svg';
function APIKeyList({ apiKeys, onRemove }) {
return (
@ -33,7 +32,7 @@ function APIKeyList({ apiKeys, onRemove }) {
<td>{lastUsed}</td>
<td className="api-key-list__action">
<button className="api-key-list__delete-button" onClick={() => onRemove(key)}>
<InlineSVG src={trashCan} alt="Delete Key" />
<TrashCanIcon title="Delete Key" />
</button>
</td>
</tr>

17
client/modules/User/components/Collection.jsx
View File

@ -2,7 +2,6 @@ import format from 'date-fns/format';
import PropTypes from 'prop-types';
import React, { useState, useRef, useEffect } from 'react';
import { Helmet } from 'react-helmet';
import InlineSVG from 'react-inlinesvg';
import { connect } from 'react-redux';
import { Link } from 'react-router';
import { bindActionCreators } from 'redux';
@ -20,11 +19,11 @@ import Overlay from '../../App/components/Overlay';
import AddToCollectionSketchList from '../../IDE/components/AddToCollectionSketchList';
import CopyableInput from '../../IDE/components/CopyableInput';
import { SketchSearchbar } from '../../IDE/components/Searchbar';
import dropdownArrow from '../../../images/down-arrow.svg';
const arrowUp = require('../../../images/sort-arrow-up.svg');
const arrowDown = require('../../../images/sort-arrow-down.svg');
const removeIcon = require('../../../images/close.svg');
import DropdownArrowIcon from '../../../images/down-arrow.svg';
import ArrowUpIcon from '../../../images/sort-arrow-up.svg';
import ArrowDownIcon from '../../../images/sort-arrow-down.svg';
import RemoveIcon from '../../../images/close.svg';
const ShareURL = ({ value }) => {
const [showURL, setShowURL] = useState(false);
@ -56,7 +55,7 @@ const ShareURL = ({ value }) => {
onClick={() => setShowURL(!showURL)}
>
<span>Share</span>
<InlineSVG className="collection-share__arrow" src={dropdownArrow} />
<DropdownArrowIcon className="collection-share__arrow" />
</button>
{ showURL &&
<div className="collection__share-dropdown">
@ -99,7 +98,7 @@ class CollectionItemRowBase extends React.Component {
className="collection-row__remove-button"
onClick={this.handleSketchRemove}
>
<InlineSVG src={removeIcon} alt="Remove" />
<RemoveIcon title="Remove" />
</button>
</td>
</tr>);
@ -307,10 +306,10 @@ class Collection extends React.Component {
<button className="sketch-list__sort-button" onClick={() => this.props.toggleDirectionForField(fieldName)}>
<span className={headerClass}>{displayName}</span>
{field === fieldName && direction === SortingActions.DIRECTION.ASC &&
<InlineSVG src={arrowUp} />
<ArrowUpIcon />
}
{field === fieldName && direction === SortingActions.DIRECTION.DESC &&
<InlineSVG src={arrowDown} />
<ArrowDownIcon />
}
</button>
</th>

5
client/modules/User/components/GithubButton.jsx
View File

@ -1,8 +1,7 @@
import InlineSVG from 'react-inlinesvg';
import PropTypes from 'prop-types';
import React from 'react';
const githubUrl = require('../../../images/github.svg');
import GithubIcon from '../../../images/github.svg';
function GithubButton(props) {
return (
@ -10,7 +9,7 @@ function GithubButton(props) {
className="github-button"
href="/auth/github"
>
<InlineSVG src={githubUrl} className="github-icon" />
<GithubIcon className="github-icon" />
<span>{props.buttonText}</span>
</a>
);

5
client/modules/User/components/GoogleButton.jsx
View File

@ -1,8 +1,7 @@
import InlineSVG from 'react-inlinesvg';
import PropTypes from 'prop-types';
import React from 'react';
import googleUrl from '../../../images/google.svg';
import GoogleIcon from '../../../images/google.svg';
function GoogleButton(props) {
return (
@ -10,7 +9,7 @@ function GoogleButton(props) {
className="google-button"
href="/auth/google/"
>
<InlineSVG src={googleUrl} className="google-icon" />
<GoogleIcon className="google-icon" />
<span>{props.buttonText}</span>
</a>
);

4
client/styles/abstracts/_mixins.scss
View File

@ -21,13 +21,13 @@
@mixin icon() {
@include themify() {
color: getThemifyVariable('icon-color');
& g, & polygon {
& g, & polygon, & path {
opacity: 1;
fill: getThemifyVariable('icon-color');
}
&:hover {
color: getThemifyVariable('icon-hover-color');
& g, & polygon {
& g, & polygon, & path {
opacity: 1;
fill: getThemifyVariable('icon-hover-color');
}

25
client/styles/abstracts/_placeholders.scss
View File

@ -5,26 +5,25 @@
width: #{44 / $base-font-size}rem;
text-align: center;
border-radius: 100%;
line-height: #{49 / $base-font-size}rem;
cursor: pointer;
border: none;
outline: none;
background-color: getThemifyVariable('toolbar-button-background-color');
color: getThemifyVariable('toolbar-button-color');
& g {
& g, & path {
fill: getThemifyVariable('toolbar-button-color');
}
&:hover {
background-color: getThemifyVariable('button-background-hover-color');
color: getThemifyVariable('button-hover-color');
& g {
& g, & path {
fill: getThemifyVariable('button-hover-color');
}
}
&--selected {
background-color: getThemifyVariable('button-background-hover-color');
& g {
& g, & path {
fill: getThemifyVariable('button-hover-color');
}
}
@ -34,12 +33,12 @@
%icon-toast{
@include themify() {
color: $toast-text-color
& g {
& g, & path {
fill: $toast-text-color
}
&:hover {
color: getThemifyVariable('icon-toast-hover-color');
& g {
& g, & path {
opacity: 1;
fill: getThemifyVariable('icon-toast-hover-color');
}
@ -59,12 +58,12 @@
%none-themify-icon-with-hover {
color: $medium-dark;
& g {
& g, & path {
fill: $medium-dark;
}
&:hover {
color: $p5js-pink;
& g {
& g, & path {
opacity: 1;
fill: $p5js-pink;
}
@ -83,7 +82,7 @@
border: 2px solid getThemifyVariable('button-border-color');
border-radius: 2px;
padding: #{10 / $base-font-size}rem #{30 / $base-font-size}rem;
& g {
& g, & path {
fill: getThemifyVariable('button-color');
opacity: 1;
}
@ -91,7 +90,7 @@
border-color: getThemifyVariable('button-background-hover-color');
background-color: getThemifyVariable('button-background-hover-color');
color: getThemifyVariable('button-hover-color');
& g {
& g, & path {
fill: getThemifyVariable('button-hover-color');
}
}
@ -99,7 +98,7 @@
border-color: getThemifyVariable('button-background-active-color');
background-color: getThemifyVariable('button-background-active-color');
color: getThemifyVariable('button-active-color');
& g {
& g, & path {
fill: getThemifyVariable('button-active-color');
}
}
@ -114,13 +113,13 @@
padding: 0;
margin-bottom: #{28 / $base-font-size}rem;
line-height: #{50 / $base-font-size}rem;
& g {
& g, & path {
fill: getThemifyVariable('modal-button-color');
}
&:enabled:hover {
background-color: getThemifyVariable('button-background-hover-color');
color: getThemifyVariable('button-hover-color');
& g {
& g, & path {
fill: getThemifyVariable('button-hover-color');
}
}

12
client/styles/abstracts/_variables.scss
View File

@ -88,8 +88,8 @@ $themes: (
nav-border-color: $middle-light,
error-color: $p5js-pink,
table-row-stripe-color: $medium-light,
codefold-icon-open: url(../images/triangle-arrow-down.svg),
codefold-icon-closed: url(../images/triangle-arrow-right.svg),
codefold-icon-open: url(../images/triangle-arrow-down.svg?byUrl),
codefold-icon-closed: url(../images/triangle-arrow-right.svg?byUrl),
primary-button-color: $lightest,
primary-button-background-color: $p5js-pink,
@ -163,8 +163,8 @@ $themes: (
nav-border-color: $middle-dark,
error-color: $p5js-pink,
table-row-stripe-color: $dark,
codefold-icon-open: url(../images/triangle-arrow-down-white.svg),
codefold-icon-closed: url(../images/triangle-arrow-right-white.svg),
codefold-icon-open: url(../images/triangle-arrow-down-white.svg?byUrl),
codefold-icon-closed: url(../images/triangle-arrow-right-white.svg?byUrl),
primary-button-color: $lightest,
primary-button-background-color: $p5js-pink,
@ -236,8 +236,8 @@ $themes: (
nav-border-color: $middle-dark,
error-color: $p5-contrast-pink,
table-row-stripe-color: $dark,
codefold-icon-open: url(../images/triangle-arrow-down-white.svg),
codefold-icon-closed: url(../images/triangle-arrow-right-white.svg),
codefold-icon-open: url(../images/triangle-arrow-down-white.svg?byUrl),
codefold-icon-closed: url(../images/triangle-arrow-right-white.svg?byUrl),
primary-button-color: $lightest,
primary-button-background-color: $p5js-pink,

6
client/styles/components/_api-key.scss
View File

@ -20,6 +20,8 @@
.api-key-form__create-icon {
display: flex;
height: #{12 / $base-font-size}rem;
margin-right: #{3 / $base-font-size}rem;
}
.api-key-form__create-button .isvg {
@ -73,7 +75,7 @@
position: initial;
left: 0;
top: 0;
& g {
& g, & path {
opacity: 1;
fill: getThemifyVariable('icon-color');
}
@ -82,7 +84,7 @@
.api-key-list__delete-button:hover {
@include themify() {
& g {
& g, & path {
opacity: 1;
fill: getThemifyVariable('icon-hover-color');
}

2
client/styles/components/_asset-list.scss
View File

@ -82,7 +82,7 @@
height:#{25 / $base-font-size}rem;
@include themify() {
& polygon {
& polygon, & path {
fill: getThemifyVariable('inactive-text-color');
}
}

8
client/styles/components/_collection.scss
View File

@ -158,12 +158,12 @@
@include icon();
@include themify() {
// icon graphic
polygon {
path {
fill: getThemifyVariable('table-button-color');
}
// icon background circle
path {
path:first-child {
fill: getThemifyVariable('table-button-background-color');
}
@ -174,11 +174,11 @@
&:hover,
&:focus {
polygon {
path {
fill: getThemifyVariable('table-button-hover-color');
}
path {
path:first-child {
fill: getThemifyVariable('table-button-background-hover-color');
}
}

6
client/styles/components/_console.scss
View File

@ -58,7 +58,8 @@
@include icon();
@include themify() {
& g,
& polygon {
& polygon,
& path {
fill: getThemifyVariable('secondary-text-color');
}
}
@ -72,7 +73,8 @@
@include icon();
@include themify() {
& g,
& polygon {
& polygon,
& path {
fill: getThemifyVariable('secondary-text-color');
}
}

2
client/styles/components/_editable-input.scss
View File

@ -30,7 +30,7 @@ button.editable-input__label {
width: 100%;
}
.editable-input__icon svg {
.editable-input__icon {
width: 1.5rem;
height: 1.5rem;
}

10
client/styles/components/_editor.scss
View File

@ -211,12 +211,12 @@ pre.CodeMirror-line {
// Previous button
.CodeMirror-search-button.prev::after {
background-image: url(../images/up-arrow.svg)
background-image: url(../images/up-arrow.svg?byUrl)
}
// Next button
.CodeMirror-search-button.next::after {
background-image: url(../images/down-arrow.svg)
background-image: url(../images/down-arrow.svg?byUrl)
}
/*
@ -247,7 +247,7 @@ pre.CodeMirror-line {
@include icon();
background: transparent url(../images/exit.svg) no-repeat;
background: transparent url(../images/exit.svg?byUrl) no-repeat;
}
// foldgutter
@ -391,3 +391,7 @@ pre.CodeMirror-line {
display: flex;
justify-content: space-between;
}
.editor__unsaved-changes {
margin-left: #{2 / $base-font-size}rem;
}

6
client/styles/components/_nav.scss
View File

@ -48,7 +48,8 @@
padding-left: #{15 / $base-font-size}rem;
}
.nav__item-header-triangle polygon {
.nav__item-header-triangle polygon,
.nav__item-header-triangle path {
@include themify() {
fill: getThemifyVariable('icon-color');
}
@ -67,7 +68,8 @@
}
}
.nav__item-header-triangle polygon {
.nav__item-header-triangle polygon,
.nav__item-header-triangle path {
@include themify() {
fill: getThemifyVariable('nav-hover-color');
}

22
client/styles/components/_quick-add.scss
View File

@ -44,12 +44,12 @@
@include icon();
@include themify() {
// icon graphic
polygon {
path {
fill: getThemifyVariable('table-button-color');
}
// icon background circle
path {
path:first-child {
fill: getThemifyVariable('table-button-background-color');
}
@ -68,15 +68,15 @@
display: inline-block;
}
.quick-add__icon--in-collection .quick-add__in-icon svg {
.quick-add__icon--in-collection .quick-add__in-icon {
@include themify() {
// icon graphic
polygon {
& path {
fill: getThemifyVariable('table-button-active-color');
}
// icon background circle
path {
& path:first-child {
fill: getThemifyVariable('table-button-background-active-color');
}
}
@ -91,14 +91,12 @@
.quick-add__item-toggle:focus {
cursor: pointer;
@include themify() {
.quick-add__icon {
polygon {
fill: getThemifyVariable('table-button-hover-color');
}
& .quick-add__icon path {
fill: getThemifyVariable('table-button-hover-color');
}
path {
fill: getThemifyVariable('table-button-background-hover-color');
}
& .quick-add__icon path:first-child {
fill: getThemifyVariable('table-button-background-hover-color');
}
}

2
client/styles/components/_searchbar.scss
View File

@ -38,6 +38,8 @@ div.searchbar__button {
height: #{27 / $base-font-size}rem;
transform: scaleX(-1);
padding-top: #{3 / $base-font-size}rem;
}
& path {
@include themify() {
fill: getThemifyVariable('input-text-color');
}

16
client/styles/components/_sidebar.scss
View File

@ -188,17 +188,17 @@
height: #{25 / $base-font-size}rem;
width: #{49 / $base-font-size}rem;
border-radius: 2px;
& svg {
height: #{25 / $base-font-size}rem;
}
display: flex;
justify-content: center;
align-items: center;
@include themify() {
background-color: getThemifyVariable("toolbar-button-background-color");
& polygon {
& polygon, & path {
fill: getThemifyVariable("toolbar-button-color");
}
&:hover {
background-color: getThemifyVariable("button-background-hover-color");
& polygon {
& polygon, & path {
fill: getThemifyVariable("button-hover-color");
}
}
@ -211,7 +211,7 @@
cursor: e-resize;
}
.sidebar--contracted & {
display: inline-block;
display: flex;
}
}
@ -236,7 +236,7 @@
.sidebar__folder-icon {
padding: #{4 / $base-font-size}rem 0;
margin-right: #{5 / $base-font-size}rem;
& g {
& path {
@include themify() {
fill: map-get($theme-map, 'primary-text-color');
}
@ -249,7 +249,7 @@
.sidebar__file-item-icon {
padding: #{4 / $base-font-size}rem 0;
margin-right: #{5 / $base-font-size}rem;
& g {
& path {
@include themify() {
fill: getThemifyVariable('secondary-text-color');
}

2
client/styles/components/_sketch-list.scss
View File

@ -96,7 +96,7 @@
width:#{25 / $base-font-size}rem;
height:#{25 / $base-font-size}rem;
@include themify() {
& polygon {
& polygon, & path {
fill: getThemifyVariable('inactive-text-color');
}
}

17
client/styles/components/_toolbar.scss
View File

@ -4,17 +4,18 @@
display: flex;
justify-content: center;
align-items: center;
padding: 0 0 0 #{3 / $base-font-size}rem;
&--selected {
@extend %toolbar-button--selected;
}
&:disabled {
cursor: auto;
& g {
& g, & path {
fill: getThemifyVariable('button-border-color');
}
&:hover {
background-color: getThemifyVariable('toolbar-button-background-color');
& g {
& g, & path {
fill: getThemifyVariable('button-border-color');
}
}
@ -42,6 +43,7 @@
justify-content: center;
align-items: center;
margin-right: #{15 / $base-font-size}rem;
padding: 0;
&--selected {
@extend %toolbar-button--selected;
}
@ -61,13 +63,11 @@
display: flex;
justify-content: center;
align-items: center;
line-height: #{52 / $base-font-size}rem;
padding: 0;
&--selected {
@extend %toolbar-button--selected;
line-height: #{52 / $base-font-size}rem;
}
}
line-height: #{52 / $base-font-size}rem;
margin-left: auto;
& span {
padding-left: #{1 / $base-font-size}rem;
@ -82,7 +82,7 @@
.toolbar__logo {
margin-right: #{30 / $base-font-size}rem;
@include themify() {
& g {
& g, & path {
fill: getThemifyVariable('logo-color');
}
}
@ -152,11 +152,8 @@
.toolbar__edit-name-button {
display: inline-block;
vertical-align: top;
width: #{18 / $base-font-size}rem;
height: #{18 / $base-font-size}rem;
& svg {
width: #{18 / $base-font-size}rem;
height: #{18 / $base-font-size}rem;
}
@include themify() {
& path {
fill: getThemifyVariable('secondary-text-color');

1188
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
package.json
View File

@ -69,6 +69,7 @@
"@babel/plugin-transform-react-inline-elements": "^7.8.3",
"@babel/preset-env": "^7.8.4",
"@babel/preset-react": "^7.8.3",
"@svgr/webpack": "^5.4.0",
"babel-core": "^7.0.0-bridge.0",
"babel-eslint": "^9.0.0",
"babel-jest": "^24.9.0",
@ -167,7 +168,6 @@
"react-dom": "^16.12.0",
"react-helmet": "^5.1.3",
"react-hot-loader": "^4.12.19",
"react-inlinesvg": "^0.7.5",
"react-redux": "^5.1.2",
"react-router": "^3.2.5",
"react-split-pane": "^0.1.89",

25
webpack/config.dev.js
View File

@ -69,7 +69,7 @@ module.exports = {
use: ['style-loader', 'css-loader', 'sass-loader']
},
{
test: /\.(svg|mp3)$/,
test: /\.(mp3)$/,
use: 'file-loader'
},
{
@ -83,9 +83,30 @@ module.exports = {
}
},
{
test: /fonts\/.*\.(eot|svg|ttf|woff|woff2)$/,
test: /fonts\/.*\.(eot|ttf|woff|woff2)$/,
use: 'file-loader'
},
{
test: /\.svg$/,
oneOf: [
{
resourceQuery: /byUrl/,
use: 'file-loader'
},
{
use: {
loader: '@svgr/webpack',
options: {
svgoConfig: {
plugins: {
removeViewBox: false
}
}
}
}
}
]
},
{
test: /_console-feed.scss/,
use: {

27
webpack/config.prod.js
View File

@ -80,10 +80,6 @@ module.exports = [{
exclude: /node_modules/,
use: 'babel-loader'
},
{
test: /\.(svg|mp3)$/,
use: 'file-loader'
},
{
test: /\.(png)$/,
use: {
@ -95,9 +91,30 @@ module.exports = [{
}
},
{
test: /fonts\/.*\.(eot|svg|ttf|woff|woff2)$/,
test: /fonts\/.*\.(mp3|eot|ttf|woff|woff2)$/,
use: 'file-loader'
},
{
test: /\.svg$/,
oneOf: [
{
resourceQuery: /byUrl/,
use: 'file-loader'
},
{
use: {
loader: '@svgr/webpack',
options: {
svgoConfig: {
plugins: {
removeViewBox: false
}
}
}
}
}
]
},
{
test: /_console-feed.scss/,
use: {