Browse Source

fix: use PAD_URL in template files

pull/30/head
decentral1se 2 years ago
parent
commit
faa4c25ccc
No known key found for this signature in database GPG Key ID: 3789458B3D0C410
  1. 12
      octomode.py
  2. 4
      templates/base.html

12
octomode.py

@ -16,7 +16,7 @@ import markdown
class Config(object): class Config(object):
PORTNUMBER = int(os.environ.get('OCTOMODE_PORTNUMBER', 5001)) PORTNUMBER = int(os.environ.get('OCTOMODE_PORTNUMBER', 5001))
PAD_URL = os.environ.get('OCTOMODE_PAD_URL', 'https://pad.vvvvvvaria.org' ) PAD_URL = os.environ.get('OCTOMODE_PAD_URL', 'https://pad.vvvvvvaria.org')
PAD_API_URL = os.environ.get('OCTOMODE_PAD_API_URL', 'https://pad.vvvvvvaria.org/api/1.2.15') PAD_API_URL = os.environ.get('OCTOMODE_PAD_API_URL', 'https://pad.vvvvvvaria.org/api/1.2.15')
PAD_API_KEY = os.environ.get('OCTOMODE_PAD_API_KEY', '') PAD_API_KEY = os.environ.get('OCTOMODE_PAD_API_KEY', '')
@ -121,7 +121,7 @@ def index():
create_pad_on_first_run(name, ext) create_pad_on_first_run(name, ext)
return redirect(f"/{ name }/pad") return redirect(f"/{ name }/pad")
else: else:
return render_template('start.html') return render_template('start.html', pad_url=APP.config['PAD_URL'])
@APP.route('/<name>') @APP.route('/<name>')
def main(name): def main(name):
@ -130,22 +130,22 @@ def main(name):
@APP.route('/<name>/pad') @APP.route('/<name>/pad')
def pad(name): def pad(name):
url = f"{ APP.config['PAD_URL'] }/{ name }.md" url = f"{ APP.config['PAD_URL'] }/{ name }.md"
return render_template('iframe.html', url=url, name=name.strip()) return render_template('iframe.html', url=url, name=name.strip(), pad_url=APP.config['PAD_URL'])
@APP.route('/<name>/stylesheet') @APP.route('/<name>/stylesheet')
def stylesheet(name): def stylesheet(name):
url = f"{ APP.config['PAD_URL'] }/{ name }.css" url = f"{ APP.config['PAD_URL'] }/{ name }.css"
return render_template('iframe.html', url=url, name=name.strip()) return render_template('iframe.html', url=url, name=name.strip(), pad_url=APP.config['PAD_URL'])
@APP.route('/<name>/html') @APP.route('/<name>/html')
def html(name): def html(name):
url = f"/{ name }/preview.html" url = f"/{ name }/preview.html"
return render_template('iframe.html', url=url, name=name.strip()) return render_template('iframe.html', url=url, name=name.strip(), pad_url=APP.config['PAD_URL'])
@APP.route('/<name>/pdf') @APP.route('/<name>/pdf')
def pdf(name): def pdf(name):
url = f"/{name}/pagedjs.html" url = f"/{name}/pagedjs.html"
return render_template('pdf.html', url=url, name=name.strip()) return render_template('pdf.html', url=url, name=name.strip(), pad_url=APP.config['PAD_URL'])
# ////////////////// # //////////////////
# RENDERED RESOURCES # RENDERED RESOURCES

4
templates/base.html

@ -25,10 +25,10 @@ window.addEventListener('load', function () {
<div id="buttons"> <div id="buttons">
<a href="/{{ name }}/pad"><button>pad</button></a>: <a href="/{{ name }}/pad"><button>pad</button></a>:
<input type="text" name="pad" value="https://pad.vvvvvvaria.org/{{ name }}.md"> <input type="text" name="pad" value="{{ pad_url }}/{{ name }}.md">
<a href="/{{ name }}/stylesheet"><button>stylesheet</button></a>: <a href="/{{ name }}/stylesheet"><button>stylesheet</button></a>:
<input type="text" name="pad" value="https://pad.vvvvvvaria.org/{{ name }}.css"> <input type="text" name="pad" value="{{ pad_url }}/{{ name }}.css">
<a href="/{{ name }}/html"><button>html</button></a> <a href="/{{ name }}/html"><button>html</button></a>

Loading…
Cancel
Save