add footer and support showing version/commit
This commit is contained in:
1
app/__commit__
Normal file
1
app/__commit__
Normal file
@@ -0,0 +1 @@
|
|||||||
|
unknown
|
1
app/__version__
Normal file
1
app/__version__
Normal file
@@ -0,0 +1 @@
|
|||||||
|
1.0.1
|
@@ -3,7 +3,7 @@ from flask import Flask, render_template, redirect, url_for, request, flash
|
|||||||
from flask_migrate import Migrate
|
from flask_migrate import Migrate
|
||||||
from werkzeug.security import generate_password_hash, check_password_hash
|
from werkzeug.security import generate_password_hash, check_password_hash
|
||||||
from flask_login import (LoginManager, login_user, login_required, logout_user, current_user)
|
from flask_login import (LoginManager, login_user, login_required, logout_user, current_user)
|
||||||
from misc import datetime, date, time, currDay, ZoneInfo
|
from misc import datetime, date, time, currDay, ZoneInfo, currVersion, currCommit
|
||||||
from db import (db, Period, Task, Event, User)
|
from db import (db, Period, Task, Event, User)
|
||||||
from forms import (TaskForm, EventForm, PeriodForm, SignupForm, LoginForm, SettingsForm)
|
from forms import (TaskForm, EventForm, PeriodForm, SignupForm, LoginForm, SettingsForm)
|
||||||
from create_events import createEvents
|
from create_events import createEvents
|
||||||
@@ -39,6 +39,11 @@ else:
|
|||||||
def load_user(user_id):
|
def load_user(user_id):
|
||||||
return User.query.get(int(user_id))
|
return User.query.get(int(user_id))
|
||||||
|
|
||||||
|
# Context processor injects current version and commit
|
||||||
|
@app.context_processor
|
||||||
|
def injectVerCommit():
|
||||||
|
return dict(currVersion=currVersion, currCommit=currCommit)
|
||||||
|
|
||||||
# Index route
|
# Index route
|
||||||
@app.route('/')
|
@app.route('/')
|
||||||
def index():
|
def index():
|
||||||
|
@@ -3,3 +3,8 @@ from datetime import datetime, date
|
|||||||
from zoneinfo import ZoneInfo
|
from zoneinfo import ZoneInfo
|
||||||
currDay = datetime.now()
|
currDay = datetime.now()
|
||||||
currDay = currDay.strftime('%m-%d-%Y')
|
currDay = currDay.strftime('%m-%d-%Y')
|
||||||
|
|
||||||
|
with open('__version__','r') as file:
|
||||||
|
currVersion = file.read()
|
||||||
|
with open('__commit__','r') as file:
|
||||||
|
currCommit = file.read()
|
@@ -10,7 +10,7 @@
|
|||||||
<title>{% block title %} {% endblock %} - BellScheduler</title>
|
<title>{% block title %} {% endblock %} - BellScheduler</title>
|
||||||
|
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body class="d-flex flex-column min-vh-100">
|
||||||
<nav class="navbar navbar-expand-md navbar-light bg-light">
|
<nav class="navbar navbar-expand-md navbar-light bg-light">
|
||||||
<a class="navbar-brand" href="{{ url_for('index') }}">BellScheduler</a>
|
<a class="navbar-brand" href="{{ url_for('index') }}">BellScheduler</a>
|
||||||
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
|
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
|
||||||
@@ -45,7 +45,9 @@
|
|||||||
<div class="container">
|
<div class="container">
|
||||||
{% block content %} {% endblock %}
|
{% block content %} {% endblock %}
|
||||||
</div>
|
</div>
|
||||||
|
<footer class="card-footer mt-auto">
|
||||||
|
Version {{ currVersion }} Commit: {{ currCommit }}
|
||||||
|
</footer>
|
||||||
<!-- Optional JavaScript -->
|
<!-- Optional JavaScript -->
|
||||||
<!-- jQuery first, then Popper.js, then Bootstrap JS -->
|
<!-- jQuery first, then Popper.js, then Bootstrap JS -->
|
||||||
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
|
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
|
||||||
|
Reference in New Issue
Block a user