merge

src/app/main.py

@@ -1,4 +1,4 @@
-from index import app
+from views.index import app
 
 if __name__ == "__main__":
     app.run()

src/app/model.py

@@ -1,71 +0,0 @@
-import mysql.connector
-
-def connect_to_db():
-    try:
-        # Access database using mysql connector package
-        db = mysql.connector.connect(
-            user='root', 
-            password='root',
-            host='10.5.0.5',
-            database='db'
-        )
-    except Exception as e:
-        print(e)
-        print("Try connecting to local mysql database instead")
-        # Access local database using mysql connector package
-        db = mysql.connector.connect(
-            user='root', 
-            password='root',
-            host='0.0.0.0',
-            database='db'
-        )
-        pass
-    return db
-
-def get_users():
-    db = connect_to_db()
-    cursor = db.cursor()
-    query = ("SELECT userid, username from users")
-    cursor.execute(query)
-    users = cursor.fetchall()
-    cursor.close()
-    db.close()
-    return users
-
-def match_user(username, password):
-    db = connect_to_db()
-    cursor = db.cursor()
-    query = ("SELECT userid, username from users where username = \"" + username + 
-            "\" and password = \"" + password + "\"")
-    cursor.execute(query)
-    user = cursor.fetchall()
-    cursor.close()
-    db.close()
-    return user
-
-def set_user(username, password):
-    db = connect_to_db()
-    cursor = db.cursor()
-    query = ("INSERT INTO users VALUES (NULL, \"" + username + 
-            "\", \"" + password + "\")")
-    cursor.execute(query)
-    cursor.close()
-    db.close()
-
-def get_guestbook_entries():
-    db = connect_to_db()
-    cursor = db.cursor()
-    query = ("SELECT entryid, text FROM guestbook")
-    cursor.execute(query)
-    entries = cursor.fetchall()
-    cursor.close()
-    db.close()
-    return entries
-
-def set_guestbook_entry(entry):
-    db = connect_to_db()
-    cursor = db.cursor()
-    query = ("INSERT INTO guestbook VALUES (NULL, \"" + entry + "\")")
-    cursor.execute(query)
-    cursor.close()
-    db.close()    

src/app/models/database.py

@@ -0,0 +1,8 @@
+import mysql.connector
+
+db = mysql.connector.connect(
+    user='root', 
+    password='root',
+    host='0.0.0.0',
+    database='db'
+)

src/app/models/guestbook.py

@@ -0,0 +1,17 @@
+from models.database import db
+
+def get_guestbook_entries():
+    cursor = db.cursor()
+    query = ("SELECT entryid, text FROM guestbook")
+    cursor.execute(query)
+    entries = cursor.fetchall()
+    cursor.close()
+    return entries
+
+def set_guestbook_entry(entry):
+    cursor = db.cursor()
+    query = ("INSERT INTO guestbook VALUES (NULL, \"" + entry + "\")")
+    cursor.execute(query)
+    cursor.close()
+
+    

src/app/models/login.py

@@ -0,0 +1,18 @@
+from models.database import db
+
+def get_users():
+    cursor = db.cursor()
+    query = ("SELECT userid, username from users")
+    cursor.execute(query)
+    users = cursor.fetchall()
+    cursor.close()
+    return users
+
+def match_user(username, password):
+    cursor = db.cursor()
+    query = ("SELECT userid, username from users where username = \"" + username + 
+            "\" and password = \"" + password + "\"")
+    cursor.execute(query)
+    user = cursor.fetchall()
+    cursor.close()
+    return user

src/app/models/register.py

@@ -0,0 +1,8 @@
+from models.database import db
+
+def set_user(username, password):
+    cursor = db.cursor()
+    query = ("INSERT INTO users VALUES (NULL, \"" + username + 
+            "\", \"" + password + "\")")
+    cursor.execute(query)
+    cursor.close()

src/app/sessions/4a7a69f1d0514a515600940b77084078a78239fd

@@ -1,3 +0,0 @@
-gAN9cQAoWAoAAABzZXNzaW9uX2lkcQFYKAAAADRhN2E2OWYxZDA1MTRhNTE1NjAwOTQwYjc3MDg0
-MDc4YTc4MjM5ZmRxAlgIAAAAdXNlcm5hbWVxA1gBAAAAYXEEWAIAAABpcHEFWAkAAAAxMjcuMC4w
-LjFxBnUu

src/app/views/admin.py

@@ -0,0 +1,6 @@
+import web
+
+class Admin:
+
+    def GET(self):
+        session = web.ctx.session

src/app/guestbook.py → src/app/views/guestbook.py

@@ -1,18 +1,17 @@
 import web
-from forms import guestbook_form
-import model
-from utils import get_nav_bar
+from views.forms import guestbook_form
+import models.guestbook
+from views.utils import get_nav_bar
 
 # Get html templates
 render = web.template.render('templates/')
 
 
-
 class Guestbook:
 
     # Get guestbook entries
     def GET(self):
-        entries = model.get_guestbook_entries()
+        entries = models.guestbook.get_guestbook_entries()
         session = web.ctx.session
         nav = get_nav_bar(session)
         return render.guestbook(nav, entries, guestbook_form)
@@ -22,5 +21,5 @@ class Guestbook:
         entry = web.data()
         print(data)
         print(entry)
-        model.set_guestbook_entry(data.entry)
+        models.guestbook.set_guestbook_entry(data.entry)
         return web.seeother("/guestbook")

src/app/index.py → src/app/views/index.py

@@ -1,11 +1,10 @@
 import web
-from forms import login_form, register_form, guestbook_form
-import model
-from utils import get_nav_bar
-from guestbook import Guestbook
-from login import Login
-from logout import Logout
-from register import Register
+from views.utils import get_nav_bar
+from views.guestbook import Guestbook
+from views.login import Login
+from views.logout import Logout
+from views.register import Register
+from views.admin import Admin
 
 # Define application routes
 urls = (
@@ -46,8 +45,3 @@ class Index:
     def GET(self):
         nav = get_nav_bar(session)
         return render.index(nav)
-
-class Admin:
-
-    def GET(self):
-        session = web.ctx.session

src/app/login.py → src/app/views/login.py

@@ -1,7 +1,7 @@
 import web
-from forms import login_form
-import model
-from utils import get_nav_bar
+from views.forms import login_form
+import models.login
+from views.utils import get_nav_bar
 
 # Get html templates
 render = web.template.render('templates/')
@@ -12,7 +12,7 @@ class Login():
         session = web.ctx.session
         # Show other registered users if the user is logged in
         if session.username:
-            friends = model.get_users()
+            friends = models.login.get_users()
         else:
             friends = [[],[]]
         nav = get_nav_bar(session)
@@ -23,10 +23,10 @@ class Login():
         session = web.ctx.session
         # Validate login credential with database query
         data = web.input()
-        user = model.match_user(data.username, data.password)
+        user = models.login.match_user(data.username, data.password)
         # If there is a matching user/password in the database the user is logged in
         if len(user):
-            friends = model.get_users()
+            friends = models.login.get_users()
             session.username = data.username
         else:
             friends = [[],[]]

src/app/logout.py → src/app/views/logout.py

@@ -1,13 +1,10 @@
 import web
-from forms import login_form, register_form, guestbook_form
-import model
-from utils import get_nav_bar
+from views.utils import get_nav_bar
 
 # Get html templates
 render = web.template.render('templates/')
 
 
-
 class Logout:
 
     # Kill session

src/app/register.py → src/app/views/register.py

@@ -1,7 +1,7 @@
 import web
-from forms import register_form
-import model
-from utils import get_nav_bar
+from views.forms import register_form
+import models.register
+from views.utils import get_nav_bar
 
 # Get html templates
 render = web.template.render('templates/')
@@ -18,6 +18,6 @@ class Register:
     # Register new user in database
     def POST(self):
         data = web.input()
-        model.set_user(data.username, data.password)
+        models.register.set_user(data.username, data.password)
         raise web.seeother('/')