From 114cce02c1edd3a0a009816422b3dc4314511afc Mon Sep 17 00:00:00 2001 From: Wynne Crisman Date: Sun, 20 Sep 2020 20:34:50 -0700 Subject: [PATCH] Added donate menu & updated to the latest Meteor. --- .meteor/.finished-upgraders | 1 + .meteor/packages | 25 +++--- .meteor/release | 2 +- .meteor/versions | 116 +++++++++++--------------- imports/ui/layouts/Public.html | 5 +- imports/ui/layouts/Public.import.styl | 22 ++++- imports/ui/layouts/Public.js | 29 ++++++- package-lock.json | 22 ++--- package.json | 4 +- 9 files changed, 131 insertions(+), 95 deletions(-) diff --git a/.meteor/.finished-upgraders b/.meteor/.finished-upgraders index 4538749..c07b6ff 100644 --- a/.meteor/.finished-upgraders +++ b/.meteor/.finished-upgraders @@ -16,3 +16,4 @@ notices-for-facebook-graph-api-2 1.4.3-split-account-service-packages 1.5-add-dynamic-import-package 1.7-split-underscore-from-meteor-base +1.8.3-split-jquery-from-blaze diff --git a/.meteor/packages b/.meteor/packages index aba2d80..9aaad09 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -5,24 +5,24 @@ # but you can also edit it by hand. meteor-base@1.4.0 # Packages every Meteor app needs to have -mobile-experience@1.0.5 # Packages for a great mobile UX -mongo@1.6.2 # The database Meteor supports right now +mobile-experience@1.1.0 # Packages for a great mobile UX +mongo@1.10.0 # The database Meteor supports right now blaze-html-templates@1.0.4 # Compile .html files into Meteor Blaze views reactive-var@1.0.11 # Reactive variable for tracker reactive-dict@1.3.0 # ??? tracker@1.2.0 # Meteor's client-side reactive programming library tomwasd:history-polyfill # Adds IE 8/9 support for HTML5 history. -email@1.2.3 # Adds the Meteor/Email package for sending lost password emails +email@2.0.0 # Adds the Meteor/Email package for sending lost password emails -standard-minifier-css@1.5.3 # CSS minifier run for production mode -standard-minifier-js@2.4.1 # JS minifier run for production mode +standard-minifier-css@1.6.1 # CSS minifier run for production mode +standard-minifier-js@2.6.0 # JS minifier run for production mode es5-shim@4.8.0 # ECMAScript 5 compatibility for older browsers. poorvavyas:es6-shim -ecmascript@0.12.4 # Enable ECMAScript2015+ syntax in app code +ecmascript@0.14.3 # Enable ECMAScript2015+ syntax in app code #accounts-ui #accounts-base -accounts-password@1.5.1 +accounts-password@1.6.2 useraccounts:core useraccounts:unstyled useraccounts:flow-routing # Configures email flows. Used for AccountsTemplates class. @@ -33,8 +33,7 @@ arillo:flow-router-helpers # Provides various template helpers such as {{pathFo #tomwasd:flow-router-seo kadira:blaze-layout #TODO: Remove? -shell-server@0.4.0 # ??? -meteortoys:allthings +shell-server@0.5.0 # ??? session@1.2.0 ##browser-policy # Adds support for specifying browser level security rules related to content and what's allowed to laod on the page. check@1.3.1 # Allows for checking the structure and types of arguments passed to Meteor methods and publications. @@ -60,8 +59,8 @@ juliancwirko:s-alert # Client error/alert handling jcbernack:reactive-aggregate # Allows us to create a new client collection (from the server) with the contents being an aggregate of server data. Note that aggregation can only be done on the server currently as mini-mongo does not support it. ostrio:logger ostrio:loggermongo -dynamic-import@0.5.1 -markdown@1.0.12 +dynamic-import@0.5.2 +markdown@1.0.14 wcrisman:jquery-custom-scrollbar wcrisman:server-side-seo # A custom plugin to take all HTML from the app, and place the templates in a map in a file in the private folder for use at runtime to generate search engine readable html. See code in the /packages folder for this project. @@ -73,3 +72,7 @@ meteorhacks:picker meteorhacks:ssr ostrio:meteor-root manuel:reactivearray +jquery + +#meteortoys:allthings@4.0.0 # Provides client side debugging just like constellation. Was having problems with dependancies. +#babrahams:constellation # Provides client side debugging when the server is not run in production mode. diff --git a/.meteor/release b/.meteor/release index 97064e1..019e3ae 100644 --- a/.meteor/release +++ b/.meteor/release @@ -1 +1 @@ -METEOR@1.8.1 +METEOR@1.11.1 diff --git a/.meteor/versions b/.meteor/versions index 76c0fb4..d962993 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -1,39 +1,41 @@ -accounts-base@1.4.3 -accounts-password@1.5.1 -alanning:roles@1.2.16 -aldeed:collection2@3.0.1 -aldeed:schema-index@3.0.0 +accounts-base@1.7.0 +accounts-password@1.6.2 +alanning:roles@1.2.19 +aldeed:collection2@2.7.1 +aldeed:collection2-core@2.1.2 +aldeed:schema-index@2.1.2 +aldeed:simple-schema@1.5.4 aldeed:template-extension@4.1.0 allow-deny@1.1.0 arillo:flow-router-helpers@0.5.2 autoupdate@1.6.0 -babel-compiler@7.3.4 -babel-runtime@1.3.0 -base64@1.0.11 +babel-compiler@7.5.3 +babel-runtime@1.5.0 +base64@1.0.12 binary-heap@1.0.11 -blaze@2.3.3 +blaze@2.3.4 blaze-html-templates@1.1.2 blaze-tools@1.0.10 -boilerplate-generator@1.6.0 -caching-compiler@1.2.1 +boilerplate-generator@1.7.1 +caching-compiler@1.2.2 caching-html-compiler@1.1.3 -callback-hook@1.1.0 +callback-hook@1.3.0 check@1.3.1 coffeescript@1.0.17 ddp@1.4.0 ddp-client@2.3.3 ddp-common@1.4.0 -ddp-rate-limiter@1.0.7 -ddp-server@2.3.0 +ddp-rate-limiter@1.0.9 +ddp-server@2.3.2 deps@1.0.12 diff-sequence@1.1.1 -dynamic-import@0.5.1 -ecmascript@0.12.4 +dynamic-import@0.5.2 +ecmascript@0.14.3 ecmascript-runtime@0.7.0 -ecmascript-runtime-client@0.8.0 -ecmascript-runtime-server@0.7.1 -ejson@1.1.0 -email@1.2.3 +ecmascript-runtime-client@0.11.0 +ecmascript-runtime-server@0.10.0 +ejson@1.1.1 +email@2.0.0 es5-shim@4.8.0 fetch@0.1.1 fortawesome:fontawesome@4.7.0 @@ -43,68 +45,50 @@ html-tools@1.0.11 htmljs@1.0.11 http@1.4.2 id-map@1.1.0 -inter-process-messaging@0.1.0 +inter-process-messaging@0.1.1 jcbernack:reactive-aggregate@1.0.0 jquery@1.11.11 juliancwirko:s-alert@3.2.0 kadira:blaze-layout@2.3.0 kadira:flow-router@2.12.1 -launch-screen@1.1.1 +launch-screen@1.2.0 livedata@1.0.18 localstorage@1.2.0 logging@1.1.20 manuel:reactivearray@1.0.9 -markdown@1.0.12 +markdown@1.0.14 +mdg:validation-error@0.5.1 meteor@1.9.3 meteor-base@1.4.0 meteorhacks:picker@1.0.3 meteorhacks:ssr@2.2.0 -meteortoys:allthings@7.0.1 -meteortoys:authenticate@4.0.0 -meteortoys:autopub@4.0.0 -meteortoys:blueprint@4.0.0 -meteortoys:email@4.0.0 -meteortoys:hotreload@4.0.0 -meteortoys:listen@4.0.0 -meteortoys:method@4.0.0 -meteortoys:mobile@4.0.0 -meteortoys:pub@4.0.0 -meteortoys:result@4.0.0 -meteortoys:shell@4.0.0 -meteortoys:status@4.0.0 -meteortoys:sub@4.0.0 -meteortoys:throttle@4.0.0 -meteortoys:toggle@4.0.0 -meteortoys:toykit@4.0.2 -minifier-css@1.4.2 -minifier-js@2.4.1 -minimongo@1.4.5 +minifier-css@1.5.3 +minifier-js@2.6.0 +minimongo@1.6.0 mizzao:bootboxjs@4.4.0 -mobile-experience@1.0.5 -mobile-status-bar@1.0.14 -modern-browsers@0.1.4 -modules@0.13.0 -modules-runtime@0.10.3 -momentjs:moment@2.23.0 -mongo@1.6.2 +mobile-experience@1.1.0 +mobile-status-bar@1.1.0 +modern-browsers@0.1.5 +modules@0.15.0 +modules-runtime@0.12.0 +momentjs:moment@2.28.0 +mongo@1.10.0 mongo-decimal@0.1.1 mongo-dev-server@1.1.0 mongo-id@1.0.7 -msavin:jetsetter@4.0.0 -msavin:mongol@7.0.1 npm-bcrypt@0.9.3 -npm-mongo@3.1.2 +npm-mongo@3.8.1 observe-sequence@1.0.16 ordered-dict@1.1.0 -ostrio:cookies@2.3.0 -ostrio:files@1.10.2 -ostrio:logger@2.0.7 -ostrio:loggermongo@2.0.4 -ostrio:meteor-root@1.0.7 +ostrio:cookies@2.6.0 +ostrio:files@1.14.2 +ostrio:logger@2.0.8 +ostrio:loggermongo@2.0.5 +ostrio:meteor-root@1.0.8 poorvavyas:es6-shim@0.21.1 promise@0.11.2 raix:eventemitter@0.1.3 -random@1.1.0 +random@1.2.0 rate-limit@1.0.9 reactive-dict@1.3.0 reactive-var@1.0.11 @@ -114,14 +98,14 @@ routepolicy@1.1.0 service-configuration@1.0.11 session@1.2.0 sha@1.0.9 -shell-server@0.4.0 -socket-stream-client@0.2.2 +shell-server@0.5.0 +socket-stream-client@0.3.1 softwarerero:accounts-t9n@1.3.11 spacebars@1.0.15 spacebars-compiler@1.1.3 -srp@1.0.12 -standard-minifier-css@1.5.3 -standard-minifier-js@2.4.1 +srp@1.1.0 +standard-minifier-css@1.6.1 +standard-minifier-js@2.6.0 stylus@2.513.14 templating@1.3.2 templating-compiler@1.3.3 @@ -132,12 +116,12 @@ tomwasd:history-polyfill@0.0.1 tracker@1.2.0 ui@1.0.13 underscore@1.0.10 -url@1.2.0 +url@1.3.1 useraccounts:core@1.14.2 useraccounts:flow-routing@1.14.2 useraccounts:unstyled@1.14.2 wcrisman:jquery-custom-scrollbar@3.0.0 wcrisman:server-side-seo@1.0.0 -webapp@1.7.3 +webapp@1.9.1 webapp-hashing@1.0.9 zimme:active-route@2.3.2 diff --git a/imports/ui/layouts/Public.html b/imports/ui/layouts/Public.html index 13e5826..3f0f7e1 100644 --- a/imports/ui/layouts/Public.html +++ b/imports/ui/layouts/Public.html @@ -9,12 +9,13 @@
    • -
  • Important Dates
    • +
  • Deadlines
  • Support  
  • Programs  
  • Contact  
  • About  
  • Home  
    • +
  • Donate  
    • @@ -39,4 +40,4 @@
    ©2013, 2018 Anderson Valley Education Foundation, Inc.
    Web Site By: Wynne Crisman and Caleb Devine-Gomes
    - \ No newline at end of file + diff --git a/imports/ui/layouts/Public.import.styl b/imports/ui/layouts/Public.import.styl index 4a83ce6..25e2d4f 100644 --- a/imports/ui/layouts/Public.import.styl +++ b/imports/ui/layouts/Public.import.styl @@ -1,9 +1,20 @@ +//Needs to be outside the #publicBody because the dialog is created outside that element. +.donateList + list-style-type: none +.donateLink + font-family: Palatino, "Palatino Linotype", "Palatino LT STD", "Book Antiqua", Georgia, serif + font-weight: bold + padding: 8px 8px 0 8px + text-decoration: none + color: #269 + #publicBody position: relative max-width: 960px min-width: 250px margin: 0 auto + #page background: #FDFDFD @@ -45,6 +56,15 @@ a.active color: #777777 cursor: default + span.link + font-family: Palatino, "Palatino Linotype", "Palatino LT STD", "Book Antiqua", Georgia, serif + font-weight: bold + padding: 8px 8px 0 8px + text-decoration: none + color: #269 + cursor: pointer + span.link + color: #5AD .dropMenu display: none position: absolute @@ -250,4 +270,4 @@ font-size: 7px .footer font-size: 7px - text-align: left \ No newline at end of file + text-align: left diff --git a/imports/ui/layouts/Public.js b/imports/ui/layouts/Public.js index 6224928..45d0092 100644 --- a/imports/ui/layouts/Public.js +++ b/imports/ui/layouts/Public.js @@ -1,8 +1,35 @@ import { Template } from 'meteor/templating'; +import Swal from 'sweetalert2'; import './Public.html'; Template.Public.events({ 'click .barButton': function(event, template) { template.$('.dropMenu').toggle(); + }, + 'click .donateMenu': function(event, template) { + let linkOnce = "https://checkout.square.site/pay/5c55a7a6f6bf443baf5b231762bd63ec"; + let openOnce = "window.open('" + linkOnce + "', '_blank')"; + let linkMonthly = "https://checkout.square.site/pay/fac3678095144f02b4cab4f8efa6e203"; + let openMonthly = "window.open('" + linkMonthly + "', '_blank')"; + let linkAnnually = "https://checkout.square.site/pay/3a9ab812d91f4a749bdae9f7c390273c"; + let openAnnually = "window.open('" + linkAnnually + "', '_blank')"; + + Swal.fire({ + title: 'How would you like to donate?', + showCancelButton: true, + showCloseButton: false, + showConfirmButton: false, + icon: 'question', + //html: '' + html: '
    ' + + '' + + '' + + '' + + '
    ' + }); } -}); \ No newline at end of file +}); diff --git a/package-lock.json b/package-lock.json index 4000a35..3a9923f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,11 +20,11 @@ } }, "@babel/runtime": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.1.2.tgz", - "integrity": "sha512-Y3SCjmhSupzFB6wcv1KmmFucH6gDVnI30WjOcicV10ju0cZjak3Jcs67YLIXBrmZYw1xCrVeJPbycFwrqNyxpg==", + "version": "7.11.2", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.11.2.tgz", + "integrity": "sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw==", "requires": { - "regenerator-runtime": "^0.12.0" + "regenerator-runtime": "^0.13.4" } }, "@jimp/bmp": { @@ -1345,9 +1345,9 @@ } }, "regenerator-runtime": { - "version": "0.12.1", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz", - "integrity": "sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg==" + "version": "0.13.7", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz", + "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==" }, "sax": { "version": "1.2.4", @@ -1376,9 +1376,9 @@ } }, "sweetalert2": { - "version": "6.11.5", - "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-6.11.5.tgz", - "integrity": "sha512-8Otu1SlWGS/u3e31cOg+uqrwyoQbByEScKp7UupmCfwEZE9St3coO1e6CXv83YzZtzdDgowdK1hBPKPW7SRp4Q==" + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-10.2.0.tgz", + "integrity": "sha512-rFDcsFbc0NGryGl0iUSzwAAgM3vjpVFVJbqyjjufgCyCOlWNjz1/ZD9enyG40oGd2no088EcYLpcg2fwYon2jA==" }, "ticky": { "version": "1.0.1", @@ -1405,7 +1405,7 @@ "resolved": "https://registry.npmjs.org/utif/-/utif-2.0.0.tgz", "integrity": "sha512-9fl1Md7tUTsgjhWCLOra+nalQnDxWme+h0OB7WQsUBZbhrxEmzL6/suCPxI4ujrFAvv6KSu7B/74HhxfydVpfw==", "requires": { - "jpgjs": "github:makr28/jpgjs#c83f107ad725b476a3441d20680a02590d8752cc", + "jpgjs": "github:makr28/jpgjs", "pako": "^1.0.5" } }, diff --git a/package.json b/package.json index 7556a8a..168ed53 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "mongodump": "mongodump -h 127.0.0.1 --port 3001 -d meteor" }, "dependencies": { - "@babel/runtime": "latest", + "@babel/runtime": "^7.11.2", "canvas-png-compression": "0.0.3", "csv-parse": "latest", "dragula": "^3.7.2", @@ -19,6 +19,6 @@ "meteor-node-stubs": "^0.4.1", "properties-reader": "0.0.15", "simpl-schema": "^1.5.3", - "sweetalert2": "^6.11.5" + "sweetalert2": "^10.2.0" } }