Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Work in progress on AmountStep and InfoStep #934

Draft
wants to merge 26 commits into
base: feature/donate-wizard-react
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
d2320b7
Using useIntl hook to fetch translations
Dec 1, 2021
140049a
Basic work and fixes to add the wizard to Storybook
Dec 1, 2021
170b66c
Includes assets to new wizard
Dec 3, 2021
3b1c3ce
Adds relative paths to a bunch of imports on stylesheet files
Dec 3, 2021
3c90d23
Imports more stylesheets on wizard component
Dec 3, 2021
cb56e02
Correctly evaluating when the steps are done and displaying steps bodies
Dec 6, 2021
a2edb83
Styles fixes
Dec 6, 2021
5963119
Fixes gradient on wizard index
Dec 6, 2021
965a83c
Prevents moving to next step using index
Dec 6, 2021
dd6fac9
wip for adding next behavior
Dec 6, 2021
6fba961
Eric does helpy-help
wwahammy Dec 6, 2021
c4bf911
Dispatches action whenever submitting on AmountStep
Dec 7, 2021
382e7ba
Adds custom amount and recurring components to AmountStep
Dec 13, 2021
b0ad970
Adds SingleAmount component and fixes recurring
Dec 15, 2021
66f9f54
Initial work for InfoStep
Dec 15, 2021
902f76e
Transmits amount and recurring information from AmountStep to InfoStep
Dec 16, 2021
38fa8e1
Sets supporter and address fields
Dec 17, 2021
e8cf2db
Add Payment buttons (sepa and card)
Dec 17, 2021
498713d
Using supporter info from state instead of props
Dec 17, 2021
1496b6a
Fix preset recurring
Dec 20, 2021
20a6b3e
Fix eslint errors
Dec 21, 2021
3809942
Use form value to tell whether a button amount was selected instead o…
Dec 21, 2021
7ad1af6
Properly using Formik on fields
Dec 23, 2021
b6a6d3e
Use loading from Formik's isSubmitting state
Dec 23, 2021
1092896
Type fixes and avoid reinitializing AmountStep's Formik
Dec 23, 2021
cd94eb6
wip
Dec 29, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/assets/stylesheets/body.css.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* License: AGPL-3.0-or-later WITH WTO-AP-3.0-or-later
Full license explanation at https://github.com/houdiniproject/houdini/blob/main/LICENSE */
@import 'components/side_nav_dimensions';
@import './components/side_nav_dimensions.css.scss';

body {
margin: 0;
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/bootstrap-tour.css.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* License: AGPL-3.0-or-later WITH WTO-AP-3.0-or-later
Full license explanation at https://github.com/houdiniproject/houdini/blob/main/LICENSE */
@import 'mixins';
@import './mixins.css.scss';

.btn {
border: none;
Expand Down
4 changes: 2 additions & 2 deletions app/assets/stylesheets/campaigns/edit/page.css.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* License: AGPL-3.0-or-later WITH WTO-AP-3.0-or-later
Full license explanation at https://github.com/houdiniproject/houdini/blob/main/LICENSE */
@import 'common/image_uploader';
@import 'mixins';
@import './common/image_uploader.css.scss';
@import './mixins.css.scss';

#settings-modal {
.field {
Expand Down
6 changes: 3 additions & 3 deletions app/assets/stylesheets/campaigns/index/page.css.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* License: AGPL-3.0-or-later WITH WTO-AP-3.0-or-later
Full license explanation at https://github.com/houdiniproject/houdini/blob/main/LICENSE */
@import 'mixins';
@import 'common/fundraisers';
@import 'campaigns/new/index';
@import './mixins.css.scss';
@import './common/fundraisers.css.scss';
@import './campaigns/new/index.css.scss';

6 changes: 3 additions & 3 deletions app/assets/stylesheets/campaigns/new/index.css.scss
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/* License: AGPL-3.0-or-later WITH WTO-AP-3.0-or-later
Full license explanation at https://github.com/houdiniproject/houdini/blob/main/LICENSE */
@import 'mixins';
@import 'pikaday';
@import 'common/image_uploader';
@import './mixins.css.scss';
@import './pikaday.css.scss';
@import './common/image_uploader.css.scss';

.globalFooter {
margin-top: 50px;
Expand Down
16 changes: 8 additions & 8 deletions app/assets/stylesheets/campaigns/peer_to_peer/page.css.scss
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
/* License: AGPL-3.0-or-later WITH WTO-AP-3.0-or-later
Full license explanation at https://github.com/houdiniproject/houdini/blob/main/LICENSE */
@import 'mixins';
@import 'components/q_and_a';
@import 'components/timeline';
@import 'components/type_ahead';
@import 'components/simple_tabs';
@import 'pikaday';
@import 'common/image_uploader';
@import '../common';
@import './mixins.css.scss';
@import './components/q_and_a.css.scss';
@import './components/timeline.css.scss';
@import './components/type_ahead.css.scss';
@import './components/simple_tabs.css.scss';
@import './pikaday.css.scss';
@import './common/image_uploader.css.scss';
@import './../common.css.scss';

body {
padding: 0;
Expand Down
30 changes: 15 additions & 15 deletions app/assets/stylesheets/campaigns/show/page.css.scss
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
/* License: AGPL-3.0-or-later WITH WTO-AP-3.0-or-later
Full license explanation at https://github.com/houdiniproject/houdini/blob/main/LICENSE */
@import 'mixins';
@import 'pikaday';
@import 'bootstrap-tour';
@import 'common/donate_button';
@import 'common/editable';
@import 'components/admin_top_nav';
@import 'common/image_uploader';
@import 'components/info_card';
@import 'components/activity_feed';
@import 'components/page_tabs';
@import 'components/fixed_top_action';
@import 'components/draggable';
@import 'gift_levels';
@import '../../nonprofits/donation_form/form';
@import '../common';
@import './mixins.css.scss';
@import './pikaday.css.scss';
@import './bootstrap-tour.css.scss';
@import './common/donate_button.css.scss';
@import './common/editable.css.scss';
@import './components/admin_top_nav.css.scss';
@import './common/image_uploader.css.scss';
@import './components/info_card.css.scss';
@import './components/activity_feed.css.scss';
@import './components/page_tabs.css.scss';
@import './components/fixed_top_action.css.scss';
@import './components/draggable.css.scss';
@import './gift_levels.css.scss';
@import './../../nonprofits/donation_form/form.css.scss';
@import './../common.css.scss';

.button--gift {
font-size: 17px;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* License: AGPL-3.0-or-later WITH WTO-AP-3.0-or-later
Full license explanation at https://github.com/houdiniproject/houdini/blob/main/LICENSE */
@import 'mixins';
@import 'components/pagination';
@import 'components/page_tabs';
@import './mixins.css.scss';
@import './components/pagination.css.scss';
@import './components/page_tabs.css.scss';

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* License: AGPL-3.0-or-later WITH WTO-AP-3.0-or-later
Full license explanation at https://github.com/houdiniproject/houdini/blob/main/LICENSE */
@import 'mixins';
@import '../mixins.css.scss';

// campaign widget
// (cw = campaign widget)
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/common/campaign_card.css.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* License: AGPL-3.0-or-later WITH WTO-AP-3.0-or-later
Full license explanation at https://github.com/houdiniproject/houdini/blob/main/LICENSE */
@import 'mixins';
@import '../mixins.css.scss';

.campaign-card {
text-align: center;
Expand Down
12 changes: 6 additions & 6 deletions app/assets/stylesheets/common/donate_button.css.scss
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/* License: AGPL-3.0-or-later WITH WTO-AP-3.0-or-later
Full license explanation at https://github.com/houdiniproject/houdini/blob/main/LICENSE */
@import 'mixins';
@import 'supporters/form';
@import 'nonprofits/donation_form/title_row';
@import 'nonprofits/donation_form/footer';
@import 'nonprofits/donation_form/form'; // for styling the actual form
@import 'nonprofits/donation_form/show/index'; // for styling the layout on /donate
@import '../mixins.css.scss';
@import '../supporters/form.css.scss';
@import '../nonprofits/donation_form/title_row.css.scss';
@import '../nonprofits/donation_form/footer.css.scss';
@import '../nonprofits/donation_form/form.css.scss'; // for styling the actual form
@import '../nonprofits/donation_form/show/index.css.scss'; // for styling the layout on /donate
2 changes: 1 addition & 1 deletion app/assets/stylesheets/common/editable.css.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* # License: AGPL-3.0-or-later WITH WTO-AP-3.0-or-later
Full license explanation at https://github.com/houdiniproject/houdini/blob/main/LICENSE */
@import 'mixins';
@import '../mixins.css.scss';

.editable,
.editable--readOnly {
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/common/fonts_special.css.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* License: AGPL-3.0-or-later WITH WTO-AP-3.0-or-later
Full license explanation at https://github.com/houdiniproject/houdini/blob/main/LICENSE */
@import 'mixins';
@import '../mixins.css.scss';

.strong {font-weight: bold;}

Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/common/fundraisers.css.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* License: AGPL-3.0-or-later WITH WTO-AP-3.0-or-later
Full license explanation at https://github.com/houdiniproject/houdini/blob/main/LICENSE */
@import 'mixins';
@import '../mixins.css.scss';

.fundraiser--active {
background-color: rgba($manila, 0.5);
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/common/icons.css.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* License: AGPL-3.0-or-later WITH WTO-AP-3.0-or-later
Full license explanation at https://github.com/houdiniproject/houdini/blob/main/LICENSE */
@import 'mixins';
@import '../mixins.css.scss';

// for styling icons and UI related psuedo elements.

Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/common/image_uploader.css.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* License: AGPL-3.0-or-later WITH WTO-AP-3.0-or-later
Full license explanation at https://github.com/houdiniproject/houdini/blob/main/LICENSE */
@import 'mixins';
@import '../mixins.css.scss';
.image-upload {
text-align: center;
margin: 0 auto;
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/common/images.css.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* License: AGPL-3.0-or-later WITH WTO-AP-3.0-or-later
Full license explanation at https://github.com/houdiniproject/houdini/blob/main/LICENSE */
@import 'mixins';
@import '../mixins.css.scss';

img {
max-width: 100%;
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/common/layouts.css.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* License: AGPL-3.0-or-later WITH WTO-AP-3.0-or-later
Full license explanation at https://github.com/houdiniproject/houdini/blob/main/LICENSE */
@import 'mixins';
@import '../mixins.css.scss';

[class*=" col-"].floatr {
clear: none;
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/common/media_queries.css.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* License: AGPL-3.0-or-later WITH WTO-AP-3.0-or-later
Full license explanation at https://github.com/houdiniproject/houdini/blob/main/LICENSE */
@import 'mixins';
@import '../mixins.css.scss';

// query by max-width

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* License: AGPL-3.0-or-later WITH WTO-AP-3.0-or-later
Full license explanation at https://github.com/houdiniproject/houdini/blob/main/LICENSE */
@import 'mixins';
@import '../mixins.css.scss';

// used for minimal, single-purpose pages like the unsubscribe page

Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/common/page.css.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* License: AGPL-3.0-or-later WITH WTO-AP-3.0-or-later
Full license explanation at https://github.com/houdiniproject/houdini/blob/main/LICENSE */
@import 'mixins';
@import '../mixins.css.scss';

.pageTitle {
position: absolute;
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/common/promote_button.css.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* License: AGPL-3.0-or-later WITH WTO-AP-3.0-or-later
Full license explanation at https://github.com/houdiniproject/houdini/blob/main/LICENSE */
@import 'mixins';
@import '../mixins.css.scss';

.promote-button {
display: block;
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/common/states.css.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* License: AGPL-3.0-or-later WITH WTO-AP-3.0-or-later
Full license explanation at https://github.com/houdiniproject/houdini/blob/main/LICENSE */
@import 'mixins';
@import '../mixins.css.scss';

.is-stuck {
top: 0;
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/common/successes.css.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* License: AGPL-3.0-or-later WITH WTO-AP-3.0-or-later
Full license explanation at https://github.com/houdiniproject/houdini/blob/main/LICENSE */
@import 'mixins';
@import '../mixins.css.scss';


.successes-section {
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/common/typography/base.css.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* License: AGPL-3.0-or-later WITH WTO-AP-3.0-or-later
Full license explanation at https://github.com/houdiniproject/houdini/blob/main/LICENSE */
@import 'mixins';
@import '../../mixins.css.scss';

// This file should'nt include any classes -
// just HTML elements that are typographical.
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/common/typography/special.css.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* License: AGPL-3.0-or-later WITH WTO-AP-3.0-or-later
Full license explanation at https://github.com/houdiniproject/houdini/blob/main/LICENSE */
@import 'mixins';
@import '../../mixins.css.scss';

.strong {
font-weight: bold;
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/common/utils.css.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* License: AGPL-3.0-or-later WITH WTO-AP-3.0-or-later
Full license explanation at https://github.com/houdiniproject/houdini/blob/main/LICENSE */
@import 'mixins';
@import '../mixins.css.scss';

.hide {display: none; }
.show {display: block;}
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/components/activity_feed.css.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* License: AGPL-3.0-or-later WITH WTO-AP-3.0-or-later
Full license explanation at https://github.com/houdiniproject/houdini/blob/main/LICENSE */
@import 'mixins';
@import '../mixins.css.scss';

.activityFeed table,
.activityFeed tr {
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/components/admin_sidebar.css.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* License: AGPL-3.0-or-later WITH WTO-AP-3.0-or-later
Full license explanation at https://github.com/houdiniproject/houdini/blob/main/LICENSE */
@import 'mixins';
@import '../mixins.css.scss';

.adminSidebar-body {
padding: 10px 15px;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* License: AGPL-3.0-or-later WITH WTO-AP-3.0-or-later
Full license explanation at https://github.com/houdiniproject/houdini/blob/main/LICENSE */
@import 'mixins';
@import '../mixins.css.scss';

@mixin announcementBar($bg) {
display: none;
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/components/app_loading_bar.css.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* License: AGPL-3.0-or-later WITH WTO-AP-3.0-or-later
Full license explanation at https://github.com/houdiniproject/houdini/blob/main/LICENSE */
@import 'mixins';
@import '../mixins.css.scss';

@-webkit-keyframes progress-bar-stripes{
from{background-position:40px 0}
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/components/arrows.css.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* License: AGPL-3.0-or-later WITH WTO-AP-3.0-or-later
Full license explanation at https://github.com/houdiniproject/houdini/blob/main/LICENSE */
@import 'mixins';
@import '../mixins.css.scss';

.sortArrows {
@include noselect;
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/components/better_browser.css.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* License: AGPL-3.0-or-later WITH WTO-AP-3.0-or-later
Full license explanation at https://github.com/houdiniproject/houdini/blob/main/LICENSE */
@import 'mixins';
@import '../mixins.css.scss';

#better-browser-message {
position: fixed;
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/components/bulk_actions.css.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* License: AGPL-3.0-or-later WITH WTO-AP-3.0-or-later
Full license explanation at https://github.com/houdiniproject/houdini/blob/main/LICENSE */
@import 'mixins';
@import '../mixins.css.scss';

.bulkActions-checkbox {
display: inline-block;
Expand Down
4 changes: 2 additions & 2 deletions app/assets/stylesheets/components/buttons.css.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* License: AGPL-3.0-or-later WITH WTO-AP-3.0-or-later
Full license explanation at https://github.com/houdiniproject/houdini/blob/main/LICENSE */
@import 'mixins';
@import 'components/animations';
@import '../mixins.css.scss';
@import './animations.css.scss';

// don't add any more classes here

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* License: AGPL-3.0-or-later WITH WTO-AP-3.0-or-later
Full license explanation at https://github.com/houdiniproject/houdini/blob/main/LICENSE */
@import 'mixins';
@import '../mixins.css.scss';

.campaignPreview--small {
padding: 15px;
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/components/cards.css.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* License: AGPL-3.0-or-later WITH WTO-AP-3.0-or-later
Full license explanation at https://github.com/houdiniproject/houdini/blob/main/LICENSE */
@import 'mixins';
@import '../mixins.css.scss';

.cardForm {
max-width: 380px;
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/components/carousel.css.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* License: AGPL-3.0-or-later WITH WTO-AP-3.0-or-later
Full license explanation at https://github.com/houdiniproject/houdini/blob/main/LICENSE */
@import 'mixins';
@import '../mixins.css.scss';

.carousel {
position: relative;
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/components/cc_pattern.css.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* License: AGPL-3.0-or-later WITH WTO-AP-3.0-or-later
Full license explanation at https://github.com/houdiniproject/houdini/blob/main/LICENSE */
@import 'mixins';
@import '../mixins.css.scss';

.ccPattern {
position: absolute;
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/components/container.css.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* License: AGPL-3.0-or-later WITH WTO-AP-3.0-or-later
Full license explanation at https://github.com/houdiniproject/houdini/blob/main/LICENSE */
@import 'mixins';
@import '../mixins.css.scss';

@mixin container {
width: 100%;
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/components/decorative.css.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* License: AGPL-3.0-or-later WITH WTO-AP-3.0-or-later
Full license explanation at https://github.com/houdiniproject/houdini/blob/main/LICENSE */
@import 'mixins';
@import '../mixins.css.scss';

hr {
border: 0;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* License: AGPL-3.0-or-later WITH WTO-AP-3.0-or-later
Full license explanation at https://github.com/houdiniproject/houdini/blob/main/LICENSE */
@import 'mixins';
@import '../mixins.css.scss';

.eventPreview--small {
position: relative;
Expand Down
Loading