Customisable server-side from emails

api/chalicelib/api/accounts.py

@@ -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.
 
-We hope you enjoy using Treadl and if you have any comments or feedback please tell us by emailing hello@treadl.com!
+We hope you enjoy using Treadl and if you have any comments or feedback please tell us by emailing {}!
 
 Best wishes,
 
 The Treadl Team
-'''.format(username, username)
+'''.format(username, username, os.environ.get('CONTACT_EMAIL'))
     })
     return {'token': generate_access_token(result.inserted_id)}
   except Exception as e:

api/chalicelib/util/mail.py

@@ -4,13 +4,13 @@ import requests
 
 def handle_send(data):
   if 'from' not in data:
-    data['from'] = 'Treadl <no_reply@mail.treadl.com>'
+    data['from'] = 'Treadl <{}>'.format(os.environ.get('FROM_EMAIL'))
   if 'to_user' in data:
     user = data['to_user']
     data['to'] = user['username'] + ' <' + user['email'] + '>'
     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 hello@treadl.com'
+  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['reply-to'] = 'hello@treadl.com'
+  data['reply-to'] = os.environ.get('CONTACT_EMAIL')
 
   base_url = os.environ.get('MAILGUN_URL')
   api_key = os.environ.get('MAILGUN_KEY')

api/envfile.template

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

web/src/utils/stripe.js

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