Commit a749ec92 authored by Benjamin S Waters's avatar Benjamin S Waters
Browse files

fixing merge notes

parent 69c5818f
from flask import Flask from flask import Flask
<<<<<<< HEAD
website = Flask(__name__)
=======
from flask.ext.sqlalchemy import SQLAlchemy from flask.ext.sqlalchemy import SQLAlchemy
from flask.ext.admin import Admin from flask.ext.admin import Admin
website = Flask(__name__) website = Flask(__name__)
website.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:////database.db' website.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:////database.db'
admin = Admin(website) admin = Admin(website)
>>>>>>> dev
from website import routes
...@@ -8,30 +8,18 @@ SERVICE_URL = "http://129.174.177.239/cgi-bin/pycas.py" ...@@ -8,30 +8,18 @@ SERVICE_URL = "http://129.174.177.239/cgi-bin/pycas.py"
@website.route('/login') @website.route('/login')
def my_login(): def my_login():
status, id, cookie = pycas.login(CAS_SERVER, SERVICE_URL, secure=1, opt="gateway") status, id, cookie = pycas.login(CAS_SERVER, SERVICE_URL, secure=1, opt="gateway")
<<<<<<< HEAD
return redirect(url_for('home'))
=======
return redirect(url_for('routes.home')) return redirect(url_for('routes.home'))
>>>>>>> dev
@website.route('/') @website.route('/')
def home(): def home():
return render_template('index.html') return render_template('index.html')
<<<<<<< HEAD
@website.route('/feature-request', method=['GET','POST'])
=======
@website.route('/submit', methods=['GET','POST']) @website.route('/submit', methods=['GET','POST'])
>>>>>>> dev
def process_request(): def process_request():
form = FeatureRequestForm() form = FeatureRequestForm()
if form.validate_on_submit(): if form.validate_on_submit():
flash('Request Successly Submitted') flash('Request Successly Submitted')
<<<<<<< HEAD
return redirect(url_for('home'))
=======
return redirect(url_for('routes.home')) return redirect(url_for('routes.home'))
>>>>>>> dev
return render_template('feature_request.html',title='Request Form', form=form) return render_template('feature_request.html',title='Request Form', form=form)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment