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

Feature/sponsorship #613

Merged
merged 73 commits into from
Oct 21, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
7095ea3
Add basic paypal structure
henriquecbuss Jul 29, 2021
46c0fac
Add sponsor CTA modal
henriquecbuss Jul 30, 2021
dad835a
Add ThankYou page
henriquecbuss Aug 2, 2021
415e9af
Translate texts
henriquecbuss Aug 2, 2021
5a46c09
Add base for Supporters page
henriquecbuss Aug 2, 2021
f5888fd
Add client-id to env config
henriquecbuss Aug 5, 2021
c28f59c
WIP: Add translations, add better base for paypal buttons
henriquecbuss Aug 5, 2021
7a2a3f0
Merge branch 'master' into feature/sponsorship
henriquecbuss Aug 5, 2021
1cff4f5
Treat paypal errors on the Elm side
henriquecbuss Aug 5, 2021
d566efe
Treat paypal load error
henriquecbuss Aug 5, 2021
c78b589
Add base on community page
henriquecbuss Aug 6, 2021
9da6b53
Fix according to style-lint
henriquecbuss Aug 6, 2021
b70bc7a
Fix according to elm-review
henriquecbuss Aug 6, 2021
c5bffc0
Merge branch 'master' into feature/sponsorship
henriquecbuss Sep 8, 2021
2916176
Order imports
henriquecbuss Sep 8, 2021
693bd42
Add sponsor route, adjust UI
henriquecbuss Sep 8, 2021
d848eed
Adjust UI for supporters and thank-you page
henriquecbuss Sep 8, 2021
f8f210b
Update graphql
henriquecbuss Sep 9, 2021
fc41318
Use new contribution API
henriquecbuss Sep 9, 2021
2eae938
Capture order on approval
henriquecbuss Sep 10, 2021
72838ec
Add contributions to community query, show contributors on community …
henriquecbuss Sep 10, 2021
4b68f15
Use contributions on supporters page
henriquecbuss Sep 10, 2021
ad8289a
Render markdown on profile summary bio
henriquecbuss Sep 10, 2021
84b1c27
Use new paypal app id, use BRL as default currency
henriquecbuss Sep 10, 2021
66f3605
Add issue number to TODO comments
henriquecbuss Sep 10, 2021
5fc924a
Check if user has seen the sponsor modal cta before
henriquecbuss Sep 10, 2021
3ca532e
Fix according to elm-review
henriquecbuss Sep 11, 2021
a765a80
Store whether or not the user has seen the sponsor modal
henriquecbuss Sep 13, 2021
8983418
Use contribution.insertedAt on supporters page
henriquecbuss Sep 14, 2021
8b2f5b2
Show total contributions on profile
henriquecbuss Sep 15, 2021
0aa0588
Improve Page.fullPageNotFound
henriquecbuss Sep 15, 2021
84b88c7
Add contributions page
henriquecbuss Sep 15, 2021
b3482d6
Fix according to elm-review
henriquecbuss Sep 15, 2021
df522f8
Merge branch 'master' into feature/sponsorship
henriquecbuss Sep 18, 2021
bd99295
Fix sponsor modal dimmensions
henriquecbuss Sep 22, 2021
69e7621
Fix paypal buttons width
henriquecbuss Sep 22, 2021
84249de
Remove scrollbar if there are modals open
henriquecbuss Sep 22, 2021
ac34c0b
Fix modal size
henriquecbuss Sep 22, 2021
7849468
Adjust button focus styles
henriquecbuss Sep 23, 2021
da3d408
Update graphql types
henriquecbuss Sep 28, 2021
fe67baa
Query for ContributionConfig
henriquecbuss Sep 28, 2021
0c3811c
Only show my contributions button if contributionCount > 0
henriquecbuss Sep 28, 2021
15ae3e7
Add Sponsorship toggle, adjust features card description
henriquecbuss Sep 28, 2021
0fa5223
Add basic structure for Community.Settings.Sponsorship page and route
henriquecbuss Sep 29, 2021
e96c7ac
Implement designs for sponsorship settings page
henriquecbuss Sep 29, 2021
4e52fb7
Translate sponsorship settings page
henriquecbuss Sep 29, 2021
6bf1ddb
Add basic structure for Community.Settings.Sponsorship.Fiat page and …
henriquecbuss Sep 29, 2021
c507bbf
Translate texts in fiat sponsorship config screen
henriquecbuss Sep 29, 2021
d4af15f
Disable link button if quill is disabled
henriquecbuss Sep 29, 2021
f66fa25
Add ThankYouMessage page
henriquecbuss Sep 29, 2021
ae1cfe0
Use community name in default title, use community data on thank-you …
henriquecbuss Sep 29, 2021
80791dc
Display image when there are no contributions
henriquecbuss Sep 29, 2021
5480665
Merge branch 'master' into feature/sponsorship
henriquecbuss Sep 29, 2021
1d8205b
Set contributions as a RemoteData field
henriquecbuss Sep 30, 2021
02ea928
Use community's first currency as default
henriquecbuss Sep 30, 2021
60a205b
Update graphql types, add contributionCount to loggedIn
henriquecbuss Oct 5, 2021
d30733a
Hide sponsor buttons if community doesnt have sponsorship configured
henriquecbuss Oct 5, 2021
4b9d5b7
Hide sponsor modal if community doesnt have sponsorship configured
henriquecbuss Oct 5, 2021
c0afd3d
Fix according to elm-review
henriquecbuss Oct 5, 2021
825d061
Add currency selector
henriquecbuss Oct 11, 2021
22a19cb
Fix according to elm-review
henriquecbuss Oct 11, 2021
df89273
Merge branch 'master' into feature/sponsorship
henriquecbuss Oct 12, 2021
42209f0
Add checkboxes on Fiat configuration screen
henriquecbuss Oct 12, 2021
a5fc136
Remove paypal script before changing currency and on disconnect
henriquecbuss Oct 13, 2021
3ae045d
Remove unused classes and styles
henriquecbuss Oct 13, 2021
b1ee5c4
Add more padding on contributions page
henriquecbuss Oct 14, 2021
205c2ca
Adjust contribution padding
henriquecbuss Oct 14, 2021
0c6a515
Show sponsor modal before contact modal
henriquecbuss Oct 15, 2021
6bf2d2d
Update graphql types
henriquecbuss Oct 15, 2021
1d45020
Use profile contributions query
henriquecbuss Oct 15, 2021
6aecb1a
Show contribution status
henriquecbuss Oct 15, 2021
a831d2d
Use NeoVier/elm-mask to format floats
henriquecbuss Oct 16, 2021
4c5aeb8
Fix according to elm-review
henriquecbuss Oct 16, 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
3 changes: 2 additions & 1 deletion env-config.js.sample
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,6 @@ window._env_ = {
USE_SUBDOMAIN: true
SELECTED_COMMUNITY: '0,CMB',
COMMUNITY_CONTRACT: 'cambiatus.cm',
TOKEN_CONTRACT: 'cambiatus.tk'
TOKEN_CONTRACT: 'cambiatus.tk',
PAYPAL_CLIENT_ID: 'AdBXyRgrFKtbmgKMU3WYUI0gPUo6_PT8NJvA4xXcqBWBsV6XdHAlYCJatB7NBgGSU2pOtO4Fez2qYq_S'
}
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@
"dependencies": {
"@absinthe/socket": "^0.2.1",
"@dillonkearns/elm-graphql": "^4.0.3",
"@paypal/paypal-js": "^4.0.6",
"@sentry/browser": "5.4.0",
"@tailwindcss/forms": "^0.3.2",
"axios": "^0.21.1",
Expand Down
262 changes: 262 additions & 0 deletions public/images/sponsor-celebration.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
267 changes: 267 additions & 0 deletions public/images/sponsor-community.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
68 changes: 68 additions & 0 deletions public/images/woman_announcer.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
94 changes: 92 additions & 2 deletions public/translations/amh-ETH.json
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,16 @@
"claims": "የይገባኛል ጥያቄዎች",
"products": "የሱቅ ሽያጭ",
"orders": "የሱቅ ግዢዎች",
"transfers": "ግብይቶች"
"transfers": "ግብይቶች",
"our_supporters": "የእኛ",
"supporters": "ደጋፊዎች",
"our_messages": "የእኛ",
"messages": "መልእክቶች",
"you": "አንቺ",
"your_turn": "{{community}} ረድቶዎታል ፣ አሁን የእርስዎ ተራ ነው!",
"support_us": "ይደግፉን",
"see_supporters": "እኛን የሚደግፉን የቅርብ ጊዜ አባላትን ይመልከቱ።",
"see_all_supporters": "ሁሉንም ደጋፊዎች ይመልከቱ"
},
"invite": {
"title": "ጓደኛን ጋብዝ",
Expand Down Expand Up @@ -614,6 +623,10 @@
"canRemove": "ከ መገለጫ ይህንነ መረጃ ለማዉጣት ሲወስኑ ባቻ ይችላሉ.",
"success": "የእርሶ KYC ደታ በትክከል ተቀምጧል."
}
},
"thank_you": {
"title": "አመሰግናለሁ!",
"all_supporters": "የሁሉንም ደጋፊዎች ዝርዝር ይመልከቱ"
}
},
"profile": {
Expand Down Expand Up @@ -687,6 +700,15 @@
"completed_action": "በትክክል ያከናወኗቸውን እርምጃዎች ብቻ ይጠይቁ;",
"know_good_practices": "ስለ ማህበረሰቡ መልካም ልምዶች ይወቁ"
}
},
"contributions": {
"profile_contributions": "አስተዋጽዖዎች ከ {{profile_name}}",
"not_allowed_title": "የሌሎች ሰዎችን መዋጮ ማየት አይችሉም",
"not_allowed": "የሌሎች ሰዎችን መዋጮ ማየት የሚችሉት የማህበረሰብ አስተዳዳሪዎች ብቻ ናቸው",
"no_contributions": "እስካሁን ምንም አስተዋፅዖ የለም",
"pending": "በመጠባበቅ ላይ",
"approved": "ጸድቋል",
"failed": "አልተሳካም"
}
},
"shop": {
Expand Down Expand Up @@ -753,6 +775,7 @@
"back": "ወደ ኃላ",
"transfer": "ለጓደኛ አስተላለፍ ",
"explore": "እንዴት እንደሚገኝ {{symbol}}",
"my_contributions": "የእኔ አስተዋፅዖዎች",
"invite": "ጓደኞችህን ጋብዝ",
"sorry": "ይቅርታ!",
"action_rejected": "የእርሶ ተግባር ተቀባይነት አላገኘም",
Expand Down Expand Up @@ -1014,7 +1037,7 @@
},
"features": {
"title": "ገጽታ",
"description": "ተግባር, ሱቅ",
"description": "ዓላማዎች ፣ እርምጃዎች ፣ መደብር ፣ ስፖንሰርነት",
"enabled": "ተችሏል",
"disabled": "አልተቻለም"
}
Expand Down Expand Up @@ -1086,6 +1109,59 @@
"accept": "አዎ"
}
},
"sponsorship": {
"title": "ስፖንሰርነት",
"no_support": "ማህበረሰብዎ ገና ስፖንሰርነትን አይደግፍም",
"no_support_subtitle": "ይህንን ባህሪ ለማግበር ከማህበረሰቡ አስተዳደር ቡድን ጋር ይነጋገሩ",
"description": "ተጠቃሚዎች ማህበረሰቡን ስፖንሰር እንዲያደርጉ ይፍቀዱ",
"sponsor": "ስፖንሰር",
"enter_amount": "እርስዎ ለማበርከት የሚፈልጉትን መጠን ያስገቡ",
"select_currency": "ሊጠቀሙበት የሚፈልጉትን ምንዛሬ ይምረጡ",
"amount_too_small": "መጠኑ ቢያንስ {{minimum}} {{currency}} መሆን አለበት",
"amount_too_big": "መጠኑ ከፍተኛው {{maximum}} {{currency}} መሆን አለበት",
"invalid_amount": "ልክ ያልሆነ እሴት",
"unknown_error": "ክፍያዎን ማስኬድ ላይ ስህተት ነበር",
"load_error": "ከ PayPal ጋር መገናኘት ላይ ችግር ነበር ፣ እባክዎ ቆይተው እንደገና ይሞክሩ",
"contribution_error": "አስተዋፅኦዎን በማዘጋጀት ላይ ሳለ የሆነ ችግር ተፈጥሯል",
"guidance": "መመሪያ",
"guidance_description": "ይህንን ባህሪ ለማንቃት ፣ በካምቢያስ ስላክ ላይ ባለው የድጋፍ ሰርጥዎ ላይ እገዛን ይጠይቁ",
"cards": {
"fiat": {
"title": "ምንዛሬዎች ዓይነቶች ተቀባይነት አግኝተዋል",
"description": "ማህበረሰቡ በ PayPal በኩል የአሜሪካን ወይም የሌሎችን የገንዘብ ምንዛሪዎችን እንዲቀበል ይፍቀዱ",
"toggle_label": "fiat ምንዛሬዎች",
"settings": "ቅንብሮች"
},
"crypto": {
"title": "ሌሎች ተቀባይነት ያላቸው ገንዘቦች",
"description": "ማህበረሰቡ ምስጢራዊ ምንዛሪዎችን እንዲቀበል ይፍቀዱ",
"toggle_label": "ምስጢራዊ ምንዛሬዎች"
},
"message": {
"title": "መልእክት \"አመሰግናለሁ\"",
"description": "ከማህበረሰብዎ ጋር የሚስማማውን ‹አመሰግናለሁ› የሚለውን መልእክት ያዋቅሩ",
"button_label": "መልዕክት ያዋቅሩ"
}
},
"fiat": {
"title": "Fiat ገንዘብ",
"paypal_account": "የማህበረሰብ PayPal ሂሳብ",
"paypal_example": "example@gmail.com",
"how_to_change": "ይህንን መለያ ማዘመን ከፈለጉ እባክዎን በ Slack ላይ ባለው የድጋፍ ሰርጥ በኩል ያነጋግሩን"
},
"thank_you_message": {
"title": "የመልዕክት ርዕስ",
"default_title": "{{community}} ን ስፖንሰር ስላደረጉ እናመሰግናለን!",
"message": "መልዕክት",
"default_message": "የእርስዎ አስተዋፅኦ ማህበረሰብዎ የበለጠ ተፅእኖ እንዲኖረው እየረዳ ነው ፣ እርስዎ ግሩም ነዎት!"
},
"dashboard_modal": {
"title": "ማህበረሰብዎን ይደግፉ",
"subtitle": "አሁን ይህንን ማህበረሰብ ስፖንሰር ማድረግ ይችላሉ።",
"explanation": "ከታች ያለውን አዝራር ጠቅ በማድረግ አስተዋፅኦዎን ያበርክቱ። ግብይትዎን ለማጠናቀቅ ወደ PayPal ይዛወራሉ።",
"sponsor": "ስፖንሰር {{community_name}}"
}
},
"markdown": {
"link_form": {
"header": "አገናኝ አክል",
Expand All @@ -1099,5 +1175,19 @@
},
"block_explorer": {
"see": "በብሎክ አሳሽ ውስጥ ይመልከቱ"
},
"currency": {
"brl_singular": "እውነተኛ",
"btc_singular": "ቢትኮይን",
"crc_singular": "ኮሎን",
"eos_singular": "Eos",
"eth_singular": "ኤቴሬም",
"usd_singular": "ዶላር",
"brl_plural": "እውነተኛ",
"btc_plural": "ቢትኮይን",
"crc_plural": "ኮሎኔሎች",
"eos_plural": "Eos",
"eth_plural": "ቢትኮይን",
"usd_plural": "ዶላር"
}
}
Loading