From 946ad3e2626785c270aeaa26895ab7c6d65a247f Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Fri, 9 Aug 2024 13:02:19 +0000 Subject: [PATCH 01/12] campaign details --- src/lib/stores/campaigns.ts | 20 ++++++++++++++++++ .../images/campaigns/Free100/reviewers/1.jpeg | Bin 0 -> 2599 bytes 2 files changed, 20 insertions(+) create mode 100644 static/images/campaigns/Free100/reviewers/1.jpeg diff --git a/src/lib/stores/campaigns.ts b/src/lib/stores/campaigns.ts index b20be2f0f..068b99545 100644 --- a/src/lib/stores/campaigns.ts +++ b/src/lib/stores/campaigns.ts @@ -68,6 +68,26 @@ campaigns ] } }) + .set('Free100', { + template: 'review', + title: 'Get started with $100 credits', + description: + "Get $100 in Cloud credits when you upgrade or create an organization with a Pro plan.", + onlyNewOrgs: true, + data: { + cta: 'Get everything out of Cloud with Pro', + claimed: 'Your credits will be valid for 3 months.', + unclaimed: 'Apply your code to join Appwrite Pro.', + reviews: [ + { + name: 'David Foster', + img: '1.jpeg', + desc: 'Managing director', + review: 'We really loved working with Appwrite for launching our bootstrapped "Open Mind" App. It was saving us a lot of money in comparison to Firebase since the amount of users grew quite fast and we needed a quick switch.' + } + ] + } + }) .set('JSMastery', { template: 'review', title: 'Claim your JavaScript Mastery $50 credits.', diff --git a/static/images/campaigns/Free100/reviewers/1.jpeg b/static/images/campaigns/Free100/reviewers/1.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..db56c928c31a3fbbed8429ff5cb0b2fafe7749b5 GIT binary patch literal 2599 zcmb7Nr0m6r1(z-HMBC5D>Sv|t_`$)As_;D8$ zx_@AH&j|uR(En8e(A}6Y34gxSMrhbHC^^vGD;@>%@CXI zxD#q}oa(oiAC1V>5JAHzVsd*J_C!KodH5T{gzY_twJ|%c+~GN5dj^l23XDKP4o^ zU;9GzuB*9y^kxX1H;hIVUsc|D_g5q;KZt&jv$%q*i>gt)QS^EEv0_J>KGO72nw&!} zsbk8u0*^`6?^X!3*V@5%?z~W+G*WzwY=~ADQzRmfrMir03V;jPo?GB2%vNB*k>(=3 z-(2s_<-oGR;Y;1dlPiE$c03-g#@lDrkC$(HprTiWV3_V_C24Ewnxto_O6pn4Hi!v>uow{okLa}{giZOzjBBZSZ?A5t{jo%4Ec3hHnR9K=3HKu> zzbmEnct+T(Xil2+|1R;e@>VsQKiXIAS(#;vdCpyCaw#qMH{wI(algYJ`~k zrbE;Xy{>PVBpQU%7%7VI$P06n?=O6&I|crGE8x#h^wtF@L*ePfUpZ1f!PH(IM^`Pp zb3;A}8SiAbiE$uq4*o`Mc%c~enss*ydF;zESGp?WhWCI}=2%!beNfG+*?uw8?J_x% zO!iE;aA7WiTX2^2s&k>;NX1t#v?6C6Ymu-hEob2;B8zz>&2ie{#xH9s4CHK z8}0nnGUA>$XRz|bBUa3qQxl}pq1ZZ4^qtwXl+rWun6(52rt%8|y%7i#+ieR$Q1lyC zYL^Ua-Hou*FKe0Zj(>O#t$>G;hrEsCHZ*$3VBBwLk=T7!@`f)M2eNz@6+Kw%n0Yr& zVeZ!HogfKk<}^IPskql2O#iurbl`kks1pFD!HlPYr;mRCEXoi)D?gT-)sc~QZQWag z5{4&2NEi2Sae65A&d05OXeCEhze7dS&a^#eH*bY5=~NXprf@I4ck8TMp>#M^Z$eyG z9}2sibW}QOuMq&XdZT?*VMf`y!Iq|LB)ap`f#sV$6?QkLD6j-;8zfUJ`bo6hSdKt7 zkHL5cOkT`2R!R}E=&UJk)tN8#DvBGIbdnBs4CG#jNJGhAv+tsA-NC28eym$~7HB}* z-*ldB{IxUtBVVzEQ~p}U%iE|(08|E3a@?cNWZgQ)u2hI~g@GGKNhSl8->ri)NfRus z#ZVmHGT)eiX}bS@lGI{7>FSrB6Js7`z(Z}+jj_D*HwjO+C8m~MO|>Z34!V)OaFYj% zUp5A<|CAq_IsUWA#?SvYB*8sie6;1=0W+@k(tO1itbdD-*U9)hf12xT{*f7aTZhfk z2&jFgUOyV!bnMeX3kI4xaZ+=+R9>i~Ny0nyu6A#Gj8EC-4tf2u)&vdj=w&w5X6qm0 zktL@@D&%eq#nj{#p>H5UN3iJ*i>ZT{zh>j|o>_meyID@6QTR2zEUmzEG8i|X{(%rE zj6ULK$bUK7Qu*X!PI{oP0@2dyN!N#!rEsO#x4Ag4OXH0!h&|DMjL zT}thym9q2WzW6h9jah8?B=o4M^aqETMkW1d_^~qfX=YwJj?vu;L6|wxC`C2x&e;tFv<^=nLD<+F z3ZA^MF;sSCNj_2f6oJUiN z8RI?4!r#tWvU};W6Q;fR;m31|tpY#{hm$bC(ZYF|38YaoWttC_SBMN~x3eyyhM&eG zBT$$-xvPW)@wn5QU$+-$N6ZU}W#y|&zb)5l{0lXbHUvSE-OoB>FQ}*3QCj`N$J;Z| zlyI(nHA8XP(SyG=hhD3b6QhHvT(^m(viA1}d*m-Z$hjJd`bzwj|E%!{>h&Ou2VFhA zp{C~Y5aoa&Nc^4A`G^^FBk`ByU(yE!0KxYOqGZDA@#ARq6VIy#sZOwfRlIV#vD&w< zH1R5H7x4mxpE2E=Uv@$u!MsyemZFR0L->qe*3&A#Tc zzMU$nv^P;Zj04QSt66YO%WHkk#|#+dc!*iX#&jDKzVY{!s5k2aQ5KfPnVkE7g_&QI z;qkGMns7K+=Xh0}I=yj{vhLo;ukfF0K0oorhe-Z*s!dznwwPK^u@X5{zbQ9Rnl|%l zo82XraG+%kk*sg7d}%p!*=;!6BVy}LspeXkuy>B7F+Z`;?FU;V6Xt~1_n+SOKVOhY zd>xb+OliX$N$aaEIrJc9`twXu4rnHE6LzZ1&2fU`o_90CWAT&bA{u(;I=Dm$);FpYoX3hkz(bdIPDVc^F{#BEQYW0Xrq4Mm1^qslt=uM ztFdg#SC1FZb||0M&Jz1OWD#aaB*^5Un<&3TsRi+o7O+&Bs>OUQhvB3GW-0wYO@^Dd zI!bICE(bEsL8!5$-qyLp7i} z)D(@T!sNZ&hl?C4Z@-PN>#tG{ll!_IG`}3nCSlQ0O0THkzjHNK4-X8hkkB%yp6{1t T5EgF}Juiu*v&wxf1Y`dO-UX#8 literal 0 HcmV?d00001 From 410b7ebc7a66a6518de63dd714c75fd83afb2bdd Mon Sep 17 00:00:00 2001 From: ItzNotABug Date: Sun, 11 Aug 2024 18:22:14 +0530 Subject: [PATCH 02/12] fix: failing git install on local/preview/test instances. --- .../project-[project]/settings/GitInstallationModal.svelte | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/routes/console/project-[project]/settings/GitInstallationModal.svelte b/src/routes/console/project-[project]/settings/GitInstallationModal.svelte index 8fc2e5c3e..06e4fcae6 100644 --- a/src/routes/console/project-[project]/settings/GitInstallationModal.svelte +++ b/src/routes/console/project-[project]/settings/GitInstallationModal.svelte @@ -2,7 +2,6 @@ import Modal from '$lib/components/modal.svelte'; import Button from '$lib/elements/forms/button.svelte'; import { sdk } from '$lib/stores/sdk'; - import { goto } from '$app/navigation'; import { page } from '$app/stores'; export let showGitInstall: boolean; @@ -15,7 +14,7 @@ target.searchParams.set('success', redirect.toString()); target.searchParams.set('failure', redirect.toString()); target.searchParams.set('mode', 'admin'); - goto(target); + return target; } @@ -23,7 +22,7 @@

Select a provider to import an existing git repositories.

- From 626010f1313ef22d7c34996f24b546cbba8cd82d Mon Sep 17 00:00:00 2001 From: Arman Date: Tue, 13 Aug 2024 09:48:39 +0200 Subject: [PATCH 03/12] feat: disaply grossAmount in payment history --- .../organization-[organization]/billing/paymentHistory.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/console/organization-[organization]/billing/paymentHistory.svelte b/src/routes/console/organization-[organization]/billing/paymentHistory.svelte index 19f9bc76b..1784b0a57 100644 --- a/src/routes/console/organization-[organization]/billing/paymentHistory.svelte +++ b/src/routes/console/organization-[organization]/billing/paymentHistory.svelte @@ -126,7 +126,7 @@ {/if} - {formatCurrency(invoice.amount)} + {formatCurrency(invoice.grossAmount)} Date: Tue, 13 Aug 2024 09:50:20 +0200 Subject: [PATCH 04/12] feat: disaply grossAmount in payment history --- .../billing/retryPaymentModal.svelte | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/routes/console/organization-[organization]/billing/retryPaymentModal.svelte b/src/routes/console/organization-[organization]/billing/retryPaymentModal.svelte index 06dde940f..040d72f47 100644 --- a/src/routes/console/organization-[organization]/billing/retryPaymentModal.svelte +++ b/src/routes/console/organization-[organization]/billing/retryPaymentModal.svelte @@ -20,6 +20,7 @@ import { paymentMethods } from '$lib/stores/billing'; import { onMount } from 'svelte'; import { sdk } from '$lib/stores/sdk'; + import { formatCurrency } from '$lib/helpers/numbers'; const endpoint = VARS.APPWRITE_ENDPOINT ?? `${$page.url.origin}/v1`; export let show = false; @@ -122,9 +123,9 @@ title="Retry payment">

- Your payment of ${invoice.amount} due on {toLocaleDate( - invoice.dueAt - )} has failed. Retry your payment to avoid service interruptions with your projects. + Your payment of ${formatCurrency(invoice.grossAmount)} due + on {toLocaleDate(invoice.dueAt)} has failed. Retry your payment to avoid service interruptions + with your projects.

- - - {/if} +