From fdd4d1ed5fb8b9e2f8e88b2e114ad5c81c52ab9a Mon Sep 17 00:00:00 2001 From: Rimian Perkins Date: Thu, 12 Sep 2019 07:14:16 +1000 Subject: [PATCH] yarn prettier --- .../discourse/components/donation-form.js.es6 | 27 +++++++------ .../discourse/components/stripe-card.js.es6 | 40 +++++++++---------- .../controllers/patrons-index.js.es6 | 6 +-- .../discourse/controllers/patrons.js.es6 | 5 +-- .../discourse/patrons-route-map.js.es6 | 5 +-- .../discourse/routes/patrons.js.es6 | 4 +- .../stylesheets/common/discourse-patrons.scss | 3 +- .../components/donation-form-test.es6 | 16 ++++---- .../components/stripe-card-test.js.es6 | 10 ++--- 9 files changed, 56 insertions(+), 60 deletions(-) diff --git a/assets/javascripts/discourse/components/donation-form.js.es6 b/assets/javascripts/discourse/components/donation-form.js.es6 index 0847831..99d9081 100644 --- a/assets/javascripts/discourse/components/donation-form.js.es6 +++ b/assets/javascripts/discourse/components/donation-form.js.es6 @@ -13,30 +13,31 @@ export default Ember.Component.extend({ this.setProperties({ confirmation: false, - currency: settings.discourse_donations_currency, + currency: settings.discourse_donations_currency }); }, actions: { closeModal() { - this.set('paymentError', false); - this.set('confirmation', false); + this.set("paymentError", false); + this.set("confirmation", false); }, handleConfirmStripeCard(paymentMethod) { - this.set('confirmation', paymentMethod); + this.set("confirmation", paymentMethod); }, confirmStripeCard() { const paymentMethodId = this.confirmation.id; - this.stripePaymentHandler(paymentMethodId, this.amount).then((paymentIntent) => { - if (paymentIntent.error) { - this.set('paymentError', paymentIntent.error); + this.stripePaymentHandler(paymentMethodId, this.amount).then( + paymentIntent => { + if (paymentIntent.error) { + this.set("paymentError", paymentIntent.error); + } else { + // console.log('ok done'); + } } - else { - // console.log('ok done'); - } - }); - }, - }, + ); + } + } }); diff --git a/assets/javascripts/discourse/components/stripe-card.js.es6 b/assets/javascripts/discourse/components/stripe-card.js.es6 index 2dc388a..3f0688b 100644 --- a/assets/javascripts/discourse/components/stripe-card.js.es6 +++ b/assets/javascripts/discourse/components/stripe-card.js.es6 @@ -1,4 +1,3 @@ - export default Ember.Component.extend({ init() { this._super(...arguments); @@ -9,14 +8,14 @@ export default Ember.Component.extend({ cardError: false, color: jQuery("body").css("color"), backgroundColor: jQuery("body").css("background-color"), - stripe: Stripe(settings.discourse_patrons_public_key), + stripe: Stripe(settings.discourse_patrons_public_key) }); }, didInsertElement() { this._super(...arguments); - const color = this.get('color'); + const color = this.get("color"); const style = { base: { @@ -29,32 +28,33 @@ export default Ember.Component.extend({ const elements = this.stripe.elements(); const card = elements.create("card", { style, hidePostalCode: true }); - card.mount('#card-element'); + card.mount("#card-element"); this.set("card", card); - card.on("change", (result) => { - this.set('cardError', false); + card.on("change", result => { + this.set("cardError", false); - if(result.error) { - this.set('cardError', result.error.message); + if (result.error) { + this.set("cardError", result.error.message); } }); }, actions: { submitStripeCard() { - this.stripe.createPaymentMethod('card', this.card).then((result) => { - - if (result.error) { - this.set('cardError', result.error.message); + this.stripe.createPaymentMethod("card", this.card).then( + result => { + if (result.error) { + this.set("cardError", result.error.message); + } else { + this.handleConfirmStripeCard(result.paymentMethod); + } + }, + () => { + this.set("cardError", "Unknown error."); } - else { - this.handleConfirmStripeCard(result.paymentMethod); - } - }, () => { - this.set('cardError', 'Unknown error.'); - }); - }, - }, + ); + } + } }); diff --git a/assets/javascripts/discourse/controllers/patrons-index.js.es6 b/assets/javascripts/discourse/controllers/patrons-index.js.es6 index 7011509..2c27352 100644 --- a/assets/javascripts/discourse/controllers/patrons-index.js.es6 +++ b/assets/javascripts/discourse/controllers/patrons-index.js.es6 @@ -7,8 +7,8 @@ export default Ember.Controller.extend({ data: { paymentMethodId, amount }, method: "post" }).catch(() => { - return { error: 'An error occured while submitting the form.' }; + return { error: "An error occured while submitting the form." }; }); - }, - }, + } + } }); diff --git a/assets/javascripts/discourse/controllers/patrons.js.es6 b/assets/javascripts/discourse/controllers/patrons.js.es6 index 6dc6109..2d3f960 100644 --- a/assets/javascripts/discourse/controllers/patrons.js.es6 +++ b/assets/javascripts/discourse/controllers/patrons.js.es6 @@ -1,4 +1 @@ - -export default Ember.Controller.extend({ - -}); +export default Ember.Controller.extend({}); diff --git a/assets/javascripts/discourse/patrons-route-map.js.es6 b/assets/javascripts/discourse/patrons-route-map.js.es6 index a31f88d..2c0777c 100644 --- a/assets/javascripts/discourse/patrons-route-map.js.es6 +++ b/assets/javascripts/discourse/patrons-route-map.js.es6 @@ -1,6 +1,5 @@ - -export default function () { - this.route('patrons', function() { +export default function() { + this.route("patrons", function() { this.route("show", { path: ":pid" }); }); } diff --git a/assets/javascripts/discourse/routes/patrons.js.es6 b/assets/javascripts/discourse/routes/patrons.js.es6 index da78be9..55af882 100644 --- a/assets/javascripts/discourse/routes/patrons.js.es6 +++ b/assets/javascripts/discourse/routes/patrons.js.es6 @@ -1,3 +1 @@ - -export default Discourse.Route.extend({ -}); +export default Discourse.Route.extend({}); diff --git a/assets/stylesheets/common/discourse-patrons.scss b/assets/stylesheets/common/discourse-patrons.scss index 8c87de8..020703d 100644 --- a/assets/stylesheets/common/discourse-patrons.scss +++ b/assets/stylesheets/common/discourse-patrons.scss @@ -1,4 +1,3 @@ - .discourse-patrons-section-columns { display: flex; justify-content: space-between; @@ -33,7 +32,7 @@ } } -#card-element{ +#card-element { padding: 20px 0; } diff --git a/test/javascripts/components/donation-form-test.es6 b/test/javascripts/components/donation-form-test.es6 index b6ce63f..c030f73 100644 --- a/test/javascripts/components/donation-form-test.es6 +++ b/test/javascripts/components/donation-form-test.es6 @@ -13,7 +13,10 @@ componentTest("Discourse Patrons donation form has content", { }, async test(assert) { - assert.ok(find(".discourse-patrons-section-columns").length, "The card section renders"); + assert.ok( + find(".discourse-patrons-section-columns").length, + "The card section renders" + ); assert.ok( find("dummy-component-tag").length, "The stripe component renders" @@ -25,20 +28,19 @@ componentTest("donation form has a confirmation", { template: `{{donation-form confirmation=confirmation}}`, beforeEach() { - this.registry.register( - "component:stripe-card", - Ember.Component.extend() - ); + this.registry.register("component:stripe-card", Ember.Component.extend()); }, async test(assert) { - this.set("confirmation", { "card": { "last4": "4242" }}); + this.set("confirmation", { card: { last4: "4242" } }); const confirmExists = find(".discourse-donations-confirmation").length; assert.ok(confirmExists, "The confirmation form renders"); - const last4 = find(".discourse-donations-last4").text().trim(); + const last4 = find(".discourse-donations-last4") + .text() + .trim(); assert.equal(last4, ".... .... .... 4242", "The last 4 digits are correct"); } diff --git a/test/javascripts/components/stripe-card-test.js.es6 b/test/javascripts/components/stripe-card-test.js.es6 index 62bc6a1..5858dd9 100644 --- a/test/javascripts/components/stripe-card-test.js.es6 +++ b/test/javascripts/components/stripe-card-test.js.es6 @@ -9,7 +9,7 @@ componentTest("Discourse Patrons stripe card success", { window.Stripe = () => { return { createPaymentMethod() { - return new Ember.RSVP.Promise((resolve) => { + return new Ember.RSVP.Promise(resolve => { resolve({}); }); }, @@ -19,11 +19,11 @@ componentTest("Discourse Patrons stripe card success", { return { on() {}, card() {}, - mount() {}, + mount() {} }; - }, + } }; - }, + } }; }; }, @@ -36,5 +36,5 @@ componentTest("Discourse Patrons stripe card success", { }); await click(".btn-payment"); - }, + } });