Skip to content

Commit 010b31f

Browse files
authored
Merge branch 'processing:develop' into keyboard_shortcut_add_file
2 parents 6c92e0f + c09cbb3 commit 010b31f

File tree

20 files changed

+1448
-212
lines changed

20 files changed

+1448
-212
lines changed

client/constants.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ 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';
9395
export const SHOW_TOAST = 'SHOW_TOAST';
9496
export const HIDE_TOAST = 'HIDE_TOAST';
9597
export const SET_TOAST_TEXT = 'SET_TOAST_TEXT';

client/images/processing-foundation-logo.svg

Lines changed: 1025 additions & 0 deletions
Loading

client/modules/IDE/actions/ide.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,18 @@ 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+
187199
export function setUnsavedChanges(value) {
188200
return {
189201
type: ActionTypes.SET_UNSAVED_CHANGES,

client/modules/IDE/components/About.jsx

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,20 @@ 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>
165179
<p className="about__content-column-list">
166180
<Link to="/privacy-policy">
167181
<AsteriskIcon

0 commit comments

Comments
 (0)