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

Sisyphus Revision Part 2: Full Donate Revision #235

Merged
merged 14 commits into from
Mar 12, 2025

Conversation

Reqrefusion
Copy link
Member

@Reqrefusion Reqrefusion commented Jan 20, 2025

resim
Ton Roosendaal devotes 1 minute of his 30-minute speech at the Blender conference to this slide.

I had made this suggestion before, but ultimately decided on a system like this. This system is the same as that used for KiCAD. However, unlike them, I do not use ifram and this provides a better view. All articles have been reused with very minor corrections. It uses entirely what Bootstrap offers. There is no design addition. It can still be modified and added to, but I think it is quite acceptable as is.

I also added another very nice feature, thanks to this feature, you can call the fields in the modal as desired within the site.

For a better look, you can look here.

resim
resim
resim
resim

Out of date Screenshots ![resim](https://github.com/user-attachments/assets/129668b2-271a-4f6e-969a-842044fb4bd5) ![resim](https://github.com/user-attachments/assets/54307d78-3ae8-4cf9-860d-f3bf5de618dc) ![resim](https://github.com/user-attachments/assets/0d292709-6f98-4613-859c-5d87ce215990) ![resim](https://github.com/user-attachments/assets/480ba76f-64be-49d3-af18-34b19885b9a2) ![resim](https://github.com/user-attachments/assets/af1d9a24-f940-42ed-a3cb-66d815203889)

@hyarion
Copy link
Contributor

hyarion commented Jan 20, 2025

  • in this version the user has to enter a value, why not include predefined values as buttons like blender and kicad has?
  • the donate button is quite invisible, could it have a background that stands out a bit like on blender and kicad's sites?
  • The ♡ is a bit too close to the text in my opinion, how about adding a small space between them?
  • the UI is really text heavy to describe levels. Godot uses predefined values and describes what you get when you click those, check it out here: https://fund.godotengine.org/

@Reqrefusion
Copy link
Member Author

in this version the user has to enter a value, why not include predefined values as buttons like blender and kicad has?

Maybe it can be added later, but it is not good to over-direct the user in this way. There should always be at least a text field.

the donate button is quite invisible, could it have a background that stands out a bit like on blender and kicad's sites?

Considering the invisibility of the current donation system, it is not right to call something on the menu invisible. I did it this way on purpose because I thought maybe it wouldn't be desirable for it to be more visible.

The ♡ is a bit too close to the text in my opinion, how about adding a small space between them?

Probably yes a gap would be nice.

the UI is really text heavy to describe levels. Godot uses predefined values and describes what you get when you click those, check it out here: https://fund.godotengine.org/

This can be done, but I think it is better for one to see the full explanation. There is a similar feature on the sponsor page, by clicking on the relevant sections, the donate modal is opened.

@hyarion
Copy link
Contributor

hyarion commented Jan 20, 2025

in this version the user has to enter a value, why not include predefined values as buttons like blender and kicad has?

Maybe it can be added later, but it is not good to over-direct the user in this way. There should always be at least a text field.

I didn't mean that we should remove the text field, just add new buttons. It's easier to click a button than to write something - this is also why tip in restaurants usually have predefined options.

the donate button is quite invisible, could it have a background that stands out a bit like on blender and kicad's sites?

Considering the invisibility of the current donation system, it is not right to call something on the menu invisible. I did it this way on purpose because I thought maybe it wouldn't be desirable for it to be more visible.

Since kicad and blender has it I don't think it would be that bad if we also have it :)

the UI is really text heavy to describe levels. Godot uses predefined values and describes what you get when you click those, check it out here: https://fund.godotengine.org/

This can be done, but I think it is better for one to see the full explanation. There is a similar feature on the sponsor page, by clicking on the relevant sections, the donate modal is opened.

I think it is important to make it simple to donate, reading a wall of text is tiresome in my opinion

@Reqrefusion
Copy link
Member Author

Reqrefusion commented Jan 20, 2025

I didn't mean that we should remove the text field, just add new buttons. It's easier to click a button than to write something - this is also why tip in restaurants usually have predefined options.

I will also add a later PR. It will even be better than the others because mostly the buttons are not interactive, I plan to be interactive. Of course, if this PR is accepted, they will come.

Since kicad and blender has it I don't think it would be that bad if we also have it :)

Depending on the reactions, I plan to do it in future PRs.

I think it is important to make it simple to donate, reading a wall of text is tiresome in my opinion

Since it was a task that required editorial things, I didn't want this PR to wait any longer just for that reason. #221 This PR of mine is pending just for editorial reasons. I plan to do something about this in future PRs.

The system added here lays a very good foundation. Anything desired can be done. But I didn't want to fill it too much.

@yorikvanhavre
Copy link
Member

I agree the sponsors page is getting big and the donation part could go elsewhere, and having it as a kind of "pop-up" like that, why not, it's cool. But it also needs to appear on the "thank you" page that the user gets after downloading, but I think we don't want that to pop up automatically after download. Ideally it would have two modes, one "pop up" and one embedded inside a page, is that doable?

@Reqrefusion
Copy link
Member Author

Reqrefusion commented Jan 22, 2025

I agree the sponsors page is getting big and the donation part could go elsewhere, and having it as a kind of "pop-up" like that, why not, it's cool. But it also needs to appear on the "thank you" page that the user gets after downloading, but I think we don't want that to pop up automatically after download. Ideally it would have two modes, one "pop up" and one embedded inside a page, is that doable?

That's the way it is now, isn't it? The existing thank you page system has not been changed. I made minimal changes to most things. This needs to be changed? So should this be opened instead of the thank you page? I think the current system makes sense.

A button that will open the donate modal can be added to the desired page, and donations can be made for the relevant level by pressing the added titles on the modified sponsor page.

This works better than an alternative included in the page because exceptions are confusing. However, there is a menu on the thank-you page and there will be a donate button in this menu, that is probably the best place to appear. Buttons to open this modal may be added in future PRs.

@Reqrefusion
Copy link
Member Author

This transforms it from the current situation to a very very good shape. The things that can be seen as a problem remain very small as well as the benefits it brings. I think it makes more sense to solve problems after Merge.

@Reqrefusion
Copy link
Member Author

resim

I work on preset quantities. I will send the relevant PR I after this merge.

@hyarion
Copy link
Contributor

hyarion commented Jan 30, 2025

I work on preset quantities. I will send the relevant PR I after this merge.

I know this is work in progress, but:

  • Don't not to forget the currency in the preset buttons, it's not obvious what 10 means until you tried to click it.
  • Also it's not that clear that Sponsor is a reoccurring, while donation is a one-time thing.

@Reqrefusion
Copy link
Member Author

I work on preset quantities. I will send the relevant PR I after this merge.

I know this is work in progress, but:

* Don't not to forget the currency in the preset buttons, it's not obvious what 10 means until you tried to click it.

* Also it's not that clear that Sponsor is a reoccurring, while donation is a one-time thing.

I did not forget I will add it. Secondly, it is related to the current text. I haven't made a change on text for now, but I'm planning to make "donation" to "One Time" for the future.

@yorikvanhavre
Copy link
Member

one-time / recurring seems like a good choice. what we should then make clearer is what is sponsoring, if sponsoring is the same as recurring donation, etc

@Reqrefusion
Copy link
Member Author

one-time / recurring seems like a good choice. what we should then make clearer is what is sponsoring, if sponsoring is the same as recurring donation, etc

I want to make it appropriate with the language on other donation pages. But I will not make a change about language. You will have to wait for the ongoing PR.

@hyarion
Copy link
Contributor

hyarion commented Feb 7, 2025

I really like your idea to have donation dialog like kicad/blender/godot.
It is simple, easy to understand, easy to donate.

Your proposal doesn't reach the same level in its current form. It sounds like you're planning to do that, but until we're there I don't think this should be merged and deployed.
Once we're there I'll fully support this feature.

@Reqrefusion
Copy link
Member Author

I really like your idea to have donation dialog like kicad/blender/godot. It is simple, easy to understand, easy to donate.

Your proposal doesn't reach the same level in its current form. It sounds like you're planning to do that, but until we're there I don't think this should be merged and deployed. Once we're there I'll fully support this feature.

Is it better or worse than the present state? If it is better, why do you see any harm in Merge. The things that will come are completely extra features. I have already mentioned from the beginning that this PR wants to change the existing features only. If the current system does not change this way, there is no need to add these extra features. Therefore, unless there is one -to -one change here, I will not make a change on these features.

@hyarion
Copy link
Contributor

hyarion commented Feb 10, 2025

The problem I have with merging this is that we only get part of a good solution.

I see three possibilities if this gets merged:

  1. after merge you fix the rest - then why not do it before the merge
  2. after merge you won't fix it, but someone does it - then they have to figure out what you've done and continue on it which takes more time than if you fix the last bits
  3. after merge you won't fix it, and none else does either - then we'll be stuck with an incomplete solution.

Neither of the alternatives above are good options to me.

But I do think you can make this great! And I think you're on the right track on getting there :)


Is it better or worse than the present state?

Currently, it's roughly the same, but changing from one bad option to another is worse than not changing it.

@Reqrefusion
Copy link
Member Author

Currently, it's roughly the same, but changing from one bad option to another is worse than not changing it.

If you think this way, this change has no point. It has no point in taking it further. If all the changes made here are only "roughly the same", it is also meaningless to take it forward. It is not right to say that this is another bad option. The things created here provide all the requirements and offer the most basic things.

Also the things mentioned here are not fix, but extra features. There is nothing to be corrected here. The solution here is not a solution that has not been completed in any way.

As for why I don't include extra features. I do not want to deal with all the extras for an unacceptable solution. As you said, the solution here is another "bad option" why why should I add extra features to improve it. Extra features do not make the change it basically better.

@hyarion
Copy link
Contributor

hyarion commented Feb 10, 2025

It sure has a point, and I do like the idea.

Why does it have to be this or nothing?

@Reqrefusion
Copy link
Member Author

Reqrefusion commented Feb 12, 2025

It sure has a point, and I do like the idea.

Why does it have to be this or nothing?

I started working to add new features, but if not accepted, I will blame you xD

It also has at least one choice of choice. This or nothing can be selected. I would choose this.

Desired features can be viewed from other PRs.

@hyarion
Copy link
Contributor

hyarion commented Feb 18, 2025

I still think this PR shouldn't be merged+deployed without further work for reasons outlined here.
You've created a new PR with some extra work done but still have this open and advocates for this to be merged.

The preview link in the description is seems to be wrong as it is the same link as the one in the other PR to show that change.

I think this is really confusing and I don't understand why you want something less refined to be merged. Shouldn't this PR be closed since you opened the new one?

@Reqrefusion
Copy link
Member Author

Reqrefusion commented Feb 18, 2025

I still think this PR shouldn't be merged+deployed without further work for reasons outlined here. You've created a new PR with some extra work done but still have this open and advocates for this to be merged.

The preview link in the description is seems to be wrong as it is the same link as the one in the other PR to show that change.

I think this is really confusing and I don't understand why you want something less refined to be merged. Shouldn't this PR be closed since you opened the new one?

I envisioned these PRs to be merged in order.

You can look at the pictures.

Of course, if desired, this can be skipped and the other two merged. These are just the basis of them.

@Reqrefusion
Copy link
Member Author

Text -related changes will be made with another PR. Please do not ask for changes. Or do not see the deficiencies in them as the lack of all PR. I think @hyarion 's remaining demands are on this. In addition, changes related to this can be made by everyone because they do not need an expert. @yorikvanhavre everything is ready here.

@hyarion
Copy link
Contributor

hyarion commented Feb 18, 2025

I'm not demanding anything, I'm simply giving you feedback on how I think you can make your PR less confusing to visitors (which I think would be good as there's money involved here).

I'm not forcing you to do any changes, you are free to do as you like with your PR. Just like I'm allowed to raise awareness about the issues I see in your PR.

My feedback is available in my comments if @yorikvanhavre or any other maintainers want to look at it.

@Reqrefusion
Copy link
Member Author

Reqrefusion commented Feb 19, 2025

The amount selected is not submitted to OpenCollective nor to Github (seems to be an issue with having a dot in the amount, numbers without a dot can be sent).

It is a simple thing about Presets. I fixed it. It's not what you guess.

Any text can be written in the custom amount field - this is passed to OpenCollective and and Github

Github or Open Colective is already correcting it. Since we do not take the money directly, I think it is enough to direct this way. Perhaps the user may want to reach the GitHub or OpenColective donation page directly without dealing with these things. Validation does not exist in other donate systems.

But I added something.

Stripe doesn't seem to support monthly payment, how about removing that option for monthly payment tab?

"Instead of donating each month, you might find it more comfortable to make a one-time donation that, when divided by twelve, would give you right to enter a sponsoring tier. Don't hesitate to do so! " This option can be used but.

I think it would be better if the "Submit" button was said "Donate" instead (with or without heart), this is how blender, Godot and KiCad label their buttons (some extra text might be present)

The panel does not fully donate, directing to places that will donate. Submit sounds more accurate.

I did this as you wish, but I think submit is better.

SEPA information is difficult could be written in a table to make it easier to read.

I thought it would be easier if this part was wanted to be copied.

I changed this too.

Update donation.php

Update sponsor.php

Update sponsor.php

Update sponsor.php

Update donation.php

Update donation.php

Update donation.php

Co-Authored-By: Benjamin Nauck <[email protected]>
Copy link
Contributor

@hyarion hyarion left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It sounds like everything should be ready to go, could you update the preview site to the newest code so I can do a final check?

@yorikvanhavre
Copy link
Member

Just one more thing, when you land on either the thankyou page or the sponsor page, it talks about donations, but it's not clear what the user should do. What about adding the same "donate" button of the top menu there inside the text too?

Update sponsor.php

Co-Authored-By: Benjamin Nauck <[email protected]>
@Reqrefusion
Copy link
Member Author

Just one more thing, when you land on either the thankyou page or the sponsor page, it talks about donations, but it's not clear what the user should do. What about adding the same "donate" button of the top menu there inside the text too?

I didn't add the exact same, but the less adorned versions. I don't think it would be right to display two fancy versions at the same time, @yorikvanhavre

It sounds like everything should be ready to go, could you update the preview site to the newest code so I can do a final check?

They are already on the site, open it from the incognito tab or clear the cache.

Also, don't care about CI, it doesn't fix things. At least it's dysfunctional here.

@yorikvanhavre
Copy link
Member

I didn't add the exact same, but the less adorned versions.

I don't see any on https://cizgivedizi.com/FreeCAD-Homepage/sponsor.php ?

@Reqrefusion
Copy link
Member Author

I didn't add the exact same, but the less adorned versions.

I don't see any on https://cizgivedizi.com/FreeCAD-Homepage/sponsor.php ?

resim
resim

@hyarion
Copy link
Contributor

hyarion commented Feb 20, 2025

There's still Stripe (credit card) under monthly.
I know there's information in the large text that describes that you can do one time payments every year instead.
The problem is that it's not obvious that the payment will be a one-time payment when you arrive at at stripe checkout.

There's two ways to fix this:

  • remove stripe when monthly is selected, or
  • disable donate button when monthly+stripe is selected & show information that stipe is only available for one-time payments (info can be showed as SEPA bank transfer), see mockup below:
image

I think I would prefer the second option, but first is ok too.

@Reqrefusion
Copy link
Member Author

There's still Stripe (credit card) under monthly. I know there's information in the large text that describes that you can do one time payments every year instead. The problem is that it's not obvious that the payment will be a one-time payment when you arrive at at stripe checkout.

There's two ways to fix this:

* remove stripe when monthly is selected, or

* disable donate button when monthly+stripe is selected & show information that stipe is only available for one-time payments (info can be showed as SEPA bank transfer), see mockup below:
image

I think I would prefer the second option, but first is ok too.

I added something similar to the second option, but I don't think it's necessary. It feels like an over-enginering as the donation doesn't happen entirely from this page.

@Reqrefusion Reqrefusion requested a review from hyarion February 22, 2025 22:28
@Reqrefusion
Copy link
Member Author

It seems that this can now be integrated, @yorikvanhavre. I believe that all your and @hyarion's requests have been met. Perhaps I will make some embellishments in the future, but at the moment, I do not see any deficiencies. Maybe if I examine the APIs, I could connect them to create a smoother experience, but the most important thing is that my lack of access to PayPal makes this unnecessary.

Copy link
Contributor

@hyarion hyarion left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this PR improves the current page.

While there might be more that could be improved, I'm fine with these changes 👍

@Reqrefusion
Copy link
Member Author

I think this PR improves the current page.

While there might be more that could be improved, I'm fine with these changes 👍

I can't wait to see the results, as this change is one of the few things that will provide a true numerical return. If there is an increase in donations, I want all the credit xD. Maybe the increase momentum that came with 1.0 can continue for a while.

@Reqrefusion
Copy link
Member Author

@yorikvanhavre I think I meet your requests. Can you make a merge?

@chennes chennes self-requested a review March 10, 2025 17:36
@yorikvanhavre
Copy link
Member

Okay this looks good to me too, just one thing: All the section about sponsoring tiers is gone? How will people know how to get into a certain sponsoring tier?

@Reqrefusion
Copy link
Member Author

Reqrefusion commented Mar 11, 2025

Okay this looks good to me too, just one thing: All the section about sponsoring tiers is gone? How will people know how to get into a certain sponsoring tier?

When you press Monthly, it is displayed on the side and even changes according to the selected amount of money. Also, when you click on the relevant tier on the sponsor page, it opens to donate the minimum amount for that tier.
resim

@yorikvanhavre
Copy link
Member

Ok, that's good for me too then!

@yorikvanhavre yorikvanhavre merged commit 608f89f into FreeCAD:main Mar 12, 2025
1 check failed
@Reqrefusion Reqrefusion deleted the new_donate_vision branch March 25, 2025 15:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants