From f4c9ac6919eb2ab7417fb41956fbe37bcfd47ba9 Mon Sep 17 00:00:00 2001 From: aaronjudd Date: Sun, 15 Feb 2015 23:51:38 -0800 Subject: [PATCH 1/9] update dev.sample.json Updated for issue reactioncommerce/reaction#245 --- .meteor/versions | 2 +- README.md | 9 +++------ settings/dev.sample.json | 25 +++++++------------------ settings/prod.sample.json | 22 ---------------------- 4 files changed, 11 insertions(+), 47 deletions(-) delete mode 100644 settings/prod.sample.json diff --git a/.meteor/versions b/.meteor/versions index 6d685e4c9d0..6bfb9d94db1 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -103,7 +103,7 @@ prinzdezibel:accounts-guest@0.1.3 raix:eventemitter@0.1.1 raix:ui-dropped-event@0.0.7 random@1.0.2 -reactioncommerce:core@0.4.2 +reactioncommerce:core@0.5.0 reactioncommerce:core-theme@1.2.2 reactioncommerce:reaction-braintree@1.1.0 reactioncommerce:reaction-google-analytics@0.3.0 diff --git a/README.md b/README.md index caf9ebd9f20..766f1c2f002 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,8 @@ #Reaction Commerce -A commerce platform developed with Meteor, Node.js, MongoDB, CoffeeScript following a reactive design pattern that puts usability and conversions first. +A commerce platform developed with Meteor, Node.js, MongoDB, CoffeeScript with a reactive,real-time design that puts usability and conversions first. ##Installation +Node.js + NPM is required. Install from http://nodejs.org/ To install Meteor + Reaction, and start the latest release: @@ -11,7 +12,6 @@ curl -L http://getrxn.io/installreaction | /bin/sh This terminal command executes [this file](https://github.com/reactioncommerce/reaction/blob/development/bin/install). Additional installation options are in the [developer documentation](https://github.com/reactioncommerce/reaction-core/blob/development/docs/installation.md). -Installed Node.js + NPM is required. Install from http://nodejs.org/ ##Demonstration @@ -23,7 +23,7 @@ Test shops help us gather feedback for Reaction development, as well as testing ##Status -**Current status: Alpha Preview v0.4.1** +**Current status: Alpha Preview v0.5.0** **Functional but unstable, with HEAVY ongoing development!** @@ -74,9 +74,6 @@ Join us on our Gitter chat room, discuss, get help. [![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/reactioncommerce/reaction?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) -###Google Group -Google group at https://groups.google.com/forum/#!forum/reaction-talk - #Developer Documentation [Getting started guide](http://thoughts.reactioncommerce.com/how-to-get-involved-with-reaction-commerce/) diff --git a/settings/dev.sample.json b/settings/dev.sample.json index 8f3c3b90357..98050ace876 100644 --- a/settings/dev.sample.json +++ b/settings/dev.sample.json @@ -1,22 +1,11 @@ { - "isDebug": "info", - "baseUrl": "http://localhost:3000", - "googleAnalyticsProperty": "", - "facebook": { - "secret": "" - }, + "ROOT_URL": "", + "MONGO_URL": "", + "MAIL_URL": "", "reaction": { - "METEOR_USER": "Administrator", - "METEOR_AUTH": "admin", - "METEOR_EMAIL": "root@localhost" - }, - "paypal": { - "client_id": "", - "client_secret": "" + "METEOR_USER": "", + "METEOR_AUTH": "", + "METEOR_EMAIL": "" }, - "public": { - "facebook": { - "appId": "" - } - } + "isDebug": "info" } diff --git a/settings/prod.sample.json b/settings/prod.sample.json deleted file mode 100644 index b103efb5e7b..00000000000 --- a/settings/prod.sample.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "isDebug": false, - "baseUrl": "http://yourdomain.com", - "googleAnalyticsProperty": "", - "facebook": { - "secret": "" - }, - "reaction": { - "METEOR_USER": "Administrator", - "METEOR_AUTH": "admin", - "METEOR_EMAIL": "admin@yourdomain.com" - }, - "paypal": { - "client_id": "", - "client_secret": "" - }, - "public": { - "facebook": { - "appId": "" - } - } -} From da852b19e0a32adedff3795369fe5139869f1941 Mon Sep 17 00:00:00 2001 From: cedric coroir Date: Thu, 19 Feb 2015 11:43:11 +0100 Subject: [PATCH 2/9] Enable meteor force-ssl package with $METEOR_SSL Changed default behavior to disable force-ssl package when using a $REPO This was causing automatic routing to https on localhost, preventing the website to be usable When launching from Docker add "-e METEOR_SSL=1" for example to enable force-ssl package. --- bin/entrypoint.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bin/entrypoint.sh b/bin/entrypoint.sh index 11048e30461..025f96e70e8 100644 --- a/bin/entrypoint.sh +++ b/bin/entrypoint.sh @@ -90,6 +90,9 @@ if [ -n "${REPO}" ]; then cd ${METEOR_DIR}/.. # Bundle the Meteor app + if [ -z "${METEOR_SSL}" ]; then + meteor remove force-ssl + fi mkdir -p ${APP_DIR} set +e # Allow the next command to fail meteor build --directory ${APP_DIR} From d168d212939b44c9e5a66b9d3075cc2072d35c86 Mon Sep 17 00:00:00 2001 From: aaronjudd Date: Thu, 19 Feb 2015 16:13:13 -0800 Subject: [PATCH 3/9] Add audit-argument-checks to standard packages Removed force-ssl as a standard package, use a build tool to add to production builds --- .meteor/packages | 2 +- .meteor/versions | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.meteor/packages b/.meteor/packages index 88cef92b15c..5d42c0fa1e1 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -13,7 +13,7 @@ less # Optional Meteor Packages accounts-facebook spiderable -force-ssl +audit-argument-checks # Community Packages nemo64:bootstrap diff --git a/.meteor/versions b/.meteor/versions index 6bfb9d94db1..b30ce41cae6 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -12,12 +12,17 @@ aldeed:template-extension@3.1.1 amplify@1.0.0 anti:fake@0.4.1 application-configuration@1.0.4 +audit-argument-checks@1.0.2 autoupdate@1.1.5 base64@1.0.2 binary-heap@1.0.2 blaze@2.0.4 blaze-tools@1.0.2 boilerplate-generator@1.0.2 +browser-policy@1.0.3 +browser-policy-common@1.0.2 +browser-policy-content@1.0.3 +browser-policy-framing@1.0.3 callback-hook@1.0.2 cfs:access-point@0.1.43 cfs:base-package@0.0.27 @@ -52,7 +57,6 @@ email@1.0.5 facebook@1.1.3 fastclick@1.0.2 follower-livedata@1.0.3 -force-ssl@1.0.3 fortawesome:fontawesome@4.2.0_2 geojson-utils@1.0.2 handlebars@1.0.2 @@ -104,9 +108,9 @@ raix:eventemitter@0.1.1 raix:ui-dropped-event@0.0.7 random@1.0.2 reactioncommerce:core@0.5.0 -reactioncommerce:core-theme@1.2.2 +reactioncommerce:core-theme@1.3.0 reactioncommerce:reaction-braintree@1.1.0 -reactioncommerce:reaction-google-analytics@0.3.0 +reactioncommerce:reaction-google-analytics@0.3.1 reactioncommerce:reaction-paypal@0.4.0 reactioncommerce:reaction-shipping@0.2.1 reactioncommerce:reaction-stripe@1.2.0 From 0a78b3bea254f81fdc7aa3c6c3ac944052ec4017 Mon Sep 17 00:00:00 2001 From: aaronjudd Date: Tue, 24 Feb 2015 09:49:13 -0800 Subject: [PATCH 4/9] Add loadSettings fixture Add loadSettings fixtures example See: https://github.com/reactioncommerce/reaction-core/blob/development/docs/ fixtures.md#fixture-data --- private/settings/.gitignore | 1 + server/fixtures.coffee | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 private/settings/.gitignore create mode 100644 server/fixtures.coffee diff --git a/private/settings/.gitignore b/private/settings/.gitignore new file mode 100644 index 00000000000..a6c57f5fb2f --- /dev/null +++ b/private/settings/.gitignore @@ -0,0 +1 @@ +*.json diff --git a/server/fixtures.coffee b/server/fixtures.coffee new file mode 100644 index 00000000000..5027c869453 --- /dev/null +++ b/server/fixtures.coffee @@ -0,0 +1,6 @@ +### +# Start up fixtures +### +Meteor.startup -> + # update for reaction package/app settings from private/settings/reaction.json + try Fixtures.loadSettings Assets.getText "settings/reaction.json" From 7077632c54fe338fa80f7cb484faf9fa3c7dd4b9 Mon Sep 17 00:00:00 2001 From: aaronjudd Date: Sun, 15 Mar 2015 18:37:31 -0700 Subject: [PATCH 5/9] updated packages, add googlefonts browser-policy Add googlefonts browser policy exception for theme. Remove shopController (it was just there as an example) --- .meteor/release | 2 +- .meteor/versions | 31 +++++++++++++++---------------- common/routing.coffee | 8 ++++---- server/policy.coffee | 8 ++++++++ 4 files changed, 28 insertions(+), 21 deletions(-) create mode 100644 server/policy.coffee diff --git a/.meteor/release b/.meteor/release index 90f87be959b..74a74cb1ba5 100644 --- a/.meteor/release +++ b/.meteor/release @@ -1 +1 @@ -METEOR@1.0.3.1 +METEOR@1.0.3.2 diff --git a/.meteor/versions b/.meteor/versions index b30ce41cae6..1d463124c91 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -24,27 +24,26 @@ browser-policy-common@1.0.2 browser-policy-content@1.0.3 browser-policy-framing@1.0.3 callback-hook@1.0.2 -cfs:access-point@0.1.43 -cfs:base-package@0.0.27 -cfs:collection@0.5.3 -cfs:collection-filters@0.2.3 -cfs:data-man@0.0.4 -cfs:file@0.1.15 -cfs:filesystem@0.1.1 -cfs:graphicsmagick@0.0.17 -cfs:gridfs@0.0.27 +cfs:access-point@0.1.44 +cfs:base-package@0.0.28 +cfs:collection@0.5.4 +cfs:collection-filters@0.2.4 +cfs:data-man@0.0.6 +cfs:file@0.1.16 +cfs:filesystem@0.1.2 +cfs:graphicsmagick@0.0.18 +cfs:gridfs@0.0.31 cfs:http-methods@0.0.27 cfs:http-publish@0.0.13 cfs:power-queue@0.9.11 cfs:reactive-list@0.0.9 cfs:reactive-property@0.0.4 -cfs:s3@0.1.1 -cfs:standard-packages@0.5.3 -cfs:storage-adapter@0.1.1 -cfs:tempstore@0.1.3 +cfs:standard-packages@0.5.4 +cfs:storage-adapter@0.2.1 +cfs:tempstore@0.1.4 cfs:ui@0.1.3 -cfs:upload-http@0.0.19 -cfs:worker@0.1.3 +cfs:upload-http@0.0.20 +cfs:worker@0.1.4 check@1.0.4 cmather:handlebars-server@2.0.0 coffeescript@1.0.5 @@ -82,6 +81,7 @@ logging@1.0.6 matb33:collection-hooks@0.7.6 meteor@1.1.4 meteor-platform@1.2.1 +meteorhacks:ssr@2.1.2 minifiers@1.1.3 minimongo@1.0.6 mobile-status-bar@1.0.2 @@ -103,7 +103,6 @@ ongoworks:security@1.0.1 ongoworks:speakingurl@1.0.5 ordered-dict@1.0.2 package-stats-opt-out@1.0.2 -prinzdezibel:accounts-guest@0.1.3 raix:eventemitter@0.1.1 raix:ui-dropped-event@0.0.7 random@1.0.2 diff --git a/common/routing.coffee b/common/routing.coffee index 5cd8d3b6ee0..84d514f3564 100644 --- a/common/routing.coffee +++ b/common/routing.coffee @@ -5,10 +5,10 @@ # yields based on the logic in this file # individual reaction packages have their own routing # -# The reaction-core controller is extended here so you can +# The reaction-core controller can be extended here so you can # modify here if needed. # ***************************************************** -ReactionController = ShopController.extend +# ReactionController = ShopController.extend # ***************************************************** # generic static pages @@ -47,9 +47,9 @@ Router.map -> # generic static pages for page in staticPages @route page, - controller: ReactionController + controller: ShopController name: page # custom 404 Page @route "notFound", - path: "/(.*)" \ No newline at end of file + path: "/(.*)" diff --git a/server/policy.coffee b/server/policy.coffee new file mode 100644 index 00000000000..cfea386d620 --- /dev/null +++ b/server/policy.coffee @@ -0,0 +1,8 @@ +### +# set browser policies +### + +#allow google fonts +BrowserPolicy.content.allowFontDataUrl() +BrowserPolicy.content.allowOriginForAll("fonts.googleapis.com") +BrowserPolicy.content.allowOriginForAll("fonts.gstatic.com") From c7697036818b6d20985ffd1589a067d7111f6aab Mon Sep 17 00:00:00 2001 From: aaronjudd Date: Sat, 21 Mar 2015 00:52:07 -0700 Subject: [PATCH 6/9] update meteor, node version, add auth-net --- .gitignore | 5 +- .meteor/packages | 1 + .meteor/release | 2 +- .meteor/versions | 135 -------------------------------------------- Dockerfile | 2 +- packages/.gitignore | 6 -- 6 files changed, 6 insertions(+), 145 deletions(-) delete mode 100644 .meteor/versions delete mode 100644 packages/.gitignore diff --git a/.gitignore b/.gitignore index 0a5bf2a46f6..d8ffbd9d326 100644 --- a/.gitignore +++ b/.gitignore @@ -20,6 +20,7 @@ npm-debug.log *.sublime-project *.sublime-workspace - reaction-dev.sh -packages/* \ No newline at end of file +packages/* + +.meteor/versions diff --git a/.meteor/packages b/.meteor/packages index 5d42c0fa1e1..3e78873e922 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -28,3 +28,4 @@ reactioncommerce:reaction-google-analytics reactioncommerce:reaction-paypal reactioncommerce:reaction-braintree reactioncommerce:reaction-stripe +reactioncommerce:reaction-auth-net diff --git a/.meteor/release b/.meteor/release index 74a74cb1ba5..41f2e623eb2 100644 --- a/.meteor/release +++ b/.meteor/release @@ -1 +1 @@ -METEOR@1.0.3.2 +METEOR@1.0.4.2 diff --git a/.meteor/versions b/.meteor/versions deleted file mode 100644 index 1d463124c91..00000000000 --- a/.meteor/versions +++ /dev/null @@ -1,135 +0,0 @@ -accounts-base@1.1.3 -accounts-facebook@1.0.3 -accounts-oauth@1.1.3 -accounts-password@1.0.6 -accounts-ui-unstyled@1.1.6 -alanning:roles@1.2.13 -aldeed:autoform@4.2.2 -aldeed:collection2@2.3.2 -aldeed:geocoder@0.3.3 -aldeed:simple-schema@1.3.0 -aldeed:template-extension@3.1.1 -amplify@1.0.0 -anti:fake@0.4.1 -application-configuration@1.0.4 -audit-argument-checks@1.0.2 -autoupdate@1.1.5 -base64@1.0.2 -binary-heap@1.0.2 -blaze@2.0.4 -blaze-tools@1.0.2 -boilerplate-generator@1.0.2 -browser-policy@1.0.3 -browser-policy-common@1.0.2 -browser-policy-content@1.0.3 -browser-policy-framing@1.0.3 -callback-hook@1.0.2 -cfs:access-point@0.1.44 -cfs:base-package@0.0.28 -cfs:collection@0.5.4 -cfs:collection-filters@0.2.4 -cfs:data-man@0.0.6 -cfs:file@0.1.16 -cfs:filesystem@0.1.2 -cfs:graphicsmagick@0.0.18 -cfs:gridfs@0.0.31 -cfs:http-methods@0.0.27 -cfs:http-publish@0.0.13 -cfs:power-queue@0.9.11 -cfs:reactive-list@0.0.9 -cfs:reactive-property@0.0.4 -cfs:standard-packages@0.5.4 -cfs:storage-adapter@0.2.1 -cfs:tempstore@0.1.4 -cfs:ui@0.1.3 -cfs:upload-http@0.0.20 -cfs:worker@0.1.4 -check@1.0.4 -cmather:handlebars-server@2.0.0 -coffeescript@1.0.5 -d3js:d3@3.4.13 -dburles:factory@0.3.7 -ddp@1.0.14 -deps@1.0.6 -ejson@1.0.5 -email@1.0.5 -facebook@1.1.3 -fastclick@1.0.2 -follower-livedata@1.0.3 -fortawesome:fontawesome@4.2.0_2 -geojson-utils@1.0.2 -handlebars@1.0.2 -html-tools@1.0.3 -htmljs@1.0.3 -http@1.0.10 -id-map@1.0.2 -iron:controller@1.0.7 -iron:core@1.0.7 -iron:dynamic-template@1.0.7 -iron:layout@1.0.7 -iron:location@1.0.7 -iron:middleware-stack@1.0.7 -iron:router@1.0.7 -iron:url@1.0.7 -jquery@1.11.3 -json@1.0.2 -launch-screen@1.0.1 -less@1.0.12 -livedata@1.0.12 -localstorage@1.0.2 -logging@1.0.6 -matb33:collection-hooks@0.7.6 -meteor@1.1.4 -meteor-platform@1.2.1 -meteorhacks:ssr@2.1.2 -minifiers@1.1.3 -minimongo@1.0.6 -mobile-status-bar@1.0.2 -momentjs:moment@2.8.4 -mongo@1.0.11 -mongo-livedata@1.0.7 -mrt:underscore-string-latest@2.3.3 -nemo64:bootstrap@3.3.1_1 -nemo64:bootstrap-data@3.3.1_1 -npm-bcrypt@0.7.7 -npm-node-aes-gcm@0.1.3 -oauth@1.1.3 -oauth-encryption@1.0.2 -oauth2@1.1.2 -observe-sequence@1.0.4 -ongoworks:bunyan-logger@1.0.0 -ongoworks:pdf@1.1.0 -ongoworks:security@1.0.1 -ongoworks:speakingurl@1.0.5 -ordered-dict@1.0.2 -package-stats-opt-out@1.0.2 -raix:eventemitter@0.1.1 -raix:ui-dropped-event@0.0.7 -random@1.0.2 -reactioncommerce:core@0.5.0 -reactioncommerce:core-theme@1.3.0 -reactioncommerce:reaction-braintree@1.1.0 -reactioncommerce:reaction-google-analytics@0.3.1 -reactioncommerce:reaction-paypal@0.4.0 -reactioncommerce:reaction-shipping@0.2.1 -reactioncommerce:reaction-stripe@1.2.0 -reactive-dict@1.0.5 -reactive-var@1.0.4 -reload@1.1.2 -retry@1.0.2 -routepolicy@1.0.4 -sacha:spin@2.0.4 -service-configuration@1.0.3 -session@1.0.5 -sha@1.0.2 -spacebars@1.0.5 -spacebars-compiler@1.0.4 -spiderable@1.0.6 -srp@1.0.2 -templating@1.0.11 -tracker@1.0.5 -ui@1.0.5 -underscore@1.0.2 -url@1.0.3 -webapp@1.1.6 -webapp-hashing@1.0.2 diff --git a/Dockerfile b/Dockerfile index a4ce196cb14..81aecf174d7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -58,7 +58,7 @@ RUN apt-get -qq update && apt-get install -qq -y curl python gcc make \ libfreetype6-dev libssl-dev libfontconfig1 imagemagick # install node -RUN mkdir /nodejs && curl http://nodejs.org/dist/v0.10.33/node-v0.10.33-linux-x64.tar.gz | tar xvzf - -C /nodejs --strip-components=1 +RUN mkdir /nodejs && curl http://nodejs.org/dist/v0.10.36/node-v0.10.36-linux-x64.tar.gz | tar xvzf - -C /nodejs --strip-components=1 ENV PATH $PATH:/nodejs/bin # Install forever & phantomjs diff --git a/packages/.gitignore b/packages/.gitignore deleted file mode 100644 index 3a05c1d87bf..00000000000 --- a/packages/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -/reaction-core -/reaction-paypal -/reaction-google-analytics -/reaction-helloworld -/reaction-shipping -/reaction-core-theme \ No newline at end of file From 93d78d7f75680c9b593680e236a810d53e9efe1e Mon Sep 17 00:00:00 2001 From: lovetostrike Date: Sat, 21 Mar 2015 19:14:01 -0400 Subject: [PATCH 7/9] social sharing for footer Added reaction-social package and replaced manual social links with customized package settings --- .meteor/packages | 1 + client/templates/layout/footer/footer.coffee | 9 ++++++++- client/templates/layout/footer/footer.html | 9 ++++----- docs/features.md | 4 ++-- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/.meteor/packages b/.meteor/packages index 3e78873e922..cf163babfe3 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -29,3 +29,4 @@ reactioncommerce:reaction-paypal reactioncommerce:reaction-braintree reactioncommerce:reaction-stripe reactioncommerce:reaction-auth-net +lovetostrike:reaction-social diff --git a/client/templates/layout/footer/footer.coffee b/client/templates/layout/footer/footer.coffee index c4a9a04eaee..0f5005a25d1 100644 --- a/client/templates/layout/footer/footer.coffee +++ b/client/templates/layout/footer/footer.coffee @@ -3,4 +3,11 @@ # This footer replaces the "layoutFooter" template defined in the reactioncommerce:core package. # https://github.com/reactioncommerce/reaction-core/blob/master/client/templates/layout/footer/footer.html ### -Template.footer.replaces "layoutFooter" \ No newline at end of file +Template.layoutFooter.helpers + customSocialSettings: -> + placement: 'footer' + faClass: 'square' + faSize: 'fa-3x' + appsOrder: ['facebook', 'twitter', 'googleplus', 'pinterest'] + +Template.footer.replaces "layoutFooter" diff --git a/client/templates/layout/footer/footer.html b/client/templates/layout/footer/footer.html index 3eefd8966c6..b79e6d3142c 100644 --- a/client/templates/layout/footer/footer.html +++ b/client/templates/layout/footer/footer.html @@ -32,12 +32,11 @@
    -
    • -
    • -
    • -
    • + {{#each reactionApps provides="social" name="reaction-social"}} + {{> Template.dynamic template=template data=customSocialSettings }} + {{/each}}
- \ No newline at end of file + diff --git a/docs/features.md b/docs/features.md index 1827acc302f..1036b359047 100644 --- a/docs/features.md +++ b/docs/features.md @@ -13,7 +13,7 @@ * Published or hidden status * Additional product details in key/value list * Uses social media handles for product urls for best SEO+social media -* Integrated custom product social media messaging (FB,Twitter,Pinterest,Instagram) +* Integrated custom product social media messaging (FB,Twitter,Pinterest,Google+) ## Images / Video @@ -38,7 +38,7 @@ * Facebook * Twitter * Google - * Instagram + * Google+ * LinkedIn * Vkontakte * Yahoo From ea04f61eac911b42de1a4cb2a4c25904ebd5687e Mon Sep 17 00:00:00 2001 From: aaronjudd Date: Sun, 22 Mar 2015 10:15:53 -0700 Subject: [PATCH 8/9] commented reactioncommerce:reaction-social --- .meteor/packages | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.meteor/packages b/.meteor/packages index cf163babfe3..ddc284030b1 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -29,4 +29,4 @@ reactioncommerce:reaction-paypal reactioncommerce:reaction-braintree reactioncommerce:reaction-stripe reactioncommerce:reaction-auth-net -lovetostrike:reaction-social +#reactioncommerce:reaction-social From 7638f312438dab515b0fc6aa88440301749efe5c Mon Sep 17 00:00:00 2001 From: aaronjudd Date: Mon, 23 Mar 2015 23:22:16 -0700 Subject: [PATCH 9/9] social footer ui update, add BrowserPolicy for velocity --- .meteor/packages | 2 +- client/templates/layout/footer/footer.coffee | 2 +- client/templates/layout/footer/footer.html | 4 ++-- server/policy.coffee | 9 ++++++++- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.meteor/packages b/.meteor/packages index ddc284030b1..979a68ee39b 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -29,4 +29,4 @@ reactioncommerce:reaction-paypal reactioncommerce:reaction-braintree reactioncommerce:reaction-stripe reactioncommerce:reaction-auth-net -#reactioncommerce:reaction-social +reactioncommerce:reaction-social diff --git a/client/templates/layout/footer/footer.coffee b/client/templates/layout/footer/footer.coffee index 0f5005a25d1..1d5fa0f0b2b 100644 --- a/client/templates/layout/footer/footer.coffee +++ b/client/templates/layout/footer/footer.coffee @@ -8,6 +8,6 @@ Template.layoutFooter.helpers placement: 'footer' faClass: 'square' faSize: 'fa-3x' - appsOrder: ['facebook', 'twitter', 'googleplus', 'pinterest'] + appsOrder: ['facebook', 'twitter', 'pinterest', 'googleplus'] Template.footer.replaces "layoutFooter" diff --git a/client/templates/layout/footer/footer.html b/client/templates/layout/footer/footer.html index b79e6d3142c..649dd4d131b 100644 --- a/client/templates/layout/footer/footer.html +++ b/client/templates/layout/footer/footer.html @@ -30,8 +30,8 @@ -
-
    +
    +
      {{#each reactionApps provides="social" name="reaction-social"}} {{> Template.dynamic template=template data=customSocialSettings }} {{/each}} diff --git a/server/policy.coffee b/server/policy.coffee index cfea386d620..7b4a19ae01c 100644 --- a/server/policy.coffee +++ b/server/policy.coffee @@ -2,7 +2,14 @@ # set browser policies ### -#allow google fonts +# allow google fonts (required for core-theme) BrowserPolicy.content.allowFontDataUrl() BrowserPolicy.content.allowOriginForAll("fonts.googleapis.com") BrowserPolicy.content.allowOriginForAll("fonts.gstatic.com") + +# allow velocity testing (optional for velocity) +if process.env.NODE_ENV is 'development' + BrowserPolicy.content.allowOriginForAll 'localhost:*' + BrowserPolicy.content.allowConnectOrigin 'ws://localhost:5000' + BrowserPolicy.content.allowConnectOrigin 'http://localhost:5000' + BrowserPolicy.framing.allowAll()