williamp/BellScheduler
1
0
Fork 0
Code Issues 5 Pull Requests Projects Releases 3 Wiki Activity

1.0.1 release #15

Merged
williamp merged 35 commits from testing into master 2023-03-21 18:10:14 +00:00
Conversation 0 Commits 35 Files Changed 32 +114 -17
12 changed files with 114 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ac8bed1bad - Show all commits

1
app/__commit__ Normal file
View File

@@ -0,0 +1 @@
unknown

1
app/__version__ Normal file
View File

@@ -0,0 +1 @@
1.0.1

7
app/app.py
View File

@@ -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():

7
app/misc.py
View File

@@ -2,4 +2,9 @@ import time
from datetime import datetime, date
from zoneinfo import ZoneInfo
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()

6
app/templates/base.html
View File

@@ -10,7 +10,7 @@
<title>{% block title %} {% endblock %} - BellScheduler</title>
</head>
<body>
<body class="d-flex flex-column min-vh-100">
<nav class="navbar navbar-expand-md navbar-light bg-light">
<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">
@@ -45,7 +45,9 @@
<div class="container">
{% block content %} {% endblock %}
</div>
<footer class="card-footer mt-auto">
Version {{ currVersion }} &nbsp; &nbsp; Commit: {{ currCommit }}
</footer>
<!-- Optional JavaScript -->
<!-- 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>