From 615426970af2c593929f1a3c5b725490b5590248 Mon Sep 17 00:00:00 2001 From: hydrocodone <44106031+diracs-delta@users.noreply.github.com> Date: Tue, 27 Oct 2020 11:41:23 -0700 Subject: [PATCH 01/13] src/statics: add donation icons --- packages/app/src/statics/icons/github-28x28.png | Bin 0 -> 786 bytes .../src/statics/icons/opencollective-28x28.png | Bin 0 -> 1392 bytes packages/app/src/statics/icons/paypal-28x28.png | Bin 0 -> 1284 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 packages/app/src/statics/icons/github-28x28.png create mode 100644 packages/app/src/statics/icons/opencollective-28x28.png create mode 100644 packages/app/src/statics/icons/paypal-28x28.png diff --git a/packages/app/src/statics/icons/github-28x28.png b/packages/app/src/statics/icons/github-28x28.png new file mode 100644 index 0000000000000000000000000000000000000000..8dd92ca716a4d58b1bc8c243028298bcb8e13dbb GIT binary patch literal 786 zcmeAS@N?(olHy`uVBq!ia0vp^G9b*s0wiy+h|2>hmUKs7M+SzC{oH>NS%G|oWRD45bDP46hOx7_4S6Fo+k-*%fF5lweBoc6VX;-`;;_Kaj^+ z;1OBOz?vZq!i=jQdTId$*-JcqUD=;-Ned~QZSsuu@TjD=R~&%1~>CVwc!P zM=7N)0ipGKy|QlV?p?m{_p zPUmdBu2#C}luFIVOR>y$Q}*q@+8~*D&`WC5`ALsl%O%e?U&_8^x$#iKbj|Z`u0Q{4 z^JMmGzFk@`n@;_ai~bt@w8d_VMb?!WmRD!lmK~o{#y{2i*{MSw?>L(tyY9|6R;|eP zHLJRjW}TtMb#29wtk}=@-?k}q+zt|1^UXtmXZ6WhrE#21r&*6Hu05Q_df95z(rc@o zKg4J-^36VQsbsofNN3Wu^ra?G*;kxx5=_q}|Tut-KQqFp94}NSK!jfBJT>7ZD?M`o==i_yfhR^nhX&YGwzWyR{&gb3I zpZ;Ol0f#)_y0I8n8C&l@TFmw@xz4q^#(ZIDdvx53b3f+RJ#X0iQ#t6}mL)cK&Pd*Kde$^7!h?11Vl2ohYqEsNoU}Ruq zplfKLYh)f`Xkle+YGr7wZD3$!V8FV2Lo|wp-29Zxv`U}`LknF4GhG9d5Can{BLgcF zBZ!8AF0W*u21$?&!TD(=<%vb94CUqJdYO6I#mR{Use1WE>9gP2NC6cwc)I$ztaD0e F0ssjWJof+q literal 0 HcmV?d00001 diff --git a/packages/app/src/statics/icons/opencollective-28x28.png b/packages/app/src/statics/icons/opencollective-28x28.png new file mode 100644 index 0000000000000000000000000000000000000000..91aa1f0f41ba5464673b66de0778c0f20abd2ab0 GIT binary patch literal 1392 zcmeAS@N?(olHy`uVBq!ia0vp^G9b*s3?yAI>n{UREa{HEjtmSN`?>!lvI6-E$sR$z z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$Ysfr0T^fKP}kP(l6LPje4` z-f{WMg2SKZ9Q+LA4h95t4-jFx1R{0vXut2{WW{ZI_40d z`xukF-CY)HUglGF5>gnR)=D(zuJXpNDefjjjuI&#V|8CEyYuX<;t--1 zO^*-gSdpkEGV@h>p6jQsqmzP|QlDPYy0U3C<4PSd*Nv;Bva&Azu-eJEGT$L5rz!2% z@o8Z@88frpMXVQ0PMUtGVZuAPBXJiNS$>O5`p@u4fk$ywn`oPrQP&FNhci_B{1yB* zCI75AoxFURV0ywdF_ZMprCV-QMl4uyJ}fS^u=A18nl+b}rEAXKu&r;~M$YKlYig~# zzP){?_)eao+~Nq|xv8f2+GO5#?n<81wfn%aqM}<_QZwI6%09pN^Qfxqw)>*Nb{k$t z#g;7Ixi>kWLC^Q>{hapb z{(ZZY?~7dP>TXV#-nXAu)INUxv-1zd-5d|x5KZLG0!E-}iEBhjN@7W>RdP`(kYX@0 zFf!0JG|)9N4>7c`GB&X?veY&(ure?>(AIncMMG|WN@iLmP=leluAvbSfi##{SQ$b! zI7#>cOFsrlkPX54X(i=}MX3yqDfvmM3ZA)%>8U}fi7AzZCsTpNAOnM^tDnm{r-UW| DeWl}k literal 0 HcmV?d00001 diff --git a/packages/app/src/statics/icons/paypal-28x28.png b/packages/app/src/statics/icons/paypal-28x28.png new file mode 100644 index 0000000000000000000000000000000000000000..a4e0099a48a13082dd12521d933e5aee06bfa78c GIT binary patch literal 1284 zcmeAS@N?(olHy`uVBq!ia0vp^Qa~)j!3-ol&c;6kQY`6?zK#qG8~eHcB(ehe3dtTp zz6=aiY77hwEes65fIrm*dXoLEQL6XL9d0e`Y=QR>;L}{H^U7|pYoz~s@-d8pmc5K!=NX))FiyVCIQJgV zBMg4?7-!yLh*|mn|9}2+4{u<4C@l%{3kD?&7!WYAFgH@>W9HU-A9XcoO`6@lS zDsTVwUvzwVQ|Xe+7CeXd^2^-)WclH@f6$-rE+tP?r>|#c-|^K?^vb_KZLC@^?-z2q z{kXGp)4Y7ObXS(nd$LR`j`Dan)YqL^#>BY3^}vsh!G>;DDGDoZ0xe}s@^*Jww=;Y4 zav+Dj#M9T6{Rx+}kO0HYlW{IU>0(b8#}JM4wHHH!4+jXaCNRasbng}`@7ldvqWVkb?rb~ue_@?Vu!q|*wH%+bXIvZNQxY>%&mKK? z?c6=bgefNi^*SbRZitC#RVgoi?%Dn6!ymUKeXrWq?K5P1Hy-4-yVao{-|(^1(=7P1 zah(;%MCQMZX=$F%o-s33a&fUmJ;*G~v{acA5Mgm)%B-*qPZq_;9y+VDT|{0>mxP!+ zTG!Fps%^HjD=B+++M`FDst10Tm5Ew(SN~==Ijo{4=*4DbV`XP)YrTKRkwZ(C6iu1N zH@~`cZHU%OX;C&c<;m9bPMvBCJI8xi-CTcufTQBH+t#A`u1ACXN>)w^+WF_-L&35s zQ^P~TLX};-LU`9yRn;X*c;?2=mE(8#IwS7>y~33X1^d5F{AF)u%3OP3+O)8*GqSgC zJ)I&ucf+dHzu6y3eEH(En!i@rY{gdltb~Mu7y7T{2OC7#SED=o%X68kvU}T38vHS{Ykt8yHv_7|4E&l10&w qo1c=IRteEyU;)$ Date: Wed, 28 Oct 2020 12:38:50 -0700 Subject: [PATCH 02/13] src/components: add DonationDialog.vue the element spawns a button that opens the donation dialog --- .../app/src/components/DonationDialog.vue | 90 +++++++++++++++++++ 1 file changed, 90 insertions(+) create mode 100644 packages/app/src/components/DonationDialog.vue diff --git a/packages/app/src/components/DonationDialog.vue b/packages/app/src/components/DonationDialog.vue new file mode 100644 index 0000000..6540e57 --- /dev/null +++ b/packages/app/src/components/DonationDialog.vue @@ -0,0 +1,90 @@ + + + + + From 0084291116da78455410fb7c8d4613b9f9badb1f Mon Sep 17 00:00:00 2001 From: hydrocodone <44106031+diracs-delta@users.noreply.github.com> Date: Wed, 28 Oct 2020 12:39:41 -0700 Subject: [PATCH 03/13] HomePage.vue: switch to new donation button and center --- packages/app/src/pages/HomePage.vue | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/packages/app/src/pages/HomePage.vue b/packages/app/src/pages/HomePage.vue index d206c73..98bf95c 100644 --- a/packages/app/src/pages/HomePage.vue +++ b/packages/app/src/pages/HomePage.vue @@ -2,12 +2,9 @@
-
- Hello there! - +
+ Hello there! +
@@ -30,6 +27,7 @@ import ConceptPicker from "../components/ConceptPicker.vue"; import CustomizePracticeCard from "../components/CustomizePracticeCard.vue"; import ActionButton from "../components/ActionButton.vue"; +import DonationDialog from "../components/DonationDialog.vue" import { Operator } from "../engine/math_questions/expression/models"; export default { @@ -37,6 +35,13 @@ export default { ConceptPicker, ActionButton, CustomizePracticeCard, + DonationDialog, + }, + methods: { + openDonationDialog () { + console.log(DonationDialog) + DonationDialog.methods.open() + }, }, }; @@ -55,7 +60,6 @@ export default { .config-header-label { color: white; font-size: 32px; - left: 36px; font-family: "Montserrat", sans-serif; top: 24px; z-index: 1; From 0ab9c0393415d171e3ed8482420171bacb5cfccb Mon Sep 17 00:00:00 2001 From: hydrocodone <44106031+diracs-delta@users.noreply.github.com> Date: Wed, 28 Oct 2020 12:40:58 -0700 Subject: [PATCH 04/13] HomePage.vue: remove unused method added in tests --- packages/app/src/pages/HomePage.vue | 6 ------ 1 file changed, 6 deletions(-) diff --git a/packages/app/src/pages/HomePage.vue b/packages/app/src/pages/HomePage.vue index 98bf95c..cc92f7d 100644 --- a/packages/app/src/pages/HomePage.vue +++ b/packages/app/src/pages/HomePage.vue @@ -37,12 +37,6 @@ export default { CustomizePracticeCard, DonationDialog, }, - methods: { - openDonationDialog () { - console.log(DonationDialog) - DonationDialog.methods.open() - }, - }, }; From 8c3dcc561515faca739f0634ba151f396f457253 Mon Sep 17 00:00:00 2001 From: hydrocodone <44106031+diracs-delta@users.noreply.github.com> Date: Wed, 28 Oct 2020 12:42:47 -0700 Subject: [PATCH 05/13] HomePage.vue: remove now-unused CSS --- packages/app/src/pages/HomePage.vue | 30 ----------------------------- 1 file changed, 30 deletions(-) diff --git a/packages/app/src/pages/HomePage.vue b/packages/app/src/pages/HomePage.vue index cc92f7d..9ff8d85 100644 --- a/packages/app/src/pages/HomePage.vue +++ b/packages/app/src/pages/HomePage.vue @@ -81,34 +81,4 @@ export default { justify-content: space-between; } } -.paypal-icon { - height: 28px; - margin-right: 8px; -} - -.paypal-button { - border-radius: 24px; - height: 48px; - border: 1px solid #003084; - outline: none; - display: flex; - align-items: center; - padding: 2px 20px; - color: #003084; - font-size: 20px; - background-color: white; - transition: all 0.3s ease-out; -} - -.paypal-button:hover { - cursor: pointer; - border: 1px solid #1ba0de; -} - -.paypal-button:active { - cursor: pointer; - border: 1px solid #1ba0de; - color: white; - background-color: #003084; -} From 7d49cb9efeb7a8d65b7749d3bb6461fa451dd7b5 Mon Sep 17 00:00:00 2001 From: hydrocodone <44106031+diracs-delta@users.noreply.github.com> Date: Wed, 28 Oct 2020 13:09:08 -0700 Subject: [PATCH 06/13] DonationDialog.vue: add type annotations --- packages/app/src/components/DonationDialog.vue | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/app/src/components/DonationDialog.vue b/packages/app/src/components/DonationDialog.vue index 6540e57..7cc3813 100644 --- a/packages/app/src/components/DonationDialog.vue +++ b/packages/app/src/components/DonationDialog.vue @@ -42,15 +42,20 @@ From 9496cb4c9d7021babf0df1e9f295defdc8254230 Mon Sep 17 00:00:00 2001 From: hydrocodone <44106031+diracs-delta@users.noreply.github.com> Date: Thu, 5 Nov 2020 13:04:46 -0800 Subject: [PATCH 12/13] DonationDialog.vue: use QSeparator and QCardActions components --- src/components/DonationDialog.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/components/DonationDialog.vue b/src/components/DonationDialog.vue index 1da126a..b7e3c57 100644 --- a/src/components/DonationDialog.vue +++ b/src/components/DonationDialog.vue @@ -7,8 +7,9 @@ This app was developed by Grey Software, a not-for-profit organization that empowers students to build open-source software for their communities and societies.
You can support us as we envision and build the software ecosystem of the future by sponsoring us below. + -
+ -
+ From a342bfd9ba20e81dab609ff791d49fbaa03f1226 Mon Sep 17 00:00:00 2001 From: ArsalaBangash Date: Sat, 7 Nov 2020 12:51:41 +0500 Subject: [PATCH 13/13] Added layout changes to home page's header and spacing changes to the Donate Dialog --- src/components/DonationDialog.vue | 23 +++++++++++++---------- src/pages/HomePage.vue | 27 +++++++++++++-------------- 2 files changed, 26 insertions(+), 24 deletions(-) diff --git a/src/components/DonationDialog.vue b/src/components/DonationDialog.vue index b7e3c57..60769c0 100644 --- a/src/components/DonationDialog.vue +++ b/src/components/DonationDialog.vue @@ -1,11 +1,11 @@