code cleanup and comments

database/db.py

@@ -1,38 +0,0 @@
-# http://flask.pocoo.org/docs/1.0/tutorial/database/
-import sqlite3
-
-import click
-from flask import current_app, g
-from flask.cli import with_appcontext
-
-def get_db():
-    if "db" not in g:
-        g.db = sqlite3.connect(
-            "database/sqlite_db", detect_types=sqlite3.PARSE_DECLTYPES
-        )
-        g.db.row_factory = sqlite3.Row
-
-    return g.db
-
-def close_db(e=None):
-    db = g.pop("db/db", None)
-
-    if db is not None:
-        db.close()
-
-def init_db():
-    db = get_db()
-
-    with current_app.open_resource("database/schema.sql") as f:
-        db.executescript(f.read().decode("utf8"))
-
-@click.command("init-db")
-@with_appcontext
-def init_db_command():
-    """Clear the existing data and create new tables."""
-    init_db()
-    click.echo("Initialized the database.")
-
-def init_app(app):
-    app.teardown_appcontext(close_db)
-    app.cli.add_command(init_db_command)

database/schema.sql

@@ -1,14 +0,0 @@
-CREATE TABLE user (
-  id TEXT PRIMARY KEY,
-  name TEXT NOT NULL,
-  email TEXT UNIQUE NOT NULL,
-  profile_pic TEXT NOT NULL
-);
-
-CREATE TABLE calendar (
-  usr_id TEXT NOT NULL,
-  calendar_id TEXT PRIMARY KEY,
-  name TEXT NOT NULL,
-  toggle TEXT,
-  color TEXT
-);

database/user.py

@@ -1,92 +0,0 @@
-from flask_login import UserMixin
-from pathlib import Path
-
-from server.database.db import get_db
-
-class User(UserMixin):
-    def __init__(self, id_, name, email, profile_pic):
-        self.id = id_
-        self.name = name
-        self.email = email
-        self.profile_pic = profile_pic
-
-    @staticmethod
-    def get(user_id):
-        db = get_db()
-        user = db.execute(
-            "SELECT * FROM user WHERE id = ?", (user_id,)
-        ).fetchone()
-        if not user:
-            return None
-
-        user = User(
-            id_=user[0], name=user[1], email=user[2], profile_pic=user[3]
-        )
-        return user
-
-    @staticmethod
-    def create(id_, name, email, profile_pic):
-        db = get_db()
-        db.execute(
-            "INSERT INTO user (id, name, email, profile_pic) "
-            "VALUES (?, ?, ?, ?)",
-            (id_, name, email, profile_pic),
-        )
-        db.commit()
-
-        Path(f"userinfo/{id_}").mkdir(parents=True, exist_ok=True)
-
-class dbCalendar():
-    def __init__(self, id_, name, toggle, color):
-        self.usr_id = id_
-        self.name = name
-        self.toggle = toggle
-        self.color = color
-
-    @staticmethod
-    def getCalendars(user_id):
-        db = get_db()
-        calendars = db.execute(
-            "SELECT * FROM calendar WHERE usr_id = ?", (user_id,)
-        ).fetchall()
-
-        return calendars
-
-    @staticmethod
-    def getCalendar(user_id, calendar_id):
-        db = get_db()
-        calendar = db.execute(
-            "SELECT * FROM calendar WHERE usr_id = ? AND calendar_id = ?", (user_id, calendar_id)
-        ).fetchone()
-        
-        if not calendar:
-            return None
-        
-        return calendar
-    
-    @staticmethod
-    def updateCalendar(user_id, calendar_name, toggle=None, color=None):
-        db = get_db()
-        print("updating")
-        if(toggle != None):
-            print(toggle)
-            db.execute(
-                "UPDATE calendar SET toggle = ? WHERE usr_id = ? AND name = ?", (toggle, user_id, calendar_name)
-            )
-            db.commit()
-
-        if(color != None):
-            db.execute(
-                "UPDATE calendar SET color = ? WHERE usr_id = ? AND name = ?", (color, user_id, calendar_name)
-            )
-            db.commit()
-
-    @staticmethod
-    def create(user_id, calendar_id, name, color, toggle = 'True'):
-        db = get_db()
-        db.execute(
-            "INSERT INTO calendar (usr_id, calendar_id, name, toggle, color) "
-            "VALUES (?, ?, ?, ?, ?)",
-            (user_id, calendar_id, name, toggle, color),
-        )
-        db.commit()