Skip to content

Commit c632ef2

Browse files
raclimraclim
authored
Merge branch 'develop' into patch-1
2 parents 81f1fca + 3846302 commit c632ef2

File tree

19 files changed

+1254
-6
lines changed

19 files changed

+1254
-6
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Issues and Pull Requests categorized under the PATCH or MINOR Release Milestones
3838

3939
We will aim to deploy on a 1-2 month basis. Here are some dates we’re working towards:
4040

41-
2.11.0 MINOR Release: By December 22, 2023
41+
2.11.0 MINOR Release: By January 10, 2023
4242

4343
[You can read more about Semantic Versioning and the differences between a MINOR and PATCH release](https://semver.org/).
4444

‎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

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

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
import React from 'react';
2+
import { useTranslation } from 'react-i18next';
3+
import LogoIcon from '../../../images/p5js-logo.svg';
4+
import PFLogoIcon from '../../../images/processing-foundation-logo.svg';
5+
6+
export default function FundraiserModal() {
7+
const { t } = useTranslation();
8+
9+
return (
10+
<div className="fundraiser">
11+
<p className="fundraiser__description">{t('Fundraiser.Description')}</p>
12+
<div className="fundraiser__img-container">
13+
<LogoIcon
14+
className="fundraiser__logo-p5"
15+
role="img"
16+
aria-label={t('Common.p5logoARIA')}
17+
focusable="false"
18+
/>
19+
<PFLogoIcon
20+
className="fundraiser__logo-PF"
21+
role="img"
22+
aria-label={t('Common.PFlogoARIA')}
23+
focusable="false"
24+
/>
25+
</div>
26+
<a
27+
className="fundraiser__CTA"
28+
href="https://donorbox.org/to-the-power-of-10"
29+
target="_blank"
30+
rel="noopener noreferrer"
31+
>
32+
{t('Fundraiser.CallToAction')}
33+
</a>
34+
</div>
35+
);
36+
}

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ import {
2323
newFile,
2424
newFolder,
2525
openPreferences,
26-
showKeyboardShortcutModal
26+
showKeyboardShortcutModal,
27+
showFundraiserModal
2728
} from '../../actions/ide';
2829
import { logoutUser } from '../../../User/actions';
2930
import { useSketchActions, useWhatPage } from '../../hooks';
@@ -93,6 +94,9 @@ export const Options = styled.div`
9394
ul.opened {
9495
transform: scale(1);
9596
opacity: 1;
97+
max-width: 90vw;
98+
max-height: 90vh;
99+
overflow-y: auto;
96100
}
97101
98102
> div {
@@ -434,6 +438,9 @@ const MoreMenu = () => {
434438
{t('Nav.Help.Reference')}
435439
</NavMenuItem>
436440
<NavMenuItem href="/about">{t('Nav.Help.About')}</NavMenuItem>
441+
<NavMenuItem onClick={() => dispatch(showFundraiserModal())}>
442+
{t('Nav.Fundraiser')}
443+
</NavMenuItem>
437444
</ParentMenuContext.Provider>
438445
</ul>
439446
</div>

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import {
2424
newFile,
2525
newFolder,
2626
showKeyboardShortcutModal,
27+
showFundraiserModal,
2728
startSketch,
2829
stopSketch
2930
} from '../../actions/ide';
@@ -37,6 +38,7 @@ const Nav = ({ layout }) => (
3738
matches ? (
3839
<NavBar>
3940
<LeftLayout layout={layout} />
41+
<FundraiserSection />
4042
<UserMenu />
4143
</NavBar>
4244
) : (
@@ -85,6 +87,24 @@ const UserMenu = () => {
8587
return null;
8688
};
8789

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+
88108
const DashboardMenu = () => {
89109
const { t } = useTranslation();
90110
const editorLink = useSelector(selectSketchPath);

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

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,13 @@ 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>
4249
</nav>
4350
</header>
4451
</DocumentFragment>
@@ -168,6 +175,9 @@ exports[`Nav renders dashboard version for mobile 1`] = `
168175
-ms-transform: scale(1);
169176
transform: scale(1);
170177
opacity: 1;
178+
max-width: 90vw;
179+
max-height: 90vh;
180+
overflow-y: auto;
171181
}
172182
173183
.c3 > div {
@@ -450,6 +460,13 @@ exports[`Nav renders dashboard version for mobile 1`] = `
450460
About
451461
</a>
452462
</li>
463+
<li
464+
class="nav__dropdown-item"
465+
>
466+
<button>
467+
Support p5.js and the Processing Foundation!
468+
</button>
469+
</li>
453470
</ul>
454471
</div>
455472
</div>
@@ -666,6 +683,13 @@ exports[`Nav renders editor version for desktop 1`] = `
666683
</ul>
667684
</li>
668685
</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>
669693
</nav>
670694
</header>
671695
</DocumentFragment>
@@ -795,6 +819,9 @@ exports[`Nav renders editor version for mobile 1`] = `
795819
-ms-transform: scale(1);
796820
transform: scale(1);
797821
opacity: 1;
822+
max-width: 90vw;
823+
max-height: 90vh;
824+
overflow-y: auto;
798825
}
799826
800827
.c3 > div {
@@ -1077,6 +1104,13 @@ exports[`Nav renders editor version for mobile 1`] = `
10771104
About
10781105
</a>
10791106
</li>
1107+
<li
1108+
class="nav__dropdown-item"
1109+
>
1110+
<button>
1111+
Support p5.js and the Processing Foundation!
1112+
</button>
1113+
</li>
10801114
</ul>
10811115
</div>
10821116
</div>

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { useLocation, useParams } from 'react-router-dom';
55
import Overlay from '../../App/components/Overlay';
66
import {
77
closeKeyboardShortcutModal,
8+
closeFundraiserModal,
89
closePreferences,
910
closeShareModal,
1011
hideErrorModal
@@ -14,6 +15,7 @@ import AddToCollectionList from './AddToCollectionList';
1415
import ErrorModal from './ErrorModal';
1516
import Feedback from './Feedback';
1617
import KeyboardShortcutModal from './KeyboardShortcutModal';
18+
import FundraiserModal from './FundraiserModal';
1719
import NewFileModal from './NewFileModal';
1820
import NewFolderModal from './NewFolderModal';
1921
import Preferences from './Preferences';
@@ -33,6 +35,7 @@ export default function IDEOverlays() {
3335
uploadFileModalVisible,
3436
preferencesIsVisible,
3537
keyboardShortcutVisible,
38+
fundraiserContentVisible,
3639
shareModalVisible,
3740
shareModalProjectId,
3841
shareModalProjectName,
@@ -106,6 +109,15 @@ export default function IDEOverlays() {
106109
<KeyboardShortcutModal />
107110
</Overlay>
108111
)}
112+
{fundraiserContentVisible && (
113+
<Overlay
114+
title={t('Fundraiser.Title')}
115+
ariaLabel={t('Fundraiser.Title')}
116+
closeOverlay={() => dispatch(closeFundraiserModal())}
117+
>
118+
<FundraiserModal />
119+
</Overlay>
120+
)}
109121
{errorType && (
110122
<Overlay
111123
title={t('Common.Error')}

0 commit comments

Comments
 (0)