Revert "Add Promotion for 2023 Fundraiser"

client/constants.js

@@ -90,8 +90,6 @@ export const SHOW_EDITOR_OPTIONS = 'SHOW_EDITOR_OPTIONS';
 export const CLOSE_EDITOR_OPTIONS = 'CLOSE_EDITOR_OPTIONS';
 export const SHOW_KEYBOARD_SHORTCUT_MODAL = 'SHOW_KEYBOARD_SHORTCUT_MODAL';
 export const CLOSE_KEYBOARD_SHORTCUT_MODAL = 'CLOSE_KEYBOARD_SHORTCUT_MODAL';
-export const SHOW_FUNDRAISER_MODAL = 'SHOW_FUNDRAISER_MODAL';
-export const CLOSE_FUNDRAISER_MODAL = 'CLOSE_FUNDRAISER_MODAL';
 export const SHOW_TOAST = 'SHOW_TOAST';
 export const HIDE_TOAST = 'HIDE_TOAST';
 export const SET_TOAST_TEXT = 'SET_TOAST_TEXT';

client/modules/IDE/actions/ide.js

@@ -184,18 +184,6 @@ export function closeKeyboardShortcutModal() {
   };
 }
 
-export function showFundraiserModal() {
-  return {
-    type: ActionTypes.SHOW_FUNDRAISER_MODAL
-  };
-}
-
-export function closeFundraiserModal() {
-  return {
-    type: ActionTypes.CLOSE_FUNDRAISER_MODAL
-  };
-}
-
 export function setUnsavedChanges(value) {
   return {
     type: ActionTypes.SET_UNSAVED_CHANGES,

client/modules/IDE/components/About.jsx

@@ -162,20 +162,6 @@ function About(props) {
             Discord
           </a>
         </p>
-        <p className="about__content-column-list">
-          <a
-            href="https://p5js.org/download/support.html"
-            target="_blank"
-            rel="noopener noreferrer"
-          >
-            <AsteriskIcon
-              className="about__content-column-asterisk"
-              aria-hidden="true"
-              focusable="false"
-            />
-            Donate
-          </a>
-        </p>
         <p className="about__content-column-list">
           <Link to="/privacy-policy">
             <AsteriskIcon

client/modules/IDE/components/Header/MobileNav.jsx

@@ -23,8 +23,7 @@ import {
   newFile,
   newFolder,
   openPreferences,
-  showKeyboardShortcutModal,
-  showFundraiserModal
+  showKeyboardShortcutModal
 } from '../../actions/ide';
 import { logoutUser } from '../../../User/actions';
 import { useSketchActions, useWhatPage } from '../../hooks';
@@ -438,9 +437,6 @@ const MoreMenu = () => {
             {t('Nav.Help.Reference')}
           </NavMenuItem>
           <NavMenuItem href="/about">{t('Nav.Help.About')}</NavMenuItem>
-          <NavMenuItem onClick={() => dispatch(showFundraiserModal())}>
-            {t('Nav.Fundraiser')}
-          </NavMenuItem>
         </ParentMenuContext.Provider>
       </ul>
     </div>

client/modules/IDE/components/Header/Nav.jsx

@@ -24,7 +24,6 @@ import {
   newFile,
   newFolder,
   showKeyboardShortcutModal,
-  showFundraiserModal,
   startSketch,
   stopSketch
 } from '../../actions/ide';
@@ -38,7 +37,6 @@ const Nav = ({ layout }) => (
       matches ? (
         <NavBar>
           <LeftLayout layout={layout} />
-          <FundraiserSection />
           <UserMenu />
         </NavBar>
       ) : (
@@ -87,24 +85,6 @@ const UserMenu = () => {
   return null;
 };
 
-const FundraiserSection = () => {
-  const { t } = useTranslation();
-  const dispatch = useDispatch();
-
-  return (
-    <>
-      <button
-        className="nav__fundraiser-btn"
-        onClick={() => dispatch(showFundraiserModal())}
-        aria-label="2023-fundraiser-button"
-        title="2023 Fundraiser Button"
-      >
-        {t('Nav.Fundraiser')}
-      </button>
-    </>
-  );
-};
-
 const DashboardMenu = () => {
   const { t } = useTranslation();
   const editorLink = useSelector(selectSketchPath);

client/modules/IDE/components/Header/__snapshots__/Nav.unit.test.jsx.snap

@@ -39,13 +39,6 @@ exports[`Nav renders dashboard version for desktop 1`] = `
           </a>
         </li>
       </ul>
-      <button
-        aria-label="2023-fundraiser-button"
-        class="nav__fundraiser-btn"
-        title="2023 Fundraiser Button"
-      >
-        Support p5.js and the Processing Foundation!
-      </button>
     </nav>
   </header>
 </DocumentFragment>
@@ -460,13 +453,6 @@ exports[`Nav renders dashboard version for mobile 1`] = `
                 About
               </a>
             </li>
-            <li
-              class="nav__dropdown-item"
-            >
-              <button>
-                Support p5.js and the Processing Foundation!
-              </button>
-            </li>
           </ul>
         </div>
       </div>
@@ -683,13 +669,6 @@ exports[`Nav renders editor version for desktop 1`] = `
           </ul>
         </li>
       </ul>
-      <button
-        aria-label="2023-fundraiser-button"
-        class="nav__fundraiser-btn"
-        title="2023 Fundraiser Button"
-      >
-        Support p5.js and the Processing Foundation!
-      </button>
     </nav>
   </header>
 </DocumentFragment>
@@ -1104,13 +1083,6 @@ exports[`Nav renders editor version for mobile 1`] = `
                 About
               </a>
             </li>
-            <li
-              class="nav__dropdown-item"
-            >
-              <button>
-                Support p5.js and the Processing Foundation!
-              </button>
-            </li>
           </ul>
         </div>
       </div>

client/modules/IDE/components/IDEOverlays.jsx

@@ -5,7 +5,6 @@ import { useLocation, useParams } from 'react-router-dom';
 import Overlay from '../../App/components/Overlay';
 import {
   closeKeyboardShortcutModal,
-  closeFundraiserModal,
   closePreferences,
   closeShareModal,
   hideErrorModal
@@ -15,7 +14,6 @@ import AddToCollectionList from './AddToCollectionList';
 import ErrorModal from './ErrorModal';
 import Feedback from './Feedback';
 import KeyboardShortcutModal from './KeyboardShortcutModal';
-import FundraiserModal from './FundraiserModal';
 import NewFileModal from './NewFileModal';
 import NewFolderModal from './NewFolderModal';
 import Preferences from './Preferences';
@@ -35,7 +33,6 @@ export default function IDEOverlays() {
     uploadFileModalVisible,
     preferencesIsVisible,
     keyboardShortcutVisible,
-    fundraiserContentVisible,
     shareModalVisible,
     shareModalProjectId,
     shareModalProjectName,
@@ -109,15 +106,6 @@ export default function IDEOverlays() {
           <KeyboardShortcutModal />
         </Overlay>
       )}
-      {fundraiserContentVisible && (
-        <Overlay
-          title={t('Fundraiser.Title')}
-          ariaLabel={t('Fundraiser.Title')}
-          closeOverlay={() => dispatch(closeFundraiserModal())}
-        >
-          <FundraiserModal />
-        </Overlay>
-      )}
       {errorType && (
         <Overlay
           title={t('Common.Error')}

client/modules/IDE/reducers/ide.js

@@ -15,7 +15,6 @@ const initialState = {
   shareModalProjectName: 'My Cute Sketch',
   shareModalProjectUsername: 'p5_user',
   keyboardShortcutVisible: false,
-  fundraiserContentVisible: false,
   unsavedChanges: false,
   infiniteLoop: false,
   previewIsRefreshing: false,
@@ -86,10 +85,6 @@ const ide = (state = initialState, action) => {
       return Object.assign({}, state, { keyboardShortcutVisible: true });
     case ActionTypes.CLOSE_KEYBOARD_SHORTCUT_MODAL:
       return Object.assign({}, state, { keyboardShortcutVisible: false });
-    case ActionTypes.SHOW_FUNDRAISER_MODAL:
-      return Object.assign({}, state, { fundraiserContentVisible: true });
-    case ActionTypes.CLOSE_FUNDRAISER_MODAL:
-      return Object.assign({}, state, { fundraiserContentVisible: false });
     case ActionTypes.SET_UNSAVED_CHANGES:
       return Object.assign({}, state, { unsavedChanges: action.value });
     case ActionTypes.DETECT_INFINITE_LOOPS:

client/styles/abstracts/_variables.scss

@@ -50,10 +50,6 @@ $themes: (
     button-nav-inactive-color: $middle-gray,
     button-hover-color: $lightest,
     button-active-color: $lightest,
-    fundraiser-button-nav-color: $p5js-pink,
-    fundraiser-button-background-color: $p5js-pink,
-    fundraiser-button-color: $white,
-    fundraiser-button-hover-active-color: $medium-dark,
     modal-background-color: $light,
     preferences-button-background-color: $medium-light,
     modal-border-color: $middle-light,
@@ -168,9 +164,6 @@ $themes: (
     editor-gutter-color: $darker,
     file-hover-color: $dark,
     file-selected-color: $medium-dark,
-    fundraiser-button-background-color: $p5js-pink,
-    fundraiser-button-color: $white,
-    fundraiser-button-hover-active-color: $medium-dark,
     input-text-color: $lightest,
     input-background-color: $dark,
     input-secondary-background-color: $medium-dark,
@@ -265,9 +258,6 @@ $themes: (
     editor-gutter-color: $darker,
     file-hover-color: $dark,
     file-selected-color: $medium-dark,
-    fundraiser-button-background-color: $yellow,
-    fundraiser-button-color: $dark,
-    fundraiser-button-hover-active-color: $medium-light,
     input-text-color: $lightest,
     input-background-color: $dark,
     input-secondary-background-color: $medium-dark,

client/styles/components/_nav.scss

@@ -23,15 +23,6 @@
   align-items: center;
 }
 
-.nav__fundraiser-btn {
-  font-weight: bold;
-  font-size: #{14 / $base-font-size}rem;
-  @include themify() {
-    color: getThemifyVariable('fundraiser-button-nav-color');
-  }
-}
-
-
 .preview-nav__editor-svg {
   @include icon();
 }

client/styles/main.scss

@@ -43,7 +43,6 @@
 @import 'components/asset-list';
 @import 'components/asset-size';
 @import 'components/keyboard-shortcuts';
-@import 'components/fundraiser';
 @import 'components/copyable-input';
 @import 'components/feedback';
 @import 'components/console-input';

client/testData/testReduxStore.js

@@ -35,7 +35,6 @@ const initialTestState = {
     shareModalProjectName: 'My Cute Sketch',
     shareModalProjectUsername: 'p5_user',
     keyboardShortcutVisible: false,
-    fundraiserContentVisible: false,
     unsavedChanges: false,
     infiniteLoop: false,
     previewIsRefreshing: false,