From 02e3fe9c25097ae117edc0565892068d691a80b1 Mon Sep 17 00:00:00 2001 From: Steve Nyemba Date: Fri, 1 May 2020 16:44:43 -0500 Subject: [PATCH] bug fix: new changes --- src/api/index.py | 9 ++++++++- src/api/static/css/default.css | 8 +++++++- src/api/static/js/jx | 2 +- src/config.json | 12 +++++++----- src/init.sh | 2 +- 5 files changed, 24 insertions(+), 9 deletions(-) diff --git a/src/api/index.py b/src/api/index.py index ccf0478..1b49bd4 100755 --- a/src/api/index.py +++ b/src/api/index.py @@ -45,7 +45,7 @@ stripe_keys = { stripe.api_key = stripe_keys['secret_key'].strip() -if os.environ['CLOUDVIEW_CONTEXT'] and os.environ['CLOUDVIEW_CONTEXT'] not in CONFIG['cloud-view']: +if 'CLOUDVIEW_CONTEXT' in os.environ and os.environ['CLOUDVIEW_CONTEXT'] not in CONFIG['cloud-view']: context = os.environ['CLOUDVIEW_CONTEXT'] CONFIG['cloud-view'] = CONFIG['cloud-view'].replace('cloud-view',context) @@ -53,6 +53,13 @@ app = Flask(__name__) CORS(app) SYS_STORE = CONFIG['store'] + +@app.route("/donate") +def donate() : + print (request.args['amount']) + amount = float(request.args['amount']) if 'amount' in request.args else 5.0 + args = {'amount':amount,'context':CONTEXT} + return render_template('donate.html',**args) @app.route("/") def index(): mystore = store.factory.instance(name='music') diff --git a/src/api/static/css/default.css b/src/api/static/css/default.css index cb3bb7b..3a583af 100644 --- a/src/api/static/css/default.css +++ b/src/api/static/css/default.css @@ -61,7 +61,7 @@ body{ .active { font-weight:bold; - font-family:verdana; + /* font-family:verdana; */ cursor:pointer ; border:2px solid transparent; @@ -128,6 +128,12 @@ body{ .plan .feature .label {text-transform: uppercase; grid-column:1; font-size:14px;} .plan .feature .status {font-size:20px; text-align: right; font-size:14px;} .border{border:1px solid #CAD5E0;} +.border-round { + border-radius:8px; + -webkit-border-radius:8px; + -moz-border-radius:8px; + padding:8px; +} .border-bottom{ border-bottom:1px solid #CAD5E0} .border-right{ border-right:1px solid #CAD5E0} .border-left{ border-left:1px solid #CAD5E0} diff --git a/src/api/static/js/jx b/src/api/static/js/jx index 3599fff..8e82431 160000 --- a/src/api/static/js/jx +++ b/src/api/static/js/jx @@ -1 +1 @@ -Subproject commit 3599fff083f1661a1762992d3891210d6c3aec05 +Subproject commit 8e82431a8f1e881df41f3ab29a63507f50f167e2 diff --git a/src/config.json b/src/config.json index 132155a..b5993ac 100644 --- a/src/config.json +++ b/src/config.json @@ -1,20 +1,22 @@ { + "about":{ + "version":"0.4", + "author":"The Phi Technology" + }, "stripe":{ "secret": "sk_test_I16uOM1ZfGALSc03AF0xqN2z", "pub":"pk_test_qTkOpNkaZVP0xHtWN28wF1ym", "version":"2016-07-06" }, - "cloud-view":"http://localhost/cloud-view/:id", + "cloud-view":"http://localhost/cloud-view/:id", + "redir_url":"http://localhost/:context/oauth.html", + "store":{ "args":{"host":"localhost:27017","dbname":"store","doc":"logs"}, "reader":"mongo.MongoReader", "writer":"mongo.MongoWriter" - }, - "couchdb":{ - "uri":"http://admin:@dm1n@dev.the-phi.com:5985", - "dbname":"cloud-view-music" } } diff --git a/src/init.sh b/src/init.sh index cf3f654..de83284 100755 --- a/src/init.sh +++ b/src/init.sh @@ -11,7 +11,7 @@ install(){ } start(){ - python3 api/index.py --path $PWD/config.json --port 8084 --context $STORE_CONTEXT & > log + python3 api/index.py --path $PWD/config.json --port 8084 --context $STORE_CONTEXT & > out.log } stop(){