Added tutoring database and sign up page

8a024c92 · mrschnei · 0cb5f24b · 8a024c92 · 8a024c92 · 8a024c92
Commit 8a024c92 authored 4 years ago by mrschnei
--- a/servicePoints/__pycache__/__init__.cpython-36.pyc
+++ b/servicePoints/__pycache__/__init__.cpython-36.pyc
--- a/servicePoints/__pycache__/config.cpython-36.pyc
+++ b/servicePoints/__pycache__/config.cpython-36.pyc
--- a/servicePoints/__pycache__/model.cpython-36.pyc
+++ b/servicePoints/__pycache__/model.cpython-36.pyc
--- a/servicePoints/templates/duplicateTutor.html
+++ b/servicePoints/templates/duplicateTutor.html
+<!DOCTYPE html>
+<html>
+<head>
+    <link rel="stylesheet" type="text/css" href="/css/style.css">
+    <title>ServicePoints</title>
+</head>
+
+<body>
+    <p>
+        You have already signed up for tutoring
+    </p>
+    <form action="/accounts/duplicateTutor/" method="post" enctype="multipart/form-data">
+        <input type="submit" name="return" value="Return to Home" />
+    </form>
+</body>
+</html>
--- a/servicePoints/templates/index.html
+++ b/servicePoints/templates/index.html
@@ -18,8 +18,8 @@
    <a href="/accounts/mask/">
        <img src=/images/food.png alt="mask">
    </a>
-    <a href="/accounts/mask/">
-        <img src=/images/tutor.png alt="mask">
+    <a href="/accounts/tutorsu/">
+        <img src=/images/tutor.png alt="tutorsu">
    </a>
    <a href="/accounts/mask/">
        <img src=/images/submit.png alt="mask">

--- a/servicePoints/templates/tutor.html
+++ b/servicePoints/templates/tutor.html
+<!DOCTYPE html>
+<html>
+<body>
+    <a href="/">Home</a>
+    <title>ServicePoints</title>
+    <form action="/accounts/tutorsu/" method="post" enctype="multipart/form-data">
+        <p>
+            Full Name
+            <input type="text" name="username" />
+        </p>
+        <p>
+            Tutuoring Subject(s):
+            <input type="text" name="subjects" />
+        </p>
+        <p>
+            Available times
+            <input type="text" name="time" />
+        </p>
+        <input type="submit" name="signup" value="sign up" />
+    </form>
+</body>
+</html>
--- a/servicePoints/views/__pycache__/__init__.cpython-36.pyc
+++ b/servicePoints/views/__pycache__/__init__.cpython-36.pyc
--- a/servicePoints/views/__pycache__/accounts.cpython-36.pyc
+++ b/servicePoints/views/__pycache__/accounts.cpython-36.pyc
--- a/servicePoints/views/accounts.py
+++ b/servicePoints/views/accounts.py
@@ -229,6 +229,13 @@ def duplicateOrgName():
    context = {}
    return render_template('duplicateOrgName.html', **context)

+@servicePoints.app.route('/accounts/duplicateTutor/', methods=['GET', 'POST'])
+def duplicateTutor():
+    if flask.request.method == 'POST':
+        return flask.redirect(flask.url_for('tutor'))
+    context = {}
+    return render_template('duplicateTutor.html', **context)
+
 @servicePoints.app.route('/accounts/incompleteForm/<prev>', methods=['GET', 'POST'])
 def incompleteForm(prev):
    if flask.request.method == 'POST':
@@ -247,3 +254,34 @@ def images(filename):
        return flask.send_from_directory(
            servicePoints.app.config['IMAGES_FOLDER'], filename, as_attachment=True)
    return flask.redirect(flask.url_for('login'))
+
+@servicePoints.app.route('/accounts/tutorsu/', methods=['GET', 'POST'])
+def tutorsu():
+
+    if flask.request.method == 'POST':
+      
+        flask.session['subjects'] = flask.request.form['subjects']
+        flask.session['time'] = flask.request.form['time']
+        cursor = servicePoints.model.get_db().cursor()
+        name = str(flask.session['username'])
+
+        to_add = (name,)
+        cursor.execute('SELECT * FROM tutors WHERE username=?', to_add)
+        if cursor.fetchone() is not None:
+            return flask.redirect(flask.url_for('duplicateTutor'))
+
+        # If a user tries to sign up with any empty fields
+        if flask.session['time'] == '':
+            return flask.redirect(flask.url_for('incompleteForm', prev="tutorsu")) 
+        if flask.session['subjects'] == '':
+            return flask.redirect(flask.url_for('incompleteForm', prev="tutorsu")) 
+
+        data = (flask.session['username'], flask.session['subjects'],
+                flask.session['time'])
+        cur = servicePoints.model.get_db()
+        cur.execute("INSERT INTO tutors(username, subject, time) VALUES (?, ?, ?)", data)
+
+        return flask.redirect(flask.url_for('index'))
+
+    context = {}
+    return render_template('tutor.html', **context)
\ No newline at end of file
--- a/sql/schema.sql
+++ b/sql/schema.sql
@@ -14,4 +14,12 @@ CREATE TABLE orgs(
 	  username VARCHAR(20) NOT NULL,
 	  orgName VARCHAR(40) NOT NULL,
 	  PRIMARY KEY(orgName)
+);
+
+
+CREATE TABLE tutors(
+	  username VARCHAR(20) NOT NULL,
+	  subject VARCHAR(40) NOT NULL,
+	  time VARCHAR(80) NOT NULL,
+	  PRIMARY KEY(username)
 );
\ No newline at end of file
--- a/var/servicePoints.sqlite3
+++ b/var/servicePoints.sqlite3