Skip to content

Commit e6be67f

Browse files
raclimraclim
authored
Merge pull request #2873 from processing/revert-2714-feature/fundraiser-content
Revert "Add Promotion for 2023 Fundraiser"
2 parents 35d93b5 + 589ca22 commit e6be67f

File tree

16 files changed

+2
-1241
lines changed

16 files changed

+2
-1241
lines changed

‎client/constants.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,6 @@ export const SHOW_EDITOR_OPTIONS = 'SHOW_EDITOR_OPTIONS';
9090
export const CLOSE_EDITOR_OPTIONS = 'CLOSE_EDITOR_OPTIONS';
9191
export const SHOW_KEYBOARD_SHORTCUT_MODAL = 'SHOW_KEYBOARD_SHORTCUT_MODAL';
9292
export const CLOSE_KEYBOARD_SHORTCUT_MODAL = 'CLOSE_KEYBOARD_SHORTCUT_MODAL';
93-
export const SHOW_FUNDRAISER_MODAL = 'SHOW_FUNDRAISER_MODAL';
94-
export const CLOSE_FUNDRAISER_MODAL = 'CLOSE_FUNDRAISER_MODAL';
9593
export const SHOW_TOAST = 'SHOW_TOAST';
9694
export const HIDE_TOAST = 'HIDE_TOAST';
9795
export const SET_TOAST_TEXT = 'SET_TOAST_TEXT';

‎client/images/processing-foundation-logo.svg

Lines changed: 0 additions & 1025 deletions
This file was deleted.

‎client/modules/IDE/actions/ide.js

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -184,18 +184,6 @@ export function closeKeyboardShortcutModal() {
184184
};
185185
}
186186

187-
export function showFundraiserModal() {
188-
return {
189-
type: ActionTypes.SHOW_FUNDRAISER_MODAL
190-
};
191-
}
192-
193-
export function closeFundraiserModal() {
194-
return {
195-
type: ActionTypes.CLOSE_FUNDRAISER_MODAL
196-
};
197-
}
198-
199187
export function setUnsavedChanges(value) {
200188
return {
201189
type: ActionTypes.SET_UNSAVED_CHANGES,

‎client/modules/IDE/components/About.jsx

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -162,20 +162,6 @@ function About(props) {
162162
Discord
163163
</a>
164164
</p>
165-
<p className="about__content-column-list">
166-
<a
167-
href="https://p5js.org/download/support.html"
168-
target="_blank"
169-
rel="noopener noreferrer"
170-
>
171-
<AsteriskIcon
172-
className="about__content-column-asterisk"
173-
aria-hidden="true"
174-
focusable="false"
175-
/>
176-
Donate
177-
</a>
178-
</p>
179165
<p className="about__content-column-list">
180166
<Link to="/privacy-policy">
181167
<AsteriskIcon

‎client/modules/IDE/components/FundraiserModal.jsx

Lines changed: 0 additions & 36 deletions
This file was deleted.

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ import {
2323
newFile,
2424
newFolder,
2525
openPreferences,
26-
showKeyboardShortcutModal,
27-
showFundraiserModal
26+
showKeyboardShortcutModal
2827
} from '../../actions/ide';
2928
import { logoutUser } from '../../../User/actions';
3029
import { useSketchActions, useWhatPage } from '../../hooks';
@@ -438,9 +437,6 @@ const MoreMenu = () => {
438437
{t('Nav.Help.Reference')}
439438
</NavMenuItem>
440439
<NavMenuItem href="/about">{t('Nav.Help.About')}</NavMenuItem>
441-
<NavMenuItem onClick={() => dispatch(showFundraiserModal())}>
442-
{t('Nav.Fundraiser')}
443-
</NavMenuItem>
444440
</ParentMenuContext.Provider>
445441
</ul>
446442
</div>

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

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import {
2424
newFile,
2525
newFolder,
2626
showKeyboardShortcutModal,
27-
showFundraiserModal,
2827
startSketch,
2928
stopSketch
3029
} from '../../actions/ide';
@@ -38,7 +37,6 @@ const Nav = ({ layout }) => (
3837
matches ? (
3938
<NavBar>
4039
<LeftLayout layout={layout} />
41-
<FundraiserSection />
4240
<UserMenu />
4341
</NavBar>
4442
) : (
@@ -87,24 +85,6 @@ const UserMenu = () => {
8785
return null;
8886
};
8987

90-
const FundraiserSection = () => {
91-
const { t } = useTranslation();
92-
const dispatch = useDispatch();
93-
94-
return (
95-
<>
96-
<button
97-
className="nav__fundraiser-btn"
98-
onClick={() => dispatch(showFundraiserModal())}
99-
aria-label="2023-fundraiser-button"
100-
title="2023 Fundraiser Button"
101-
>
102-
{t('Nav.Fundraiser')}
103-
</button>
104-
</>
105-
);
106-
};
107-
10888
const DashboardMenu = () => {
10989
const { t } = useTranslation();
11090
const editorLink = useSelector(selectSketchPath);

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

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,6 @@ exports[`Nav renders dashboard version for desktop 1`] = `
3939
</a>
4040
</li>
4141
</ul>
42-
<button
43-
aria-label="2023-fundraiser-button"
44-
class="nav__fundraiser-btn"
45-
title="2023 Fundraiser Button"
46-
>
47-
Support p5.js and the Processing Foundation!
48-
</button>
4942
</nav>
5043
</header>
5144
</DocumentFragment>
@@ -460,13 +453,6 @@ exports[`Nav renders dashboard version for mobile 1`] = `
460453
About
461454
</a>
462455
</li>
463-
<li
464-
class="nav__dropdown-item"
465-
>
466-
<button>
467-
Support p5.js and the Processing Foundation!
468-
</button>
469-
</li>
470456
</ul>
471457
</div>
472458
</div>
@@ -683,13 +669,6 @@ exports[`Nav renders editor version for desktop 1`] = `
683669
</ul>
684670
</li>
685671
</ul>
686-
<button
687-
aria-label="2023-fundraiser-button"
688-
class="nav__fundraiser-btn"
689-
title="2023 Fundraiser Button"
690-
>
691-
Support p5.js and the Processing Foundation!
692-
</button>
693672
</nav>
694673
</header>
695674
</DocumentFragment>
@@ -1104,13 +1083,6 @@ exports[`Nav renders editor version for mobile 1`] = `
11041083
About
11051084
</a>
11061085
</li>
1107-
<li
1108-
class="nav__dropdown-item"
1109-
>
1110-
<button>
1111-
Support p5.js and the Processing Foundation!
1112-
</button>
1113-
</li>
11141086
</ul>
11151087
</div>
11161088
</div>

‎client/modules/IDE/components/IDEOverlays.jsx

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import { useLocation, useParams } from 'react-router-dom';
55
import Overlay from '../../App/components/Overlay';
66
import {
77
closeKeyboardShortcutModal,
8-
closeFundraiserModal,
98
closePreferences,
109
closeShareModal,
1110
hideErrorModal
@@ -15,7 +14,6 @@ import AddToCollectionList from './AddToCollectionList';
1514
import ErrorModal from './ErrorModal';
1615
import Feedback from './Feedback';
1716
import KeyboardShortcutModal from './KeyboardShortcutModal';
18-
import FundraiserModal from './FundraiserModal';
1917
import NewFileModal from './NewFileModal';
2018
import NewFolderModal from './NewFolderModal';
2119
import Preferences from './Preferences';
@@ -35,7 +33,6 @@ export default function IDEOverlays() {
3533
uploadFileModalVisible,
3634
preferencesIsVisible,
3735
keyboardShortcutVisible,
38-
fundraiserContentVisible,
3936
shareModalVisible,
4037
shareModalProjectId,
4138
shareModalProjectName,
@@ -109,15 +106,6 @@ export default function IDEOverlays() {
109106
<KeyboardShortcutModal />
110107
</Overlay>
111108
)}
112-
{fundraiserContentVisible && (
113-
<Overlay
114-
title={t('Fundraiser.Title')}
115-
ariaLabel={t('Fundraiser.Title')}
116-
closeOverlay={() => dispatch(closeFundraiserModal())}
117-
>
118-
<FundraiserModal />
119-
</Overlay>
120-
)}
121109
{errorType && (
122110
<Overlay
123111
title={t('Common.Error')}

‎client/modules/IDE/reducers/ide.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ const initialState = {
1515
shareModalProjectName: 'My Cute Sketch',
1616
shareModalProjectUsername: 'p5_user',
1717
keyboardShortcutVisible: false,
18-
fundraiserContentVisible: false,
1918
unsavedChanges: false,
2019
infiniteLoop: false,
2120
previewIsRefreshing: false,
@@ -86,10 +85,6 @@ const ide = (state = initialState, action) => {
8685
return Object.assign({}, state, { keyboardShortcutVisible: true });
8786
case ActionTypes.CLOSE_KEYBOARD_SHORTCUT_MODAL:
8887
return Object.assign({}, state, { keyboardShortcutVisible: false });
89-
case ActionTypes.SHOW_FUNDRAISER_MODAL:
90-
return Object.assign({}, state, { fundraiserContentVisible: true });
91-
case ActionTypes.CLOSE_FUNDRAISER_MODAL:
92-
return Object.assign({}, state, { fundraiserContentVisible: false });
9388
case ActionTypes.SET_UNSAVED_CHANGES:
9489
return Object.assign({}, state, { unsavedChanges: action.value });
9590
case ActionTypes.DETECT_INFINITE_LOOPS:

‎client/styles/abstracts/_variables.scss

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,6 @@ $themes: (
5050
button-nav-inactive-color: $middle-gray,
5151
button-hover-color: $lightest,
5252
button-active-color: $lightest,
53-
fundraiser-button-nav-color: $p5js-pink,
54-
fundraiser-button-background-color: $p5js-pink,
55-
fundraiser-button-color: $white,
56-
fundraiser-button-hover-active-color: $medium-dark,
5753
modal-background-color: $light,
5854
preferences-button-background-color: $medium-light,
5955
modal-border-color: $middle-light,
@@ -168,9 +164,6 @@ $themes: (
168164
editor-gutter-color: $darker,
169165
file-hover-color: $dark,
170166
file-selected-color: $medium-dark,
171-
fundraiser-button-background-color: $p5js-pink,
172-
fundraiser-button-color: $white,
173-
fundraiser-button-hover-active-color: $medium-dark,
174167
input-text-color: $lightest,
175168
input-background-color: $dark,
176169
input-secondary-background-color: $medium-dark,
@@ -265,9 +258,6 @@ $themes: (
265258
editor-gutter-color: $darker,
266259
file-hover-color: $dark,
267260
file-selected-color: $medium-dark,
268-
fundraiser-button-background-color: $yellow,
269-
fundraiser-button-color: $dark,
270-
fundraiser-button-hover-active-color: $medium-light,
271261
input-text-color: $lightest,
272262
input-background-color: $dark,
273263
input-secondary-background-color: $medium-dark,

‎client/styles/components/_fundraiser.scss

Lines changed: 0 additions & 53 deletions
This file was deleted.

‎client/styles/components/_nav.scss

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,6 @@
2323
align-items: center;
2424
}
2525

26-
.nav__fundraiser-btn {
27-
font-weight: bold;
28-
font-size: #{14 / $base-font-size}rem;
29-
@include themify() {
30-
color: getThemifyVariable('fundraiser-button-nav-color');
31-
}
32-
}
33-
34-
3526
.preview-nav__editor-svg {
3627
@include icon();
3728
}

‎client/styles/main.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
@import 'components/asset-list';
4444
@import 'components/asset-size';
4545
@import 'components/keyboard-shortcuts';
46-
@import 'components/fundraiser';
4746
@import 'components/copyable-input';
4847
@import 'components/feedback';
4948
@import 'components/console-input';

‎client/testData/testReduxStore.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ const initialTestState = {
3535
shareModalProjectName: 'My Cute Sketch',
3636
shareModalProjectUsername: 'p5_user',
3737
keyboardShortcutVisible: false,
38-
fundraiserContentVisible: false,
3938
unsavedChanges: false,
4039
infiniteLoop: false,
4140
previewIsRefreshing: false,

0 commit comments

Comments
 (0)