Merge pull request #244 from ComputerScienceHouse/develop

Version 1.10.1

Author: devinmatte

conditional/__init__.py

@@ -10,6 +10,10 @@
 from flask_sqlalchemy import SQLAlchemy
 from raven.contrib.flask import Sentry
 
+import sentry_sdk
+from sentry_sdk.integrations.flask import FlaskIntegration
+from sentry_sdk.integrations.sqlalchemy import SqlalchemyIntegration
+
 app = Flask(__name__)
 gzip = Gzip(app)
 
@@ -24,7 +28,13 @@
 
 db = SQLAlchemy(app)
 migrate = Migrate(app, db)
+
+# Sentry setup
 sentry = Sentry(app)
+sentry_sdk.init(
+    dsn=app.config['SENTRY_DSN'],
+    integrations=[FlaskIntegration(), SqlalchemyIntegration()]
+)
 
 ldap = CSHLDAP(app.config['LDAP_BIND_DN'],
                app.config['LDAP_BIND_PW'],

conditional/templates/dashboard.html

@@ -195,7 +195,6 @@ <h3 class="panel-title">Conditionals</h3>
             {% endif %}
 
 
-            {% if is_eboard %}
             <div class="panel panel-default">
                 <div class="panel-heading">
                     <h3 class="panel-title">Member Statistics</h3>
@@ -220,7 +219,6 @@ <h3 class="panel-title">Member Statistics</h3>
                     </div>
                 </div>
             </div>
-            {% endif %}
 
 
             {% if major_projects_count == 0 and not active%}

config.env.py

@@ -26,6 +26,7 @@
 
 # Sentry config
 # Do not set the DSN for local development
+SENTRY_DSN = env.get("CONDITIONAL_SENTRY_DSN", "")
 SENTRY_CONFIG = {
     'dsn': env.get("CONDITIONAL_SENTRY_DSN", ""),
     'release': VERSION,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "conditional",
-  "version": "1.10.0",
+  "version": "1.10.1",
   "description": "CSH Re-evaluation (MEGA_EVALS RE:RE:LOADED)",
   "license": "MIT",
   "homepage": "http://csh.rit.edu/",

requirements.txt

@@ -23,6 +23,7 @@ pylint~=2.3.1
 python-dateutil~=2.6.1
 python-editor~=1.0.3
 raven~=6.6.0
+sentry-sdk[flask]~=0.13.1
 six~=1.11.0
 SQLAlchemy~=1.3.7
 structlog~=18.1.0