self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-21 09:38:01 +02:00
Code Issues Releases Activity

Chore: cleanup

Browse Source
This commit is contained in:
Laurent Cozic 2023-07-16 17:48:13 +01:00
parent 77482a0c95
commit 0470a3168c
6 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Assets/WebsiteAssets/templates/plans.mustache
View File

@ -96,6 +96,8 @@
console.info('Creating Stripe session for price:', priceId, 'Promotion code:', promotionCode); console.info('Creating Stripe session for price:', priceId, 'Promotion code:', promotionCode);
const source = localStorage.getItem('source');
return fetch("{{{stripeConfig.webhookBaseUrl}}}/stripe/createCheckoutSession", { return fetch("{{{stripeConfig.webhookBaseUrl}}}/stripe/createCheckoutSession", {
method: "POST", method: "POST",
headers: { headers: {
@ -105,6 +107,7 @@
priceId, priceId,
promotionCode, promotionCode,
email: checkoutSessionUser ? checkoutSessionUser.email : '', email: checkoutSessionUser ? checkoutSessionUser.email : '',
source,
}) })
}).then(async function(result) { }).then(async function(result) {
if (!result.ok) { if (!result.ok) {

8
packages/app-mobile/ios/Podfile.lock
View File

@ -782,9 +782,9 @@ EXTERNAL SOURCES:
:path: "../node_modules/react-native/ReactCommon/yoga" :path: "../node_modules/react-native/ReactCommon/yoga"
SPEC CHECKSUMS: SPEC CHECKSUMS:
boost: 57d2868c099736d80fcd648bf211b4431e51a558 boost: a7c83b31436843459a1961bfd74b96033dc77234
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54 DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662
FBLazyVector: ddb55c55295ea51ed98aa7e2e08add2f826309d5 FBLazyVector: ddb55c55295ea51ed98aa7e2e08add2f826309d5
FBReactNativeSpec: 90fc1a90b4b7a171e0a7c20ea426c1bf6ce4399c FBReactNativeSpec: 90fc1a90b4b7a171e0a7c20ea426c1bf6ce4399c
Flipper: 26fc4b7382499f1281eb8cb921e5c3ad6de91fe0 Flipper: 26fc4b7382499f1281eb8cb921e5c3ad6de91fe0
@ -797,13 +797,13 @@ SPEC CHECKSUMS:
Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541 Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541
FlipperKit: cbdee19bdd4e7f05472a66ce290f1b729ba3cb86 FlipperKit: cbdee19bdd4e7f05472a66ce290f1b729ba3cb86
fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b glog: 5337263514dd6f09803962437687240c5dc39aa4
hermes-engine: d27603b55a48402501ad1928c05411dae9cd6b85 hermes-engine: d27603b55a48402501ad1928c05411dae9cd6b85
JoplinCommonShareExtension: a8b60b02704d85a7305627912c0240e94af78db7 JoplinCommonShareExtension: a8b60b02704d85a7305627912c0240e94af78db7
JoplinRNShareExtension: 485f3e6dad83b7b77f1572eabc249f869ee55c02 JoplinRNShareExtension: 485f3e6dad83b7b77f1572eabc249f869ee55c02
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c
RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1 RCT-Folly: 0080d0a6ebf2577475bda044aa59e2ca1f909cda
RCTRequired: 8ef706f91e2b643cd32c26a57700b5f24fab0585 RCTRequired: 8ef706f91e2b643cd32c26a57700b5f24fab0585
RCTTypeSafety: 5fbddd8eb9242b91ac0d901c01da3673f358b1b7 RCTTypeSafety: 5fbddd8eb9242b91ac0d901c01da3673f358b1b7
React: e5d2d559e89d256a1d6da64d51adaecda9c8ddae React: e5d2d559e89d256a1d6da64d51adaecda9c8ddae

3
packages/lib/uuid.ts
View File

@ -15,4 +15,7 @@ export default {
createNano: function(): string { createNano: function(): string {
return nanoid(); return nanoid();
}, },
createNanoForInboxEmail: (): string => {
return customAlphabet('0123456789abcdefghijklmnopqrstuvwxyz', 8)();
},
}; };

1
packages/utils/index.ts
View File

@ -6,6 +6,7 @@ import { pathExists } from 'fs-extra';
let rootDir_ = ''; let rootDir_ = '';
const getRootDir = async () => { const getRootDir = async () => {
if (rootDir_) return rootDir_; if (rootDir_) return rootDir_;

1
packages/utils/package.json
View File

@ -24,6 +24,7 @@
"node-fetch": "2.6.7" "node-fetch": "2.6.7"
}, },
"devDependencies": { "devDependencies": {
"@types/fs-extra": "11.0.1",
"@types/jest": "29.5.1", "@types/jest": "29.5.1",
"@types/node-fetch": "2.6.3", "@types/node-fetch": "2.6.3",
"jest": "29.5.0", "jest": "29.5.0",

1
yarn.lock
View File

@ -5021,6 +5021,7 @@ __metadata:
version: 0.0.0-use.local version: 0.0.0-use.local
resolution: "@joplin/utils@workspace:packages/utils" resolution: "@joplin/utils@workspace:packages/utils"
dependencies: dependencies:
"@types/fs-extra": 11.0.1
"@types/jest": 29.5.1 "@types/jest": 29.5.1
"@types/node-fetch": 2.6.3 "@types/node-fetch": 2.6.3
execa: 5.1.1 execa: 5.1.1