From 55aba18c93cb4b78a44d8283836aa49e4a20edca Mon Sep 17 00:00:00 2001 From: ntr Date: Mon, 2 Sep 2019 18:13:29 +1000 Subject: [PATCH 1/4] version bump --- VERSION | 2 +- acp/package.json | 2 +- client/package.json | 2 +- ops/package.json | 2 +- server/Cargo.toml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/VERSION b/VERSION index afaf360d..7f207341 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.0 \ No newline at end of file +1.0.1 \ No newline at end of file diff --git a/acp/package.json b/acp/package.json index 9ad1a0b1..5cfb205d 100644 --- a/acp/package.json +++ b/acp/package.json @@ -1,6 +1,6 @@ { "name": "mnml-client", - "version": "1.0.0", + "version": "1.0.1", "description": "", "main": "index.js", "scripts": { diff --git a/client/package.json b/client/package.json index da1b56da..17da24ac 100644 --- a/client/package.json +++ b/client/package.json @@ -1,6 +1,6 @@ { "name": "mnml-client", - "version": "1.0.0", + "version": "1.0.1", "description": "", "main": "index.js", "scripts": { diff --git a/ops/package.json b/ops/package.json index 1eb603d9..6017c376 100755 --- a/ops/package.json +++ b/ops/package.json @@ -1,6 +1,6 @@ { "name": "mnml-ops", - "version": "1.0.0", + "version": "1.0.1", "description": "", "main": "index.js", "scripts": { diff --git a/server/Cargo.toml b/server/Cargo.toml index caea8b7e..ff673688 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "mnml" -version = "1.0.0" +version = "1.0.1" authors = ["ntr "] [dependencies] From 7f882d58e340e8c3439d46cc85d6a04c08b76360 Mon Sep 17 00:00:00 2001 From: ntr Date: Mon, 2 Sep 2019 18:21:24 +1000 Subject: [PATCH 2/4] production key --- client/src/app.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/app.jsx b/client/src/app.jsx index ddd7a1ea..044c2ea1 100644 --- a/client/src/app.jsx +++ b/client/src/app.jsx @@ -30,7 +30,7 @@ document.fonts.load('16pt "Jura"').then(() => { const App = () => ( - + From bb5e4d572868f5c0e565b44ee37888d83dc8dbf3 Mon Sep 17 00:00:00 2001 From: ntr Date: Mon, 2 Sep 2019 18:57:46 +1000 Subject: [PATCH 3/4] fixed key" --- client/src/app.jsx | 2 +- client/src/components/stripe.buttons.jsx | 8 ++++---- etc/nginx/sites-available/mnml.gg.PRODUCTION.nginx.conf | 1 - 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/client/src/app.jsx b/client/src/app.jsx index 044c2ea1..ad0db010 100644 --- a/client/src/app.jsx +++ b/client/src/app.jsx @@ -30,7 +30,7 @@ document.fonts.load('16pt "Jura"').then(() => { const App = () => ( - + diff --git a/client/src/components/stripe.buttons.jsx b/client/src/components/stripe.buttons.jsx index e760fb6b..0dd1a9ed 100644 --- a/client/src/components/stripe.buttons.jsx +++ b/client/src/components/stripe.buttons.jsx @@ -9,8 +9,8 @@ function BitsBtn(args) { function subscribeClick() { stripe.redirectToCheckout({ items: [{ plan: 'prod_Fjdt7mYvzXkNBN', quantity: 1 }], - successUrl: 'http://mnml.gg', - cancelUrl: 'http://mnml.gg', + successUrl: 'https://mnml.gg', + cancelUrl: 'https://mnml.gg', clientReferenceId: account.id, }); } @@ -18,8 +18,8 @@ function BitsBtn(args) { function bitsClick() { stripe.redirectToCheckout({ items: [{ sku: 'sku_Fjdu7zOy3sLGc5', quantity: 1 }], - successUrl: 'http://mnml.gg', - cancelUrl: 'http://mnml.gg', + successUrl: 'https://mnml.gg', + cancelUrl: 'https://mnml.gg', clientReferenceId: account.id, }); } diff --git a/etc/nginx/sites-available/mnml.gg.PRODUCTION.nginx.conf b/etc/nginx/sites-available/mnml.gg.PRODUCTION.nginx.conf index cce73707..73941ae9 100644 --- a/etc/nginx/sites-available/mnml.gg.PRODUCTION.nginx.conf +++ b/etc/nginx/sites-available/mnml.gg.PRODUCTION.nginx.conf @@ -6,7 +6,6 @@ upstream mnml_ws { server 127.0.0.1:40055; } - map $http_upgrade $connection_upgrade { default upgrade; '' close; From f3237ffe51ab27d25558c93ae9432aa9512368c9 Mon Sep 17 00:00:00 2001 From: ntr Date: Mon, 2 Sep 2019 19:09:04 +1000 Subject: [PATCH 4/4] fix plan id --- client/src/components/stripe.buttons.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/components/stripe.buttons.jsx b/client/src/components/stripe.buttons.jsx index 0dd1a9ed..83076a9d 100644 --- a/client/src/components/stripe.buttons.jsx +++ b/client/src/components/stripe.buttons.jsx @@ -8,7 +8,7 @@ function BitsBtn(args) { } = args; function subscribeClick() { stripe.redirectToCheckout({ - items: [{ plan: 'prod_Fjdt7mYvzXkNBN', quantity: 1 }], + items: [{ plan: 'plan_Fjdtsd4i7aVLe1', quantity: 1 }], successUrl: 'https://mnml.gg', cancelUrl: 'https://mnml.gg', clientReferenceId: account.id,