Changes EVERYTHING! And I mean everything. Not only has everything been organized more clearly (all held under an app/ folder, rather than jumbled). Begins to incorporate databases, and has a hell of a lot more dependencies (thank you Flask, for integrating with literally EVERY python module known to man. Also separates views, models, and config, and clarifies the distinction and relationship between various HTML pages. Externalized the startup command to run.py. All python scripts are now executable by the venv python interpreter. What else... the project becomes a package, rather than a module (or I may have that wrong... - we now have an __init__.py). There is more (namely, better login support), but this commit is just because I'm deathly afraid I'll erase all of my code again. Yay version control! Sorry for the long commit - if you're reading this, get back to work.

Author: Sam Redmond

.gitignore

@@ -42,3 +42,10 @@ venv
 #Request and Feedback pickled arrays
 requests/*
 feedback/*
+
+#Ignore database storage
+db_*
+app.db
+
+#Ignore tmp
+tmp/*

Procfile

@@ -1 +1 @@
-web: gunicorn main:app
+web: gunicorn run:app

app/__init__.py

@@ -0,0 +1,16 @@
+import os
+from flask import Flask
+from flask.ext.sqlalchemy import SQLAlchemy
+from flask.ext.login import LoginManager
+from flask.ext.openid import OpenID
+from config import basedir
+
+app = Flask(__name__)
+app.config.from_object('config')
+db = SQLAlchemy(app)
+
+lm = LoginManager()
+lm.init_app(app)
+lm.login_view = 'login'
+
+from app import views, models

clear.py renamed to app/clear.py

@@ -0,0 +1 @@
+from flask.ext.sqlalchemy import SQLAlchemy #Our SQL helper

app/dbLib.py

@@ -0,0 +1,7 @@
+from flask.ext.wtf import Form
+from wtforms import TextField, BooleanField
+from wtforms.validators import Required
+
+class LoginForm(Form):
+	openid = TextField('openid', validators = [Required()])
+	remember_me = BooleanField('remember_me', default = False)

feedback/feedback.txt renamed to app/feedback/feedback.txt

@@ -0,0 +1,63 @@
+import os
+from flask import Flask, request, render_template, url_for, redirect, flash #The main module that does a lot of hidden work
+from flask.ext.sqlalchemy import SQLAlchemy #Our SQL helper
+import cPickle as cp #A workaround to SQL for now
+from mshc_lib import * #Our custom library
+import bcrypt
+
+DEBUG=True #CHANGE THIS TO FALSE ON MAJOR RELEASES
+app = Flask(__name__)
+app.secret_key=os.urandom(24)
+app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:////tmp/test.db'
+db = SQLAlchemy(app)
+
+pickle_path = os.path.join(os.getcwd(), 'requests/pickled_requests.txt')
+feedback_path = os.path.join(os.getcwd(), 'feedback/feedback.txt')
+
+
+##DECLARE DATABASE MODELS##
+class Request(db.Model):
+	request_id = db.Column(db.Integer, primary_key=True)
+	title = db.Column(db.String, unique=True)
+	description = db.Column(db.String, unique=True)
+	class_name = db.Column(db.String, unique=True)
+	user = db.relationship('User', backref='request')
+
+	def __init__(self, username, email, class_name):
+		self.username = username
+		self.email = email
+
+	def __repr__(self):
+		return '<User %r>' % self.title
+
+class User(db.Model):
+	user_id = db.Column(db.Integer, primary_key=True)
+	username = db.Column(db.String(50), unique=True)
+	pw_hash = db.Column(db.String, unique=True)
+
+	first_name = db.Column(db.String(50), unique=True)
+	last_name = db.Column(db.String(50), unique=True)
+	grade = db.Column(db.Integer, unique=True)
+	email = db.Column(db.String(150), unique=True)
+
+	##Classes the user is taking
+
+	##Classes the user can Tutor
+
+	##Requests I have made
+
+
+	def __init__(self, username, email):
+		self.username = username
+		self.email = email
+
+	def __repr__(self):
+		return '<User %r>' % self.username
+
+##END DECLARE DB MODELS####
+
+#DATABASE STUFF
+
+#Run the app
+if __name__ == '__main__':
+  app.run(debug=DEBUG)

app/forms.py

@@ -0,0 +1,63 @@
+from app import db
+ROLE_USER = 0
+ROLE_ADMIN = 1
+
+class User(db.Model):
+    id = db.Column(db.Integer, primary_key = True)
+    
+    #Information for logging in 
+    email = db.Column(db.String(120), unique = True)
+    hashed_password = db.Column(db.String(60));
+
+    #Personal Information
+    first_name = db.Column(db.String(20))
+    last_name = db.Column(db.String(20))
+    grade = db.Column(db.SmallInteger)
+
+    #Classes
+    #classes_taking = db.Column(db.PickleType(mutable=True))
+    #classes_can_help = db.Column(db.PickleType(mutable=True))
+    
+    #Administrative
+    role = db.Column(db.SmallInteger, default = ROLE_USER)
+    
+    #Requests Made
+    requests = db.relationship('Request', backref = 'author', lazy = 'dynamic')
+
+    #Necessary methods for Flask-Login
+    def is_authenticated(self):
+        return True
+
+    def is_active(self):
+        return True
+
+    def is_anonymous(self):
+        return False
+
+    def get_id(self):
+        return unicode(self.id)
+
+    def verify_password(self, password):
+    	return bcrypt.hashpw(password, self.hashed_password) == self.hashed_password
+
+    def __repr__(self):
+        return '<User %r>' % (self.email)
+
+class Request(db.Model):
+    id = db.Column(db.Integer, primary_key = True)
+    #A form of meta data
+    class_for = db.Column(db.String(64)) #64 is arbitrary
+    issue = db.Column(db.String(64)) #Again, arbitrary - this field holds "homework" or "project" or "test" or something else
+    
+    #Content
+    body = db.Column(db.String(255)) #Max length for VARCHARs in older versions of SQL 
+    extra_requests = db.Column(db.String(255))
+    availability = db.Column(db.String(255))
+    additional = db.Column(db.String(255))
+
+    #Other
+    timestamp = db.Column(db.DateTime)
+    user_id = db.Column(db.Integer, db.ForeignKey('user.id'))
+
+    def __repr__(self):
+        return '<Post %r>' % (self.body)

app/main.py

@@ -12,7 +12,7 @@
 
 .footer {
   text-align: center;
-  padding: 30px 0;
+  padding: 30px 0 0 0;
   margin-top: 70px;
   border-top: 1px solid #e5e5e5;
   background-color: #f5f5f5;

app/models.py

@@ -0,0 +1,7 @@
+{% extends "layout.html" %}
+{% block content %}	
+<h1>Hi, {{user.email}}!</h1>
+{% for post in posts %}
+<div><p>{{post.author.email}} says: <b>{{post.body}}</b></p></div>
+{% endfor %}
+{% endblock %}

mshc_lib.py renamed to app/mshc_lib.py

@@ -0,0 +1,139 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<!--You found an easter egg!
+__      _____________.____   _________  ________      _____  ___________
+/  \    /  \_   _____/|    |  \_   ___ \ \_____  \    /     \ \_   _____/
+\   \/\/   /|    __)_ |    |  /    \  \/  /   |   \  /  \ /  \ |    __)_ 
+\        / |        \|    |__\     \____/    |    \/    Y    \|        \
+\__/\  / /_______  /|_______ \______  /\_______  /\____|__  /_______  /
+\/          \/         \/      \/         \/         \/        \/ 
+___________________   
+\__    ___/\_____  \  
+|    |    /   |   \ 
+|    |   /    |    \
+|____|   \_______  /
+\/ 
+______________ ______________
+\__    ___/   |   \_   _____/
+|    | /    ~    \    __)_ 
+|    | \    Y    /        \
+|____|  \___|_  /_______  /
+\/        \/ 
+_____    _________ ___ ___  _________  
+/     \  /   _____//   |   \ \_   ___ \ 
+/  \ /  \ \_____  \/    ~    \/    \  \/ 
+/    Y    \/        \    Y    /\     \____
+\____|__  /_______  /\___|_  /  \______  /
+\/        \/       \/          \/
+-->
+
+<meta charset="utf-8">
+{% if title %}
+<title>{{ title }} - MSHC</title>
+{% else %}
+<title>Menlo's Math and Science Help Center</title>
+{% endif %}
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<meta name="keywords" content="menlo, mshc, math, science, help">
+<meta name="description" content="">
+<meta name="author" content="Sam Redmond">
+
+<!-- Styles -->
+<link href="/static/css/bootstrap.css" rel="stylesheet">
+<link href="/static/css/extra_styles.css" rel="stylesheet">
+
+<!-- Touch and fav icons -->
+<link rel="icon" href="/static/img/favicon.ico" type="image/x-icon" />
+
+</head>
+<body>
+  <!--Flash any messages-->
+  {% with messages = get_flashed_messages() %}
+  {% if messages %}
+  <ul class="flashes">
+    {% for message in messages %}
+    <li>{{ message }}</li>
+    {% endfor %}
+  </ul>
+  {% endif %}
+  {% endwith %}
+  <!-- Begin header -->
+  <div class="navbar navbar-inverse navbar-fixed-top">
+    <div class="navbar-inner">
+      <div class="container-fluid">
+        <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+        </button>
+        <a class="brand" href="/">Math&amp;Science Help Center</a>
+        <div class="nav-collapse collapse">
+          <ul class="nav">
+            <li class="active"><a href="/">Home</a></li>
+            <li class="dropdown">
+              <a href="#" class="dropdown-toggle" data-toggle="dropdown">Me<b class="caret"></b></a>
+              <ul class="dropdown-menu">
+                <li class="nav-header">View</li>
+                <li><a href="#">Learner View</a></li>
+                <li><a href="#">Tutor View</a></li>
+                <li class="divider"></li>
+                <li class="nav-header">Settings</li>
+                <li><a href="#">My information</a></li>
+                <li><a href="#">My classes</a></li>
+                <li><a href="#">My history</a></li>
+              </ul>
+            </li>
+          </ul>
+          <form class="navbar-form pull-right">
+            {% if g.user.is_authenticated() %}
+            <button type="submit" class="btn">Logout</button>
+            {% endif %}
+            <input class="span2" type="text" placeholder="Email" disabled>
+            <input class="span2" type="password" placeholder="Password" disabled>
+            <button type="submit" class="btn">Sign in</button>
+          </form>
+        </div><!--/.nav-collapse -->
+      </div>
+    </div>
+  </div>
+</div> 
+<!-- End header -->
+<!--Flash any messages-->
+{% with messages = get_flashed_messages() %}
+{% if messages %}
+<ul>
+  {% for message in messages %}
+  <li>{{ message }} </li>
+  {% endfor %}
+</ul>
+{% endif %}
+{% endwith %}
+<!--End message flashing-->
+{% block content %}
+{% endblock %}
+<!-- Begin footer -->
+<div class="footer">
+  <div class="container">
+    <p class="muted">Designed and built lovingly by Sam Redmond</p>
+    <p class="muted">This project is structured on <a href="http://getbootstrap.com/2.3.2/" target="_blank">Twitter Bootstrap v2.3.2</a></p>
+    <p class="muted">Code licensed under <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a> (actually MIT license), documentation under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
+    <p class="muted"><a href="http://glyphicons.com">Glyphicons Free</a> licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
+    <ul class="footer-links">
+      <li><a href="https://github.com/sredmond/menlo-mathsci-help" target="_blank">Contribute</a></li>
+      <li class="muted">&middot;</li>
+      <li><a href="https://github.com/sredmond/menlo-mathsci-help/issues?state=open" target="_blank">Issues</a></li>
+      <li class="muted">&middot;</li>
+      <li><a href="https://github.com/sredmond/menlo-mathsci-help/releases" target="_blank">Changelog</a></li>
+    </ul>
+  </div>
+</div>
+<!-- End footer -->
+
+<!-- Scripts -->
+<!-- Placed at the end of the document so the pages load faster-->
+<script src="http://code.jquery.com/jquery.js"></script>
+<script src="/static/js/bootstrap.js"></script>
+<script src="/static/js/main.js"></script>
+</body>
+</html>

requests/pickled_requests.txt renamed to app/requests/pickled_requests.txt

@@ -0,0 +1,46 @@
+{% extends "layout.html" %}
+{% block content %}
+<script type="text/javascript">
+function set_openid(openid, pr)
+{
+    u = openid.search('<username>');
+    if (u != -1) {
+        // openid requires username
+        user = prompt('Enter your ' + pr + ' username:');
+        openid = openid.substr(0, u) + user;
+    }
+    form = document.forms['login'];
+    form.elements['openid'].value = openid;
+}
+</script>
+<h1>Sign In</h1>
+<form action="" method="post" name="login">
+    {{form.hidden_tag()}}
+    <p>
+        Please enter your OpenID, or select one of the providers below:<br>
+        {{form.openid(size=80)}}
+        {% for error in form.errors.openid %}
+        <span style="color: red;">[{{error}}]</span>
+        {% endfor %}<br>
+    </p>
+    <p>{{form.remember_me}} Remember Me</p>
+    <p><input type="submit" value="Sign In"></p>
+</form>
+<!--<div class="container-fluid">
+<div class="hero-unit">
+<h1>Login</h1>
+{% if error %}
+<p class="error"><strong>Error:</strong> {{ error }}</p>
+{% endif %}
+<form action="" method="post">
+<dl>
+<dt>Username:</dt>
+<dd><input type="text" name="username" value={{ request.form.username }}></dd>
+<dt>Password:</dt>
+<dd><input type="password" name="password"></dd>
+</dl>
+<p><input type=submit value=Login></p>
+</form>
+</div>
+</div>-->
+{% endblock %}