Remove feedback form

src/components/feedback-form/feedback-form.css

@@ -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;
-}

src/components/feedback-form/feedback-form.jsx

@@ -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 => (
-    <ReactModal
-        isOpen
-        className={styles.modalContent}
-        overlayClassName={styles.modalOverlay}
-        onRequestClose={props.onFeedbackGiven}
-    >
-        <Box className={styles.body}>
-            {/* eslint-disable react/no-unknown-property */}
-            <iframe
-                frameborder="0"
-                height="450"
-                marginheight="0"
-                marginwidth="0"
-                src="https://docs.google.com/forms/d/e/1FAIpQLSfAaCbOwcwQb4vrNDrlNw5BTRZc4xOayGRPzymaQ22heBTLmQ/viewform?embedded=true"
-                width="500"
-            >
-                Loading...
-            </iframe>
-            {/* eslint-enable react/no-unknown-property */}
-        </Box>
-    </ReactModal>
-);
-
-FeedbackForm.propTypes = {
-    onFeedbackGiven: PropTypes.func.isRequired
-};
-
-const mapStateToProps = () => ({});
-
-const mapDispatchToProps = dispatch => ({
-    onFeedbackGiven: () => {
-        dispatch(closeFeedbackForm());
-    }
-});
-
-export default connect(
-    mapStateToProps,
-    mapDispatchToProps
-)(FeedbackForm);

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 ? (
                 <ImportModal />
             ) : null}
-            {feedbackFormVisible ? (
-                <FeedbackForm />
-            ) : null}
             {isRendererSupported ? null : (
                 <WebGlModal />
             )}
@@ -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,

src/components/menu-bar/icon--feedback.svg

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 48.1 (47250) - http://www.bohemiancoding.com/sketch -->
-    <title>Feedback</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Feedback" fill="#4C97FF">
-            <path d="M12.3811686,14.2770244 C12.3811686,14.3987659 12.3515563,14.506558 12.306433,14.6257633 L11.4998525,16.6002595 C11.2770558,16.478518 10.93299,16.3846755 10.4704753,16.3846755 C10.0234717,16.3846755 9.6949171,16.478518 9.47071028,16.58631 L8.66412979,14.6257633 C8.60490535,14.506558 8.59080429,14.3848164 8.59080429,14.2643429 C8.60490535,14.2503934 8.60490535,14.2237624 8.60490535,14.2098129 L8.60490535,14.1705005 C8.60490535,13.9828155 8.67964095,13.7938625 8.813601,13.6188589 C9.1576668,13.1775457 9.79926492,12.9086997 10.4859864,12.9086997 C11.1727079,12.9086997 11.8143061,13.1775457 12.1428607,13.6188589 C12.2472085,13.7684996 12.3360452,13.9409669 12.3670675,14.103289 C12.3811686,14.1565509 12.3811686,14.2098129 12.3811686,14.2643429 L12.3811686,14.2770244 Z M8.60490535,5.94153049 C8.60490535,5.50782611 8.89115681,5.12865181 9.33393002,4.89024122 C9.59056927,4.7520138 9.91771381,4.9143359 9.91771381,5.18445004 L9.91771381,11.6621167 C9.91771381,11.8168299 9.80490535,11.9550573 9.63851287,11.9918334 C9.46789007,12.0311458 9.3029077,12.0831396 9.14638596,12.1452786 C8.89115681,12.2467299 8.60490535,12.0844078 8.60490535,11.8345839 L8.60490535,5.94153049 Z M12.3670675,5.94153049 L12.3670675,11.8333158 C12.3670675,12.0780671 12.0892767,12.2505343 11.8410981,12.1516193 C11.6775258,12.0844078 11.5054929,12.032414 11.3278196,11.9931016 C11.1529665,11.9550573 11.0373378,11.8054166 11.0373378,11.6443627 L11.0373378,5.18191375 C11.0373378,4.9143359 11.3630722,4.75074565 11.6211216,4.88770493 C12.0709453,5.12611553 12.3670675,5.50528983 12.3670675,5.94153049 Z M10.4859864,1.48528137 C8.82911216,1.48528137 7.48528137,2.53149809 7.48528137,3.82119796 L7.48528137,14.2237624 C7.48528137,14.4786589 7.5148936,14.7335553 7.62065153,14.9757703 L9.1576668,18.7066425 C9.3522614,19.177123 9.87400053,19.4852814 10.4859864,19.4852814 C11.0979723,19.4852814 11.6197115,19.177123 11.8143061,18.7066425 L13.3513213,14.9757703 C13.4556692,14.7335553 13.4852814,14.4786589 13.4852814,14.2237624 L13.4852814,3.82119796 C13.4852814,2.53149809 12.1428607,1.48528137 10.4859864,1.48528137 Z" id="feedback" transform="translate(10.485281, 10.485281) rotate(45.000000) translate(-10.485281, -10.485281) "></path>
-        </g>
-    </g>
-</svg>

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;

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 => (
                 </MenuBarItemTooltip>
             </div>
         </div>
-        <div className={classNames(styles.menuBarItem, styles.feedbackButtonWrapper)}>
-            <Button
-                className={styles.feedbackButton}
-                iconSrc={feedbackIcon}
-                onClick={props.onGiveFeedback}
-            >
-                <FormattedMessage
-                    defaultMessage="Give Feedback"
-                    description="Label for feedback form modal button"
-                    id="gui.menuBar.giveFeedback"
-                />
-            </Button>
-        </div>
         <div className={styles.accountInfoWrapper}>
             <MenuBarItemTooltip id="mystuff">
                 <div
@@ -279,7 +264,6 @@ MenuBar.propTypes = {
     fileMenuOpen: PropTypes.bool,
     onClickEdit: PropTypes.func,
     onClickFile: PropTypes.func,
-    onGiveFeedback: PropTypes.func.isRequired,
     onRequestCloseEdit: PropTypes.func,
     onRequestCloseFile: PropTypes.func
 };
@@ -290,7 +274,6 @@ const mapStateToProps = state => ({
 });
 
 const mapDispatchToProps = dispatch => ({
-    onGiveFeedback: () => dispatch(openFeedbackForm()),
     onClickFile: () => dispatch(openFileMenu()),
     onRequestCloseFile: () => dispatch(closeFileMenu()),
     onClickEdit: () => dispatch(openEditMenu()),

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,

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,