Skip to content

app.py: redirect to home instead of rendering index.html separately a… #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
peterbarker merged 2 commits into from
May 5, 2023
Merged

app.py: redirect to home instead of rendering index.html separately a… #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c951750
app.py: redirect to home instead of rendering index.html separately a…
shiv-tyagi May 4, 2023
994c46c
templates: correct path to home at index.html
shiv-tyagi May 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import hashlib
import fnmatch
from distutils.dir_util import copy_tree
from flask import Flask, render_template, request, send_from_directory, render_template_string, jsonify
from flask import Flask, render_template, request, send_from_directory, render_template_string, jsonify, redirect
from threading import Thread, Lock
import sys
import re
Expand Down Expand Up @@ -640,8 +640,8 @@ def generate():

base_url = request.url_root
app.logger.info(base_url)
app.logger.info('Rendering index.html')
return render_template('index.html', token=token)
app.logger.info('Redirecting to /viewlog')
return redirect('/viewlog/'+token)

except Exception as ex:
app.logger.error(ex)
Expand All @@ -668,11 +668,13 @@ def filter_build_options_by_category(build_options, category):
def parse_build_categories(build_options):
return sorted(list(set([f.category for f in build_options])))

@app.route('/')
def home():
@app.route('/', defaults={'token': None}, methods=['GET'])
@app.route('/viewlog/<token>', methods=['GET'])
def home(token):
if token:
app.logger.info("Showing log for build id " + token)
app.logger.info('Rendering index.html')
return render_template('index.html',
token=None)
return render_template('index.html', token=token)

@app.route("/builds/<path:name>")
def download_file(name):
Expand Down
2 changes: 1 addition & 1 deletion templates/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<nav class="navbar bg-dark">
<div class="container-fluid">
<div>
<a class="navbar-brand" href="./">
<a class="navbar-brand" href="/">
<img src="{{ url_for('static', filename='images/ardupilot_logo.png')}}" alt="ArduPilot" height="24"
class="d-inline-block align-text-top">
<span class="ms-2 text-white" style="font-size: 25px;">Custom Firmware Builder</span>
Expand Down