Skip to content

Commit ff24a66

Browse files
author
DESKTOP-GNUER75\teama
committed
Merge remote-tracking branch 'upstream/master'
g the commit.
2 parents a938f32 + 6bfde56 commit ff24a66

File tree

16 files changed

+345
-258
lines changed

16 files changed

+345
-258
lines changed

README.md

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# Background
2-
Pedagogy is a performance management tool for education professionals. It is developed within Algoritma, a data science education center.
2+
Pedagogy is a performance management tool for education professionals. It is developed within Algoritma, a data science education center.
33

44
## Main Features
55

66
![](blurb.png)
77

8-
At its current release (v0.1), Pedagogy delivers key performance indicators and assembly-wide analytics to its employees and training roster. The initial release includes three main modules:
8+
At its current release (v0.4), Pedagogy delivers key performance indicators and assembly-wide analytics to its employees and training roster. The initial release includes three main modules:
99
- Company-wide statistics
1010
- Number of students
1111
- Number of workshop hours
@@ -31,3 +31,13 @@ At its current release (v0.1), Pedagogy delivers key performance indicators and
3131
## Deployment
3232

3333
Pedagogy is deployed on Azure and can be accessed on http://pedagogy.azurewebsites.net
34+
35+
## Feature Requests and Contribution
36+
37+
The project is under active development and we welcome any contribution. Feel free to open issues on any feature request.
38+
39+
If you wish to contribute, we need:
40+
- Getting Started Documentation: A getting started guide to help developers clone and run a local copy of Pedagogy on their machine
41+
- Deployment Guide: A guide on deploying a copy of Pedagogy on all major cloud infrastructure (Azure, AWS, Heroku)
42+
43+
Feel free to submit pull request!

__pycache__/config.cpython-36.pyc

156 Bytes
Binary file not shown.

app/__init__.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
from flask import Flask
2+
from flask_caching import Cache
23
from flask_admin import Admin
34
from flask_admin.contrib.sqla import ModelView
45
from flask_mail import Mail
@@ -17,11 +18,11 @@
1718
login = LoginManager(app)
1819
admin = Admin(app, name='pedagogy')
1920
mail = Mail(app)
21+
cache = Cache(app)
2022

2123
# let Flask-Login know which page (function name) handles login
2224
login.login_view = 'login'
2325

24-
# mailing configuration
2526
if not app.debug:
2627
if app.config['MAIL_SERVER']:
2728
auth = None

app/adminconf.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from flask import redirect, url_for, request
2-
from app import admin, db
2+
from app import app, admin, db
33
from app.models import Employee, Workshop, Response
44
from app.users import User
55
from flask_admin import BaseView, expose
@@ -13,7 +13,7 @@ class AdminModelView(ModelView):
1313

1414
def is_accessible(self):
1515
return (current_user.is_authenticated and
16-
current_user.email == '[email protected]')
16+
current_user.email in app.config['ADMINS'])
1717
def inaccessible_callback(self, name, **kwargs):
1818
# redirect to login page if user doesn't have access
1919
return redirect(url_for('login', next=request.url))
@@ -48,7 +48,7 @@ def inaccessible_callback(self, name, **kwargs):
4848
class ResponseView(ModelView):
4949
def is_accessible(self):
5050
return (current_user.is_authenticated and
51-
current_user.email == '[email protected]')
51+
current_user.email in app.config['ADMINS'])
5252

5353
def inaccessible_callback(self, name, **kwargs):
5454
# redirect to login page if user doesn't have access

0 commit comments

Comments
 (0)