{title}
-
+
+ {actions}
+
+
{children}
@@ -91,18 +96,22 @@ class Overlay extends React.Component {
Overlay.propTypes = {
children: PropTypes.element,
+ actions: PropTypes.element,
closeOverlay: PropTypes.func,
title: PropTypes.string,
ariaLabel: PropTypes.string,
- previousPath: PropTypes.string
+ previousPath: PropTypes.string,
+ isFixedHeight: PropTypes.bool,
};
Overlay.defaultProps = {
children: null,
+ actions: null,
title: 'Modal',
closeOverlay: null,
ariaLabel: 'modal',
- previousPath: '/'
+ previousPath: '/',
+ isFixedHeight: false,
};
export default Overlay;
diff --git a/client/modules/IDE/actions/collections.js b/client/modules/IDE/actions/collections.js
new file mode 100644
index 00000000..cb61dc23
--- /dev/null
+++ b/client/modules/IDE/actions/collections.js
@@ -0,0 +1,173 @@
+import axios from 'axios';
+import * as ActionTypes from '../../../constants';
+import { startLoader, stopLoader } from './loader';
+import { setToastText, showToast } from './toast';
+
+const __process = (typeof global !== 'undefined' ? global : window).process;
+const ROOT_URL = __process.env.API_URL;
+
+const TOAST_DISPLAY_TIME_MS = 1500;
+
+// eslint-disable-next-line
+export function getCollections(username) {
+ return (dispatch) => {
+ dispatch(startLoader());
+ let url;
+ if (username) {
+ url = `${ROOT_URL}/${username}/collections`;
+ } else {
+ url = `${ROOT_URL}/collections`;
+ }
+ axios.get(url, { withCredentials: true })
+ .then((response) => {
+ dispatch({
+ type: ActionTypes.SET_COLLECTIONS,
+ collections: response.data
+ });
+ dispatch(stopLoader());
+ })
+ .catch((response) => {
+ dispatch({
+ type: ActionTypes.ERROR,
+ error: response.data
+ });
+ dispatch(stopLoader());
+ });
+ };
+}
+
+export function createCollection(collection) {
+ return (dispatch) => {
+ dispatch(startLoader());
+ const url = `${ROOT_URL}/collections`;
+ return axios.post(url, collection, { withCredentials: true })
+ .then((response) => {
+ dispatch({
+ type: ActionTypes.CREATE_COLLECTION
+ });
+ dispatch(stopLoader());
+
+ const collectionName = response.data.name;
+ dispatch(setToastText(`Created "${collectionName}"`));
+ dispatch(showToast(TOAST_DISPLAY_TIME_MS));
+
+ return response.data;
+ })
+ .catch((response) => {
+ dispatch({
+ type: ActionTypes.ERROR,
+ error: response.data
+ });
+ dispatch(stopLoader());
+
+ return response.data;
+ });
+ };
+}
+
+export function addToCollection(collectionId, projectId) {
+ return (dispatch) => {
+ dispatch(startLoader());
+ const url = `${ROOT_URL}/collections/${collectionId}/${projectId}`;
+ return axios.post(url, { withCredentials: true })
+ .then((response) => {
+ dispatch({
+ type: ActionTypes.ADD_TO_COLLECTION,
+ payload: response.data
+ });
+ dispatch(stopLoader());
+
+ const collectionName = response.data.name;
+
+ dispatch(setToastText(`Added to "${collectionName}`));
+ dispatch(showToast(TOAST_DISPLAY_TIME_MS));
+
+ return response.data;
+ })
+ .catch((response) => {
+ dispatch({
+ type: ActionTypes.ERROR,
+ error: response.data
+ });
+ dispatch(stopLoader());
+
+ return response.data;
+ });
+ };
+}
+
+export function removeFromCollection(collectionId, projectId) {
+ return (dispatch) => {
+ dispatch(startLoader());
+ const url = `${ROOT_URL}/collections/${collectionId}/${projectId}`;
+ return axios.delete(url, { withCredentials: true })
+ .then((response) => {
+ dispatch({
+ type: ActionTypes.REMOVE_FROM_COLLECTION,
+ payload: response.data
+ });
+ dispatch(stopLoader());
+
+ const collectionName = response.data.name;
+
+ dispatch(setToastText(`Removed from "${collectionName}`));
+ dispatch(showToast(TOAST_DISPLAY_TIME_MS));
+
+ return response.data;
+ })
+ .catch((response) => {
+ dispatch({
+ type: ActionTypes.ERROR,
+ error: response.data
+ });
+ dispatch(stopLoader());
+
+ return response.data;
+ });
+ };
+}
+
+export function editCollection(collectionId, { name, description }) {
+ return (dispatch) => {
+ const url = `${ROOT_URL}/collections/${collectionId}`;
+ return axios.patch(url, { name, description }, { withCredentials: true })
+ .then((response) => {
+ dispatch({
+ type: ActionTypes.EDIT_COLLECTION,
+ payload: response.data
+ });
+ return response.data;
+ })
+ .catch((response) => {
+ dispatch({
+ type: ActionTypes.ERROR,
+ error: response.data
+ });
+
+ return response.data;
+ });
+ };
+}
+
+export function deleteCollection(collectionId) {
+ return (dispatch) => {
+ const url = `${ROOT_URL}/collections/${collectionId}`;
+ return axios.delete(url, { withCredentials: true })
+ .then((response) => {
+ dispatch({
+ type: ActionTypes.DELETE_COLLECTION,
+ payload: response.data,
+ collectionId,
+ });
+ return response.data;
+ })
+ .catch((response) => {
+ dispatch({
+ type: ActionTypes.ERROR,
+ error: response.data
+ });
+
+ return response.data;
+ });
+ };
+}
diff --git a/client/modules/IDE/actions/sorting.js b/client/modules/IDE/actions/sorting.js
index 8feb9b12..f28cf325 100644
--- a/client/modules/IDE/actions/sorting.js
+++ b/client/modules/IDE/actions/sorting.js
@@ -26,13 +26,14 @@ export function toggleDirectionForField(field) {
};
}
-export function setSearchTerm(searchTerm) {
+export function setSearchTerm(scope, searchTerm) {
return {
type: ActionTypes.SET_SEARCH_TERM,
- query: searchTerm
+ query: searchTerm,
+ scope,
};
}
-export function resetSearchTerm() {
- return setSearchTerm('');
+export function resetSearchTerm(scope) {
+ return setSearchTerm(scope, '');
}
diff --git a/client/modules/IDE/components/AddToCollectionList.jsx b/client/modules/IDE/components/AddToCollectionList.jsx
new file mode 100644
index 00000000..e9417d3b
--- /dev/null
+++ b/client/modules/IDE/components/AddToCollectionList.jsx
@@ -0,0 +1,165 @@
+import PropTypes from 'prop-types';
+import React from 'react';
+import { Helmet } from 'react-helmet';
+import { connect } from 'react-redux';
+import { bindActionCreators } from 'redux';
+
+import * as ProjectActions from '../actions/project';
+import * as ProjectsActions from '../actions/projects';
+import * as CollectionsActions from '../actions/collections';
+import * as ToastActions from '../actions/toast';
+import * as SortingActions from '../actions/sorting';
+import getSortedCollections from '../selectors/collections';
+import Loader from '../../App/components/loader';
+import QuickAddList from './QuickAddList';
+
+const projectInCollection = (project, collection) =>
+ collection.items.find(item => item.project.id === project.id) != null;
+
+class CollectionList extends React.Component {
+ constructor(props) {
+ super(props);
+
+ if (props.projectId) {
+ props.getProject(props.projectId);
+ }
+
+ this.props.getCollections(this.props.username);
+
+ this.state = {
+ hasLoadedData: false,
+ };
+ }
+
+ componentDidUpdate(prevProps) {
+ if (prevProps.loading === true && this.props.loading === false) {
+ // eslint-disable-next-line react/no-did-update-set-state
+ this.setState({
+ hasLoadedData: true,
+ });
+ }
+ }
+
+ getTitle() {
+ if (this.props.username === this.props.user.username) {
+ return 'p5.js Web Editor | My collections';
+ }
+ return `p5.js Web Editor | ${this.props.username}'s collections`;
+ }
+
+ handleCollectionAdd = (collection) => {
+ this.props.addToCollection(collection.id, this.props.project.id);
+ }
+
+ handleCollectionRemove = (collection) => {
+ this.props.removeFromCollection(collection.id, this.props.project.id);
+ }
+
+ render() {
+ const { collections, project } = this.props;
+ const hasCollections = collections.length > 0;
+ const collectionWithSketchStatus = collections.map(collection => ({
+ ...collection,
+ url: `/${collection.owner.username}/collections/${collection.id}`,
+ isAdded: projectInCollection(project, collection),
+ }));
+
+ let content = null;
+
+ if (this.props.loading && !this.state.hasLoadedData) {
+ content =
;
+ } else if (hasCollections) {
+ content = (
+
+ );
+ } else {
+ content = 'No collections';
+ }
+
+ return (
+
+
+ {this.getTitle()}
+
+
+ {content}
+
+ );
+ }
+}
+
+const ProjectShape = PropTypes.shape({
+ id: PropTypes.string.isRequired,
+ name: PropTypes.string.isRequired,
+ createdAt: PropTypes.string.isRequired,
+ updatedAt: PropTypes.string.isRequired,
+ user: PropTypes.shape({
+ username: PropTypes.string.isRequired
+ }).isRequired,
+});
+
+const ItemsShape = PropTypes.shape({
+ createdAt: PropTypes.string.isRequired,
+ updatedAt: PropTypes.string.isRequired,
+ project: ProjectShape
+});
+
+CollectionList.propTypes = {
+ user: PropTypes.shape({
+ username: PropTypes.string,
+ authenticated: PropTypes.bool.isRequired
+ }).isRequired,
+ projectId: PropTypes.string.isRequired,
+ getCollections: PropTypes.func.isRequired,
+ getProject: PropTypes.func.isRequired,
+ addToCollection: PropTypes.func.isRequired,
+ removeFromCollection: PropTypes.func.isRequired,
+ collections: PropTypes.arrayOf(PropTypes.shape({
+ id: PropTypes.string.isRequired,
+ name: PropTypes.string.isRequired,
+ description: PropTypes.string,
+ createdAt: PropTypes.string.isRequired,
+ updatedAt: PropTypes.string.isRequired,
+ items: PropTypes.arrayOf(ItemsShape),
+ })).isRequired,
+ username: PropTypes.string,
+ loading: PropTypes.bool.isRequired,
+ project: PropTypes.shape({
+ id: PropTypes.string,
+ owner: PropTypes.shape({
+ id: PropTypes.string
+ })
+ })
+};
+
+CollectionList.defaultProps = {
+ project: {
+ id: undefined,
+ owner: undefined
+ },
+ username: undefined
+};
+
+function mapStateToProps(state, ownProps) {
+ return {
+ user: state.user,
+ collections: getSortedCollections(state),
+ sorting: state.sorting,
+ loading: state.loading,
+ project: ownProps.project || state.project,
+ projectId: ownProps && ownProps.params ? ownProps.prams.project_id : null,
+ };
+}
+
+function mapDispatchToProps(dispatch) {
+ return bindActionCreators(
+ Object.assign({}, CollectionsActions, ProjectsActions, ProjectActions, ToastActions, SortingActions),
+ dispatch
+ );
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(CollectionList);
diff --git a/client/modules/IDE/components/AddToCollectionSketchList.jsx b/client/modules/IDE/components/AddToCollectionSketchList.jsx
new file mode 100644
index 00000000..d4173b4b
--- /dev/null
+++ b/client/modules/IDE/components/AddToCollectionSketchList.jsx
@@ -0,0 +1,137 @@
+import PropTypes from 'prop-types';
+import React from 'react';
+import { Helmet } from 'react-helmet';
+import { connect } from 'react-redux';
+import { bindActionCreators } from 'redux';
+// import find from 'lodash/find';
+import * as ProjectsActions from '../actions/projects';
+import * as CollectionsActions from '../actions/collections';
+import * as ToastActions from '../actions/toast';
+import * as SortingActions from '../actions/sorting';
+import getSortedSketches from '../selectors/projects';
+import Loader from '../../App/components/loader';
+import QuickAddList from './QuickAddList';
+
+class SketchList extends React.Component {
+ constructor(props) {
+ super(props);
+ this.props.getProjects(this.props.username);
+
+ this.state = {
+ isInitialDataLoad: true,
+ };
+ }
+
+ componentWillReceiveProps(nextProps) {
+ if (this.props.sketches !== nextProps.sketches && Array.isArray(nextProps.sketches)) {
+ this.setState({
+ isInitialDataLoad: false,
+ });
+ }
+ }
+
+ getSketchesTitle() {
+ if (this.props.username === this.props.user.username) {
+ return 'p5.js Web Editor | My sketches';
+ }
+ return `p5.js Web Editor | ${this.props.username}'s sketches`;
+ }
+
+ handleCollectionAdd = (sketch) => {
+ this.props.addToCollection(this.props.collection.id, sketch.id);
+ }
+
+ handleCollectionRemove = (sketch) => {
+ this.props.removeFromCollection(this.props.collection.id, sketch.id);
+ }
+
+ inCollection = sketch => this.props.collection.items.find(item => item.project.id === sketch.id) != null
+
+ render() {
+ const hasSketches = this.props.sketches.length > 0;
+ const sketchesWithAddedStatus = this.props.sketches.map(sketch => ({
+ ...sketch,
+ isAdded: this.inCollection(sketch),
+ url: `/${this.props.username}/sketches/${sketch.id}`,
+ }));
+
+ let content = null;
+
+ if (this.props.loading && this.state.isInitialDataLoad) {
+ content =
;
+ } else if (hasSketches) {
+ content = (
+
+ );
+ } else {
+ content = 'No collections';
+ }
+
+ return (
+
+
+ {this.getSketchesTitle()}
+
+ {content}
+
+ );
+ }
+}
+
+SketchList.propTypes = {
+ user: PropTypes.shape({
+ username: PropTypes.string,
+ authenticated: PropTypes.bool.isRequired
+ }).isRequired,
+ getProjects: PropTypes.func.isRequired,
+ sketches: PropTypes.arrayOf(PropTypes.shape({
+ id: PropTypes.string.isRequired,
+ name: PropTypes.string.isRequired,
+ createdAt: PropTypes.string.isRequired,
+ updatedAt: PropTypes.string.isRequired
+ })).isRequired,
+ collection: PropTypes.shape({
+ id: PropTypes.string.isRequired,
+ name: PropTypes.string.isRequired,
+ items: PropTypes.arrayOf(PropTypes.shape({
+ project: PropTypes.shape({
+ id: PropTypes.string.isRequired,
+ }),
+ })),
+ }).isRequired,
+ username: PropTypes.string,
+ loading: PropTypes.bool.isRequired,
+ sorting: PropTypes.shape({
+ field: PropTypes.string.isRequired,
+ direction: PropTypes.string.isRequired
+ }).isRequired,
+ addToCollection: PropTypes.func.isRequired,
+ removeFromCollection: PropTypes.func.isRequired,
+};
+
+SketchList.defaultProps = {
+ username: undefined
+};
+
+function mapStateToProps(state) {
+ return {
+ user: state.user,
+ sketches: getSortedSketches(state),
+ sorting: state.sorting,
+ loading: state.loading,
+ project: state.project
+ };
+}
+
+function mapDispatchToProps(dispatch) {
+ return bindActionCreators(
+ Object.assign({}, ProjectsActions, CollectionsActions, ToastActions, SortingActions),
+ dispatch
+ );
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(SketchList);
diff --git a/client/modules/IDE/components/AssetList.jsx b/client/modules/IDE/components/AssetList.jsx
index 3bec6cc2..821ae152 100644
--- a/client/modules/IDE/components/AssetList.jsx
+++ b/client/modules/IDE/components/AssetList.jsx
@@ -40,13 +40,9 @@ class AssetList extends React.Component {
render() {
const username = this.props.username !== undefined ? this.props.username : this.props.user.username;
- const { assetList, totalSize } = this.props;
+ const { assetList } = this.props;
return (
- {/* Eventually, this copy should be Total / 250 MB Used */}
- {this.hasAssets() &&
-
{`${prettyBytes(totalSize)} Total`}
- }
{this.getAssetsTitle()}
@@ -93,7 +89,6 @@ AssetList.propTypes = {
sketchName: PropTypes.string.isRequired,
sketchId: PropTypes.string.isRequired
})).isRequired,
- totalSize: PropTypes.number.isRequired,
getAssets: PropTypes.func.isRequired,
loading: PropTypes.bool.isRequired
};
diff --git a/client/modules/IDE/components/AssetSize.jsx b/client/modules/IDE/components/AssetSize.jsx
new file mode 100644
index 00000000..db083708
--- /dev/null
+++ b/client/modules/IDE/components/AssetSize.jsx
@@ -0,0 +1,49 @@
+import PropTypes from 'prop-types';
+import React from 'react';
+import { connect } from 'react-redux';
+import prettyBytes from 'pretty-bytes';
+
+const MB_TO_B = 1000 * 1000;
+const MAX_SIZE_B = 250 * MB_TO_B;
+
+const formatPercent = (percent) => {
+ const percentUsed = percent * 100;
+ if (percentUsed < 1) {
+ return '0%';
+ }
+
+ return `${Math.round(percentUsed)}%`;
+};
+
+/* Eventually, this copy should be Total / 250 MB Used */
+const AssetSize = ({ totalSize }) => {
+ if (!totalSize) {
+ return null;
+ }
+
+ const currentSize = prettyBytes(totalSize);
+ const sizeLimit = prettyBytes(MAX_SIZE_B);
+ const percentValue = totalSize / MAX_SIZE_B;
+ const percent = formatPercent(percentValue);
+
+ return (
+
+
+
{currentSize} ({percent})
+
Max: {sizeLimit}
+
+ );
+};
+
+AssetSize.propTypes = {
+ totalSize: PropTypes.number.isRequired,
+};
+
+function mapStateToProps(state) {
+ return {
+ user: state.user,
+ totalSize: state.assets.totalSize,
+ };
+}
+
+export default connect(mapStateToProps)(AssetSize);
diff --git a/client/modules/IDE/components/CollectionList/CollectionList.jsx b/client/modules/IDE/components/CollectionList/CollectionList.jsx
new file mode 100644
index 00000000..02a43297
--- /dev/null
+++ b/client/modules/IDE/components/CollectionList/CollectionList.jsx
@@ -0,0 +1,238 @@
+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';
+import find from 'lodash/find';
+import * as ProjectActions from '../../actions/project';
+import * as ProjectsActions from '../../actions/projects';
+import * as CollectionsActions from '../../actions/collections';
+import * as ToastActions from '../../actions/toast';
+import * as SortingActions from '../../actions/sorting';
+import getSortedCollections from '../../selectors/collections';
+import Loader from '../../../App/components/loader';
+import Overlay from '../../../App/components/Overlay';
+import AddToCollectionSketchList from '../AddToCollectionSketchList';
+import { SketchSearchbar } from '../Searchbar';
+
+import CollectionListRow from './CollectionListRow';
+
+const arrowUp = require('../../../../images/sort-arrow-up.svg');
+const arrowDown = require('../../../../images/sort-arrow-down.svg');
+
+class CollectionList extends React.Component {
+ constructor(props) {
+ super(props);
+
+ if (props.projectId) {
+ props.getProject(props.projectId);
+ }
+
+ this.props.getCollections(this.props.username);
+ this.props.resetSorting();
+
+ this.state = {
+ hasLoadedData: false,
+ addingSketchesToCollectionId: null,
+ };
+ }
+
+ componentDidUpdate(prevProps, prevState) {
+ if (prevProps.loading === true && this.props.loading === false) {
+ // eslint-disable-next-line react/no-did-update-set-state
+ this.setState({
+ hasLoadedData: true,
+ });
+ }
+ }
+
+ getTitle() {
+ if (this.props.username === this.props.user.username) {
+ return 'p5.js Web Editor | My collections';
+ }
+ return `p5.js Web Editor | ${this.props.username}'s collections`;
+ }
+
+ showAddSketches = (collectionId) => {
+ this.setState({
+ addingSketchesToCollectionId: collectionId,
+ });
+ }
+
+ hideAddSketches = () => {
+ console.log('hideAddSketches');
+ this.setState({
+ addingSketchesToCollectionId: null,
+ });
+ }
+
+ hasCollections() {
+ return (!this.props.loading || this.state.hasLoadedData) && this.props.collections.length > 0;
+ }
+
+ _renderLoader() {
+ if (this.props.loading && !this.state.hasLoadedData) return
;
+ return null;
+ }
+
+ _renderEmptyTable() {
+ if (!this.props.loading && this.props.collections.length === 0) {
+ return (
No collections.
);
+ }
+ return null;
+ }
+
+ _renderFieldHeader = (fieldName, displayName) => {
+ const { field, direction } = this.props.sorting;
+ const headerClass = classNames({
+ 'sketches-table__header': true,
+ 'sketches-table__header--selected': field === fieldName
+ });
+ return (
+
+
+ |
+ );
+ }
+
+ render() {
+ const username = this.props.username !== undefined ? this.props.username : this.props.user.username;
+
+ return (
+
+
+ {this.getTitle()}
+
+
+ {this._renderLoader()}
+ {this._renderEmptyTable()}
+ {this.hasCollections() &&
+
+
+
+ {this._renderFieldHeader('name', 'Name')}
+ {this._renderFieldHeader('createdAt', 'Date Created')}
+ {this._renderFieldHeader('updatedAt', 'Date Updated')}
+ {this._renderFieldHeader('numItems', '# sketches')}
+ |
+
+
+
+ {this.props.collections.map(collection =>
+ ( this.showAddSketches(collection.id)}
+ />))}
+
+
}
+ {
+ this.state.addingSketchesToCollectionId && (
+
}
+ closeOverlay={this.hideAddSketches}
+ isFixedHeight
+ >
+
+
+ )
+ }
+
+ );
+ }
+}
+
+const ProjectShape = PropTypes.shape({
+ id: PropTypes.string.isRequired,
+ name: PropTypes.string.isRequired,
+ createdAt: PropTypes.string.isRequired,
+ updatedAt: PropTypes.string.isRequired,
+ user: PropTypes.shape({
+ username: PropTypes.string.isRequired
+ }).isRequired,
+});
+
+const ItemsShape = PropTypes.shape({
+ createdAt: PropTypes.string.isRequired,
+ updatedAt: PropTypes.string.isRequired,
+ project: ProjectShape
+});
+
+CollectionList.propTypes = {
+ user: PropTypes.shape({
+ username: PropTypes.string,
+ authenticated: PropTypes.bool.isRequired
+ }).isRequired,
+ projectId: PropTypes.string.isRequired,
+ getCollections: PropTypes.func.isRequired,
+ getProject: PropTypes.func.isRequired,
+ collections: PropTypes.arrayOf(PropTypes.shape({
+ id: PropTypes.string.isRequired,
+ name: PropTypes.string.isRequired,
+ description: PropTypes.string,
+ createdAt: PropTypes.string.isRequired,
+ updatedAt: PropTypes.string.isRequired,
+ items: PropTypes.arrayOf(ItemsShape),
+ })).isRequired,
+ username: PropTypes.string,
+ loading: PropTypes.bool.isRequired,
+ toggleDirectionForField: PropTypes.func.isRequired,
+ resetSorting: PropTypes.func.isRequired,
+ sorting: PropTypes.shape({
+ field: PropTypes.string.isRequired,
+ direction: PropTypes.string.isRequired
+ }).isRequired,
+ project: PropTypes.shape({
+ id: PropTypes.string,
+ owner: PropTypes.shape({
+ id: PropTypes.string
+ })
+ })
+};
+
+CollectionList.defaultProps = {
+ project: {
+ id: undefined,
+ owner: undefined
+ },
+ username: undefined
+};
+
+function mapStateToProps(state, ownProps) {
+ return {
+ user: state.user,
+ collections: getSortedCollections(state),
+ sorting: state.sorting,
+ loading: state.loading,
+ project: state.project,
+ projectId: ownProps && ownProps.params ? ownProps.prams.project_id : null,
+ };
+}
+
+function mapDispatchToProps(dispatch) {
+ return bindActionCreators(
+ Object.assign({}, CollectionsActions, ProjectsActions, ProjectActions, ToastActions, SortingActions),
+ dispatch
+ );
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(CollectionList);
diff --git a/client/modules/IDE/components/CollectionList/CollectionListRow.jsx b/client/modules/IDE/components/CollectionList/CollectionListRow.jsx
new file mode 100644
index 00000000..6b714bde
--- /dev/null
+++ b/client/modules/IDE/components/CollectionList/CollectionListRow.jsx
@@ -0,0 +1,248 @@
+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';
+import * as ProjectActions from '../../actions/project';
+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');
+
+class CollectionListRowBase extends React.Component {
+ static projectInCollection(project, collection) {
+ return collection.items.find(item => item.project.id === project.id) != null;
+ }
+
+ constructor(props) {
+ super(props);
+ this.state = {
+ optionsOpen: false,
+ isFocused: false,
+ renameOpen: false,
+ renameValue: '',
+ };
+ }
+
+ onFocusComponent = () => {
+ this.setState({ isFocused: true });
+ }
+
+ onBlurComponent = () => {
+ this.setState({ isFocused: false });
+ setTimeout(() => {
+ if (!this.state.isFocused) {
+ this.closeAll();
+ }
+ }, 200);
+ }
+
+ openOptions = () => {
+ this.setState({
+ optionsOpen: true
+ });
+ }
+
+ closeOptions = () => {
+ this.setState({
+ optionsOpen: false
+ });
+ }
+
+ toggleOptions = () => {
+ if (this.state.optionsOpen) {
+ this.closeOptions();
+ } else {
+ this.openOptions();
+ }
+ }
+
+ closeAll = () => {
+ this.setState({
+ optionsOpen: false,
+ renameOpen: false,
+ });
+ }
+
+ handleAddSketches = () => {
+ this.closeAll();
+ this.props.onAddSketches();
+ }
+
+ handleDropdownOpen = () => {
+ this.closeAll();
+ this.openOptions();
+ }
+
+ handleCollectionDelete = () => {
+ this.closeAll();
+ if (window.confirm(`Are you sure you want to delete "${this.props.collection.name}"?`)) {
+ this.props.deleteCollection(this.props.collection.id);
+ }
+ }
+
+ handleRenameOpen = () => {
+ this.closeAll();
+ this.setState({
+ renameOpen: true,
+ renameValue: this.props.collection.name,
+ });
+ }
+
+ handleRenameChange = (e) => {
+ this.setState({
+ renameValue: e.target.value
+ });
+ }
+
+ handleRenameEnter = (e) => {
+ const isValid = this.state.renameValue !== '';
+
+ if (e.key === 'Enter') {
+ if (isValid) {
+ this.props.editCollection(this.props.collection.id, { name: this.state.renameValue });
+ }
+
+ // this.resetName();
+ this.closeAll();
+ }
+ }
+
+ // resetName = () => {
+ // this.setState({
+ // renameValue: this.props.collection.name
+ // });
+ // }
+
+ renderActions = () => {
+ const { optionsOpen } = this.state;
+ const userIsOwner = this.props.user.username === this.props.username;
+
+ return (
+
+
+ {optionsOpen &&
+
+ -
+
+
+ {userIsOwner &&
+ -
+
+
}
+ {userIsOwner &&
+ -
+
+
}
+
+ }
+
+ );
+ }
+
+ renderCollectionName = () => {
+ const { collection, username } = this.props;
+ const { renameOpen, renameValue } = this.state;
+
+ return (
+
+
+ {renameOpen ? '' : collection.name}
+
+ {renameOpen
+ &&
+ e.stopPropagation()}
+ />
+ }
+
+ );
+ }
+
+ render() {
+ const { collection } = this.props;
+
+ return (
+
+ |
+
+ {this.renderCollectionName()}
+
+ |
+ {format(new Date(collection.createdAt), 'MMM D, YYYY')} |
+ {format(new Date(collection.updatedAt), 'MMM D, YYYY')} |
+ {(collection.items || []).length} |
+
+ {this.renderActions()}
+ |
+
+ );
+ }
+}
+
+CollectionListRowBase.propTypes = {
+ collection: PropTypes.shape({
+ id: PropTypes.string.isRequired,
+ name: PropTypes.string.isRequired,
+ owner: PropTypes.shape({
+ username: PropTypes.string.isRequired,
+ }).isRequired,
+ }).isRequired,
+ project: PropTypes.shape({
+ id: PropTypes.string.isRequired,
+ }).isRequired,
+ username: PropTypes.string.isRequired,
+ user: PropTypes.shape({
+ username: PropTypes.string,
+ authenticated: PropTypes.bool.isRequired
+ }).isRequired,
+ deleteCollection: PropTypes.func.isRequired,
+ editCollection: PropTypes.func.isRequired,
+ onAddSketches: PropTypes.func.isRequired,
+};
+
+function mapDispatchToPropsSketchListRow(dispatch) {
+ return bindActionCreators(Object.assign({}, CollectionsActions, ProjectActions, IdeActions, ToastActions), dispatch);
+}
+
+export default connect(null, mapDispatchToPropsSketchListRow)(CollectionListRowBase);
diff --git a/client/modules/IDE/components/CollectionList/index.js b/client/modules/IDE/components/CollectionList/index.js
new file mode 100644
index 00000000..51d43417
--- /dev/null
+++ b/client/modules/IDE/components/CollectionList/index.js
@@ -0,0 +1 @@
+export { default } from './CollectionList';
diff --git a/client/modules/IDE/components/EditableInput.jsx b/client/modules/IDE/components/EditableInput.jsx
new file mode 100644
index 00000000..eef5e0b8
--- /dev/null
+++ b/client/modules/IDE/components/EditableInput.jsx
@@ -0,0 +1,93 @@
+import PropTypes from 'prop-types';
+import React from 'react';
+import InlineSVG from 'react-inlinesvg';
+
+const editIconUrl = require('../../../images/pencil.svg');
+
+function EditIcon() {
+ return
;
+}
+
+function EditableInput({
+ validate, value, emptyPlaceholder, InputComponent, inputProps, onChange
+}) {
+ const [isEditing, setIsEditing] = React.useState(false);
+ const [currentValue, setCurrentValue] = React.useState(value || '');
+ const displayValue = currentValue || emptyPlaceholder;
+ const hasValue = currentValue !== '';
+ const classes = `editable-input editable-input--${isEditing ? 'is-editing' : 'is-not-editing'} editable-input--${hasValue ? 'has-value' : 'has-placeholder'}`;
+ const inputRef = React.createRef();
+
+ React.useEffect(() => {
+ if (isEditing) {
+ inputRef.current.focus();
+ }
+ }, [isEditing]);
+
+ function beginEditing() {
+ setIsEditing(true);
+ }
+
+ function doneEditing() {
+ setIsEditing(false);
+
+ const isValid = typeof validate === 'function' && validate(currentValue);
+
+ if (isValid) {
+ onChange(currentValue);
+ } else {
+ setCurrentValue(value);
+ }
+ }
+
+ function updateValue(event) {
+ setCurrentValue(event.target.value);
+ }
+
+ function checkForKeyAction(event) {
+ if (event.key === 'Enter') {
+ doneEditing();
+ }
+ }
+
+ return (
+
+
+
+
+
+ );
+}
+
+EditableInput.defaultProps = {
+ emptyPlaceholder: 'No value',
+ InputComponent: 'input',
+ inputProps: {},
+ validate: () => true,
+ value: '',
+};
+
+EditableInput.propTypes = {
+ emptyPlaceholder: PropTypes.string,
+ InputComponent: PropTypes.elementType,
+ // eslint-disable-next-line react/forbid-prop-types
+ inputProps: PropTypes.object,
+ onChange: PropTypes.func.isRequired,
+ validate: PropTypes.func,
+ value: PropTypes.string,
+};
+
+export default EditableInput;
diff --git a/client/modules/IDE/components/QuickAddList/Icons.jsx b/client/modules/IDE/components/QuickAddList/Icons.jsx
new file mode 100644
index 00000000..41e0c52f
--- /dev/null
+++ b/client/modules/IDE/components/QuickAddList/Icons.jsx
@@ -0,0 +1,27 @@
+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');
+
+const Icons = ({ isAdded }) => {
+ const classes = [
+ 'quick-add__icon',
+ isAdded ? 'quick-add__icon--in-collection' : 'quick-add__icon--not-in-collection'
+ ].join(' ');
+
+ return (
+
+
+
+
+
+ );
+};
+
+Icons.propTypes = {
+ isAdded: PropTypes.bool.isRequired,
+};
+
+export default Icons;
diff --git a/client/modules/IDE/components/QuickAddList/QuickAddList.jsx b/client/modules/IDE/components/QuickAddList/QuickAddList.jsx
new file mode 100644
index 00000000..3d566654
--- /dev/null
+++ b/client/modules/IDE/components/QuickAddList/QuickAddList.jsx
@@ -0,0 +1,59 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Link } from 'react-router';
+
+import Icons from './Icons';
+
+const Item = ({
+ isAdded, onSelect, name, url
+}) => (
+
+
+ View
+
+);
+
+const ItemType = PropTypes.shape({
+ name: PropTypes.string.isRequired,
+ url: PropTypes.string.isRequired,
+ isAdded: PropTypes.bool.isRequired,
+});
+
+Item.propTypes = {
+ ...ItemType,
+ onSelect: PropTypes.func.isRequired,
+};
+
+const QuickAddList = ({
+ items, onAdd, onRemove
+}) => {
+ const handleAction = (item) => {
+ if (item.isAdded) {
+ onRemove(item);
+ } else {
+ onAdd(item);
+ }
+ };
+
+ return (
+
{items.map(item => (- handleAction(item)
+ }
+ />))}
+
+ );
+};
+
+QuickAddList.propTypes = {
+ items: PropTypes.arrayOf(ItemType).isRequired,
+ onAdd: PropTypes.func.isRequired,
+ onRemove: PropTypes.func.isRequired,
+};
+
+export default QuickAddList;
diff --git a/client/modules/IDE/components/QuickAddList/index.js b/client/modules/IDE/components/QuickAddList/index.js
new file mode 100644
index 00000000..4503fca5
--- /dev/null
+++ b/client/modules/IDE/components/QuickAddList/index.js
@@ -0,0 +1 @@
+export { default } from './QuickAddList.jsx';
diff --git a/client/modules/IDE/components/Searchbar/Collection.jsx b/client/modules/IDE/components/Searchbar/Collection.jsx
new file mode 100644
index 00000000..c566ced2
--- /dev/null
+++ b/client/modules/IDE/components/Searchbar/Collection.jsx
@@ -0,0 +1,24 @@
+import { bindActionCreators } from 'redux';
+import { connect } from 'react-redux';
+import * as SortingActions from '../../actions/sorting';
+
+import Searchbar from './Searchbar';
+
+const scope = 'collection';
+
+function mapStateToProps(state) {
+ return {
+ searchLabel: 'Search collections...',
+ searchTerm: state.search[`${scope}SearchTerm`],
+ };
+}
+
+function mapDispatchToProps(dispatch) {
+ const actions = {
+ setSearchTerm: term => SortingActions.setSearchTerm(scope, term),
+ resetSearchTerm: () => SortingActions.resetSearchTerm(scope),
+ };
+ return bindActionCreators(Object.assign({}, actions), dispatch);
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(Searchbar);
diff --git a/client/modules/IDE/components/Searchbar.jsx b/client/modules/IDE/components/Searchbar/Searchbar.jsx
similarity index 73%
rename from client/modules/IDE/components/Searchbar.jsx
rename to client/modules/IDE/components/Searchbar/Searchbar.jsx
index 4f5f350e..2a926c4e 100644
--- a/client/modules/IDE/components/Searchbar.jsx
+++ b/client/modules/IDE/components/Searchbar/Searchbar.jsx
@@ -1,12 +1,9 @@
import PropTypes from 'prop-types';
import React from 'react';
import InlineSVG from 'react-inlinesvg';
-import { bindActionCreators } from 'redux';
-import { connect } from 'react-redux';
import { throttle } from 'lodash';
-import * as SortingActions from '../actions/sorting';
-const searchIcon = require('../../../images/magnifyingglass.svg');
+const searchIcon = require('../../../../images/magnifyingglass.svg');
class Searchbar extends React.Component {
constructor(props) {
@@ -46,7 +43,7 @@ class Searchbar extends React.Component {
render() {
const { searchValue } = this.state;
return (
-
+
@@ -75,17 +72,12 @@ class Searchbar extends React.Component {
Searchbar.propTypes = {
searchTerm: PropTypes.string.isRequired,
setSearchTerm: PropTypes.func.isRequired,
- resetSearchTerm: PropTypes.func.isRequired
+ resetSearchTerm: PropTypes.func.isRequired,
+ searchLabel: PropTypes.string,
};
-function mapStateToProps(state) {
- return {
- searchTerm: state.search.searchTerm
- };
-}
+Searchbar.defaultProps = {
+ searchLabel: 'Search sketches...',
+};
-function mapDispatchToProps(dispatch) {
- return bindActionCreators(Object.assign({}, SortingActions), dispatch);
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(Searchbar);
+export default Searchbar;
diff --git a/client/modules/IDE/components/Searchbar/Sketch.jsx b/client/modules/IDE/components/Searchbar/Sketch.jsx
new file mode 100644
index 00000000..bc12854e
--- /dev/null
+++ b/client/modules/IDE/components/Searchbar/Sketch.jsx
@@ -0,0 +1,23 @@
+import { bindActionCreators } from 'redux';
+import { connect } from 'react-redux';
+import * as SortingActions from '../../actions/sorting';
+
+import Searchbar from './Searchbar';
+
+const scope = 'sketch';
+
+function mapStateToProps(state) {
+ return {
+ searchTerm: state.search[`${scope}SearchTerm`],
+ };
+}
+
+function mapDispatchToProps(dispatch) {
+ const actions = {
+ setSearchTerm: term => SortingActions.setSearchTerm(scope, term),
+ resetSearchTerm: () => SortingActions.resetSearchTerm(scope),
+ };
+ return bindActionCreators(Object.assign({}, actions), dispatch);
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(Searchbar);
diff --git a/client/modules/IDE/components/Searchbar/index.js b/client/modules/IDE/components/Searchbar/index.js
new file mode 100644
index 00000000..3a063f68
--- /dev/null
+++ b/client/modules/IDE/components/Searchbar/index.js
@@ -0,0 +1,2 @@
+export { default as CollectionSearchbar } from './Collection.jsx';
+export { default as SketchSearchbar } from './Sketch.jsx';
diff --git a/client/modules/IDE/components/SketchList.jsx b/client/modules/IDE/components/SketchList.jsx
index b430df14..d5c7bef0 100644
--- a/client/modules/IDE/components/SketchList.jsx
+++ b/client/modules/IDE/components/SketchList.jsx
@@ -10,11 +10,14 @@ import classNames from 'classnames';
import slugify from 'slugify';
import * as ProjectActions from '../actions/project';
import * as ProjectsActions from '../actions/projects';
+import * as CollectionsActions from '../actions/collections';
import * as ToastActions from '../actions/toast';
import * as SortingActions from '../actions/sorting';
import * as IdeActions from '../actions/ide';
import getSortedSketches from '../selectors/projects';
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');
@@ -27,7 +30,7 @@ class SketchListRowBase extends React.Component {
optionsOpen: false,
renameOpen: false,
renameValue: props.sketch.name,
- isFocused: false
+ isFocused: false,
};
}
@@ -134,105 +137,146 @@ class SketchListRowBase extends React.Component {
}
}
- render() {
- const { sketch, username } = this.props;
- const { renameOpen, optionsOpen, renameValue } = this.state;
+ renderViewButton = sketchURL => (
+
+ View
+ |
+ )
+
+ renderDropdown = () => {
+ const { optionsOpen } = this.state;
const userIsOwner = this.props.user.username === this.props.username;
+
+ return (
+
+
+ {optionsOpen &&
+
+ {userIsOwner &&
+ -
+
+
}
+ -
+
+
+ {this.props.user.authenticated &&
+ -
+
+
}
+ {this.props.user.authenticated &&
+ -
+
+
}
+ { /* -
+
+
*/ }
+ {userIsOwner &&
+ -
+
+
}
+ }
+ |
+ );
+ }
+
+ render() {
+ const {
+ sketch,
+ username,
+ } = this.props;
+ const { renameOpen, renameValue } = this.state;
let url = `/${username}/sketches/${sketch.id}`;
if (username === 'p5') {
url = `/${username}/sketches/${slugify(sketch.name, '_')}`;
}
+
+ const name = (
+
+
+ {renameOpen ? '' : sketch.name}
+
+ {renameOpen
+ &&
+ e.stopPropagation()}
+ />
+ }
+
+ );
+
return (
-
- |
-
- {renameOpen ? '' : sketch.name}
-
- {renameOpen
- &&
- e.stopPropagation()}
- />
- }
- |
- {format(new Date(sketch.createdAt), 'MMM D, YYYY h:mm A')} |
- {format(new Date(sketch.updatedAt), 'MMM D, YYYY h:mm A')} |
-
-
- {optionsOpen &&
-
- {userIsOwner &&
- -
-
-
}
- -
-
-
- {this.props.user.authenticated &&
- -
-
-
}
- { /* -
-
-
*/ }
- {userIsOwner &&
- -
-
-
}
- }
- |
-
);
+
+
+ |
+ {name}
+ |
+ {format(new Date(sketch.createdAt), 'MMM D, YYYY h:mm A')} |
+ {format(new Date(sketch.updatedAt), 'MMM D, YYYY h:mm A')} |
+ {this.renderDropdown()}
+
+ );
}
}
@@ -250,7 +294,8 @@ SketchListRowBase.propTypes = {
showShareModal: PropTypes.func.isRequired,
cloneProject: PropTypes.func.isRequired,
exportProjectAsZip: PropTypes.func.isRequired,
- changeProjectName: PropTypes.func.isRequired
+ changeProjectName: PropTypes.func.isRequired,
+ onAddToCollection: PropTypes.func.isRequired,
};
function mapDispatchToPropsSketchListRow(dispatch) {
@@ -265,6 +310,18 @@ class SketchList extends React.Component {
this.props.getProjects(this.props.username);
this.props.resetSorting();
this._renderFieldHeader = this._renderFieldHeader.bind(this);
+
+ this.state = {
+ isInitialDataLoad: true,
+ };
+ }
+
+ componentWillReceiveProps(nextProps) {
+ if (this.props.sketches !== nextProps.sketches && Array.isArray(nextProps.sketches)) {
+ this.setState({
+ isInitialDataLoad: false,
+ });
+ }
}
getSketchesTitle() {
@@ -275,16 +332,20 @@ class SketchList extends React.Component {
}
hasSketches() {
- return !this.props.loading && this.props.sketches.length > 0;
+ return !this.isLoading() && this.props.sketches.length > 0;
+ }
+
+ isLoading() {
+ return this.props.loading && this.state.isInitialDataLoad;
}
_renderLoader() {
- if (this.props.loading) return
;
+ if (this.isLoading()) return
;
return null;
}
_renderEmptyTable() {
- if (!this.props.loading && this.props.sketches.length === 0) {
+ if (!this.isLoading() && this.props.sketches.length === 0) {
return (
No sketches.
);
}
return null;
@@ -337,9 +398,26 @@ class SketchList extends React.Component {
sketch={sketch}
user={this.props.user}
username={username}
+ onAddToCollection={() => {
+ this.setState({ sketchToAddToCollection: sketch });
+ }}
/>))}
}
+ {
+ this.state.sketchToAddToCollection &&
+
this.setState({ sketchToAddToCollection: null })}
+ >
+
+
+ }
);
}
@@ -357,6 +435,15 @@ SketchList.propTypes = {
createdAt: PropTypes.string.isRequired,
updatedAt: PropTypes.string.isRequired
})).isRequired,
+ collection: PropTypes.shape({
+ id: PropTypes.string.isRequired,
+ name: PropTypes.string.isRequired,
+ items: PropTypes.arrayOf(PropTypes.shape({
+ project: PropTypes.shape({
+ id: PropTypes.string.isRequired,
+ }),
+ })),
+ }).isRequired,
username: PropTypes.string,
loading: PropTypes.bool.isRequired,
toggleDirectionForField: PropTypes.func.isRequired,
@@ -365,19 +452,9 @@ SketchList.propTypes = {
field: PropTypes.string.isRequired,
direction: PropTypes.string.isRequired
}).isRequired,
- project: PropTypes.shape({
- id: PropTypes.string,
- owner: PropTypes.shape({
- id: PropTypes.string
- })
- })
};
SketchList.defaultProps = {
- project: {
- id: undefined,
- owner: undefined
- },
username: undefined
};
@@ -392,7 +469,10 @@ function mapStateToProps(state) {
}
function mapDispatchToProps(dispatch) {
- return bindActionCreators(Object.assign({}, ProjectsActions, ToastActions, SortingActions), dispatch);
+ return bindActionCreators(
+ Object.assign({}, ProjectsActions, CollectionsActions, ToastActions, SortingActions),
+ dispatch
+ );
}
export default connect(mapStateToProps, mapDispatchToProps)(SketchList);
diff --git a/client/modules/IDE/pages/FullView.jsx b/client/modules/IDE/pages/FullView.jsx
index 7003496e..6a18566f 100644
--- a/client/modules/IDE/pages/FullView.jsx
+++ b/client/modules/IDE/pages/FullView.jsx
@@ -11,13 +11,6 @@ import * as ProjectActions from '../actions/project';
class FullView extends React.Component {
componentDidMount() {
this.props.getProject(this.props.params.project_id);
- document.body.className = this.props.theme;
- }
-
- componentWillUpdate(nextProps) {
- if (nextProps.theme !== this.props.theme) {
- document.body.className = nextProps.theme;
- }
}
ident = () => {}
@@ -62,7 +55,6 @@ class FullView extends React.Component {
}
FullView.propTypes = {
- theme: PropTypes.string.isRequired,
params: PropTypes.shape({
project_id: PropTypes.string
}).isRequired,
@@ -98,7 +90,6 @@ FullView.propTypes = {
function mapStateToProps(state) {
return {
user: state.user,
- theme: state.preferences.theme,
htmlFile: getHTMLFile(state.files),
jsFiles: getJSFiles(state.files),
cssFiles: getCSSFiles(state.files),
diff --git a/client/modules/IDE/pages/IDEView.jsx b/client/modules/IDE/pages/IDEView.jsx
index 29f8b6ee..24843d32 100644
--- a/client/modules/IDE/pages/IDEView.jsx
+++ b/client/modules/IDE/pages/IDEView.jsx
@@ -28,11 +28,10 @@ import * as ToastActions from '../actions/toast';
import * as ConsoleActions from '../actions/console';
import { getHTMLFile } from '../reducers/files';
import Overlay from '../../App/components/Overlay';
-import SketchList from '../components/SketchList';
-import Searchbar from '../components/Searchbar';
-import AssetList from '../components/AssetList';
import About from '../components/About';
+import AddToCollectionList from '../components/AddToCollectionList';
import Feedback from '../components/Feedback';
+import { CollectionSearchbar } from '../components/Searchbar';
class IDEView extends React.Component {
constructor(props) {
@@ -66,7 +65,6 @@ class IDEView extends React.Component {
window.onbeforeunload = () => this.warnIfUnsavedChanges();
- document.body.className = this.props.preferences.theme;
this.autosaveInterval = null;
}
@@ -90,10 +88,6 @@ class IDEView extends React.Component {
this.props.getProject(nextProps.params.project_id);
}
}
-
- if (nextProps.preferences.theme !== this.props.preferences.theme) {
- document.body.className = nextProps.preferences.theme;
- }
}
componentDidUpdate(prevProps) {
@@ -318,12 +312,12 @@ class IDEView extends React.Component {
{(
(
(this.props.preferences.textOutput ||
- this.props.preferences.gridOutput ||
- this.props.preferences.soundOutput
+ this.props.preferences.gridOutput ||
+ this.props.preferences.soundOutput
) &&
- this.props.ide.isPlaying
+ this.props.ide.isPlaying
) ||
- this.props.ide.isAccessibleOutputPlaying
+ this.props.ide.isAccessibleOutputPlaying
)
}
@@ -354,44 +348,19 @@ class IDEView extends React.Component {
- { this.props.ide.modalIsVisible &&
+ {this.props.ide.modalIsVisible &&
}
- { this.props.ide.newFolderModalVisible &&
+ {this.props.ide.newFolderModalVisible &&
}
- { this.props.location.pathname.match(/sketches$/) &&
-
-
-
-
- }
- { this.props.location.pathname.match(/assets$/) &&
-
-
-
- }
{ this.props.location.pathname === '/about' &&
}
- { this.props.location.pathname === '/feedback' &&
+ {this.props.location.pathname === '/feedback' &&
}
- { this.props.ide.shareModalVisible &&
+ {this.props.location.pathname.match(/add-to-collection$/) &&
+
}
+ isFixedHeight
+ >
+
+
+ }
+ {this.props.ide.shareModalVisible &&
}
- { this.props.ide.keyboardShortcutVisible &&
+ {this.props.ide.keyboardShortcutVisible &&
}
- { this.props.ide.errorType &&
+ {this.props.ide.errorType &&
{
+ switch (action.type) {
+ case ActionTypes.SET_COLLECTIONS:
+ return action.collections;
+
+ case ActionTypes.DELETE_COLLECTION:
+ return state.filter(({ id }) => action.collectionId !== id);
+
+ // The API returns the complete new edited collection
+ // with any items added or removed
+ case ActionTypes.EDIT_COLLECTION:
+ case ActionTypes.ADD_TO_COLLECTION:
+ case ActionTypes.REMOVE_FROM_COLLECTION:
+ return state.map((collection) => {
+ if (collection.id === action.payload.id) {
+ return action.payload;
+ }
+
+ return collection;
+ });
+ default:
+ return state;
+ }
+};
+
+export default sketches;
diff --git a/client/modules/IDE/reducers/project.js b/client/modules/IDE/reducers/project.js
index 0779c0f5..2eb19d4d 100644
--- a/client/modules/IDE/reducers/project.js
+++ b/client/modules/IDE/reducers/project.js
@@ -1,14 +1,8 @@
-import friendlyWords from 'friendly-words';
import * as ActionTypes from '../../../constants';
-
-const generateRandomName = () => {
- const adj = friendlyWords.predicates[Math.floor(Math.random() * friendlyWords.predicates.length)];
- const obj = friendlyWords.objects[Math.floor(Math.random() * friendlyWords.objects.length)];
- return `${adj} ${obj}`;
-};
+import { generateProjectName } from '../../../utils/generateRandomName';
const initialState = () => {
- const generatedString = generateRandomName();
+ const generatedString = generateProjectName();
const generatedName = generatedString.charAt(0).toUpperCase() + generatedString.slice(1);
return {
name: generatedName,
diff --git a/client/modules/IDE/reducers/search.js b/client/modules/IDE/reducers/search.js
index 1e2ff8d4..67d35243 100644
--- a/client/modules/IDE/reducers/search.js
+++ b/client/modules/IDE/reducers/search.js
@@ -1,13 +1,14 @@
import * as ActionTypes from '../../../constants';
const initialState = {
- searchTerm: ''
+ collectionSearchTerm: '',
+ sketchSearchTerm: ''
};
export default (state = initialState, action) => {
switch (action.type) {
case ActionTypes.SET_SEARCH_TERM:
- return { ...state, searchTerm: action.query };
+ return { ...state, [`${action.scope}SearchTerm`]: action.query };
default:
return state;
}
diff --git a/client/modules/IDE/selectors/collections.js b/client/modules/IDE/selectors/collections.js
new file mode 100644
index 00000000..f212103a
--- /dev/null
+++ b/client/modules/IDE/selectors/collections.js
@@ -0,0 +1,56 @@
+import { createSelector } from 'reselect';
+import differenceInMilliseconds from 'date-fns/difference_in_milliseconds';
+import find from 'lodash/find';
+import orderBy from 'lodash/orderBy';
+import { DIRECTION } from '../actions/sorting';
+
+const getCollections = state => state.collections;
+const getField = state => state.sorting.field;
+const getDirection = state => state.sorting.direction;
+const getSearchTerm = state => state.search.collectionSearchTerm;
+
+const getFilteredCollections = createSelector(
+ getCollections,
+ getSearchTerm,
+ (collections, search) => {
+ if (search) {
+ const searchStrings = collections.map((collection) => {
+ const smallCollection = {
+ name: collection.name
+ };
+ return { ...collection, searchString: Object.values(smallCollection).join(' ').toLowerCase() };
+ });
+ return searchStrings.filter(collection => collection.searchString.includes(search.toLowerCase()));
+ }
+ return collections;
+ }
+);
+
+
+const getSortedCollections = createSelector(
+ getFilteredCollections,
+ getField,
+ getDirection,
+ (collections, field, direction) => {
+ if (field === 'name') {
+ if (direction === DIRECTION.DESC) {
+ return orderBy(collections, 'name', 'desc');
+ }
+ return orderBy(collections, 'name', 'asc');
+ }
+ const sortedCollections = [...collections].sort((a, b) => {
+ const result =
+ direction === DIRECTION.ASC
+ ? differenceInMilliseconds(new Date(a[field]), new Date(b[field]))
+ : differenceInMilliseconds(new Date(b[field]), new Date(a[field]));
+ return result;
+ });
+ return sortedCollections;
+ }
+);
+
+export function getCollection(state, id) {
+ return find(getCollections(state), { id });
+}
+
+export default getSortedCollections;
diff --git a/client/modules/IDE/selectors/projects.js b/client/modules/IDE/selectors/projects.js
index b2230826..14d65ea0 100644
--- a/client/modules/IDE/selectors/projects.js
+++ b/client/modules/IDE/selectors/projects.js
@@ -6,7 +6,7 @@ import { DIRECTION } from '../actions/sorting';
const getSketches = state => state.sketches;
const getField = state => state.sorting.field;
const getDirection = state => state.sorting.direction;
-const getSearchTerm = state => state.search.searchTerm;
+const getSearchTerm = state => state.search.sketchSearchTerm;
const getFilteredSketches = createSelector(
getSketches,
diff --git a/client/modules/User/components/Collection.jsx b/client/modules/User/components/Collection.jsx
new file mode 100644
index 00000000..002d9921
--- /dev/null
+++ b/client/modules/User/components/Collection.jsx
@@ -0,0 +1,393 @@
+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';
+import classNames from 'classnames';
+import * as ProjectActions from '../../IDE/actions/project';
+import * as ProjectsActions from '../../IDE/actions/projects';
+import * as CollectionsActions from '../../IDE/actions/collections';
+import * as ToastActions from '../../IDE/actions/toast';
+import * as SortingActions from '../../IDE/actions/sorting';
+import * as IdeActions from '../../IDE/actions/ide';
+import { getCollection } from '../../IDE/selectors/collections';
+import Loader from '../../App/components/loader';
+import EditableInput from '../../IDE/components/EditableInput';
+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');
+
+const ShareURL = ({ value }) => {
+ const [showURL, setShowURL] = React.useState(false);
+
+ return (
+
+
+ { showURL &&
+
+
+
+ }
+
+ |
+
+ {item.project.name}
+
+ |
+ {format(new Date(item.createdAt), 'MMM D, YYYY h:mm A')} |
+ {sketchOwnerUsername} |
+
+
+ |
+
);
+ }
+}
+
+CollectionItemRowBase.propTypes = {
+ collection: PropTypes.shape({
+ id: PropTypes.string.isRequired,
+ name: PropTypes.string.isRequired
+ }).isRequired,
+ item: PropTypes.shape({
+ project: PropTypes.shape({
+ id: PropTypes.string.isRequired,
+ name: PropTypes.string.isRequired,
+ }).isRequired,
+ }).isRequired,
+ user: PropTypes.shape({
+ username: PropTypes.string,
+ authenticated: PropTypes.bool.isRequired
+ }).isRequired,
+ removeFromCollection: PropTypes.func.isRequired
+};
+
+function mapDispatchToPropsSketchListRow(dispatch) {
+ return bindActionCreators(Object.assign({}, CollectionsActions, ProjectActions, IdeActions), dispatch);
+}
+
+const CollectionItemRow = connect(null, mapDispatchToPropsSketchListRow)(CollectionItemRowBase);
+
+class Collection extends React.Component {
+ constructor(props) {
+ super(props);
+ this.props.getCollections(this.props.username);
+ this.props.resetSorting();
+ this._renderFieldHeader = this._renderFieldHeader.bind(this);
+ this.showAddSketches = this.showAddSketches.bind(this);
+ this.hideAddSketches = this.hideAddSketches.bind(this);
+
+ this.state = {
+ isAddingSketches: false,
+ };
+ }
+
+ getTitle() {
+ if (this.props.username === this.props.user.username) {
+ return 'p5.js Web Editor | My collections';
+ }
+ return `p5.js Web Editor | ${this.props.username}'s collections`;
+ }
+
+ getUsername() {
+ return this.props.username !== undefined ? this.props.username : this.props.user.username;
+ }
+
+ getCollectionName() {
+ return this.props.collection.name;
+ }
+
+ isOwner() {
+ let isOwner = false;
+
+ if (this.props.user != null &&
+ this.props.user.username &&
+ this.props.collection.owner.username === this.props.user.username) {
+ isOwner = true;
+ }
+
+ return isOwner;
+ }
+
+ hasCollection() {
+ return !this.props.loading && this.props.collection != null;
+ }
+
+ hasCollectionItems() {
+ return this.hasCollection() && this.props.collection.items.length > 0;
+ }
+
+ _renderLoader() {
+ if (this.props.loading) return ;
+ return null;
+ }
+
+ _renderCollectionMetadata() {
+ const {
+ id, name, description, items, owner
+ } = this.props.collection;
+
+ const hostname = window.location.origin;
+ const { username } = this.props;
+
+ const baseURL = `${hostname}/${username}/collections/`;
+
+ const handleEditCollectionName = (value) => {
+ if (value === name) {
+ return;
+ }
+
+ this.props.editCollection(id, { name: value });
+ };
+
+ const handleEditCollectionDescription = (value) => {
+ if (value === description) {
+ return;
+ }
+
+ this.props.editCollection(id, { description: value });
+ };
+
+ //
+ // TODO: Implement UI for editing slug
+ //
+ // const handleEditCollectionSlug = (value) => {
+ // if (value === slug) {
+ // return;
+ // }
+ //
+ // this.props.editCollection(id, { slug: value });
+ // };
+
+ return (
+
+
+
+
+ {
+ this.isOwner() ? value !== ''} /> : name
+ }
+
+
+
+ {
+ this.isOwner() ?
+ :
+ description
+ }
+
+
+
Collection by{' '}
+ {owner.username}
+
+
+
{items.length} sketch{items.length === 1 ? '' : 'es'}
+
+
+
+
+
+
+ {
+ this.isOwner() &&
+
+ }
+
+
+
No sketches in collection
);
+ }
+ return null;
+ }
+
+ _renderFieldHeader(fieldName, displayName) {
+ const { field, direction } = this.props.sorting;
+ const headerClass = classNames({
+ 'sketches-table__header': true,
+ 'sketches-table__header--selected': field === fieldName
+ });
+ return (
+
+
+ |
+ );
+ }
+
+ render() {
+ const title = this.hasCollection() ? this.getCollectionName() : null;
+
+ return (
+
+
+ {this.getTitle()}
+
+ {this._renderLoader()}
+ {this.hasCollection() && this._renderCollectionMetadata()}
+
+ {this._renderEmptyTable()}
+ {this.hasCollectionItems() &&
+
+
+
+ {this._renderFieldHeader('name', 'Name')}
+ {this._renderFieldHeader('createdAt', 'Date Added')}
+ {this._renderFieldHeader('user', 'Owner')}
+ |
+
+
+
+ {this.props.collection.items.map(item =>
+ ())}
+
+
+ }
+ {
+ this.state.isAddingSketches && (
+
}
+ closeOverlay={this.hideAddSketches}
+ isFixedHeight
+ >
+
+
+ )
+ }
+
+
+ {this.getTitle()}
+
+
+
@@ -30,8 +31,9 @@ Tab.propTypes = {
const DashboardTabSwitcher = ({ currentTab, isOwner, username }) => (
);
diff --git a/client/modules/User/pages/AccountView.jsx b/client/modules/User/pages/AccountView.jsx
index 2bd63db3..55b353d3 100644
--- a/client/modules/User/pages/AccountView.jsx
+++ b/client/modules/User/pages/AccountView.jsx
@@ -40,7 +40,7 @@ class AccountView extends React.Component {
Account
- Access Tokens
+ {accessTokensUIEnabled && Access Tokens
}
diff --git a/client/modules/User/pages/CollectionView.jsx b/client/modules/User/pages/CollectionView.jsx
new file mode 100644
index 00000000..c402539c
--- /dev/null
+++ b/client/modules/User/pages/CollectionView.jsx
@@ -0,0 +1,91 @@
+import PropTypes from 'prop-types';
+import React from 'react';
+import { connect } from 'react-redux';
+import Nav from '../../../components/Nav';
+
+import CollectionCreate from '../components/CollectionCreate';
+import Collection from '../components/Collection';
+
+class CollectionView extends React.Component {
+ static defaultProps = {
+ user: null,
+ };
+
+ componentDidMount() {
+ document.body.className = this.props.theme;
+ }
+
+ ownerName() {
+ if (this.props.params.username) {
+ return this.props.params.username;
+ }
+
+ return this.props.user.username;
+ }
+
+ pageTitle() {
+ if (this.isCreatePage()) {
+ return 'Create collection';
+ }
+
+ return 'collection';
+ }
+
+ isOwner() {
+ return this.props.user.username === this.props.params.username;
+ }
+
+ isCreatePage() {
+ const path = this.props.location.pathname;
+ return /create$/.test(path);
+ }
+
+ renderContent() {
+ if (this.isCreatePage() && this.isOwner()) {
+ return ;
+ }
+
+ return (
+
+ );
+ }
+
+ render() {
+ return (
+
+
+
+ {this.renderContent()}
+
+ );
+ }
+}
+
+function mapStateToProps(state) {
+ return {
+ user: state.user,
+ theme: state.preferences.theme
+ };
+}
+
+function mapDispatchToProps(dispatch) {
+}
+
+CollectionView.propTypes = {
+ location: PropTypes.shape({
+ pathname: PropTypes.string.isRequired,
+ }).isRequired,
+ params: PropTypes.shape({
+ collection_id: PropTypes.string.isRequired,
+ username: PropTypes.string.isRequired,
+ }).isRequired,
+ theme: PropTypes.string.isRequired,
+ user: PropTypes.shape({
+ username: PropTypes.string.isRequired,
+ }),
+};
+
+export default connect(mapStateToProps, mapDispatchToProps)(CollectionView);
diff --git a/client/modules/User/pages/DashboardView.jsx b/client/modules/User/pages/DashboardView.jsx
index d6c02bfd..9ba5a945 100644
--- a/client/modules/User/pages/DashboardView.jsx
+++ b/client/modules/User/pages/DashboardView.jsx
@@ -2,15 +2,18 @@ import PropTypes from 'prop-types';
import React from 'react';
import { connect } from 'react-redux';
import { bindActionCreators } from 'redux';
-import { browserHistory } from 'react-router';
-
+import { browserHistory, Link } from 'react-router';
import { updateSettings, initiateVerification, createApiKey, removeApiKey } from '../actions';
import Nav from '../../../components/Nav';
+import Overlay from '../../App/components/Overlay';
import AssetList from '../../IDE/components/AssetList';
+import AssetSize from '../../IDE/components/AssetSize';
+import CollectionList from '../../IDE/components/CollectionList';
import SketchList from '../../IDE/components/SketchList';
-import Searchbar from '../../IDE/components/Searchbar';
+import { CollectionSearchbar, SketchSearchbar } from '../../IDE/components/Searchbar';
+import CollectionCreate from '../components/CollectionCreate';
import DashboardTabSwitcher, { TabKey } from '../components/DashboardTabSwitcher';
class DashboardView extends React.Component {
@@ -36,11 +39,13 @@ class DashboardView extends React.Component {
browserHistory.push('/');
}
- selectedTabName() {
+ selectedTabKey() {
const path = this.props.location.pathname;
if (/assets/.test(path)) {
return TabKey.assets;
+ } else if (/collections/.test(path)) {
+ return TabKey.collections;
}
return TabKey.sketches;
@@ -58,14 +63,55 @@ class DashboardView extends React.Component {
return this.props.user.username === this.props.params.username;
}
- navigationItem() {
+ isCollectionCreate() {
+ const path = this.props.location.pathname;
+ return /collections\/create$/.test(path);
+ }
+ returnToDashboard = () => {
+ browserHistory.push(`/${this.ownerName()}/collections`);
+ }
+
+ renderActionButton(tabKey, username) {
+ switch (tabKey) {
+ case TabKey.assets:
+ return this.isOwner() && ;
+ case TabKey.collections:
+ return this.isOwner() && (
+
+
+ Create collection
+
+
+ );
+ case TabKey.sketches:
+ default:
+ return (
+
+ {this.isOwner() && New sketch}
+
+
+ );
+ }
+ }
+
+ renderContent(tabKey, username) {
+ switch (tabKey) {
+ case TabKey.assets:
+ return ;
+ case TabKey.collections:
+ return ;
+ case TabKey.sketches:
+ default:
+ return ;
+ }
}
render() {
- const currentTab = this.selectedTabName();
+ const currentTab = this.selectedTabKey();
const isOwner = this.isOwner();
const { username } = this.props.params;
+ const actions = this.renderActionButton(currentTab, username);
return (
@@ -74,17 +120,28 @@ class DashboardView extends React.Component {
{this.ownerName()}
-
-
- { currentTab === TabKey.sketches &&
}
+
+
+ {actions &&
+
+ {actions}
+
+ }
+
- {
- currentTab === TabKey.sketches ?
:
- }
+ {this.renderContent(currentTab, username)}
+ {this.isCollectionCreate() &&
+
+
+
+ }