Compare commits

..

No commits in common. "d65f7aaf889fdb5c5383c6d1b8f407b28ae5c273" and "126b0dcf783d56c76b84af7698cfcfa5a48b0c0a" have entirely different histories.

4 changed files with 14 additions and 8 deletions

View File

@ -56,12 +56,12 @@ Creating a new project: When you are ready to create/store a project on the syst
Once complete you then have the option of saving the file privately, shared within a group, or made public for other Treadl users to see. Once complete you then have the option of saving the file privately, shared within a group, or made public for other Treadl users to see.
We hope you enjoy using Treadl and if you have any comments or feedback please tell us by emailing {}! We hope you enjoy using Treadl and if you have any comments or feedback please tell us by emailing hello@treadl.com!
Best wishes, Best wishes,
The Treadl Team The Treadl Team
'''.format(username, username, os.environ.get('CONTACT_EMAIL')) '''.format(username, username)
}) })
return {'token': generate_access_token(result.inserted_id)} return {'token': generate_access_token(result.inserted_id)}
except Exception as e: except Exception as e:

View File

@ -4,13 +4,13 @@ import requests
def handle_send(data): def handle_send(data):
if 'from' not in data: if 'from' not in data:
data['from'] = 'Treadl <{}>'.format(os.environ.get('FROM_EMAIL')) data['from'] = 'Treadl <no_reply@mail.treadl.com>'
if 'to_user' in data: if 'to_user' in data:
user = data['to_user'] user = data['to_user']
data['to'] = user['username'] + ' <' + user['email'] + '>' data['to'] = user['username'] + ' <' + user['email'] + '>'
del data['to_user'] del data['to_user']
data['text'] += '\n\nFrom the team at Treadl\n\n\n\n--\n\nDon\'t like this email? Choose which emails you receive from Treadl by visiting https://treadl.com/settings/notifications\n\nReceived this email in error? Please let us know by contacting {}'.format(os.environ.get('CONTACT_EMAIL')) data['text'] += '\n\nFrom the team at Treadl\n\n\n\n--\n\nDon\'t like this email? Choose which emails you receive from Treadl by visiting https://treadl.com/settings/notifications\n\nReceived this email in error? Please let us know by contacting hello@treadl.com'
data['reply-to'] = os.environ.get('CONTACT_EMAIL') data['reply-to'] = 'hello@treadl.com'
base_url = os.environ.get('MAILGUN_URL') base_url = os.environ.get('MAILGUN_URL')
api_key = os.environ.get('MAILGUN_KEY') api_key = os.environ.get('MAILGUN_KEY')

View File

@ -4,9 +4,10 @@ export FLASK_RUN_PORT="2001"
export MONGO_URL="mongodb://localhost" export MONGO_URL="mongodb://localhost"
export MONGO_DATABASE="weaving" export MONGO_DATABASE="weaving"
export JWT_SECRET="devsecret" export JWT_SECRET="devsecret"
export GOOGLE_APPLICATION_CREDENTIALS="chalicelib/firebase.json" export STRIPE_KEY=""
export STRIPE_PLAN_HOBBYIST=""
export STRIPE_PLAN_WEAVER=""
export GOOGLE_APPLICATION_CREDENTIALS="chalicelib/firebase.json",
export AWS_S3_BUCKET="treadl-files" export AWS_S3_BUCKET="treadl-files"
export AWS_ACCESS_KEY_ID="" export AWS_ACCESS_KEY_ID=""
export AWS_SECRET_ACCESS_KEY="" export AWS_SECRET_ACCESS_KEY=""
export CONTACT_EMAIL="hello@treadl.com"
export FROM_EMAIL="no_reply@mail.treadl.com"

5
web/src/utils/stripe.js Normal file
View File

@ -0,0 +1,5 @@
const stripe = {
};
export default stripe;