diff --git a/client/constants.js b/client/constants.js index 4529d25efb..565d716fa6 100644 --- a/client/constants.js +++ b/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'; diff --git a/client/images/processing-foundation-logo.svg b/client/images/processing-foundation-logo.svg deleted file mode 100644 index 013501f44e..0000000000 --- a/client/images/processing-foundation-logo.svg +++ /dev/null @@ -1,1025 +0,0 @@ - - - - diff --git a/client/modules/IDE/actions/ide.js b/client/modules/IDE/actions/ide.js index 7a23535713..80a43443bc 100644 --- a/client/modules/IDE/actions/ide.js +++ b/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, diff --git a/client/modules/IDE/components/About.jsx b/client/modules/IDE/components/About.jsx index 9d2459c48b..e9a17f141d 100644 --- a/client/modules/IDE/components/About.jsx +++ b/client/modules/IDE/components/About.jsx @@ -162,20 +162,6 @@ function About(props) { Discord

-

- - -

-

{t('Fundraiser.Description')}

-
- - -
- - {t('Fundraiser.CallToAction')} - - - ); -} diff --git a/client/modules/IDE/components/Header/MobileNav.jsx b/client/modules/IDE/components/Header/MobileNav.jsx index dc450c6214..9d81cf6d22 100644 --- a/client/modules/IDE/components/Header/MobileNav.jsx +++ b/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')} {t('Nav.Help.About')} - dispatch(showFundraiserModal())}> - {t('Nav.Fundraiser')} - diff --git a/client/modules/IDE/components/Header/Nav.jsx b/client/modules/IDE/components/Header/Nav.jsx index 591f9b5740..b4f7cb151f 100644 --- a/client/modules/IDE/components/Header/Nav.jsx +++ b/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 ? ( - ) : ( @@ -87,24 +85,6 @@ const UserMenu = () => { return null; }; -const FundraiserSection = () => { - const { t } = useTranslation(); - const dispatch = useDispatch(); - - return ( - <> - - - ); -}; - const DashboardMenu = () => { const { t } = useTranslation(); const editorLink = useSelector(selectSketchPath); diff --git a/client/modules/IDE/components/Header/__snapshots__/Nav.unit.test.jsx.snap b/client/modules/IDE/components/Header/__snapshots__/Nav.unit.test.jsx.snap index bbfcb41e6e..45a7f72f52 100644 --- a/client/modules/IDE/components/Header/__snapshots__/Nav.unit.test.jsx.snap +++ b/client/modules/IDE/components/Header/__snapshots__/Nav.unit.test.jsx.snap @@ -39,13 +39,6 @@ exports[`Nav renders dashboard version for desktop 1`] = ` - @@ -460,13 +453,6 @@ exports[`Nav renders dashboard version for mobile 1`] = ` About -
  • - -
    • @@ -683,13 +669,6 @@ exports[`Nav renders editor version for desktop 1`] = ` - @@ -1104,13 +1083,6 @@ exports[`Nav renders editor version for mobile 1`] = ` About -
  • - -
    • diff --git a/client/modules/IDE/components/IDEOverlays.jsx b/client/modules/IDE/components/IDEOverlays.jsx index 789caeb753..6dba0e76f5 100644 --- a/client/modules/IDE/components/IDEOverlays.jsx +++ b/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() { )} - {fundraiserContentVisible && ( - dispatch(closeFundraiserModal())} - > - - - )} {errorType && ( { 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: diff --git a/client/styles/abstracts/_variables.scss b/client/styles/abstracts/_variables.scss index e3c539e0dc..17cd04bab8 100644 --- a/client/styles/abstracts/_variables.scss +++ b/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, diff --git a/client/styles/components/_fundraiser.scss b/client/styles/components/_fundraiser.scss deleted file mode 100644 index 2d3a989782..0000000000 --- a/client/styles/components/_fundraiser.scss +++ /dev/null @@ -1,53 +0,0 @@ -.fundraiser { - padding: #{20 / $base-font-size}rem; - margin-right: #{20 / $base-font-size}rem; - padding-bottom: #{40 / $base-font-size}rem; - width: #{500 / $base-font-size}rem; - text-align: center; - overflow-y: auto; -} - -.fundraiser__CTA { - font-size: #{23 / $base-font-size}rem; - font-weight: bold; - margin-top: #{10 / $base-font-size}rem; - padding: #{20 / $base-font-size}rem; - border-radius: #{35 / $base-font-size}rem; - - @include themify() { - color: getThemifyVariable('fundraiser-button-color'); - background-color: getThemifyVariable('fundraiser-button-background-color'); - } - - &:hover, - &:focus { - @include themify() { - color: getThemifyVariable('fundraiser-button-color'); - background-color: getThemifyVariable('fundraiser-button-hover-active-color'); - } - } -} - -.fundraiser__description { - margin: #{20 / $base-font-size}rem 0; - font-size: #{20 / $base-font-size}rem; -} - -.fundraiser__img-container { - display: flex; - justify-content: center; - margin: #{40 / $base-font-size}rem 0 #{55 / $base-font-size}rem 0; -} - -.fundraiser__logo-p5 { - margin: 0 #{15 / $base-font-size}rem 0 #{30 / $base-font-size}rem; - width:#{150 / $base-font-size}rem; - height:#{150 / $base-font-size}rem; -} - -.fundraiser__logo-PF { - margin-left: #{20 / $base-font-size}rem; - padding-bottom: #{15 / $base-font-size}rem; - width:#{250 / $base-font-size}rem; - height:#{150 / $base-font-size}rem; -} \ No newline at end of file diff --git a/client/styles/components/_nav.scss b/client/styles/components/_nav.scss index 4ca31ee872..69f267955e 100644 --- a/client/styles/components/_nav.scss +++ b/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(); } diff --git a/client/styles/main.scss b/client/styles/main.scss index 96d279d964..9018fe6273 100644 --- a/client/styles/main.scss +++ b/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'; diff --git a/client/testData/testReduxStore.js b/client/testData/testReduxStore.js index 551edb742b..6af5989a66 100644 --- a/client/testData/testReduxStore.js +++ b/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, diff --git a/translations/locales/en-US/translations.json b/translations/locales/en-US/translations.json index 7f33febd97..7097411097 100644 --- a/translations/locales/en-US/translations.json +++ b/translations/locales/en-US/translations.json @@ -45,8 +45,7 @@ "Asset": "Asset", "MyAssets": "My Assets", "LogOut": "Log Out" - }, - "Fundraiser": "Support p5.js and the Processing Foundation!" + } }, "CodemirrorFindAndReplace": { "ToggleReplace": "Toggle Replace", @@ -202,11 +201,6 @@ "TurnOffAccessibleOutput": "Turn Off Accessible Output" } }, - "Fundraiser": { - "Title": "Support Our Software and Team", - "Description": "🎉 Join us in celebrating a Decade of Code! 🎉 Support p5.js and the Processing Foundation and earn unique rewards. 🙂", - "CallToAction": "Contribute and learn more!" - }, "Sidebar": { "Title": "Sketch Files", "ToggleARIA": "Toggle open/close sketch file options", @@ -236,7 +230,6 @@ "ErrorARIA": "Error", "Save": "Save", "p5logoARIA": "p5.js Logo", - "PFlogoARIA": "Processing Foundation Logo", "DeleteConfirmation": "Are you sure you want to delete {{name}}?" }, "IDEView": {