diff --git a/app/__commit__ b/app/__commit__ new file mode 100644 index 0000000..87edf79 --- /dev/null +++ b/app/__commit__ @@ -0,0 +1 @@ +unknown \ No newline at end of file diff --git a/app/__version__ b/app/__version__ new file mode 100644 index 0000000..7f20734 --- /dev/null +++ b/app/__version__ @@ -0,0 +1 @@ +1.0.1 \ No newline at end of file diff --git a/app/app.py b/app/app.py index f1d61b0..257bf35 100644 --- a/app/app.py +++ b/app/app.py @@ -3,7 +3,7 @@ from flask import Flask, render_template, redirect, url_for, request, flash from flask_migrate import Migrate from werkzeug.security import generate_password_hash, check_password_hash 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 forms import (TaskForm, EventForm, PeriodForm, SignupForm, LoginForm, SettingsForm) from create_events import createEvents @@ -39,6 +39,11 @@ else: def load_user(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 @app.route('/') def index(): diff --git a/app/misc.py b/app/misc.py index b0933f7..cfc9589 100644 --- a/app/misc.py +++ b/app/misc.py @@ -2,4 +2,9 @@ import time from datetime import datetime, date from zoneinfo import ZoneInfo currDay = datetime.now() -currDay = currDay.strftime('%m-%d-%Y') \ No newline at end of file +currDay = currDay.strftime('%m-%d-%Y') + +with open('__version__','r') as file: + currVersion = file.read() +with open('__commit__','r') as file: + currCommit = file.read() \ No newline at end of file diff --git a/app/templates/base.html b/app/templates/base.html index 3c17a12..983983f 100644 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -10,7 +10,7 @@ {% block title %} {% endblock %} - BellScheduler - +