diff --git a/src/components/feedback-form/feedback-form.css b/src/components/feedback-form/feedback-form.css deleted file mode 100644 index 5f1d7556f..000000000 --- a/src/components/feedback-form/feedback-form.css +++ /dev/null @@ -1,39 +0,0 @@ -@import "../../css/colors.css"; -@import "../../css/units.css"; -@import "../../css/typography.css"; - -$content-width: 500px; -$content-height: 450px; - -.modal-overlay { - position: fixed; - top: 0; - left: 0; - right: 0; - bottom: 0; - z-index: 1000; - background-color: $ui-modal-overlay; -} - -.modal-content { - margin: 100px auto; - outline: none; - border: .25rem solid $ui-white-transparent; - padding: 0; - border-radius: $space; - user-select: none; - width: $content-width; - color: $text-primary; - overflow: hidden; -} - -.body { - /* Need to repeat dimensions here to allow iframe scrolling for iOS */ - width: $content-width; - height: $content-height; - background: $ui-white; - - /* These properties needed to allow iframe scrolling for iOS */ - overflow-y: scroll; - -webkit-overflow-scrolling: touch; -} diff --git a/src/components/feedback-form/feedback-form.jsx b/src/components/feedback-form/feedback-form.jsx deleted file mode 100644 index b8006e8f8..000000000 --- a/src/components/feedback-form/feedback-form.jsx +++ /dev/null @@ -1,51 +0,0 @@ -import {connect} from 'react-redux'; -import PropTypes from 'prop-types'; -import React from 'react'; -import ReactModal from 'react-modal'; - -import Box from '../box/box.jsx'; - -import {closeFeedbackForm} from '../../reducers/modals'; - -import styles from './feedback-form.css'; - -const FeedbackForm = props => ( - - - {/* eslint-disable react/no-unknown-property */} - - {/* eslint-enable react/no-unknown-property */} - - -); - -FeedbackForm.propTypes = { - onFeedbackGiven: PropTypes.func.isRequired -}; - -const mapStateToProps = () => ({}); - -const mapDispatchToProps = dispatch => ({ - onFeedbackGiven: () => { - dispatch(closeFeedbackForm()); - } -}); - -export default connect( - mapStateToProps, - mapDispatchToProps -)(FeedbackForm); diff --git a/src/components/gui/gui.jsx b/src/components/gui/gui.jsx index d594767ab..6423dbd12 100644 --- a/src/components/gui/gui.jsx +++ b/src/components/gui/gui.jsx @@ -16,7 +16,6 @@ import StageHeader from '../../containers/stage-header.jsx'; import Stage from '../../containers/stage.jsx'; import Loader from '../loader/loader.jsx'; import Box from '../box/box.jsx'; -import FeedbackForm from '../feedback-form/feedback-form.jsx'; import MenuBar from '../menu-bar/menu-bar.jsx'; import PreviewModal from '../../containers/preview-modal.jsx'; import ImportModal from '../../containers/import-modal.jsx'; @@ -48,7 +47,6 @@ const GUIComponent = props => { blocksTabVisible, children, costumesTabVisible, - feedbackFormVisible, importInfoVisible, intl, loading, @@ -96,9 +94,6 @@ const GUIComponent = props => { {importInfoVisible ? ( ) : null} - {feedbackFormVisible ? ( - - ) : null} {isRendererSupported ? null : ( )} @@ -224,7 +219,6 @@ GUIComponent.propTypes = { blocksTabVisible: PropTypes.bool, children: PropTypes.node, costumesTabVisible: PropTypes.bool, - feedbackFormVisible: PropTypes.bool, importInfoVisible: PropTypes.bool, intl: intlShape.isRequired, loading: PropTypes.bool, diff --git a/src/components/menu-bar/icon--feedback.svg b/src/components/menu-bar/icon--feedback.svg deleted file mode 100644 index 012761715..000000000 --- a/src/components/menu-bar/icon--feedback.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - Feedback - Created with Sketch. - - - - - - - \ No newline at end of file diff --git a/src/components/menu-bar/menu-bar.css b/src/components/menu-bar/menu-bar.css index 1e2612a1d..4805e302d 100644 --- a/src/components/menu-bar/menu-bar.css +++ b/src/components/menu-bar/menu-bar.css @@ -80,12 +80,6 @@ padding: 0 0.75rem; } -.feedback-button { - background-color: $ui-white; - color: $motion-primary; - height: 34px; -} - .divider { border-right: 1px dashed $ui-black-transparent; margin: 0 .5rem; diff --git a/src/components/menu-bar/menu-bar.jsx b/src/components/menu-bar/menu-bar.jsx index 2114875b0..633b8130d 100644 --- a/src/components/menu-bar/menu-bar.jsx +++ b/src/components/menu-bar/menu-bar.jsx @@ -13,7 +13,6 @@ import Menu from '../../containers/menu.jsx'; import {MenuItem, MenuSection} from '../menu/menu.jsx'; import ProjectSaver from '../../containers/project-saver.jsx'; -import {openFeedbackForm} from '../../reducers/modals'; import { openFileMenu, closeFileMenu, @@ -27,7 +26,6 @@ import styles from './menu-bar.css'; import mystuffIcon from './icon--mystuff.png'; import profileIcon from './icon--profile.png'; -import feedbackIcon from './icon--feedback.svg'; import communityIcon from './icon--see-community.svg'; import dropdownCaret from '../language-selector/dropdown-caret.svg'; import scratchLogo from './scratch-logo.svg'; @@ -220,19 +218,6 @@ const MenuBar = props => ( -
- -
({ }); const mapDispatchToProps = dispatch => ({ - onGiveFeedback: () => dispatch(openFeedbackForm()), onClickFile: () => dispatch(openFileMenu()), onRequestCloseFile: () => dispatch(closeFileMenu()), onClickEdit: () => dispatch(openEditMenu()), diff --git a/src/containers/gui.jsx b/src/containers/gui.jsx index f8598848e..22dccba2c 100644 --- a/src/containers/gui.jsx +++ b/src/containers/gui.jsx @@ -83,7 +83,6 @@ class GUI extends React.Component { GUI.propTypes = { ...GUIComponent.propTypes, - feedbackFormVisible: PropTypes.bool, fetchingProject: PropTypes.bool, importInfoVisible: PropTypes.bool, loadingStateVisible: PropTypes.bool, @@ -98,7 +97,6 @@ const mapStateToProps = state => ({ activeTabIndex: state.editorTab.activeTabIndex, blocksTabVisible: state.editorTab.activeTabIndex === BLOCKS_TAB_INDEX, costumesTabVisible: state.editorTab.activeTabIndex === COSTUMES_TAB_INDEX, - feedbackFormVisible: state.modals.feedbackForm, importInfoVisible: state.modals.importInfo, loadingStateVisible: state.modals.loadingProject, previewInfoVisible: state.modals.previewInfo, diff --git a/src/reducers/modals.js b/src/reducers/modals.js index 2a3772e59..2bce0635c 100644 --- a/src/reducers/modals.js +++ b/src/reducers/modals.js @@ -6,7 +6,6 @@ const CLOSE_MODAL = 'scratch-gui/modals/CLOSE_MODAL'; const MODAL_BACKDROP_LIBRARY = 'backdropLibrary'; const MODAL_COSTUME_LIBRARY = 'costumeLibrary'; const MODAL_EXTENSION_LIBRARY = 'extensionLibrary'; -const MODAL_FEEDBACK_FORM = 'feedbackForm'; const MODAL_IMPORT_INFO = 'importInfo'; const MODAL_LOADING_PROJECT = 'loadingProject'; const MODAL_PREVIEW_INFO = 'previewInfo'; @@ -19,7 +18,6 @@ const initialState = { [MODAL_BACKDROP_LIBRARY]: false, [MODAL_COSTUME_LIBRARY]: false, [MODAL_EXTENSION_LIBRARY]: false, - [MODAL_FEEDBACK_FORM]: false, [MODAL_IMPORT_INFO]: false, [MODAL_LOADING_PROJECT]: false, [MODAL_PREVIEW_INFO]: true, @@ -67,10 +65,6 @@ const openExtensionLibrary = function () { analytics.pageview('/libraries/extensions'); return openModal(MODAL_EXTENSION_LIBRARY); }; -const openFeedbackForm = function () { - analytics.pageview('/modals/feedback'); - return openModal(MODAL_FEEDBACK_FORM); -}; const openImportInfo = function () { analytics.pageview('modals/import'); return openModal(MODAL_IMPORT_INFO); @@ -104,9 +98,6 @@ const closeCostumeLibrary = function () { const closeExtensionLibrary = function () { return closeModal(MODAL_EXTENSION_LIBRARY); }; -const closeFeedbackForm = function () { - return closeModal(MODAL_FEEDBACK_FORM); -}; const closeImportInfo = function () { return closeModal(MODAL_IMPORT_INFO); }; @@ -130,7 +121,6 @@ export { openBackdropLibrary, openCostumeLibrary, openExtensionLibrary, - openFeedbackForm, openImportInfo, openLoadingProject, openPreviewInfo, @@ -140,7 +130,6 @@ export { closeBackdropLibrary, closeCostumeLibrary, closeExtensionLibrary, - closeFeedbackForm, closeImportInfo, closeLoadingProject, closePreviewInfo,